diff --git a/src/nitro/avatar/pets/PetType.ts b/src/api/nitro/avatar/pet/PetType.ts similarity index 100% rename from src/nitro/avatar/pets/PetType.ts rename to src/api/nitro/avatar/pet/PetType.ts diff --git a/src/api/nitro/avatar/pet/index.ts b/src/api/nitro/avatar/pet/index.ts index dd896253..a30c541e 100644 --- a/src/api/nitro/avatar/pet/index.ts +++ b/src/api/nitro/avatar/pet/index.ts @@ -1 +1,2 @@ export * from './IPetCustomPart'; +export * from './PetType'; diff --git a/src/api/nitro/index.ts b/src/api/nitro/index.ts index ea72f5ac..6e966b1c 100644 --- a/src/api/nitro/index.ts +++ b/src/api/nitro/index.ts @@ -5,9 +5,10 @@ export * from './communication'; export * from './enums'; export * from './localization'; export * from './room'; -export * from './room/data'; export * from './room/enums'; export * from './room/object'; +export * from './room/object/data'; +export * from './room/object/data/type'; export * from './room/utils'; export * from './session'; export * from './session/enum'; diff --git a/src/api/nitro/room/IRoomCreator.ts b/src/api/nitro/room/IRoomCreator.ts index acbc9906..040bba18 100644 --- a/src/api/nitro/room/IRoomCreator.ts +++ b/src/api/nitro/room/IRoomCreator.ts @@ -1,7 +1,6 @@ import { IRoomInstance, IRoomObjectController, IVector3D } from '../../room'; import { IRoomSessionManager, ISessionDataManager } from '../session'; -import { IObjectData } from './data'; -import { IRoomMapData } from './object'; +import { IObjectData, IRoomMapData } from './object'; import { IFurnitureStackingHeightMap, ILegacyWallGeometry } from './utils'; export interface IRoomCreator diff --git a/src/api/nitro/room/IRoomEngine.ts b/src/api/nitro/room/IRoomEngine.ts index 42dcd019..b1f42942 100644 --- a/src/api/nitro/room/IRoomEngine.ts +++ b/src/api/nitro/room/IRoomEngine.ts @@ -5,13 +5,12 @@ import { INitroManager } from '../../common'; import { IRoomGeometry, IRoomManager, IRoomObject, IRoomObjectController, IRoomObjectLogicFactory, IRoomObjectVisualizationFactory, IRoomRendererFactory, IRoomRenderingCanvas, IVector3D } from '../../room'; import { IPetCustomPart } from '../avatar'; import { IRoomSessionManager, ISessionDataManager } from '../session'; -import { IObjectData } from './data'; import { IGetImageListener } from './IGetImageListener'; import { IImageResult } from './IImageResult'; import { IPetColorResult } from './IPetColorResult'; import { IRoomContentLoader } from './IRoomContentLoader'; import { IRoomObjectEventManager } from './IRoomObjectEventManager'; -import { IRoomMapData } from './object'; +import { IObjectData, IRoomMapData } from './object'; export interface IRoomEngine extends INitroManager { diff --git a/src/api/nitro/room/IRoomEngineServices.ts b/src/api/nitro/room/IRoomEngineServices.ts index 7b8d363a..af1444b5 100644 --- a/src/api/nitro/room/IRoomEngineServices.ts +++ b/src/api/nitro/room/IRoomEngineServices.ts @@ -2,8 +2,8 @@ import { IEventDispatcher } from '../../common'; import { IConnection } from '../../communication'; import { IRoomInstance, IRoomObjectController, IRoomRenderingCanvas, IVector3D } from '../../room'; import { IRoomSessionManager, ISessionDataManager } from '../session'; -import { IObjectData } from './data'; import { ISelectedRoomObjectData } from './ISelectedRoomObjectData'; +import { IObjectData } from './object'; import { IFurnitureStackingHeightMap, ILegacyWallGeometry, ITileObjectMap } from './utils'; export interface IRoomEngineServices diff --git a/src/api/nitro/room/ISelectedRoomObjectData.ts b/src/api/nitro/room/ISelectedRoomObjectData.ts index f4b4a6cb..e189a6b3 100644 --- a/src/api/nitro/room/ISelectedRoomObjectData.ts +++ b/src/api/nitro/room/ISelectedRoomObjectData.ts @@ -1,5 +1,5 @@ import { IVector3D } from '../../room'; -import { IObjectData } from './data'; +import { IObjectData } from './object'; export interface ISelectedRoomObjectData { diff --git a/src/api/nitro/room/index.ts b/src/api/nitro/room/index.ts index 71e9d5b0..e10262d3 100644 --- a/src/api/nitro/room/index.ts +++ b/src/api/nitro/room/index.ts @@ -1,4 +1,3 @@ -export * from './data'; export * from './enums'; export * from './IGetImageListener'; export * from './IImageResult'; @@ -11,4 +10,6 @@ export * from './IRoomEngineServices'; export * from './IRoomObjectEventManager'; export * from './ISelectedRoomObjectData'; export * from './object'; +export * from './object/data'; +export * from './object/data/type'; export * from './utils'; diff --git a/src/nitro/room/object/RoomObjectCategory.ts b/src/api/nitro/room/object/RoomObjectCategory.ts similarity index 100% rename from src/nitro/room/object/RoomObjectCategory.ts rename to src/api/nitro/room/object/RoomObjectCategory.ts diff --git a/src/nitro/room/object/RoomObjectType.ts b/src/api/nitro/room/object/RoomObjectType.ts similarity index 100% rename from src/nitro/room/object/RoomObjectType.ts rename to src/api/nitro/room/object/RoomObjectType.ts diff --git a/src/nitro/room/object/RoomObjectUserType.ts b/src/api/nitro/room/object/RoomObjectUserType.ts similarity index 100% rename from src/nitro/room/object/RoomObjectUserType.ts rename to src/api/nitro/room/object/RoomObjectUserType.ts diff --git a/src/nitro/room/object/RoomObjectVariable.ts b/src/api/nitro/room/object/RoomObjectVariable.ts similarity index 100% rename from src/nitro/room/object/RoomObjectVariable.ts rename to src/api/nitro/room/object/RoomObjectVariable.ts diff --git a/src/api/nitro/room/data/IObjectData.ts b/src/api/nitro/room/object/data/IObjectData.ts similarity index 78% rename from src/api/nitro/room/data/IObjectData.ts rename to src/api/nitro/room/object/data/IObjectData.ts index 2006f581..be56f1c8 100644 --- a/src/api/nitro/room/data/IObjectData.ts +++ b/src/api/nitro/room/object/data/IObjectData.ts @@ -1,5 +1,5 @@ -import { IMessageDataWrapper } from '../../../communication'; -import { IRoomObjectModel } from '../../../room'; +import { IMessageDataWrapper } from '../../../../communication'; +import { IRoomObjectModel } from '../../../../room'; export interface IObjectData { diff --git a/src/nitro/room/object/data/ObjectDataBase.ts b/src/api/nitro/room/object/data/ObjectDataBase.ts similarity index 90% rename from src/nitro/room/object/data/ObjectDataBase.ts rename to src/api/nitro/room/object/data/ObjectDataBase.ts index 1e4b13db..d2972959 100644 --- a/src/nitro/room/object/data/ObjectDataBase.ts +++ b/src/api/nitro/room/object/data/ObjectDataBase.ts @@ -1,5 +1,8 @@ -import { IMessageDataWrapper, IObjectData, IRoomObjectModel, ObjectDataFlags } from '../../../../api'; +import { IMessageDataWrapper } from '../../../../communication'; +import { IRoomObjectModel } from '../../../../room'; import { RoomObjectVariable } from '../RoomObjectVariable'; +import { IObjectData } from './IObjectData'; +import { ObjectDataFlags } from './ObjectDataFlags'; export class ObjectDataBase implements IObjectData { diff --git a/src/nitro/room/object/data/ObjectDataFactory.ts b/src/api/nitro/room/object/data/ObjectDataFactory.ts similarity index 96% rename from src/nitro/room/object/data/ObjectDataFactory.ts rename to src/api/nitro/room/object/data/ObjectDataFactory.ts index a3cf6408..5f456bbc 100644 --- a/src/nitro/room/object/data/ObjectDataFactory.ts +++ b/src/api/nitro/room/object/data/ObjectDataFactory.ts @@ -1,4 +1,4 @@ -import { IObjectData } from '../../../../api'; +import { IObjectData } from './IObjectData'; import { CrackableDataType, EmptyDataType, HighScoreDataType, LegacyDataType, MapDataType, NumberDataType, StringDataType, VoteDataType } from './type'; export class ObjectDataFactory diff --git a/src/api/nitro/room/data/ObjectDataFlags.ts b/src/api/nitro/room/object/data/ObjectDataFlags.ts similarity index 100% rename from src/api/nitro/room/data/ObjectDataFlags.ts rename to src/api/nitro/room/object/data/ObjectDataFlags.ts diff --git a/src/api/nitro/room/data/ObjectDataKey.ts b/src/api/nitro/room/object/data/ObjectDataKey.ts similarity index 100% rename from src/api/nitro/room/data/ObjectDataKey.ts rename to src/api/nitro/room/object/data/ObjectDataKey.ts diff --git a/src/api/nitro/room/data/index.ts b/src/api/nitro/room/object/data/index.ts similarity index 51% rename from src/api/nitro/room/data/index.ts rename to src/api/nitro/room/object/data/index.ts index defc6511..64993e43 100644 --- a/src/api/nitro/room/data/index.ts +++ b/src/api/nitro/room/object/data/index.ts @@ -1,3 +1,6 @@ export * from './IObjectData'; +export * from './ObjectDataBase'; +export * from './ObjectDataFactory'; export * from './ObjectDataFlags'; export * from './ObjectDataKey'; +export * from './type'; diff --git a/src/nitro/room/object/data/type/CrackableDataType.ts b/src/api/nitro/room/object/data/type/CrackableDataType.ts similarity index 89% rename from src/nitro/room/object/data/type/CrackableDataType.ts rename to src/api/nitro/room/object/data/type/CrackableDataType.ts index c41c47b6..b030242c 100644 --- a/src/nitro/room/object/data/type/CrackableDataType.ts +++ b/src/api/nitro/room/object/data/type/CrackableDataType.ts @@ -1,6 +1,9 @@ -import { IMessageDataWrapper, IObjectData, IRoomObjectModel, ObjectDataKey } from '../../../../../api'; +import { IMessageDataWrapper } from '../../../../../communication'; +import { IRoomObjectModel } from '../../../../../room'; import { RoomObjectVariable } from '../../RoomObjectVariable'; +import { IObjectData } from '../IObjectData'; import { ObjectDataBase } from '../ObjectDataBase'; +import { ObjectDataKey } from '../ObjectDataKey'; export class CrackableDataType extends ObjectDataBase implements IObjectData { diff --git a/src/nitro/room/object/data/type/EmptyDataType.ts b/src/api/nitro/room/object/data/type/EmptyDataType.ts similarity index 79% rename from src/nitro/room/object/data/type/EmptyDataType.ts rename to src/api/nitro/room/object/data/type/EmptyDataType.ts index 74812a54..8909854d 100644 --- a/src/nitro/room/object/data/type/EmptyDataType.ts +++ b/src/api/nitro/room/object/data/type/EmptyDataType.ts @@ -1,6 +1,9 @@ -import { IMessageDataWrapper, IObjectData, IRoomObjectModel, ObjectDataKey } from '../../../../../api'; +import { IMessageDataWrapper } from '../../../../../communication'; +import { IRoomObjectModel } from '../../../../../room'; import { RoomObjectVariable } from '../../RoomObjectVariable'; +import { IObjectData } from '../IObjectData'; import { ObjectDataBase } from '../ObjectDataBase'; +import { ObjectDataKey } from '../ObjectDataKey'; export class EmptyDataType extends ObjectDataBase implements IObjectData { diff --git a/src/nitro/room/object/data/type/HighScoreData.ts b/src/api/nitro/room/object/data/type/HighScoreData.ts similarity index 100% rename from src/nitro/room/object/data/type/HighScoreData.ts rename to src/api/nitro/room/object/data/type/HighScoreData.ts diff --git a/src/nitro/room/object/data/type/HighScoreDataType.ts b/src/api/nitro/room/object/data/type/HighScoreDataType.ts similarity index 94% rename from src/nitro/room/object/data/type/HighScoreDataType.ts rename to src/api/nitro/room/object/data/type/HighScoreDataType.ts index 247e474c..01cc5693 100644 --- a/src/nitro/room/object/data/type/HighScoreDataType.ts +++ b/src/api/nitro/room/object/data/type/HighScoreDataType.ts @@ -1,6 +1,9 @@ -import { IMessageDataWrapper, IObjectData, IRoomObjectModel, ObjectDataKey } from '../../../../../api'; +import { IMessageDataWrapper } from '../../../../../communication'; +import { IRoomObjectModel } from '../../../../../room'; import { RoomObjectVariable } from '../../RoomObjectVariable'; +import { IObjectData } from '../IObjectData'; import { ObjectDataBase } from '../ObjectDataBase'; +import { ObjectDataKey } from '../ObjectDataKey'; import { HighScoreData } from './HighScoreData'; export class HighScoreDataType extends ObjectDataBase implements IObjectData diff --git a/src/nitro/room/object/data/type/LegacyDataType.ts b/src/api/nitro/room/object/data/type/LegacyDataType.ts similarity index 85% rename from src/nitro/room/object/data/type/LegacyDataType.ts rename to src/api/nitro/room/object/data/type/LegacyDataType.ts index 8e508360..25bda6fe 100644 --- a/src/nitro/room/object/data/type/LegacyDataType.ts +++ b/src/api/nitro/room/object/data/type/LegacyDataType.ts @@ -1,6 +1,9 @@ -import { IMessageDataWrapper, IObjectData, IRoomObjectModel, ObjectDataKey } from '../../../../../api'; +import { IMessageDataWrapper } from '../../../../../communication'; +import { IRoomObjectModel } from '../../../../../room'; import { RoomObjectVariable } from '../../RoomObjectVariable'; +import { IObjectData } from '../IObjectData'; import { ObjectDataBase } from '../ObjectDataBase'; +import { ObjectDataKey } from '../ObjectDataKey'; export class LegacyDataType extends ObjectDataBase implements IObjectData { diff --git a/src/nitro/room/object/data/type/MapDataType.ts b/src/api/nitro/room/object/data/type/MapDataType.ts similarity index 90% rename from src/nitro/room/object/data/type/MapDataType.ts rename to src/api/nitro/room/object/data/type/MapDataType.ts index c9a2b015..f5aa98d2 100644 --- a/src/nitro/room/object/data/type/MapDataType.ts +++ b/src/api/nitro/room/object/data/type/MapDataType.ts @@ -1,6 +1,9 @@ -import { IMessageDataWrapper, IObjectData, IRoomObjectModel, ObjectDataKey } from '../../../../../api'; +import { IMessageDataWrapper } from '../../../../../communication'; +import { IRoomObjectModel } from '../../../../../room'; import { RoomObjectVariable } from '../../RoomObjectVariable'; +import { IObjectData } from '../IObjectData'; import { ObjectDataBase } from '../ObjectDataBase'; +import { ObjectDataKey } from '../ObjectDataKey'; export class MapDataType extends ObjectDataBase { diff --git a/src/nitro/room/object/data/type/NumberDataType.ts b/src/api/nitro/room/object/data/type/NumberDataType.ts similarity index 90% rename from src/nitro/room/object/data/type/NumberDataType.ts rename to src/api/nitro/room/object/data/type/NumberDataType.ts index bd1552d9..366da692 100644 --- a/src/nitro/room/object/data/type/NumberDataType.ts +++ b/src/api/nitro/room/object/data/type/NumberDataType.ts @@ -1,6 +1,9 @@ -import { IMessageDataWrapper, IObjectData, IRoomObjectModel, ObjectDataKey } from '../../../../../api'; +import { IMessageDataWrapper } from '../../../../../communication'; +import { IRoomObjectModel } from '../../../../../room'; import { RoomObjectVariable } from '../../RoomObjectVariable'; +import { IObjectData } from '../IObjectData'; import { ObjectDataBase } from '../ObjectDataBase'; +import { ObjectDataKey } from '../ObjectDataKey'; export class NumberDataType extends ObjectDataBase { diff --git a/src/nitro/room/object/data/type/StringDataType.ts b/src/api/nitro/room/object/data/type/StringDataType.ts similarity index 89% rename from src/nitro/room/object/data/type/StringDataType.ts rename to src/api/nitro/room/object/data/type/StringDataType.ts index 68c092e6..f706f0eb 100644 --- a/src/nitro/room/object/data/type/StringDataType.ts +++ b/src/api/nitro/room/object/data/type/StringDataType.ts @@ -1,6 +1,9 @@ -import { IMessageDataWrapper, IObjectData, IRoomObjectModel, ObjectDataKey } from '../../../../../api'; +import { IMessageDataWrapper } from '../../../../../communication'; +import { IRoomObjectModel } from '../../../../../room'; import { RoomObjectVariable } from '../../RoomObjectVariable'; +import { IObjectData } from '../IObjectData'; import { ObjectDataBase } from '../ObjectDataBase'; +import { ObjectDataKey } from '../ObjectDataKey'; export class StringDataType extends ObjectDataBase { diff --git a/src/nitro/room/object/data/type/VoteDataType.ts b/src/api/nitro/room/object/data/type/VoteDataType.ts similarity index 85% rename from src/nitro/room/object/data/type/VoteDataType.ts rename to src/api/nitro/room/object/data/type/VoteDataType.ts index ccd3c9f3..6c19afb3 100644 --- a/src/nitro/room/object/data/type/VoteDataType.ts +++ b/src/api/nitro/room/object/data/type/VoteDataType.ts @@ -1,6 +1,9 @@ -import { IMessageDataWrapper, IObjectData, IRoomObjectModel, ObjectDataKey } from '../../../../../api'; +import { IMessageDataWrapper } from '../../../../../communication'; +import { IRoomObjectModel } from '../../../../../room'; import { RoomObjectVariable } from '../../RoomObjectVariable'; +import { IObjectData } from '../IObjectData'; import { ObjectDataBase } from '../ObjectDataBase'; +import { ObjectDataKey } from '../ObjectDataKey'; export class VoteDataType extends ObjectDataBase { diff --git a/src/nitro/room/object/data/type/index.ts b/src/api/nitro/room/object/data/type/index.ts similarity index 100% rename from src/nitro/room/object/data/type/index.ts rename to src/api/nitro/room/object/data/type/index.ts diff --git a/src/api/nitro/room/object/index.ts b/src/api/nitro/room/object/index.ts index 71d089c6..5a5ac5f1 100644 --- a/src/api/nitro/room/object/index.ts +++ b/src/api/nitro/room/object/index.ts @@ -1 +1,7 @@ +export * from './data'; +export * from './data/type'; export * from './IRoomMapData'; +export * from './RoomObjectCategory'; +export * from './RoomObjectType'; +export * from './RoomObjectUserType'; +export * from './RoomObjectVariable'; diff --git a/src/nitro/room/utils/ObjectRolling.ts b/src/api/nitro/room/utils/ObjectRolling.ts similarity index 95% rename from src/nitro/room/utils/ObjectRolling.ts rename to src/api/nitro/room/utils/ObjectRolling.ts index 3b45d442..15cbc4fd 100644 --- a/src/nitro/room/utils/ObjectRolling.ts +++ b/src/api/nitro/room/utils/ObjectRolling.ts @@ -1,4 +1,4 @@ -import { IVector3D } from '../../../api'; +import { IVector3D } from '../../../room'; export class ObjectRolling { diff --git a/src/api/nitro/room/utils/index.ts b/src/api/nitro/room/utils/index.ts index b80a2402..e8d16689 100644 --- a/src/api/nitro/room/utils/index.ts +++ b/src/api/nitro/room/utils/index.ts @@ -1,3 +1,4 @@ export * from './IFurnitureStackingHeightMap'; export * from './ILegacyWallGeometry'; export * from './ITileObjectMap'; +export * from './ObjectRolling'; diff --git a/src/room/utils/Vector3d.ts b/src/api/room/Vector3d.ts similarity index 99% rename from src/room/utils/Vector3d.ts rename to src/api/room/Vector3d.ts index 3a025edf..f1300950 100644 --- a/src/room/utils/Vector3d.ts +++ b/src/api/room/Vector3d.ts @@ -1,4 +1,4 @@ -import { IVector3D } from '../../api'; +import { IVector3D } from './IVector3D'; export class Vector3d implements IVector3D { diff --git a/src/api/room/index.ts b/src/api/room/index.ts index 2193aba8..001384f7 100644 --- a/src/api/room/index.ts +++ b/src/api/room/index.ts @@ -13,3 +13,4 @@ export * from './object/logic'; export * from './object/visualization'; export * from './renderer'; export * from './RoomObjectSpriteData'; +export * from './Vector3d'; diff --git a/src/nitro/avatar/pets/index.ts b/src/nitro/avatar/pets/index.ts index b77ed63d..5c93ab19 100644 --- a/src/nitro/avatar/pets/index.ts +++ b/src/nitro/avatar/pets/index.ts @@ -1,3 +1,2 @@ export * from './PetCustomPart'; export * from './PetFigureData'; -export * from './PetType'; diff --git a/src/nitro/communication/NitroCommunicationManager.ts b/src/nitro/communication/NitroCommunicationManager.ts index 0952c648..1a01671e 100644 --- a/src/nitro/communication/NitroCommunicationManager.ts +++ b/src/nitro/communication/NitroCommunicationManager.ts @@ -1,8 +1,7 @@ import { ICommunicationManager, IConnection, IConnectionStateListener, IMessageConfiguration, IMessageEvent, INitroCommunicationDemo, INitroCommunicationManager } from '../../api'; import { NitroEvent, NitroManager, SocketConnectionEvent } from '../../core'; import { Nitro } from '../Nitro'; -import { NitroCommunicationDemo } from './demo/NitroCommunicationDemo'; -import { NitroCommunicationDemoEvent } from './demo/NitroCommunicationDemoEvent'; +import { NitroCommunicationDemo, NitroCommunicationDemoEvent } from './demo'; import { NitroMessages } from './NitroMessages'; export class NitroCommunicationManager extends NitroManager implements INitroCommunicationManager, IConnectionStateListener diff --git a/src/nitro/communication/NitroMessages.ts b/src/nitro/communication/NitroMessages.ts index 9908d403..8f788cd4 100644 --- a/src/nitro/communication/NitroMessages.ts +++ b/src/nitro/communication/NitroMessages.ts @@ -1,26 +1,5 @@ import { IMessageConfiguration } from '../../api'; -import { AchievementNotificationMessageEvent, ActivityPointNotificationMessageEvent, AddFavouriteRoomMessageComposer, AddJukeboxDiskComposer, ApproveNameMessageComposer, ApproveNameMessageEvent, AvailabilityTimeMessageEvent, BadgePointLimitsEvent, BadgeReceivedEvent, BonusRareInfoMessageEvent, BuildersClubFurniCountMessageEvent, BuildersClubSubscriptionStatusMessageEvent, BundleDiscountRulesetMessageEvent, BuyMarketplaceOfferMessageComposer, BuyMarketplaceTokensMessageComposer, CallForHelpFromForumMessageMessageComposer, CallForHelpFromForumThreadMessageComposer, CallForHelpFromIMMessageComposer, CallForHelpFromPhotoMessageComposer, CallForHelpFromSelfieMessageComposer, CallForHelpMessageComposer, CallForHelpPendingCallsDeletedMessageEvent, CallForHelpPendingCallsMessageEvent, CallForHelpReplyMessageEvent, CancelEventMessageComposer, CancelMarketplaceOfferMessageComposer, CanCreateRoomEvent, CanCreateRoomMessageComposer, CategoriesWithVisitorCountEvent, ChangeUserNameMessageComposer, ChangeUserNameResultMessageEvent, ChatReviewGuideDecidesOnOfferMessageComposer, ChatReviewGuideDetachedMessageComposer, ChatReviewGuideVoteMessageComposer, ChatReviewSessionCreateMessageComposer, ChatReviewSessionDetachedMessageEvent, ChatReviewSessionOfferedToGuideMessageEvent, ChatReviewSessionResultsMessageEvent, ChatReviewSessionStartedMessageEvent, ChatReviewSessionVotingStatusMessageEvent, CheckUserNameMessageComposer, CheckUserNameResultMessageEvent, CloseIssueDefaultActionMessageComposer, CloseIssuesMessageComposer, ClubGiftNotificationEvent, CompetitionRoomsDataMessageEvent, CompetitionRoomsSearchMessageComposer, ControlYoutubeDisplayPlaybackMessageComposer, ConvertedRoomIdEvent, CustomUserNotificationMessageEvent, DeleteFavouriteRoomMessageComposer, DeletePendingCallsForHelpMessageComposer, DirectSMSClubBuyAvailableMessageEvent, DoorbellMessageEvent, EditEventMessageComposer, FavouriteChangedEvent, FavouritesEvent, FigureUpdateEvent, FlatAccessDeniedMessageEvent, FlatCreatedEvent, ForwardToARandomPromotedRoomMessageComposer, ForwardToASubmittableRoomMessageComposer, ForwardToRandomCompetitionRoomMessageComposer, ForwardToSomeRoomMessageComposer, FurnitureGroupInfoComposer, GetBonusRareInfoMessageComposer, GetCatalogPageExpirationComposer, GetCatalogPageWithEarliestExpiryComposer, GetCategoriesWithUserCountMessageComposer, GetCfhChatlogMessageComposer, GetCfhStatusMessageComposer, GetCurrentTimingCodeMessageComposer, GetDirectClubBuyAvailableComposer, GetExtendedProfileByNameMessageComposer, GetFaqCategoryMessageComposer, GetFaqTextMessageComposer, GetForumsListMessageComposer, GetForumStatsMessageComposer, GetGiftMessageComposer, GetGuestRoomMessageComposer, GetGuestRoomResultEvent, GetGuideReportingStatusMessageComposer, GetHabboBasicMembershipExtendOfferComposer, GetHabboClubExtendOfferMessageComposer, GetHabboGroupBadgesMessageComposer, GetInterstitialMessageComposer, GetJukeboxPlayListMessageComposer, GetLimitedOfferAppearingNextComposer, GetMarketplaceConfigurationMessageComposer, GetMarketplaceItemStatsComposer, GetMarketplaceOffersMessageComposer, GetMarketplaceOwnOffersMessageComposer, GetMessagesMessageComposer, GetNextTargetedOfferComposer, GetNowPlayingMessageComposer, GetOfficialRoomsMessageComposer, GetOfficialSongIdMessageComposer, GetPendingCallsForHelpMessageComposer, GetPopularRoomTagsMessageComposer, GetQuizQuestionsComposer, GetRoomAdPurchaseInfoComposer, GetSeasonalCalendarDailyOfferComposer, GetSecondsUntilMessageComposer, GetSongInfoMessageComposer, GetSoundMachinePlayListMessageComposer, GetThreadMessageComposer, GetThreadsMessageComposer, GetUnreadForumsCountMessageComposer, GetUserSongDisksMessageComposer, GetYoutubeDisplayStatusMessageComposer, GoToFlatMessageComposer, GuideOnDutyStatusMessageEvent, GuideSessionAttachedMessageEvent, GuideSessionCreateMessageComposer, GuideSessionDetachedMessageEvent, GuideSessionEndedMessageEvent, GuideSessionErrorMessageEvent, GuideSessionFeedbackMessageComposer, GuideSessionGetRequesterRoomMessageComposer, GuideSessionGuideDecidesMessageComposer, GuideSessionInvitedToGuideRoomMessageEvent, GuideSessionInviteRequesterMessageComposer, GuideSessionIsTypingMessageComposer, GuideSessionMessageMessageComposer, GuideSessionMessageMessageEvent, GuideSessionOnDutyUpdateMessageComposer, GuideSessionPartnerIsTypingMessageEvent, GuideSessionReportMessageComposer, GuideSessionRequesterCancelsMessageComposer, GuideSessionRequesterRoomMessageEvent, GuideSessionResolvedMessageComposer, GuideSessionStartedMessageEvent, GuideTicketCreationResultMessageEvent, GuideTicketResolutionMessageEvent, GuildBaseSearchMessageComposer, HabboClubExtendOfferMessageEvent, HabboGroupBadgesMessageEvent, HotelClosedAndOpensEvent, HotelClosesAndWillOpenAtEvent, HotelMergeNameChangeEvent, HotelWillCloseInMinutesEvent, InfoFeedEnableMessageEvent, InterstitialMessageEvent, InterstitialShownMessageComposer, IsBadgeRequestFulfilledEvent, IsOfferGiftableMessageEvent, IssueCloseNotificationMessageEvent, JukeboxPlayListFullMessageEvent, JukeboxSongDisksMessageEvent, LimitedOfferAppearingNextMessageEvent, MaintenanceStatusMessageEvent, MarkCatalogNewAdditionsPageOpenedComposer, ModerateMessageMessageComposer, ModerateThreadMessageComposer, ModToolPreferencesComposer, ModToolSanctionComposer, MyFavouriteRoomsSearchMessageComposer, MyFrequentRoomHistorySearchMessageComposer, MyFriendsRoomsSearchMessageComposer, MyGuildBasesSearchMessageComposer, MyRecommendedRoomsMessageComposer, MyRoomHistorySearchMessageComposer, MyRoomRightsSearchMessageComposer, MyRoomsSearchMessageComposer, MysteryBoxKeysEvent, NotEnoughBalanceMessageEvent, NowPlayingMessageEvent, OfficialSongIdMessageEvent, OpenCampaignCalendarDoorAsStaffComposer, OpenCampaignCalendarDoorComposer, PetExperienceEvent, PetMountComposer, PetSupplementComposer, PetSupplementedNotificationEvent, PickIssuesMessageComposer, PlayListMessageEvent, PlayListSongAddedMessageEvent, PollAnswerComposer, PollContentsEvent, PollErrorEvent, PollOfferEvent, PollRejectComposer, PollStartComposer, PopularRoomsSearchMessageComposer, PostMessageMessageComposer, PostQuizAnswersComposer, PurchaseBasicMembershipExtensionComposer, PurchaseRoomAdMessageComposer, PurchaseTargetedOfferComposer, PurchaseVipMembershipExtensionComposer, QuestionAnsweredEvent, QuestionEvent, QuestionFinishedEvent, QuizDataMessageEvent, QuizResultsMessageEvent, RateFlatMessageComposer, RedeemMarketplaceOfferCreditsMessageComposer, ReleaseIssuesMessageComposer, RemoveAllRightsMessageComposer, RemoveJukeboxDiskComposer, RemoveOwnRoomRightsRoomMessageComposer, RemovePetSaddleComposer, ResetPhoneNumberStateMessageComposer, RoomAdErrorEvent, RoomAdEventTabAdClickedComposer, RoomAdEventTabViewedComposer, RoomAdPurchaseInfoEvent, RoomAdSearchMessageComposer, RoomCompetitionInitMessageComposer, RoomEventCancelEvent, RoomEventEvent, RoomsWhereMyFriendsAreSearchMessageComposer, RoomsWithHighestScoreSearchMessageComposer, RoomTextSearchMessageComposer, RoomThumbnailUpdateResultEvent, RoomUnitGiveHandItemPetComposer, ScrGetKickbackInfoMessageComposer, ScrSendKickbackInfoMessageEvent, SearchFaqsMessageComposer, SeasonalCalendarDailyOfferMessageEvent, SellablePetPalettesMessageEvent, SetPhoneNumberVerificationStatusMessageComposer, SetRoomSessionTagsMessageComposer, SetTargetedOfferStateComposer, SetYoutubeDisplayPlaylistMessageComposer, ShopTargetedOfferViewedComposer, SubmitRoomToCompetitionMessageComposer, TalentTrackMessageEvent, TargetedOfferEvent, TargetedOfferNotFoundEvent, TogglePetBreedingComposer, TogglePetRidingComposer, ToggleStaffPickMessageComposer, TraxSongInfoMessageEvent, TryPhoneNumberMessageComposer, UnseenResetCategoryComposer, UnseenResetItemsComposer, UpdateForumReadMarkerMessageComposer, UpdateForumSettingsMessageComposer, UpdateHomeRoomMessageComposer, UpdateRoomThumbnailMessageComposer, UpdateThreadMessageComposer, UsePetProductComposer, UserSongDisksInventoryMessageEvent, VerifyCodeMessageComposer, VoteForRoomMessageComposer, WardrobeMessageEvent } from './messages'; -import { AvailabilityStatusMessageEvent } from './messages/incoming/availability/AvailabilityStatusMessageEvent'; -import { BotAddedToInventoryEvent, BotInventoryMessageEvent, BotReceivedMessageEvent, BotRemovedFromInventoryEvent } from './messages/incoming/bots'; -import { CfhSanctionMessageEvent, CfhTopicsInitEvent, SanctionStatusEvent } from './messages/incoming/callforhelp'; -import { CameraPublishStatusMessageEvent } from './messages/incoming/camera/CameraPublishStatusMessageEvent'; -import { CameraPurchaseOKMessageEvent } from './messages/incoming/camera/CameraPurchaseOKMessageEvent'; -import { CameraStorageUrlMessageEvent } from './messages/incoming/camera/CameraStorageUrlMessageEvent'; -import { CompetitionStatusMessageEvent } from './messages/incoming/camera/CompetitionStatusMessageEvent'; -import { InitCameraMessageEvent } from './messages/incoming/camera/InitCameraMessageEvent'; -import { ThumbnailStatusMessageEvent } from './messages/incoming/camera/ThumbnailStatusMessageEvent'; -import { CampaignCalendarDataMessageEvent, CampaignCalendarDoorOpenedMessageEvent } from './messages/incoming/campaign'; -import { CatalogPageExpirationEvent, CatalogPageMessageEvent, CatalogPagesListEvent, CatalogPageWithEarliestExpiryMessageEvent, CatalogPublishedMessageEvent, ClubGiftInfoEvent, ClubGiftSelectedEvent, GiftReceiverNotFoundEvent, GiftWrappingConfigurationEvent, HabboClubOffersMessageEvent, LimitedEditionSoldOutEvent, ProductOfferEvent, PurchaseErrorMessageEvent, PurchaseNotAllowedMessageEvent, PurchaseOKMessageEvent, VoucherRedeemErrorMessageEvent, VoucherRedeemOkMessageEvent } from './messages/incoming/catalog'; -import { ClientPingEvent } from './messages/incoming/client/ClientPingEvent'; -import { CompetitionEntrySubmitResultEvent } from './messages/incoming/competition/CompetitionEntrySubmitResultEvent'; -import { CompetitionVotingInfoMessageEvent } from './messages/incoming/competition/CompetitionVotingInfoMessageEvent'; -import { CurrentTimingCodeMessageEvent } from './messages/incoming/competition/CurrentTimingCodeMessageEvent'; -import { IsUserPartOfCompetitionMessageEvent } from './messages/incoming/competition/IsUserPartOfCompetitionMessageEvent'; -import { NoOwnedRoomsAlertMessageEvent } from './messages/incoming/competition/NoOwnedRoomsAlertMessageEvent'; -import { SecondsUntilMessageEvent } from './messages/incoming/competition/SecondsUntilMessageEvent'; -import { CraftableProductsEvent } from './messages/incoming/crafting/CraftableProductsEvent'; -import { CraftingRecipeEvent } from './messages/incoming/crafting/CraftingRecipeEvent'; -import { CraftingRecipesAvailableEvent } from './messages/incoming/crafting/CraftingRecipesAvailableEvent'; +import { AchievementNotificationMessageEvent, ActivityPointNotificationMessageEvent, AddFavouriteRoomMessageComposer, AddJukeboxDiskComposer, ApproveNameMessageComposer, ApproveNameMessageEvent, AvailabilityStatusMessageEvent, AvailabilityTimeMessageEvent, BadgePointLimitsEvent, BadgeReceivedEvent, BonusRareInfoMessageEvent, BotAddedToInventoryEvent, BotInventoryMessageEvent, BotReceivedMessageEvent, BotRemovedFromInventoryEvent, BuildersClubFurniCountMessageEvent, BuildersClubSubscriptionStatusMessageEvent, BundleDiscountRulesetMessageEvent, BuyMarketplaceOfferMessageComposer, BuyMarketplaceTokensMessageComposer, CallForHelpFromForumMessageMessageComposer, CallForHelpFromForumThreadMessageComposer, CallForHelpFromIMMessageComposer, CallForHelpFromPhotoMessageComposer, CallForHelpFromSelfieMessageComposer, CallForHelpMessageComposer, CallForHelpPendingCallsDeletedMessageEvent, CallForHelpPendingCallsMessageEvent, CallForHelpReplyMessageEvent, CameraPublishStatusMessageEvent, CameraPurchaseOKMessageEvent, CameraStorageUrlMessageEvent, CampaignCalendarDataMessageEvent, CampaignCalendarDoorOpenedMessageEvent, CancelEventMessageComposer, CancelMarketplaceOfferMessageComposer, CanCreateRoomEvent, CanCreateRoomMessageComposer, CatalogPageExpirationEvent, CatalogPageMessageEvent, CatalogPagesListEvent, CatalogPageWithEarliestExpiryMessageEvent, CatalogPublishedMessageEvent, CategoriesWithVisitorCountEvent, CfhChatlogEvent, CfhSanctionMessageEvent, CfhTopicsInitEvent, ChangeUserNameMessageComposer, ChangeUserNameResultMessageEvent, ChatReviewGuideDecidesOnOfferMessageComposer, ChatReviewGuideDetachedMessageComposer, ChatReviewGuideVoteMessageComposer, ChatReviewSessionCreateMessageComposer, ChatReviewSessionDetachedMessageEvent, ChatReviewSessionOfferedToGuideMessageEvent, ChatReviewSessionResultsMessageEvent, ChatReviewSessionStartedMessageEvent, ChatReviewSessionVotingStatusMessageEvent, CheckUserNameMessageComposer, CheckUserNameResultMessageEvent, ClientPingEvent, CloseIssueDefaultActionMessageComposer, CloseIssuesMessageComposer, ClubGiftInfoEvent, ClubGiftNotificationEvent, ClubGiftSelectedEvent, CompetitionEntrySubmitResultEvent, CompetitionRoomsDataMessageEvent, CompetitionRoomsSearchMessageComposer, CompetitionStatusMessageEvent, CompetitionVotingInfoMessageEvent, ControlYoutubeDisplayPlaybackMessageComposer, ConvertedRoomIdEvent, CraftableProductsEvent, CraftingRecipeEvent, CraftingRecipesAvailableEvent, CurrentTimingCodeMessageEvent, CustomUserNotificationMessageEvent, DeleteFavouriteRoomMessageComposer, DeletePendingCallsForHelpMessageComposer, DirectSMSClubBuyAvailableMessageEvent, DoorbellMessageEvent, EditEventMessageComposer, FavouriteChangedEvent, FavouritesEvent, FigureUpdateEvent, FlatAccessDeniedMessageEvent, FlatCreatedEvent, ForumDataMessageEvent, ForumsListMessageEvent, ForwardToARandomPromotedRoomMessageComposer, ForwardToASubmittableRoomMessageComposer, ForwardToRandomCompetitionRoomMessageComposer, ForwardToSomeRoomMessageComposer, FurnitureGroupInfoComposer, GetBonusRareInfoMessageComposer, GetCatalogPageExpirationComposer, GetCatalogPageWithEarliestExpiryComposer, GetCategoriesWithUserCountMessageComposer, GetCfhChatlogMessageComposer, GetCfhStatusMessageComposer, GetCurrentTimingCodeMessageComposer, GetDirectClubBuyAvailableComposer, GetExtendedProfileByNameMessageComposer, GetFaqCategoryMessageComposer, GetFaqTextMessageComposer, GetForumsListMessageComposer, GetForumStatsMessageComposer, GetGiftMessageComposer, GetGuestRoomMessageComposer, GetGuestRoomResultEvent, GetGuideReportingStatusMessageComposer, GetHabboBasicMembershipExtendOfferComposer, GetHabboClubExtendOfferMessageComposer, GetHabboGroupBadgesMessageComposer, GetInterstitialMessageComposer, GetJukeboxPlayListMessageComposer, GetLimitedOfferAppearingNextComposer, GetMarketplaceConfigurationMessageComposer, GetMarketplaceItemStatsComposer, GetMarketplaceOffersMessageComposer, GetMarketplaceOwnOffersMessageComposer, GetMessagesMessageComposer, GetNextTargetedOfferComposer, GetNowPlayingMessageComposer, GetOfficialRoomsMessageComposer, GetOfficialSongIdMessageComposer, GetPendingCallsForHelpMessageComposer, GetPopularRoomTagsMessageComposer, GetQuizQuestionsComposer, GetRoomAdPurchaseInfoComposer, GetSeasonalCalendarDailyOfferComposer, GetSecondsUntilMessageComposer, GetSongInfoMessageComposer, GetSoundMachinePlayListMessageComposer, GetThreadMessageComposer, GetThreadsMessageComposer, GetUnreadForumsCountMessageComposer, GetUserSongDisksMessageComposer, GetYoutubeDisplayStatusMessageComposer, GiftReceiverNotFoundEvent, GiftWrappingConfigurationEvent, GoToFlatMessageComposer, GuideOnDutyStatusMessageEvent, GuideSessionAttachedMessageEvent, GuideSessionCreateMessageComposer, GuideSessionDetachedMessageEvent, GuideSessionEndedMessageEvent, GuideSessionErrorMessageEvent, GuideSessionFeedbackMessageComposer, GuideSessionGetRequesterRoomMessageComposer, GuideSessionGuideDecidesMessageComposer, GuideSessionInvitedToGuideRoomMessageEvent, GuideSessionInviteRequesterMessageComposer, GuideSessionIsTypingMessageComposer, GuideSessionMessageMessageComposer, GuideSessionMessageMessageEvent, GuideSessionOnDutyUpdateMessageComposer, GuideSessionPartnerIsTypingMessageEvent, GuideSessionReportMessageComposer, GuideSessionRequesterCancelsMessageComposer, GuideSessionRequesterRoomMessageEvent, GuideSessionResolvedMessageComposer, GuideSessionStartedMessageEvent, GuideTicketCreationResultMessageEvent, GuideTicketResolutionMessageEvent, GuildBaseSearchMessageComposer, GuildForumThreadsEvent, HabboClubExtendOfferMessageEvent, HabboClubOffersMessageEvent, HabboGroupBadgesMessageEvent, HabboGroupDeactivatedMessageEvent, HotelClosedAndOpensEvent, HotelClosesAndWillOpenAtEvent, HotelMergeNameChangeEvent, HotelWillCloseInMinutesEvent, InfoFeedEnableMessageEvent, InitCameraMessageEvent, InterstitialMessageEvent, InterstitialShownMessageComposer, IsBadgeRequestFulfilledEvent, IsOfferGiftableMessageEvent, IssueCloseNotificationMessageEvent, IssueDeletedMessageEvent, IssueInfoMessageEvent, IssuePickFailedMessageEvent, IsUserPartOfCompetitionMessageEvent, JukeboxPlayListFullMessageEvent, JukeboxSongDisksMessageEvent, LimitedEditionSoldOutEvent, LimitedOfferAppearingNextMessageEvent, MaintenanceStatusMessageEvent, MarkCatalogNewAdditionsPageOpenedComposer, ModerateMessageMessageComposer, ModerateThreadMessageComposer, ModeratorActionResultMessageEvent, ModeratorInitMessageEvent, ModeratorMessageEvent, ModeratorRoomInfoEvent, ModeratorToolPreferencesEvent, ModeratorUserInfoEvent, ModToolPreferencesComposer, ModToolSanctionComposer, MyFavouriteRoomsSearchMessageComposer, MyFrequentRoomHistorySearchMessageComposer, MyFriendsRoomsSearchMessageComposer, MyGuildBasesSearchMessageComposer, MyRecommendedRoomsMessageComposer, MyRoomHistorySearchMessageComposer, MyRoomRightsSearchMessageComposer, MyRoomsSearchMessageComposer, MysteryBoxKeysEvent, NoOwnedRoomsAlertMessageEvent, NotEnoughBalanceMessageEvent, NowPlayingMessageEvent, OfficialSongIdMessageEvent, OpenCampaignCalendarDoorAsStaffComposer, OpenCampaignCalendarDoorComposer, PetExperienceEvent, PetMountComposer, PetSupplementComposer, PetSupplementedNotificationEvent, PickIssuesMessageComposer, PlayListMessageEvent, PlayListSongAddedMessageEvent, PollAnswerComposer, PollContentsEvent, PollErrorEvent, PollOfferEvent, PollRejectComposer, PollStartComposer, PopularRoomsSearchMessageComposer, PostMessageMessageComposer, PostMessageMessageEvent, PostQuizAnswersComposer, PostThreadMessageEvent, ProductOfferEvent, PurchaseBasicMembershipExtensionComposer, PurchaseErrorMessageEvent, PurchaseNotAllowedMessageEvent, PurchaseOKMessageEvent, PurchaseRoomAdMessageComposer, PurchaseTargetedOfferComposer, PurchaseVipMembershipExtensionComposer, QuestionAnsweredEvent, QuestionEvent, QuestionFinishedEvent, QuizDataMessageEvent, QuizResultsMessageEvent, RateFlatMessageComposer, RedeemMarketplaceOfferCreditsMessageComposer, ReleaseIssuesMessageComposer, RemoveAllRightsMessageComposer, RemoveJukeboxDiskComposer, RemoveOwnRoomRightsRoomMessageComposer, RemovePetSaddleComposer, ResetPhoneNumberStateMessageComposer, RoomAdErrorEvent, RoomAdEventTabAdClickedComposer, RoomAdEventTabViewedComposer, RoomAdPurchaseInfoEvent, RoomAdSearchMessageComposer, RoomChatlogEvent, RoomCompetitionInitMessageComposer, RoomEventCancelEvent, RoomEventEvent, RoomsWhereMyFriendsAreSearchMessageComposer, RoomsWithHighestScoreSearchMessageComposer, RoomTextSearchMessageComposer, RoomThumbnailUpdateResultEvent, RoomUnitGiveHandItemPetComposer, RoomVisitsEvent, SanctionStatusEvent, ScrGetKickbackInfoMessageComposer, ScrSendKickbackInfoMessageEvent, SearchFaqsMessageComposer, SeasonalCalendarDailyOfferMessageEvent, SecondsUntilMessageEvent, SellablePetPalettesMessageEvent, SetPhoneNumberVerificationStatusMessageComposer, SetRoomSessionTagsMessageComposer, SetTargetedOfferStateComposer, SetYoutubeDisplayPlaylistMessageComposer, ShopTargetedOfferViewedComposer, SubmitRoomToCompetitionMessageComposer, TalentTrackMessageEvent, TargetedOfferEvent, TargetedOfferNotFoundEvent, ThreadMessagesMessageEvent, ThumbnailStatusMessageEvent, TogglePetBreedingComposer, TogglePetRidingComposer, ToggleStaffPickMessageComposer, TraxSongInfoMessageEvent, TryPhoneNumberMessageComposer, UnreadForumsCountMessageEvent, UnseenResetCategoryComposer, UnseenResetItemsComposer, UpdateForumReadMarkerMessageComposer, UpdateForumSettingsMessageComposer, UpdateHomeRoomMessageComposer, UpdateMessageMessageEvent, UpdateRoomThumbnailMessageComposer, UpdateThreadMessageComposer, UpdateThreadMessageEvent, UsePetProductComposer, UserBannedMessageEvent, UserChatlogEvent, UserSongDisksInventoryMessageEvent, VerifyCodeMessageComposer, VoteForRoomMessageComposer, VoucherRedeemErrorMessageEvent, VoucherRedeemOkMessageEvent, WardrobeMessageEvent } from './messages'; import { CraftingResultEvent } from './messages/incoming/crafting/CraftingResultEvent'; import { DesktopViewEvent } from './messages/incoming/desktop/DesktopViewEvent'; import { AcceptFriendResultEvent } from './messages/incoming/friendlist/AcceptFriendResultEvent'; @@ -49,8 +28,6 @@ import { GroupInformationEvent } from './messages/incoming/group/GroupInformatio import { GroupMembersEvent } from './messages/incoming/group/GroupMembersEvent'; import { GroupPurchasedEvent } from './messages/incoming/group/GroupPurchasedEvent'; import { GroupSettingsEvent } from './messages/incoming/group/GroupSettingsEvent'; -import { HabboGroupDeactivatedMessageEvent } from './messages/incoming/group/HabboGroupDeactivatedMessageEvent'; -import { ForumDataMessageEvent, ForumsListMessageEvent, GuildForumThreadsEvent, PostMessageMessageEvent, PostThreadMessageEvent, ThreadMessagesMessageEvent, UnreadForumsCountMessageEvent, UpdateMessageMessageEvent, UpdateThreadMessageEvent } from './messages/incoming/groupforums'; import { NoobnessLevelMessageEvent } from './messages/incoming/handshake/NoobnessLevelMessageEvent'; import { CallForHelpDisabledNotifyMessageEvent } from './messages/incoming/help/CallForHelpDisabledNotifyMessageEvent'; import { CallForHelpResultMessageEvent } from './messages/incoming/help/CallForHelpResultMessageEvent'; @@ -95,7 +72,6 @@ import { MarketplaceItemStatsEvent } from './messages/incoming/marketplace/Marke import { MarketplaceMakeOfferResult } from './messages/incoming/marketplace/MarketplaceMakeOfferResult'; import { MarketPlaceOffersEvent } from './messages/incoming/marketplace/MarketplaceOffersEvent'; import { MarketplaceOwnOffersEvent } from './messages/incoming/marketplace/MarketplaceOwnOffersEvent'; -import { CfhChatlogEvent, IssueDeletedMessageEvent, IssueInfoMessageEvent, IssuePickFailedMessageEvent, ModeratorActionResultMessageEvent, ModeratorInitMessageEvent, ModeratorMessageEvent, ModeratorRoomInfoEvent, ModeratorToolPreferencesEvent, ModeratorUserInfoEvent, RoomChatlogEvent, RoomVisitsEvent, UserBannedMessageEvent, UserChatlogEvent } from './messages/incoming/moderation'; import { ModeratorCautionEvent } from './messages/incoming/moderation/ModeratorCautionEvent'; import { CanCreateRoomEventEvent } from './messages/incoming/navigator/CanCreateRoomEventEvent'; import { GuestRoomSearchResultEvent } from './messages/incoming/navigator/GuestRoomSearchResultEvent'; diff --git a/src/nitro/communication/demo/NitroCommunicationDemo.ts b/src/nitro/communication/demo/NitroCommunicationDemo.ts index 9971c4fd..686ca176 100644 --- a/src/nitro/communication/demo/NitroCommunicationDemo.ts +++ b/src/nitro/communication/demo/NitroCommunicationDemo.ts @@ -1,13 +1,7 @@ -import { IConnection, INitroCommunicationDemo } from '../../../api'; -import { INitroCommunicationManager } from '../../../api/nitro/communication/INitroCommunicationManager'; +import { IConnection, INitroCommunicationDemo, INitroCommunicationManager } from '../../../api'; import { NitroManager, SocketConnectionEvent } from '../../../core'; import { Nitro } from '../../Nitro'; -import { ClientPingEvent } from '../messages/incoming/client/ClientPingEvent'; -import { AuthenticatedEvent } from '../messages/incoming/security/AuthenticatedEvent'; -import { ClientHelloMessageComposer } from '../messages/outgoing/handshake/ClientHelloMessageComposer'; -import { InfoRetrieveMessageComposer } from '../messages/outgoing/handshake/InfoRetrieveMessageComposer'; -import { PongMessageComposer } from '../messages/outgoing/handshake/PongMessageComposer'; -import { SSOTicketMessageComposer } from '../messages/outgoing/handshake/SSOTicketMessageComposer'; +import { AuthenticatedEvent, ClientHelloMessageComposer, ClientPingEvent, InfoRetrieveMessageComposer, PongMessageComposer, SSOTicketMessageComposer } from '../messages'; import { NitroCommunicationDemoEvent } from './NitroCommunicationDemoEvent'; export class NitroCommunicationDemo extends NitroManager implements INitroCommunicationDemo diff --git a/src/nitro/communication/messages/incoming/availability/AvailabilityStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/availability/AvailabilityStatusMessageEvent.ts index 9779f778..58827fdd 100644 --- a/src/nitro/communication/messages/incoming/availability/AvailabilityStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/availability/AvailabilityStatusMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { AvailabilityStatusMessageParser } from '../../parser/availability/AvailabilityStatusMessageParser'; +import { AvailabilityStatusMessageParser } from '../../parser'; export class AvailabilityStatusMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/avatar/ChangeUserNameResultMessageEvent.ts b/src/nitro/communication/messages/incoming/avatar/ChangeUserNameResultMessageEvent.ts index f816b19a..f0eaeed0 100644 --- a/src/nitro/communication/messages/incoming/avatar/ChangeUserNameResultMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/avatar/ChangeUserNameResultMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { ChangeUserNameResultMessageParser } from '../../parser/avatar/ChangeUserNameResultMessageParser'; +import { ChangeUserNameResultMessageParser } from '../../parser'; export class ChangeUserNameResultMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/avatar/CheckUserNameResultMessageEvent.ts b/src/nitro/communication/messages/incoming/avatar/CheckUserNameResultMessageEvent.ts index 91700289..76177870 100644 --- a/src/nitro/communication/messages/incoming/avatar/CheckUserNameResultMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/avatar/CheckUserNameResultMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { CheckUserNameResultMessageParser } from '../../parser/avatar/CheckUserNameResultMessageParser'; +import { CheckUserNameResultMessageParser } from '../../parser'; export class CheckUserNameResultMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/avatar/index.ts b/src/nitro/communication/messages/incoming/avatar/index.ts index 0c23b82c..45a727e6 100644 --- a/src/nitro/communication/messages/incoming/avatar/index.ts +++ b/src/nitro/communication/messages/incoming/avatar/index.ts @@ -1,5 +1,4 @@ export * from './ChangeUserNameResultMessageEvent'; export * from './CheckUserNameResultMessageEvent'; export * from './FigureUpdateEvent'; -export * from './OutfitData'; export * from './WardrobeMessageEvent'; diff --git a/src/nitro/communication/messages/incoming/bots/BotAddedToInventoryEvent.ts b/src/nitro/communication/messages/incoming/bots/BotAddedToInventoryEvent.ts index 90c26e35..53b17052 100644 --- a/src/nitro/communication/messages/incoming/bots/BotAddedToInventoryEvent.ts +++ b/src/nitro/communication/messages/incoming/bots/BotAddedToInventoryEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { BotAddedToInventoryParser } from '../../parser/bots/BotAddedToInventoryParser'; +import { BotAddedToInventoryParser } from '../../parser'; export class BotAddedToInventoryEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/bots/BotInventoryMessageEvent.ts b/src/nitro/communication/messages/incoming/bots/BotInventoryMessageEvent.ts index a9ccfec3..cf462462 100644 --- a/src/nitro/communication/messages/incoming/bots/BotInventoryMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/bots/BotInventoryMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { BotInventoryMessageParser } from '../../parser/bots/BotInventoryMessageParser'; +import { BotInventoryMessageParser } from '../../parser'; export class BotInventoryMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/bots/BotReceivedMessageEvent.ts b/src/nitro/communication/messages/incoming/bots/BotReceivedMessageEvent.ts index f1dfc554..7852f696 100644 --- a/src/nitro/communication/messages/incoming/bots/BotReceivedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/bots/BotReceivedMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { BotReceivedMessageParser } from '../../parser/bots/BotReceivedMessageParser'; +import { BotReceivedMessageParser } from '../../parser'; export class BotReceivedMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/bots/BotRemovedFromInventoryEvent.ts b/src/nitro/communication/messages/incoming/bots/BotRemovedFromInventoryEvent.ts index 0e9ea6b6..36622665 100644 --- a/src/nitro/communication/messages/incoming/bots/BotRemovedFromInventoryEvent.ts +++ b/src/nitro/communication/messages/incoming/bots/BotRemovedFromInventoryEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { BotRemovedFromInventoryParser } from '../../parser/bots/BotRemovedFromInventoryParser'; +import { BotRemovedFromInventoryParser } from '../../parser'; export class BotRemovedFromInventoryEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/callforhelp/CfhSanctionMessageEvent.ts b/src/nitro/communication/messages/incoming/callforhelp/CfhSanctionMessageEvent.ts index 3cd38c61..cfc1bd52 100644 --- a/src/nitro/communication/messages/incoming/callforhelp/CfhSanctionMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/callforhelp/CfhSanctionMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { CfhSanctionMessageParser } from '../../parser/callforhelp/CfhSanctionMessageParser'; +import { CfhSanctionMessageParser } from '../../parser'; export class CfhSanctionMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/callforhelp/CfhTopicsInitEvent.ts b/src/nitro/communication/messages/incoming/callforhelp/CfhTopicsInitEvent.ts index 0e604104..a45ee59e 100644 --- a/src/nitro/communication/messages/incoming/callforhelp/CfhTopicsInitEvent.ts +++ b/src/nitro/communication/messages/incoming/callforhelp/CfhTopicsInitEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { CfhTopicsInitMessageParser } from '../../parser/callforhelp/CfhTopicsInitMessageParser'; +import { CfhTopicsInitMessageParser } from '../../parser'; export class CfhTopicsInitEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/callforhelp/SanctionStatusEvent.ts b/src/nitro/communication/messages/incoming/callforhelp/SanctionStatusEvent.ts index 10c71b77..5091dc4f 100644 --- a/src/nitro/communication/messages/incoming/callforhelp/SanctionStatusEvent.ts +++ b/src/nitro/communication/messages/incoming/callforhelp/SanctionStatusEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { SanctionStatusMessageParser } from '../../parser/callforhelp'; +import { SanctionStatusMessageParser } from '../../parser'; export class SanctionStatusEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/callforhelp/index.ts b/src/nitro/communication/messages/incoming/callforhelp/index.ts index be8b70cc..9b60cfbb 100644 --- a/src/nitro/communication/messages/incoming/callforhelp/index.ts +++ b/src/nitro/communication/messages/incoming/callforhelp/index.ts @@ -1,6 +1,3 @@ -export * from './CallForHelpCategoryData'; -export * from './CallForHelpTopicData'; export * from './CfhSanctionMessageEvent'; -export * from './CfhSanctionTypeData'; export * from './CfhTopicsInitEvent'; export * from './SanctionStatusEvent'; diff --git a/src/nitro/communication/messages/incoming/camera/CameraPublishStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/camera/CameraPublishStatusMessageEvent.ts index b7f301d6..ba37bf86 100644 --- a/src/nitro/communication/messages/incoming/camera/CameraPublishStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/camera/CameraPublishStatusMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { CameraPublishStatusMessageParser } from '../../parser/camera/CameraPublishStatusMessageParser'; +import { CameraPublishStatusMessageParser } from '../../parser'; export class CameraPublishStatusMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/camera/CameraPurchaseOKMessageEvent.ts b/src/nitro/communication/messages/incoming/camera/CameraPurchaseOKMessageEvent.ts index ffa9168d..1495510c 100644 --- a/src/nitro/communication/messages/incoming/camera/CameraPurchaseOKMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/camera/CameraPurchaseOKMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { CameraPurchaseOKMessageParser } from '../../parser/camera/CameraPurchaseOKMessageParser'; +import { CameraPurchaseOKMessageParser } from '../../parser'; export class CameraPurchaseOKMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/camera/CameraStorageUrlMessageEvent.ts b/src/nitro/communication/messages/incoming/camera/CameraStorageUrlMessageEvent.ts index 6845e9bf..16f22453 100644 --- a/src/nitro/communication/messages/incoming/camera/CameraStorageUrlMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/camera/CameraStorageUrlMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { CameraStorageUrlMessageParser } from '../../parser/camera/CameraStorageUrlMessageParser'; +import { CameraStorageUrlMessageParser } from '../../parser'; export class CameraStorageUrlMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/camera/CompetitionStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/camera/CompetitionStatusMessageEvent.ts index 86d5b402..95ff38d3 100644 --- a/src/nitro/communication/messages/incoming/camera/CompetitionStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/camera/CompetitionStatusMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { CompetitionStatusMessageParser } from '../../parser/camera/CompetitionStatusMessageParser'; +import { CompetitionStatusMessageParser } from '../../parser'; export class CompetitionStatusMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/camera/InitCameraMessageEvent.ts b/src/nitro/communication/messages/incoming/camera/InitCameraMessageEvent.ts index d71b1820..4dcaef28 100644 --- a/src/nitro/communication/messages/incoming/camera/InitCameraMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/camera/InitCameraMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { InitCameraMessageParser } from '../../parser/camera/InitCameraMessageParser'; +import { InitCameraMessageParser } from '../../parser'; export class InitCameraMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/camera/ThumbnailStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/camera/ThumbnailStatusMessageEvent.ts index d7992c71..a1c516fa 100644 --- a/src/nitro/communication/messages/incoming/camera/ThumbnailStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/camera/ThumbnailStatusMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { ThumbnailStatusMessageParser } from '../../parser/camera/ThumbnailStatusMessageParser'; +import { ThumbnailStatusMessageParser } from '../../parser'; export class ThumbnailStatusMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/campaign/CampaignCalendarDataMessageEvent.ts b/src/nitro/communication/messages/incoming/campaign/CampaignCalendarDataMessageEvent.ts index f40dfc8b..d275a6c9 100644 --- a/src/nitro/communication/messages/incoming/campaign/CampaignCalendarDataMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/campaign/CampaignCalendarDataMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { CampaignCalendarDataMessageParser } from '../../parser/campaign'; +import { CampaignCalendarDataMessageParser } from '../../parser'; export class CampaignCalendarDataMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/campaign/CampaignCalendarDoorOpenedMessageEvent.ts b/src/nitro/communication/messages/incoming/campaign/CampaignCalendarDoorOpenedMessageEvent.ts index d1e9e3cf..f845afd5 100644 --- a/src/nitro/communication/messages/incoming/campaign/CampaignCalendarDoorOpenedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/campaign/CampaignCalendarDoorOpenedMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { CampaignCalendarDoorOpenedMessageParser } from '../../parser/campaign'; +import { CampaignCalendarDoorOpenedMessageParser } from '../../parser'; export class CampaignCalendarDoorOpenedMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/catalog/CatalogPageMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/CatalogPageMessageEvent.ts index de262a39..28793986 100644 --- a/src/nitro/communication/messages/incoming/catalog/CatalogPageMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/CatalogPageMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { CatalogPageMessageParser } from '../../parser/catalog/CatalogPageMessageParser'; +import { CatalogPageMessageParser } from '../../parser'; export class CatalogPageMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/catalog/CatalogPublishedMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/CatalogPublishedMessageEvent.ts index 6cb6c3a0..e9b5df22 100644 --- a/src/nitro/communication/messages/incoming/catalog/CatalogPublishedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/CatalogPublishedMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { CatalogPublishedMessageParser } from '../../parser/catalog/CatalogPublishedMessageParser'; +import { CatalogPublishedMessageParser } from '../../parser'; export class CatalogPublishedMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/catalog/VoucherRedeemOkMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/VoucherRedeemOkMessageEvent.ts index b08ce177..f5628451 100644 --- a/src/nitro/communication/messages/incoming/catalog/VoucherRedeemOkMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/VoucherRedeemOkMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { VoucherRedeemOkMessageParser } from '../../parser/catalog/VoucherRedeemOkMessageParser'; +import { VoucherRedeemOkMessageParser } from '../../parser'; export class VoucherRedeemOkMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/catalog/index.ts b/src/nitro/communication/messages/incoming/catalog/index.ts index 96964b5b..4ea5da76 100644 --- a/src/nitro/communication/messages/incoming/catalog/index.ts +++ b/src/nitro/communication/messages/incoming/catalog/index.ts @@ -1,42 +1,30 @@ export * from './BonusRareInfoMessageEvent'; export * from './BuildersClubFurniCountMessageEvent'; export * from './BuildersClubSubscriptionStatusMessageEvent'; -export * from './BundleDiscountRuleset'; export * from './BundleDiscountRulesetMessageEvent'; -export * from './CatalogLocalizationData'; export * from './CatalogPageExpirationEvent'; export * from './CatalogPageMessageEvent'; -export * from './CatalogPageMessageOfferData'; -export * from './CatalogPageMessageProductData'; export * from './CatalogPagesListEvent'; export * from './CatalogPageWithEarliestExpiryMessageEvent'; export * from './CatalogPublishedMessageEvent'; -export * from './ClubGiftData'; export * from './ClubGiftInfoEvent'; export * from './ClubGiftSelectedEvent'; -export * from './ClubOfferData'; -export * from './ClubOfferExtendedData'; export * from './DirectSMSClubBuyAvailableMessageEvent'; -export * from './FrontPageItem'; export * from './GiftReceiverNotFoundEvent'; export * from './GiftWrappingConfigurationEvent'; export * from './HabboClubExtendOfferMessageEvent'; export * from './HabboClubOffersMessageEvent'; -export * from './INodeData'; export * from './IsOfferGiftableMessageEvent'; export * from './LimitedEditionSoldOutEvent'; export * from './LimitedOfferAppearingNextMessageEvent'; -export * from './NodeData'; export * from './NotEnoughBalanceMessageEvent'; export * from './ProductOfferEvent'; export * from './PurchaseErrorMessageEvent'; export * from './PurchaseNotAllowedMessageEvent'; export * from './PurchaseOKMessageEvent'; -export * from './PurchaseOKMessageOfferData'; export * from './RoomAdPurchaseInfoEvent'; export * from './SeasonalCalendarDailyOfferMessageEvent'; export * from './SellablePetPalettesMessageEvent'; -export * from './TargetedOfferData'; export * from './TargetedOfferEvent'; export * from './TargetedOfferNotFoundEvent'; export * from './VoucherRedeemErrorMessageEvent'; diff --git a/src/nitro/communication/messages/incoming/client/ClientPingEvent.ts b/src/nitro/communication/messages/incoming/client/ClientPingEvent.ts index 4834f1b2..55e656c6 100644 --- a/src/nitro/communication/messages/incoming/client/ClientPingEvent.ts +++ b/src/nitro/communication/messages/incoming/client/ClientPingEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { ClientPingParser } from '../../parser/client/ClientPingParser'; +import { ClientPingParser } from '../../parser'; export class ClientPingEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/crafting/CraftableProductsEvent.ts b/src/nitro/communication/messages/incoming/crafting/CraftableProductsEvent.ts index f2a5c66a..e3a768f1 100644 --- a/src/nitro/communication/messages/incoming/crafting/CraftableProductsEvent.ts +++ b/src/nitro/communication/messages/incoming/crafting/CraftableProductsEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { CraftableProductsMessageParser } from '../../parser/crafting/CraftableProductsMessageParser'; +import { CraftableProductsMessageParser } from '../../parser'; export class CraftableProductsEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/crafting/CraftingRecipeEvent.ts b/src/nitro/communication/messages/incoming/crafting/CraftingRecipeEvent.ts index aaa84b7c..93195a50 100644 --- a/src/nitro/communication/messages/incoming/crafting/CraftingRecipeEvent.ts +++ b/src/nitro/communication/messages/incoming/crafting/CraftingRecipeEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { CraftingRecipeMessageParser } from '../../parser/crafting/CraftingRecipeMessageParser'; +import { CraftingRecipeMessageParser } from '../../parser'; export class CraftingRecipeEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/crafting/CraftingRecipesAvailableEvent.ts b/src/nitro/communication/messages/incoming/crafting/CraftingRecipesAvailableEvent.ts index 3fac46b4..8e371a58 100644 --- a/src/nitro/communication/messages/incoming/crafting/CraftingRecipesAvailableEvent.ts +++ b/src/nitro/communication/messages/incoming/crafting/CraftingRecipesAvailableEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { CraftingRecipesAvailableMessageParser } from '../../parser/crafting/CraftingRecipesAvailableMessageParser'; +import { CraftingRecipesAvailableMessageParser } from '../../parser'; export class CraftingRecipesAvailableEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/crafting/CraftingResultEvent.ts b/src/nitro/communication/messages/incoming/crafting/CraftingResultEvent.ts index 2a84671a..e353a38b 100644 --- a/src/nitro/communication/messages/incoming/crafting/CraftingResultEvent.ts +++ b/src/nitro/communication/messages/incoming/crafting/CraftingResultEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { CraftingResultMessageParser } from '../../parser/crafting/CraftingResultMessageParser'; +import { CraftingResultMessageParser } from '../../parser'; export class CraftingResultEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/desktop/DesktopViewEvent.ts b/src/nitro/communication/messages/incoming/desktop/DesktopViewEvent.ts index f80f56ae..b3080346 100644 --- a/src/nitro/communication/messages/incoming/desktop/DesktopViewEvent.ts +++ b/src/nitro/communication/messages/incoming/desktop/DesktopViewEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { DesktopViewParser } from '../../parser/desktop/DesktopViewParser'; +import { DesktopViewParser } from '../../parser'; export class DesktopViewEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/friendlist/AcceptFriendResultEvent.ts b/src/nitro/communication/messages/incoming/friendlist/AcceptFriendResultEvent.ts index a2c7163f..716ab0a9 100644 --- a/src/nitro/communication/messages/incoming/friendlist/AcceptFriendResultEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/AcceptFriendResultEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { AcceptFriendResultParser } from '../../parser/friendlist/AcceptFriendResultParser'; +import { AcceptFriendResultParser } from '../../parser'; export class AcceptFriendResultEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/friendlist/FindFriendsProcessResultEvent.ts b/src/nitro/communication/messages/incoming/friendlist/FindFriendsProcessResultEvent.ts index 39db4392..f2d3c767 100644 --- a/src/nitro/communication/messages/incoming/friendlist/FindFriendsProcessResultEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/FindFriendsProcessResultEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { FindFriendsProcessResultParser } from '../../parser/friendlist/FindFriendsProcessResultParser'; +import { FindFriendsProcessResultParser } from '../../parser'; export class FindFriendsProcessResultEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/friendlist/FollowFriendFailedEvent.ts b/src/nitro/communication/messages/incoming/friendlist/FollowFriendFailedEvent.ts index 2c6cab97..4e1558b4 100644 --- a/src/nitro/communication/messages/incoming/friendlist/FollowFriendFailedEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/FollowFriendFailedEvent.ts @@ -1,7 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { DesktopViewParser } from '../../parser/desktop/DesktopViewParser'; -import { FollowFriendFailedParser } from '../../parser/friendlist/FollowFriendFailedParser'; +import { FollowFriendFailedParser } from '../../parser'; export class FollowFriendFailedEvent extends MessageEvent implements IMessageEvent { @@ -10,7 +9,7 @@ export class FollowFriendFailedEvent extends MessageEvent implements IMessageEve super(callBack, FollowFriendFailedParser); } - public getParser(): DesktopViewParser + public getParser(): FollowFriendFailedParser { return this.parser as FollowFriendFailedParser; } diff --git a/src/nitro/communication/messages/incoming/friendlist/FriendListFragmentEvent.ts b/src/nitro/communication/messages/incoming/friendlist/FriendListFragmentEvent.ts index be786b17..a244b512 100644 --- a/src/nitro/communication/messages/incoming/friendlist/FriendListFragmentEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/FriendListFragmentEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { FriendListFragmentParser } from '../../parser/friendlist/FriendListFragmentMessageParser'; +import { FriendListFragmentParser } from '../../parser'; export class FriendListFragmentEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/friendlist/FriendListUpdateEvent.ts b/src/nitro/communication/messages/incoming/friendlist/FriendListUpdateEvent.ts index e7c08ca5..79834deb 100644 --- a/src/nitro/communication/messages/incoming/friendlist/FriendListUpdateEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/FriendListUpdateEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { FriendListUpdateParser } from '../../parser/friendlist/FriendListUpdateParser'; +import { FriendListUpdateParser } from '../../parser'; export class FriendListUpdateEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/friendlist/FriendNotificationEvent.ts b/src/nitro/communication/messages/incoming/friendlist/FriendNotificationEvent.ts index 67d68dfa..b0e5777f 100644 --- a/src/nitro/communication/messages/incoming/friendlist/FriendNotificationEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/FriendNotificationEvent.ts @@ -1,7 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { DesktopViewParser } from '../../parser/desktop/DesktopViewParser'; -import { FriendNotificationParser } from '../../parser/friendlist/FriendNotificationParser'; +import { FriendNotificationParser } from '../../parser'; export class FriendNotificationEvent extends MessageEvent implements IMessageEvent { @@ -10,7 +9,7 @@ export class FriendNotificationEvent extends MessageEvent implements IMessageEve super(callBack, FriendNotificationParser); } - public getParser(): DesktopViewParser + public getParser(): FriendNotificationParser { return this.parser as FriendNotificationParser; } diff --git a/src/nitro/communication/messages/incoming/friendlist/FriendRequestsEvent.ts b/src/nitro/communication/messages/incoming/friendlist/FriendRequestsEvent.ts index 7dbbaa23..e419cb16 100644 --- a/src/nitro/communication/messages/incoming/friendlist/FriendRequestsEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/FriendRequestsEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { FriendRequestsParser } from '../../parser/friendlist/FriendRequestsParser'; +import { FriendRequestsParser } from '../../parser'; export class FriendRequestsEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/friendlist/HabboSearchResultEvent.ts b/src/nitro/communication/messages/incoming/friendlist/HabboSearchResultEvent.ts index df517e17..cecb0479 100644 --- a/src/nitro/communication/messages/incoming/friendlist/HabboSearchResultEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/HabboSearchResultEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { HabboSearchResultParser } from '../../parser/friendlist/HabboSearchResultParser'; +import { HabboSearchResultParser } from '../../parser'; export class HabboSearchResultEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/friendlist/InstantMessageErrorEvent.ts b/src/nitro/communication/messages/incoming/friendlist/InstantMessageErrorEvent.ts index 4a1288ce..33694360 100644 --- a/src/nitro/communication/messages/incoming/friendlist/InstantMessageErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/InstantMessageErrorEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { InstantMessageErrorParser } from '../../parser/friendlist/InstantMessageErrorParser'; +import { InstantMessageErrorParser } from '../../parser'; export class InstantMessageErrorEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/friendlist/MessageErrorEvent.ts b/src/nitro/communication/messages/incoming/friendlist/MessageErrorEvent.ts index fa9cdd2a..0a97f5a1 100644 --- a/src/nitro/communication/messages/incoming/friendlist/MessageErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/MessageErrorEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { MessageErrorParser } from '../../parser/friendlist/MessageErrorParser'; +import { MessageErrorParser } from '../../parser'; export class MessageErrorEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/friendlist/MessengerInitEvent.ts b/src/nitro/communication/messages/incoming/friendlist/MessengerInitEvent.ts index 62dbb854..7f4c06f2 100644 --- a/src/nitro/communication/messages/incoming/friendlist/MessengerInitEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/MessengerInitEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { MessengerInitParser } from '../../parser/friendlist/MessengerInitParser'; +import { MessengerInitParser } from '../../parser'; export class MessengerInitEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/friendlist/MiniMailNewMessageEvent.ts b/src/nitro/communication/messages/incoming/friendlist/MiniMailNewMessageEvent.ts index f4c51a62..f6b9d8bc 100644 --- a/src/nitro/communication/messages/incoming/friendlist/MiniMailNewMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/MiniMailNewMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { MiniMailNewMessageParser } from '../../parser/friendlist/MiniMailNewMessageParser'; +import { MiniMailNewMessageParser } from '../../parser'; export class MiniMailNewMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/friendlist/MiniMailUnreadCountEvent.ts b/src/nitro/communication/messages/incoming/friendlist/MiniMailUnreadCountEvent.ts index fccb4a10..b8242f84 100644 --- a/src/nitro/communication/messages/incoming/friendlist/MiniMailUnreadCountEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/MiniMailUnreadCountEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { MiniMailUnreadCountParser } from '../../parser/friendlist/MiniMailUnreadCountParser'; +import { MiniMailUnreadCountParser } from '../../parser'; export class MiniMailUnreadCountEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/friendlist/NewConsoleMessageEvent.ts b/src/nitro/communication/messages/incoming/friendlist/NewConsoleMessageEvent.ts index d324ebfd..50a2b98a 100644 --- a/src/nitro/communication/messages/incoming/friendlist/NewConsoleMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/NewConsoleMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { NewConsoleMessageParser } from '../../parser/friendlist/NewConsoleMessageParser'; +import { NewConsoleMessageParser } from '../../parser'; export class NewConsoleMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/friendlist/NewFriendRequestEvent.ts b/src/nitro/communication/messages/incoming/friendlist/NewFriendRequestEvent.ts index 69f5c9e6..7f0157ee 100644 --- a/src/nitro/communication/messages/incoming/friendlist/NewFriendRequestEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/NewFriendRequestEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { NewFriendRequestParser } from '../../parser/friendlist/NewFriendRequestMessageParser'; +import { NewFriendRequestParser } from '../../parser'; export class NewFriendRequestEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/friendlist/RoomInviteErrorEvent.ts b/src/nitro/communication/messages/incoming/friendlist/RoomInviteErrorEvent.ts index 356b77dc..9d3ce22c 100644 --- a/src/nitro/communication/messages/incoming/friendlist/RoomInviteErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/RoomInviteErrorEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { RoomInviteErrorParser } from '../../parser/friendlist/RoomInviteErrorParser'; +import { RoomInviteErrorParser } from '../../parser'; export class RoomInviteErrorEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/friendlist/RoomInviteEvent.ts b/src/nitro/communication/messages/incoming/friendlist/RoomInviteEvent.ts index 8b5dc6a0..1e2765e5 100644 --- a/src/nitro/communication/messages/incoming/friendlist/RoomInviteEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/RoomInviteEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { RoomInviteParser } from '../../parser/friendlist/RoomInviteMessageParser'; +import { RoomInviteParser } from '../../parser'; export class RoomInviteEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/friendlist/index.ts b/src/nitro/communication/messages/incoming/friendlist/index.ts index 727187bf..47c991c4 100644 --- a/src/nitro/communication/messages/incoming/friendlist/index.ts +++ b/src/nitro/communication/messages/incoming/friendlist/index.ts @@ -1,15 +1,10 @@ -export * from './AcceptFriendFailureData'; export * from './AcceptFriendResultEvent'; export * from './FindFriendsProcessResultEvent'; export * from './FollowFriendFailedEvent'; -export * from './FriendCategoryData'; export * from './FriendListFragmentEvent'; export * from './FriendListUpdateEvent'; export * from './FriendNotificationEvent'; -export * from './FriendParser'; -export * from './FriendRequestData'; export * from './FriendRequestsEvent'; -export * from './HabboSearchResultData'; export * from './HabboSearchResultEvent'; export * from './InstantMessageErrorEvent'; export * from './MessageErrorEvent'; diff --git a/src/nitro/communication/messages/incoming/game/LoadGameUrlEvent.ts b/src/nitro/communication/messages/incoming/game/LoadGameUrlEvent.ts index 6d466541..9531b543 100644 --- a/src/nitro/communication/messages/incoming/game/LoadGameUrlEvent.ts +++ b/src/nitro/communication/messages/incoming/game/LoadGameUrlEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { LoadGameUrlParser } from '../../parser/game/LoadGameUrlParser'; +import { LoadGameUrlParser } from '../../parser'; export class LoadGameUrlEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/generic/GenericErrorEvent.ts b/src/nitro/communication/messages/incoming/generic/GenericErrorEvent.ts index b8f3c45d..3364f632 100644 --- a/src/nitro/communication/messages/incoming/generic/GenericErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/generic/GenericErrorEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { GenericErrorParser } from '../../parser/generic/GenericErrorParser'; +import { GenericErrorParser } from '../../parser'; export class GenericErrorEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/group/GroupBadgePartsEvent.ts b/src/nitro/communication/messages/incoming/group/GroupBadgePartsEvent.ts index e6bfb685..a6db9f17 100644 --- a/src/nitro/communication/messages/incoming/group/GroupBadgePartsEvent.ts +++ b/src/nitro/communication/messages/incoming/group/GroupBadgePartsEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { GroupBadgePartsParser } from '../../parser/group/GroupBadgePartsParser'; +import { GroupBadgePartsParser } from '../../parser'; export class GroupBadgePartsEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/group/GroupBuyDataEvent.ts b/src/nitro/communication/messages/incoming/group/GroupBuyDataEvent.ts index 795bfbdf..454b4e87 100644 --- a/src/nitro/communication/messages/incoming/group/GroupBuyDataEvent.ts +++ b/src/nitro/communication/messages/incoming/group/GroupBuyDataEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { GroupBuyDataParser } from '../../parser/group/GroupBuyDataParser'; +import { GroupBuyDataParser } from '../../parser'; export class GroupBuyDataEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/group/GroupConfirmMemberRemoveEvent.ts b/src/nitro/communication/messages/incoming/group/GroupConfirmMemberRemoveEvent.ts index fabf8cf0..6e82bbc4 100644 --- a/src/nitro/communication/messages/incoming/group/GroupConfirmMemberRemoveEvent.ts +++ b/src/nitro/communication/messages/incoming/group/GroupConfirmMemberRemoveEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { GroupConfirmMemberRemoveParser } from '../../parser/group/GroupConfirmMemberRemoveParser'; +import { GroupConfirmMemberRemoveParser } from '../../parser'; export class GroupConfirmMemberRemoveEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/group/GroupInformationEvent.ts b/src/nitro/communication/messages/incoming/group/GroupInformationEvent.ts index 639481c6..bbaefc07 100644 --- a/src/nitro/communication/messages/incoming/group/GroupInformationEvent.ts +++ b/src/nitro/communication/messages/incoming/group/GroupInformationEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { GroupInformationParser } from '../../parser/group/GroupInformationParser'; +import { GroupInformationParser } from '../../parser'; export class GroupInformationEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/group/GroupMembersEvent.ts b/src/nitro/communication/messages/incoming/group/GroupMembersEvent.ts index 873f8060..655e25a0 100644 --- a/src/nitro/communication/messages/incoming/group/GroupMembersEvent.ts +++ b/src/nitro/communication/messages/incoming/group/GroupMembersEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { GroupMembersParser } from '../../parser/group/GroupMembersParser'; +import { GroupMembersParser } from '../../parser'; export class GroupMembersEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/group/GroupPurchasedEvent.ts b/src/nitro/communication/messages/incoming/group/GroupPurchasedEvent.ts index c6aa04c8..d0c49901 100644 --- a/src/nitro/communication/messages/incoming/group/GroupPurchasedEvent.ts +++ b/src/nitro/communication/messages/incoming/group/GroupPurchasedEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { GroupPurchasedParser } from '../../parser/group/GroupPurchasedParser'; +import { GroupPurchasedParser } from '../../parser'; export class GroupPurchasedEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/group/GroupSettingsEvent.ts b/src/nitro/communication/messages/incoming/group/GroupSettingsEvent.ts index ed0ff9b0..abb0c6ed 100644 --- a/src/nitro/communication/messages/incoming/group/GroupSettingsEvent.ts +++ b/src/nitro/communication/messages/incoming/group/GroupSettingsEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { GroupSettingsParser } from '../../parser/group/GroupSettingsParser'; +import { GroupSettingsParser } from '../../parser'; export class GroupSettingsEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/group/HabboGroupDeactivatedMessageEvent.ts b/src/nitro/communication/messages/incoming/group/HabboGroupDeactivatedMessageEvent.ts index 22e2ed3c..d2dfe90b 100644 --- a/src/nitro/communication/messages/incoming/group/HabboGroupDeactivatedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/group/HabboGroupDeactivatedMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { HabboGroupDeactivatedMessageParser } from '../../parser/group/HabboGroupDeactivatedMessageParser'; +import { HabboGroupDeactivatedMessageParser } from '../../parser'; export class HabboGroupDeactivatedMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/groupforums/ForumDataMessageEvent.ts b/src/nitro/communication/messages/incoming/groupforums/ForumDataMessageEvent.ts index 26e92aae..bcfe4b9d 100644 --- a/src/nitro/communication/messages/incoming/groupforums/ForumDataMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/groupforums/ForumDataMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { ForumDataMessageParser } from '../../parser/groupforums/ForumDataMessageParser'; +import { ForumDataMessageParser } from '../../parser'; export class ForumDataMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/groupforums/ForumsListMessageEvent.ts b/src/nitro/communication/messages/incoming/groupforums/ForumsListMessageEvent.ts index 65d75b3e..2be0030f 100644 --- a/src/nitro/communication/messages/incoming/groupforums/ForumsListMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/groupforums/ForumsListMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { GetForumsListMessageParser } from '../../parser/groupforums/GetForumsListMessageParser'; +import { GetForumsListMessageParser } from '../../parser'; export class ForumsListMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/groupforums/GuildForumThreadsEvent.ts b/src/nitro/communication/messages/incoming/groupforums/GuildForumThreadsEvent.ts index b31717c8..f93374f8 100644 --- a/src/nitro/communication/messages/incoming/groupforums/GuildForumThreadsEvent.ts +++ b/src/nitro/communication/messages/incoming/groupforums/GuildForumThreadsEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { GuildForumThreadsParser } from '../../parser/groupforums/GuildForumThreadsParser'; +import { GuildForumThreadsParser } from '../../parser'; export class GuildForumThreadsEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/groupforums/PostMessageMessageEvent.ts b/src/nitro/communication/messages/incoming/groupforums/PostMessageMessageEvent.ts index 4c1b29aa..afd83ba8 100644 --- a/src/nitro/communication/messages/incoming/groupforums/PostMessageMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/groupforums/PostMessageMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { PostMessageMessageParser } from '../../parser/groupforums/PostMessageMessageParser'; +import { PostMessageMessageParser } from '../../parser'; export class PostMessageMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/groupforums/PostThreadMessageEvent.ts b/src/nitro/communication/messages/incoming/groupforums/PostThreadMessageEvent.ts index 100cdc7f..994349a9 100644 --- a/src/nitro/communication/messages/incoming/groupforums/PostThreadMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/groupforums/PostThreadMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { PostThreadMessageParser } from '../../parser/groupforums/PostThreadMessageParser'; +import { PostThreadMessageParser } from '../../parser'; export class PostThreadMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/groupforums/ThreadMessagesMessageEvent.ts b/src/nitro/communication/messages/incoming/groupforums/ThreadMessagesMessageEvent.ts index 8b45dbf5..c768edfd 100644 --- a/src/nitro/communication/messages/incoming/groupforums/ThreadMessagesMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/groupforums/ThreadMessagesMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { ThreadMessagesMessageParser } from '../../parser/groupforums/ThreadMessagesMessageParser'; +import { ThreadMessagesMessageParser } from '../../parser'; export class ThreadMessagesMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/groupforums/UnreadForumsCountMessageEvent.ts b/src/nitro/communication/messages/incoming/groupforums/UnreadForumsCountMessageEvent.ts index 36cd2ba3..f5531c23 100644 --- a/src/nitro/communication/messages/incoming/groupforums/UnreadForumsCountMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/groupforums/UnreadForumsCountMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { UnreadForumsCountMessageParser } from '../../parser/groupforums/UnreadForumsCountMessageParser'; +import { UnreadForumsCountMessageParser } from '../../parser'; export class UnreadForumsCountMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/groupforums/UpdateMessageMessageEvent.ts b/src/nitro/communication/messages/incoming/groupforums/UpdateMessageMessageEvent.ts index dfa77879..fab0d801 100644 --- a/src/nitro/communication/messages/incoming/groupforums/UpdateMessageMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/groupforums/UpdateMessageMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { UpdateMessageMessageParser } from '../../parser/groupforums/UpdateMessageMessageParser'; +import { UpdateMessageMessageParser } from '../../parser'; export class UpdateMessageMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/groupforums/UpdateThreadMessageEvent.ts b/src/nitro/communication/messages/incoming/groupforums/UpdateThreadMessageEvent.ts index 1a2f940d..d605eaca 100644 --- a/src/nitro/communication/messages/incoming/groupforums/UpdateThreadMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/groupforums/UpdateThreadMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { UpdateThreadMessageParser } from '../../parser/groupforums/UpdateThreadMessageParser'; +import { UpdateThreadMessageParser } from '../../parser'; export class UpdateThreadMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/handshake/NoobnessLevelMessageEvent.ts b/src/nitro/communication/messages/incoming/handshake/NoobnessLevelMessageEvent.ts index f2f5b4b2..63a52edb 100644 --- a/src/nitro/communication/messages/incoming/handshake/NoobnessLevelMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/handshake/NoobnessLevelMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { NoobnessLevelMessageParser } from '../../parser/handshake/NoobnessLevelMessageParser'; +import { NoobnessLevelMessageParser } from '../../parser'; export class NoobnessLevelMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/help/CallForHelpDisabledNotifyMessageEvent.ts b/src/nitro/communication/messages/incoming/help/CallForHelpDisabledNotifyMessageEvent.ts index f981a893..1a6285ef 100644 --- a/src/nitro/communication/messages/incoming/help/CallForHelpDisabledNotifyMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/CallForHelpDisabledNotifyMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { CallForHelpDisabledNotifyMessageParser } from '../../parser/help/CallForHelpDisabledNotifyMessageParser'; +import { CallForHelpDisabledNotifyMessageParser } from '../../parser'; export class CallForHelpDisabledNotifyMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/help/CallForHelpPendingCallsDeletedMessageEvent.ts b/src/nitro/communication/messages/incoming/help/CallForHelpPendingCallsDeletedMessageEvent.ts index fb94bd94..9b970505 100644 --- a/src/nitro/communication/messages/incoming/help/CallForHelpPendingCallsDeletedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/CallForHelpPendingCallsDeletedMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { CallForHelpPendingCallsDeletedMessageParser } from '../../parser/help/CallForHelpPendingCallsDeletedMessageParser'; +import { CallForHelpPendingCallsDeletedMessageParser } from '../../parser'; export class CallForHelpPendingCallsDeletedMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/help/CallForHelpPendingCallsMessageEvent.ts b/src/nitro/communication/messages/incoming/help/CallForHelpPendingCallsMessageEvent.ts index 1b362cd9..e9594766 100644 --- a/src/nitro/communication/messages/incoming/help/CallForHelpPendingCallsMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/CallForHelpPendingCallsMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { CallForHelpPendingCallsMessageParser } from '../../parser/help/CallForHelpPendingCallsMessageParser'; +import { CallForHelpPendingCallsMessageParser } from '../../parser'; export class CallForHelpPendingCallsMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/help/CallForHelpReplyMessageEvent.ts b/src/nitro/communication/messages/incoming/help/CallForHelpReplyMessageEvent.ts index 2e01f02a..aff01c67 100644 --- a/src/nitro/communication/messages/incoming/help/CallForHelpReplyMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/CallForHelpReplyMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { CallForHelpReplyMessageParser } from '../../parser/help/CallForHelpReplyMessageParser'; +import { CallForHelpReplyMessageParser } from '../../parser'; export class CallForHelpReplyMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/help/CallForHelpResultMessageEvent.ts b/src/nitro/communication/messages/incoming/help/CallForHelpResultMessageEvent.ts index e836417a..28556d76 100644 --- a/src/nitro/communication/messages/incoming/help/CallForHelpResultMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/CallForHelpResultMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { CallForHelpResultMessageParser } from '../../parser/help/CallForHelpResultMessageParser'; +import { CallForHelpResultMessageParser } from '../../parser'; export class CallForHelpResultMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/help/ChatReviewSessionDetachedMessageEvent.ts b/src/nitro/communication/messages/incoming/help/ChatReviewSessionDetachedMessageEvent.ts index 8c24e491..157b5a91 100644 --- a/src/nitro/communication/messages/incoming/help/ChatReviewSessionDetachedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/ChatReviewSessionDetachedMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { ChatReviewSessionDetachedMessageParser } from '../../parser/help/ChatReviewSessionDetachedMessageParser'; +import { ChatReviewSessionDetachedMessageParser } from '../../parser'; export class ChatReviewSessionDetachedMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/help/ChatReviewSessionOfferedToGuideMessageEvent.ts b/src/nitro/communication/messages/incoming/help/ChatReviewSessionOfferedToGuideMessageEvent.ts index 587ed2b7..2fc04610 100644 --- a/src/nitro/communication/messages/incoming/help/ChatReviewSessionOfferedToGuideMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/ChatReviewSessionOfferedToGuideMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { ChatReviewSessionOfferedToGuideMessageParser } from '../../parser/help/ChatReviewSessionOfferedToGuideMessageParser'; +import { ChatReviewSessionOfferedToGuideMessageParser } from '../../parser'; export class ChatReviewSessionOfferedToGuideMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/help/ChatReviewSessionResultsMessageEvent.ts b/src/nitro/communication/messages/incoming/help/ChatReviewSessionResultsMessageEvent.ts index f181b437..176c2c02 100644 --- a/src/nitro/communication/messages/incoming/help/ChatReviewSessionResultsMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/ChatReviewSessionResultsMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { ChatReviewSessionResultsMessageParser } from '../../parser/help/ChatReviewSessionResultsMessageParser'; +import { ChatReviewSessionResultsMessageParser } from '../../parser'; export class ChatReviewSessionResultsMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/help/ChatReviewSessionStartedMessageEvent.ts b/src/nitro/communication/messages/incoming/help/ChatReviewSessionStartedMessageEvent.ts index e8203af6..3504177d 100644 --- a/src/nitro/communication/messages/incoming/help/ChatReviewSessionStartedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/ChatReviewSessionStartedMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { ChatReviewSessionStartedMessageParser } from '../../parser/help/ChatReviewSessionStartedMessageParser'; +import { ChatReviewSessionStartedMessageParser } from '../../parser'; export class ChatReviewSessionStartedMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/help/ChatReviewSessionVotingStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/help/ChatReviewSessionVotingStatusMessageEvent.ts index f1d6bd82..3f055ed5 100644 --- a/src/nitro/communication/messages/incoming/help/ChatReviewSessionVotingStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/ChatReviewSessionVotingStatusMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { ChatReviewSessionVotingStatusMessageParser } from '../../parser/help/ChatReviewSessionVotingStatusMessageParser'; +import { ChatReviewSessionVotingStatusMessageParser } from '../../parser'; export class ChatReviewSessionVotingStatusMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/help/GuideOnDutyStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideOnDutyStatusMessageEvent.ts index bb4ff0f8..c8a60069 100644 --- a/src/nitro/communication/messages/incoming/help/GuideOnDutyStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideOnDutyStatusMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { GuideOnDutyStatusMessageParser } from '../../parser/help/GuideOnDutyStatusMessageParser'; +import { GuideOnDutyStatusMessageParser } from '../../parser'; export class GuideOnDutyStatusMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/help/GuideReportingStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideReportingStatusMessageEvent.ts index 15764ae6..72169149 100644 --- a/src/nitro/communication/messages/incoming/help/GuideReportingStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideReportingStatusMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { GuideReportingStatusMessageParser } from './../../parser/help/GuideReportingStatusMessageParser'; +import { GuideReportingStatusMessageParser } from './../../parser'; export class GuideReportingStatusMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/help/GuideSessionAttachedMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideSessionAttachedMessageEvent.ts index afdc3b3f..7fbceb87 100644 --- a/src/nitro/communication/messages/incoming/help/GuideSessionAttachedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideSessionAttachedMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { GuideSessionAttachedMessageParser } from '../../parser/help/GuideSessionAttachedMessageParser'; +import { GuideSessionAttachedMessageParser } from '../../parser'; export class GuideSessionAttachedMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/help/GuideSessionDetachedMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideSessionDetachedMessageEvent.ts index 89bc6426..89912dd8 100644 --- a/src/nitro/communication/messages/incoming/help/GuideSessionDetachedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideSessionDetachedMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { GuideSessionDetachedMessageParser } from '../../parser/help/GuideSessionDetachedMessageParser'; +import { GuideSessionDetachedMessageParser } from '../../parser'; export class GuideSessionDetachedMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/help/GuideSessionEndedMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideSessionEndedMessageEvent.ts index fc1100f8..52299756 100644 --- a/src/nitro/communication/messages/incoming/help/GuideSessionEndedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideSessionEndedMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { GuideSessionEndedMessageParser } from '../../parser/help/GuideSessionEndedMessageParser'; +import { GuideSessionEndedMessageParser } from '../../parser'; export class GuideSessionEndedMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/help/GuideSessionErrorMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideSessionErrorMessageEvent.ts index 931488aa..cfa0df25 100644 --- a/src/nitro/communication/messages/incoming/help/GuideSessionErrorMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideSessionErrorMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { GuideSessionErrorMessageParser } from '../../parser/help/GuideSessionErrorMessageParser'; +import { GuideSessionErrorMessageParser } from '../../parser'; export class GuideSessionErrorMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/help/GuideSessionInvitedToGuideRoomMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideSessionInvitedToGuideRoomMessageEvent.ts index c33bedea..439d5661 100644 --- a/src/nitro/communication/messages/incoming/help/GuideSessionInvitedToGuideRoomMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideSessionInvitedToGuideRoomMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { GuideSessionInvitedToGuideRoomMessageParser } from '../../parser/help/GuideSessionInvitedToGuideRoomMessageParser'; +import { GuideSessionInvitedToGuideRoomMessageParser } from '../../parser'; export class GuideSessionInvitedToGuideRoomMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/help/GuideSessionMessageMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideSessionMessageMessageEvent.ts index e8c04821..e15fc0c8 100644 --- a/src/nitro/communication/messages/incoming/help/GuideSessionMessageMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideSessionMessageMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { GuideSessionMessageMessageParser } from '../../parser/help/GuideSessionMessageMessageParser'; +import { GuideSessionMessageMessageParser } from '../../parser'; export class GuideSessionMessageMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/help/GuideSessionPartnerIsTypingMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideSessionPartnerIsTypingMessageEvent.ts index db4fd468..75357011 100644 --- a/src/nitro/communication/messages/incoming/help/GuideSessionPartnerIsTypingMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideSessionPartnerIsTypingMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { GuideSessionPartnerIsTypingMessageParser } from '../../parser/help/GuideSessionPartnerIsTypingMessageParser'; +import { GuideSessionPartnerIsTypingMessageParser } from '../../parser'; export class GuideSessionPartnerIsTypingMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/help/GuideSessionRequesterRoomMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideSessionRequesterRoomMessageEvent.ts index e1072ef8..458a5216 100644 --- a/src/nitro/communication/messages/incoming/help/GuideSessionRequesterRoomMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideSessionRequesterRoomMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { GuideSessionRequesterRoomMessageParser } from '../../parser/help/GuideSessionRequesterRoomMessageParser'; +import { GuideSessionRequesterRoomMessageParser } from '../../parser'; export class GuideSessionRequesterRoomMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/help/GuideSessionStartedMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideSessionStartedMessageEvent.ts index 59a871a1..254eb8c0 100644 --- a/src/nitro/communication/messages/incoming/help/GuideSessionStartedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideSessionStartedMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { GuideSessionStartedMessageParser } from '../../parser/help/GuideSessionStartedMessageParser'; +import { GuideSessionStartedMessageParser } from '../../parser'; export class GuideSessionStartedMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/help/GuideTicketCreationResultMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideTicketCreationResultMessageEvent.ts index 59e39d2e..b8b7c6f6 100644 --- a/src/nitro/communication/messages/incoming/help/GuideTicketCreationResultMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideTicketCreationResultMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { GuideTicketCreationResultMessageParser } from '../../parser/help/GuideTicketCreationResultMessageParser'; +import { GuideTicketCreationResultMessageParser } from '../../parser'; export class GuideTicketCreationResultMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/help/GuideTicketResolutionMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideTicketResolutionMessageEvent.ts index 4c407e8d..b2c80727 100644 --- a/src/nitro/communication/messages/incoming/help/GuideTicketResolutionMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideTicketResolutionMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { GuideTicketResolutionMessageParser } from '../../parser/help/GuideTicketResolutionMessageParser'; +import { GuideTicketResolutionMessageParser } from '../../parser'; export class GuideTicketResolutionMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/help/HotelMergeNameChangeEvent.ts b/src/nitro/communication/messages/incoming/help/HotelMergeNameChangeEvent.ts index 30d0fdac..4ec49a41 100644 --- a/src/nitro/communication/messages/incoming/help/HotelMergeNameChangeEvent.ts +++ b/src/nitro/communication/messages/incoming/help/HotelMergeNameChangeEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { HotelMergeNameChangeParser } from '../../parser/help/HotelMergeNameChangeParser'; +import { HotelMergeNameChangeParser } from '../../parser'; export class HotelMergeNameChangeEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/help/IssueCloseNotificationMessageEvent.ts b/src/nitro/communication/messages/incoming/help/IssueCloseNotificationMessageEvent.ts index 5f2b3413..3557bced 100644 --- a/src/nitro/communication/messages/incoming/help/IssueCloseNotificationMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/IssueCloseNotificationMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { IssueCloseNotificationMessageParser } from '../../parser/help/IssueCloseNotificationMessageParser'; +import { IssueCloseNotificationMessageParser } from '../../parser'; export class IssueCloseNotificationMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/help/QuizDataMessageEvent.ts b/src/nitro/communication/messages/incoming/help/QuizDataMessageEvent.ts index f89a77c8..ccac10d8 100644 --- a/src/nitro/communication/messages/incoming/help/QuizDataMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/QuizDataMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { QuizDataMessageParser } from '../../parser/help/QuizDataMessageParser'; +import { QuizDataMessageParser } from '../../parser'; export class QuizDataMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/help/QuizResultsMessageEvent.ts b/src/nitro/communication/messages/incoming/help/QuizResultsMessageEvent.ts index c7490d6a..4b4bf7ea 100644 --- a/src/nitro/communication/messages/incoming/help/QuizResultsMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/QuizResultsMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { QuizResultsMessageParser } from '../../parser/help/QuizResultsMessageParser'; +import { QuizResultsMessageParser } from '../../parser'; export class QuizResultsMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/help/index.ts b/src/nitro/communication/messages/incoming/help/index.ts index 0c0dc829..029319e9 100644 --- a/src/nitro/communication/messages/incoming/help/index.ts +++ b/src/nitro/communication/messages/incoming/help/index.ts @@ -9,6 +9,7 @@ export * from './ChatReviewSessionResultsMessageEvent'; export * from './ChatReviewSessionStartedMessageEvent'; export * from './ChatReviewSessionVotingStatusMessageEvent'; export * from './GuideOnDutyStatusMessageEvent'; +export * from './GuideReportingStatusMessageEvent'; export * from './GuideSessionAttachedMessageEvent'; export * from './GuideSessionDetachedMessageEvent'; export * from './GuideSessionEndedMessageEvent'; diff --git a/src/nitro/communication/messages/incoming/index.ts b/src/nitro/communication/messages/incoming/index.ts index a1077548..41286c59 100644 --- a/src/nitro/communication/messages/incoming/index.ts +++ b/src/nitro/communication/messages/incoming/index.ts @@ -7,6 +7,7 @@ export * from './camera'; export * from './campaign'; export * from './catalog'; export * from './client'; +export * from './competition'; export * from './crafting'; export * from './desktop'; export * from './friendlist'; @@ -27,6 +28,7 @@ export * from './inventory/furni/gifts'; export * from './inventory/pets'; export * from './inventory/trading'; export * from './landingview'; +export * from './landingview/votes'; export * from './marketplace'; export * from './moderation'; export * from './mysterybox'; @@ -45,6 +47,7 @@ export * from './room/engine'; export * from './room/furniture'; export * from './room/furniture/floor'; export * from './room/furniture/wall'; +export * from './room/furniture/youtube'; export * from './room/mapping'; export * from './room/pet'; export * from './room/session'; diff --git a/src/nitro/communication/messages/incoming/inventory/achievements/AchievementEvent.ts b/src/nitro/communication/messages/incoming/inventory/achievements/AchievementEvent.ts index 2d917e03..cba60fe1 100644 --- a/src/nitro/communication/messages/incoming/inventory/achievements/AchievementEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/achievements/AchievementEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { AchievementParser } from '../../../parser/inventory/achievements/AchievementParser'; +import { AchievementParser } from '../../../parser'; export class AchievementEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/achievements/AchievementsEvent.ts b/src/nitro/communication/messages/incoming/inventory/achievements/AchievementsEvent.ts index 775d2924..14eb18cb 100644 --- a/src/nitro/communication/messages/incoming/inventory/achievements/AchievementsEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/achievements/AchievementsEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { AchievementsParser } from '../../../parser/inventory/achievements/AchievementsParser'; +import { AchievementsParser } from '../../../parser'; export class AchievementsEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/achievements/AchievementsScoreEvent.ts b/src/nitro/communication/messages/incoming/inventory/achievements/AchievementsScoreEvent.ts index b2c67d44..b37b2a75 100644 --- a/src/nitro/communication/messages/incoming/inventory/achievements/AchievementsScoreEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/achievements/AchievementsScoreEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { AchievementsScoreParser } from '../../../parser/inventory/achievements/AchievementsScoreParser'; +import { AchievementsScoreParser } from '../../../parser'; export class AchievementsScoreEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/achievements/index.ts b/src/nitro/communication/messages/incoming/inventory/achievements/index.ts index eac884bd..1344aec5 100644 --- a/src/nitro/communication/messages/incoming/inventory/achievements/index.ts +++ b/src/nitro/communication/messages/incoming/inventory/achievements/index.ts @@ -1,5 +1,3 @@ -export * from './AchievementData'; export * from './AchievementEvent'; -export * from './AchievementResolutionData'; export * from './AchievementsEvent'; export * from './AchievementsScoreEvent'; diff --git a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectActivatedEvent.ts b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectActivatedEvent.ts index 1d12e676..7170ac8d 100644 --- a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectActivatedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectActivatedEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { AvatarEffectActivatedParser } from '../../../parser/inventory/avatareffect/AvatarEffectActivatedParser'; +import { AvatarEffectActivatedParser } from '../../../parser'; export class AvatarEffectActivatedEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectAddedEvent.ts b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectAddedEvent.ts index f977e6aa..ecd9057a 100644 --- a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectAddedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectAddedEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { AvatarEffectAddedParser } from '../../../parser/inventory/avatareffect/AvatarEffectAddedParser'; +import { AvatarEffectAddedParser } from '../../../parser'; export class AvatarEffectAddedEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectExpiredEvent.ts b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectExpiredEvent.ts index de6cee64..daaccad6 100644 --- a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectExpiredEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectExpiredEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { AvatarEffectExpiredParser } from '../../../parser/inventory/avatareffect/AvatarEffectExpiredParser'; +import { AvatarEffectExpiredParser } from '../../../parser'; export class AvatarEffectExpiredEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectSelectedEvent.ts b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectSelectedEvent.ts index 7ce283f0..5983b17f 100644 --- a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectSelectedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectSelectedEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { AvatarEffectSelectedParser } from '../../../parser/inventory/avatareffect/AvatarEffectSelectedParser'; +import { AvatarEffectSelectedParser } from '../../../parser'; export class AvatarEffectSelectedEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectsEvent.ts b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectsEvent.ts index e6705395..c8a11275 100644 --- a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectsEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectsEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { AvatarEffectsParser } from '../../../parser/inventory/avatareffect/AvatarEffectsParser'; +import { AvatarEffectsParser } from '../../../parser'; export class AvatarEffectsEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/avatareffect/index.ts b/src/nitro/communication/messages/incoming/inventory/avatareffect/index.ts index 2b4d6fc0..4a407ad8 100644 --- a/src/nitro/communication/messages/incoming/inventory/avatareffect/index.ts +++ b/src/nitro/communication/messages/incoming/inventory/avatareffect/index.ts @@ -1,4 +1,3 @@ -export * from './AvatarEffect'; export * from './AvatarEffectActivatedEvent'; export * from './AvatarEffectAddedEvent'; export * from './AvatarEffectExpiredEvent'; diff --git a/src/nitro/communication/messages/incoming/inventory/badges/BadgePointLimitsEvent.ts b/src/nitro/communication/messages/incoming/inventory/badges/BadgePointLimitsEvent.ts index 15506831..8d3326eb 100644 --- a/src/nitro/communication/messages/incoming/inventory/badges/BadgePointLimitsEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/badges/BadgePointLimitsEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { BadgePointLimitsParser } from '../../../parser/inventory/badges/BadgePointLimitsParser'; +import { BadgePointLimitsParser } from '../../../parser'; export class BadgePointLimitsEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/badges/BadgeReceivedEvent.ts b/src/nitro/communication/messages/incoming/inventory/badges/BadgeReceivedEvent.ts index 7ca6fd2e..289811eb 100644 --- a/src/nitro/communication/messages/incoming/inventory/badges/BadgeReceivedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/badges/BadgeReceivedEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { BadgeReceivedParser } from '../../../parser/inventory/badges/BadgeReceivedParser'; +import { BadgeReceivedParser } from '../../../parser'; export class BadgeReceivedEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/badges/BadgesEvent.ts b/src/nitro/communication/messages/incoming/inventory/badges/BadgesEvent.ts index 5ad091c0..d274f821 100644 --- a/src/nitro/communication/messages/incoming/inventory/badges/BadgesEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/badges/BadgesEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { BadgesParser } from '../../../parser/inventory/badges/BadgesParser'; +import { BadgesParser } from '../../../parser'; export class BadgesEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/badges/IsBadgeRequestFulfilledEvent.ts b/src/nitro/communication/messages/incoming/inventory/badges/IsBadgeRequestFulfilledEvent.ts index 0f0ced3b..fda4c255 100644 --- a/src/nitro/communication/messages/incoming/inventory/badges/IsBadgeRequestFulfilledEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/badges/IsBadgeRequestFulfilledEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { IsBadgeRequestFulfilledParser } from '../../../parser/inventory/badges/IsBadgeRequestFulfilledParser'; +import { IsBadgeRequestFulfilledParser } from '../../../parser'; export class IsBadgeRequestFulfilledEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/clothes/FigureSetIdsMessageEvent.ts b/src/nitro/communication/messages/incoming/inventory/clothes/FigureSetIdsMessageEvent.ts index 78b26d58..36a1e317 100644 --- a/src/nitro/communication/messages/incoming/inventory/clothes/FigureSetIdsMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/clothes/FigureSetIdsMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { FigureSetIdsMessageParser } from '../../../parser/inventory/clothing/FigureSetIdsMessageParser'; +import { FigureSetIdsMessageParser } from '../../../parser'; export class FigureSetIdsMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/clothes/_Str_16135.ts b/src/nitro/communication/messages/incoming/inventory/clothes/_Str_16135.ts index 0ae296ed..80f2618e 100644 --- a/src/nitro/communication/messages/incoming/inventory/clothes/_Str_16135.ts +++ b/src/nitro/communication/messages/incoming/inventory/clothes/_Str_16135.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { _Str_8728 } from '../../../parser/inventory/clothing/_Str_8728'; +import { _Str_8728 } from '../../../parser'; export class _Str_16135 extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/clothes/_Str_17532.ts b/src/nitro/communication/messages/incoming/inventory/clothes/_Str_17532.ts index 6a58b9b5..d2d644f7 100644 --- a/src/nitro/communication/messages/incoming/inventory/clothes/_Str_17532.ts +++ b/src/nitro/communication/messages/incoming/inventory/clothes/_Str_17532.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { _Str_9021 } from '../../../parser/inventory/clothing/_Str_9021'; +import { _Str_9021 } from '../../../parser'; export class _Str_17532 extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListAddOrUpdateEvent.ts b/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListAddOrUpdateEvent.ts index 47d24956..414df47a 100644 --- a/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListAddOrUpdateEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListAddOrUpdateEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { FurnitureListAddOrUpdateParser } from '../../../parser/inventory/furniture/FurnitureListAddOrUpdateParser'; +import { FurnitureListAddOrUpdateParser } from '../../../parser'; export class FurnitureListAddOrUpdateEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListEvent.ts b/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListEvent.ts index ea16e249..43049a3c 100644 --- a/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { FurnitureListParser } from '../../../parser/inventory/furniture/FurnitureListParser'; +import { FurnitureListParser } from '../../../parser'; export class FurnitureListEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListInvalidateEvent.ts b/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListInvalidateEvent.ts index 3108dc13..00803bc8 100644 --- a/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListInvalidateEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListInvalidateEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { FurnitureListInvalidateParser } from '../../../parser/inventory/furniture/FurnitureListInvalidateParser'; +import { FurnitureListInvalidateParser } from '../../../parser'; export class FurnitureListInvalidateEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListRemovedEvent.ts b/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListRemovedEvent.ts index bc82cfd0..5f081ae7 100644 --- a/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListRemovedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListRemovedEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { FurnitureListRemovedParser } from '../../../parser/inventory/furniture/FurnitureListRemovedParser'; +import { FurnitureListRemovedParser } from '../../../parser'; export class FurnitureListRemovedEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/furni/FurniturePostItPlacedEvent.ts b/src/nitro/communication/messages/incoming/inventory/furni/FurniturePostItPlacedEvent.ts index 4cbfdf1c..301b3edd 100644 --- a/src/nitro/communication/messages/incoming/inventory/furni/FurniturePostItPlacedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/furni/FurniturePostItPlacedEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { FurniturePostItPlacedParser } from '../../../parser/inventory/furniture/FurniturePostItPlacedParser'; +import { FurniturePostItPlacedParser } from '../../../parser'; export class FurniturePostItPlacedEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/furni/gifts/PresentOpenedMessageEvent.ts b/src/nitro/communication/messages/incoming/inventory/furni/gifts/PresentOpenedMessageEvent.ts index 3bb7956d..2161076c 100644 --- a/src/nitro/communication/messages/incoming/inventory/furni/gifts/PresentOpenedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/furni/gifts/PresentOpenedMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../../api'; import { MessageEvent } from '../../../../../../../core'; -import { PresentOpenedMessageParser } from '../../../../parser/inventory/furniture/PresentOpenedMessageParser'; +import { PresentOpenedMessageParser } from '../../../../parser'; export class PresentOpenedMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/furni/index.ts b/src/nitro/communication/messages/incoming/inventory/furni/index.ts index edb79f2b..79c30966 100644 --- a/src/nitro/communication/messages/incoming/inventory/furni/index.ts +++ b/src/nitro/communication/messages/incoming/inventory/furni/index.ts @@ -4,4 +4,3 @@ export * from './FurnitureListInvalidateEvent'; export * from './FurnitureListRemovedEvent'; export * from './FurniturePostItPlacedEvent'; export * from './gifts'; -export * from './IFurnitureItemData'; diff --git a/src/nitro/communication/messages/incoming/inventory/index.ts b/src/nitro/communication/messages/incoming/inventory/index.ts index 6146ac07..4f6ae27b 100644 --- a/src/nitro/communication/messages/incoming/inventory/index.ts +++ b/src/nitro/communication/messages/incoming/inventory/index.ts @@ -3,5 +3,6 @@ export * from './avatareffect'; export * from './badges'; export * from './clothes'; export * from './furni'; +export * from './furni/gifts'; export * from './pets'; export * from './trading'; diff --git a/src/nitro/communication/messages/incoming/inventory/pets/PetAddedToInventoryEvent.ts b/src/nitro/communication/messages/incoming/inventory/pets/PetAddedToInventoryEvent.ts index a97ec902..6e0f7682 100644 --- a/src/nitro/communication/messages/incoming/inventory/pets/PetAddedToInventoryEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/pets/PetAddedToInventoryEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { PetAddedToInventoryParser } from '../../../parser/inventory/pets/PetAddedToInventoryParser'; +import { PetAddedToInventoryParser } from '../../../parser'; export class PetAddedToInventoryEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/pets/PetInventoryEvent.ts b/src/nitro/communication/messages/incoming/inventory/pets/PetInventoryEvent.ts index eab3ce36..2f7d2129 100644 --- a/src/nitro/communication/messages/incoming/inventory/pets/PetInventoryEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/pets/PetInventoryEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { PetInventoryParser } from '../../../parser/inventory/pets/PetInventoryParser'; +import { PetInventoryParser } from '../../../parser'; export class PetInventoryEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/pets/PetReceivedMessageEvent.ts b/src/nitro/communication/messages/incoming/inventory/pets/PetReceivedMessageEvent.ts index bcf01ff2..3ce49ff2 100644 --- a/src/nitro/communication/messages/incoming/inventory/pets/PetReceivedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/pets/PetReceivedMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { PetReceivedMessageParser } from '../../../parser/inventory/pets/PetReceivedMessageParser'; +import { PetReceivedMessageParser } from '../../../parser'; export class PetReceivedMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/pets/PetRemovedFromInventoryEvent.ts b/src/nitro/communication/messages/incoming/inventory/pets/PetRemovedFromInventoryEvent.ts index 30af3d53..62f2227a 100644 --- a/src/nitro/communication/messages/incoming/inventory/pets/PetRemovedFromInventoryEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/pets/PetRemovedFromInventoryEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { PetRemovedFromInventoryParser } from '../../../parser/inventory/pets/PetRemovedFromInventoryParser'; +import { PetRemovedFromInventoryParser } from '../../../parser'; export class PetRemovedFromInventory extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingAcceptEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingAcceptEvent.ts index 775b5469..6eb2b485 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingAcceptEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingAcceptEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { TradingAcceptParser } from '../../../parser/inventory/trading/TradingAcceptParser'; +import { TradingAcceptParser } from '../../../parser'; export class TradingAcceptEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingCloseEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingCloseEvent.ts index 1121f570..9bfece5a 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingCloseEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingCloseEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { TradingCloseParser } from '../../../parser/inventory/trading/TradingCloseParser'; +import { TradingCloseParser } from '../../../parser'; export class TradingCloseEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingCompletedEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingCompletedEvent.ts index 8d7a6697..92b36854 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingCompletedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingCompletedEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { TradingCompletedParser } from '../../../parser/inventory/trading/TradingCompletedParser'; +import { TradingCompletedParser } from '../../../parser'; export class TradingCompletedEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingConfirmationEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingConfirmationEvent.ts index 6d93b012..40a39605 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingConfirmationEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingConfirmationEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { TradingConfirmationParser } from '../../../parser/inventory/trading/TradingConfirmationParser'; +import { TradingConfirmationParser } from '../../../parser'; export class TradingConfirmationEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingListItemEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingListItemEvent.ts index 9d6f9bf0..e8a73826 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingListItemEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingListItemEvent.ts @@ -1,7 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { TradingListItemParser } from '../../../parser/inventory/trading/TradingListItemParser'; -import { ItemDataStructure } from './ItemDataStructure'; +import { ItemDataStructure, TradingListItemParser } from '../../../parser'; export class TradingListItemEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingNotOpenEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingNotOpenEvent.ts index e64a3961..11965a48 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingNotOpenEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingNotOpenEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { TradingNotOpenParser } from '../../../parser/inventory/trading/TradingNotOpenParser'; +import { TradingNotOpenParser } from '../../../parser'; export class TradingNotOpenEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingOpenEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingOpenEvent.ts index d5c52fec..25a8bb8a 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingOpenEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingOpenEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { TradingOpenParser } from '../../../parser/inventory/trading/TradingOpenParser'; +import { TradingOpenParser } from '../../../parser'; export class TradingOpenEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingOpenFailedEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingOpenFailedEvent.ts index 70a2424a..ad83ea0a 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingOpenFailedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingOpenFailedEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { TradingOpenFailedParser } from '../../../parser/inventory/trading/TradingOpenFailedParser'; +import { TradingOpenFailedParser } from '../../../parser'; export class TradingOpenFailedEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingOtherNotAllowedEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingOtherNotAllowedEvent.ts index 17623aab..e56f838d 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingOtherNotAllowedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingOtherNotAllowedEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { TradingOtherNotAllowedParser } from '../../../parser/inventory/trading/TradingOtherNotAllowedParser'; +import { TradingOtherNotAllowedParser } from '../../../parser'; export class TradingOtherNotAllowedEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingYouAreNotAllowedEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingYouAreNotAllowedEvent.ts index 2fbdb87c..a457b9ae 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingYouAreNotAllowedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingYouAreNotAllowedEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { TradingYouAreNotAllowedParser } from '../../../parser/inventory/trading/TradingYouAreNotAllowedParser'; +import { TradingYouAreNotAllowedParser } from '../../../parser'; export class TradingYouAreNotAllowedEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/inventory/trading/index.ts b/src/nitro/communication/messages/incoming/inventory/trading/index.ts index ae6758f5..952688bd 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/index.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/index.ts @@ -1,4 +1,3 @@ -export * from './ItemDataStructure'; export * from './TradingAcceptEvent'; export * from './TradingCloseEvent'; export * from './TradingCompletedEvent'; diff --git a/src/nitro/communication/messages/incoming/landingview/PromoArticlesMessageEvent.ts b/src/nitro/communication/messages/incoming/landingview/PromoArticlesMessageEvent.ts index 32ca745b..f9078a99 100644 --- a/src/nitro/communication/messages/incoming/landingview/PromoArticlesMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/landingview/PromoArticlesMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { PromoArticlesMessageParser } from '../../parser/landingview/PromoArticlesMessageParser'; +import { PromoArticlesMessageParser } from '../../parser'; export class PromoArticlesMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/landingview/index.ts b/src/nitro/communication/messages/incoming/landingview/index.ts index 340e57ef..d566aeb5 100644 --- a/src/nitro/communication/messages/incoming/landingview/index.ts +++ b/src/nitro/communication/messages/incoming/landingview/index.ts @@ -1,3 +1,2 @@ -export * from './PromoArticleData'; export * from './PromoArticlesMessageEvent'; export * from './votes'; diff --git a/src/nitro/communication/messages/incoming/landingview/votes/CommunityGoalVoteMessageEvent.ts b/src/nitro/communication/messages/incoming/landingview/votes/CommunityGoalVoteMessageEvent.ts index b936557f..196fb5d1 100644 --- a/src/nitro/communication/messages/incoming/landingview/votes/CommunityGoalVoteMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/landingview/votes/CommunityGoalVoteMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { CommunityVoteReceivedParser } from '../../../parser/landingview/votes/CommunityVoteReceivedParser'; +import { CommunityVoteReceivedParser } from '../../../parser'; export class CommunityGoalVoteMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/marketplace/MarketplaceBuyOfferResultEvent.ts b/src/nitro/communication/messages/incoming/marketplace/MarketplaceBuyOfferResultEvent.ts index 68a2ca6e..b96f8fec 100644 --- a/src/nitro/communication/messages/incoming/marketplace/MarketplaceBuyOfferResultEvent.ts +++ b/src/nitro/communication/messages/incoming/marketplace/MarketplaceBuyOfferResultEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { MarketplaceBuyOfferResultParser } from '../../parser/marketplace/MarketplaceBuyOfferResultParser'; +import { MarketplaceBuyOfferResultParser } from '../../parser'; export class MarketplaceBuyOfferResultEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/marketplace/MarketplaceCanMakeOfferResult.ts b/src/nitro/communication/messages/incoming/marketplace/MarketplaceCanMakeOfferResult.ts index 6dda05d1..aa451acd 100644 --- a/src/nitro/communication/messages/incoming/marketplace/MarketplaceCanMakeOfferResult.ts +++ b/src/nitro/communication/messages/incoming/marketplace/MarketplaceCanMakeOfferResult.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { MarketplaceCanMakeOfferResultParser } from '../../parser/marketplace/MarketplaceCanMakeOfferResultParser'; +import { MarketplaceCanMakeOfferResultParser } from '../../parser'; export class MarketplaceCanMakeOfferResult extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/marketplace/MarketplaceCancelOfferResultEvent.ts b/src/nitro/communication/messages/incoming/marketplace/MarketplaceCancelOfferResultEvent.ts index 52615ae4..6d714337 100644 --- a/src/nitro/communication/messages/incoming/marketplace/MarketplaceCancelOfferResultEvent.ts +++ b/src/nitro/communication/messages/incoming/marketplace/MarketplaceCancelOfferResultEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { MarketplaceCancelOfferResultParser } from '../../parser/marketplace/MarketplaceCancelOfferResultParser'; +import { MarketplaceCancelOfferResultParser } from '../../parser'; export class MarketplaceCancelOfferResultEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/marketplace/MarketplaceConfigurationEvent.ts b/src/nitro/communication/messages/incoming/marketplace/MarketplaceConfigurationEvent.ts index 1d4b58d8..5fc00b84 100644 --- a/src/nitro/communication/messages/incoming/marketplace/MarketplaceConfigurationEvent.ts +++ b/src/nitro/communication/messages/incoming/marketplace/MarketplaceConfigurationEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { MarketplaceConfigurationMessageParser } from '../../parser/marketplace/MarketplaceConfigurationMessageParser'; +import { MarketplaceConfigurationMessageParser } from '../../parser'; export class MarketplaceConfigurationEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/marketplace/MarketplaceItemStatsEvent.ts b/src/nitro/communication/messages/incoming/marketplace/MarketplaceItemStatsEvent.ts index 4014972f..954ce20d 100644 --- a/src/nitro/communication/messages/incoming/marketplace/MarketplaceItemStatsEvent.ts +++ b/src/nitro/communication/messages/incoming/marketplace/MarketplaceItemStatsEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { MarketplaceItemStatsParser } from '../../parser/marketplace/MarketplaceItemStatsParser'; +import { MarketplaceItemStatsParser } from '../../parser'; export class MarketplaceItemStatsEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/marketplace/MarketplaceMakeOfferResult.ts b/src/nitro/communication/messages/incoming/marketplace/MarketplaceMakeOfferResult.ts index 3915e19e..d9d6182b 100644 --- a/src/nitro/communication/messages/incoming/marketplace/MarketplaceMakeOfferResult.ts +++ b/src/nitro/communication/messages/incoming/marketplace/MarketplaceMakeOfferResult.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { MarketplaceMakeOfferResultParser } from '../../parser/marketplace/MarketplaceItemPostedParser'; +import { MarketplaceMakeOfferResultParser } from '../../parser'; export class MarketplaceMakeOfferResult extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/marketplace/MarketplaceOffersEvent.ts b/src/nitro/communication/messages/incoming/marketplace/MarketplaceOffersEvent.ts index 7f8c0967..ac92985e 100644 --- a/src/nitro/communication/messages/incoming/marketplace/MarketplaceOffersEvent.ts +++ b/src/nitro/communication/messages/incoming/marketplace/MarketplaceOffersEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { MarketplaceOffersParser } from '../../parser/marketplace/MarketplaceOffersParser'; +import { MarketplaceOffersParser } from '../../parser'; export class MarketPlaceOffersEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/marketplace/MarketplaceOwnOffersEvent.ts b/src/nitro/communication/messages/incoming/marketplace/MarketplaceOwnOffersEvent.ts index 800a5ab3..8055159b 100644 --- a/src/nitro/communication/messages/incoming/marketplace/MarketplaceOwnOffersEvent.ts +++ b/src/nitro/communication/messages/incoming/marketplace/MarketplaceOwnOffersEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { MarketplaceOwnOffersParser } from '../../parser/marketplace/MarketplaceOwnOffersParser'; +import { MarketplaceOwnOffersParser } from '../../parser'; export class MarketplaceOwnOffersEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/marketplace/index.ts b/src/nitro/communication/messages/incoming/marketplace/index.ts index df0f5ccf..7f4c2d51 100644 --- a/src/nitro/communication/messages/incoming/marketplace/index.ts +++ b/src/nitro/communication/messages/incoming/marketplace/index.ts @@ -4,6 +4,5 @@ export * from './MarketplaceCanMakeOfferResult'; export * from './MarketplaceConfigurationEvent'; export * from './MarketplaceItemStatsEvent'; export * from './MarketplaceMakeOfferResult'; -export * from './MarketplaceOffer'; export * from './MarketplaceOffersEvent'; export * from './MarketplaceOwnOffersEvent'; diff --git a/src/nitro/communication/messages/incoming/moderation/CfhChatlogEvent.ts b/src/nitro/communication/messages/incoming/moderation/CfhChatlogEvent.ts index de4a91d8..e64a2884 100644 --- a/src/nitro/communication/messages/incoming/moderation/CfhChatlogEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/CfhChatlogEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { CfhChatlogMessageParser } from '../../parser/moderation/CfhChatlogMessageParser'; +import { CfhChatlogMessageParser } from '../../parser'; export class CfhChatlogEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/moderation/IssueDeletedMessageEvent.ts b/src/nitro/communication/messages/incoming/moderation/IssueDeletedMessageEvent.ts index e9c5d363..2abba560 100644 --- a/src/nitro/communication/messages/incoming/moderation/IssueDeletedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/IssueDeletedMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { IssueDeletedMessageParser } from '../../parser/moderation/IssueDeletedMessageParser'; +import { IssueDeletedMessageParser } from '../../parser'; export class IssueDeletedMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/moderation/IssueInfoMessageEvent.ts b/src/nitro/communication/messages/incoming/moderation/IssueInfoMessageEvent.ts index 138cce47..63b28572 100644 --- a/src/nitro/communication/messages/incoming/moderation/IssueInfoMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/IssueInfoMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { IssueInfoMessageParser } from '../../parser/moderation/IssueInfoMessageParser'; +import { IssueInfoMessageParser } from '../../parser'; export class IssueInfoMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/moderation/IssuePickFailedMessageEvent.ts b/src/nitro/communication/messages/incoming/moderation/IssuePickFailedMessageEvent.ts index a858efe3..1ea036d0 100644 --- a/src/nitro/communication/messages/incoming/moderation/IssuePickFailedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/IssuePickFailedMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { IssuePickFailedMessageParser } from '../../parser/moderation/IssuePickFailedMessageParser'; +import { IssuePickFailedMessageParser } from '../../parser'; export class IssuePickFailedMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/moderation/ModeratorActionResultMessageEvent.ts b/src/nitro/communication/messages/incoming/moderation/ModeratorActionResultMessageEvent.ts index 359a8ba9..1103cda5 100644 --- a/src/nitro/communication/messages/incoming/moderation/ModeratorActionResultMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/ModeratorActionResultMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { ModeratorActionResultMessageParser } from '../../parser/moderation/ModeratorActionResultMessageParser'; +import { ModeratorActionResultMessageParser } from '../../parser'; export class ModeratorActionResultMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/moderation/ModeratorCautionEvent.ts b/src/nitro/communication/messages/incoming/moderation/ModeratorCautionEvent.ts index bf983707..bce4de39 100644 --- a/src/nitro/communication/messages/incoming/moderation/ModeratorCautionEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/ModeratorCautionEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { ModerationCautionParser } from '../../parser/moderation'; +import { ModerationCautionParser } from '../../parser'; export class ModeratorCautionEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/moderation/ModeratorInitMessageEvent.ts b/src/nitro/communication/messages/incoming/moderation/ModeratorInitMessageEvent.ts index 992eb44d..804715ee 100644 --- a/src/nitro/communication/messages/incoming/moderation/ModeratorInitMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/ModeratorInitMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { ModeratorInitMessageParser } from '../../parser/moderation/ModeratorInitMessageParser'; +import { ModeratorInitMessageParser } from '../../parser'; export class ModeratorInitMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/moderation/ModeratorMessageEvent.ts b/src/nitro/communication/messages/incoming/moderation/ModeratorMessageEvent.ts index 7d58438a..2330470e 100644 --- a/src/nitro/communication/messages/incoming/moderation/ModeratorMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/ModeratorMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { ModeratorMessageParser } from '../../parser/moderation/ModeratorMessageParser'; +import { ModeratorMessageParser } from '../../parser'; export class ModeratorMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/moderation/ModeratorRoomInfoEvent.ts b/src/nitro/communication/messages/incoming/moderation/ModeratorRoomInfoEvent.ts index 59f5a7a2..c4bfbbd1 100644 --- a/src/nitro/communication/messages/incoming/moderation/ModeratorRoomInfoEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/ModeratorRoomInfoEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { ModeratorRoomInfoMessageParser } from '../../parser/moderation/ModeratorRoomInfoMessageParser'; +import { ModeratorRoomInfoMessageParser } from '../../parser'; export class ModeratorRoomInfoEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/moderation/ModeratorToolPreferencesEvent.ts b/src/nitro/communication/messages/incoming/moderation/ModeratorToolPreferencesEvent.ts index f50fd6bc..c8572f7a 100644 --- a/src/nitro/communication/messages/incoming/moderation/ModeratorToolPreferencesEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/ModeratorToolPreferencesEvent.ts @@ -1,6 +1,6 @@ -import { ModeratorToolPreferencesMessageParser } from '../..'; import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; +import { ModeratorToolPreferencesMessageParser } from '../../parser'; export class ModeratorToolPreferencesEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/moderation/ModeratorUserInfoEvent.ts b/src/nitro/communication/messages/incoming/moderation/ModeratorUserInfoEvent.ts index 1301f69c..5cec3cc9 100644 --- a/src/nitro/communication/messages/incoming/moderation/ModeratorUserInfoEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/ModeratorUserInfoEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { ModeratorUserInfoMessageParser } from '../../parser/moderation/ModeratorUserInfoMessageParser'; +import { ModeratorUserInfoMessageParser } from '../../parser'; export class ModeratorUserInfoEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/moderation/RoomChatlogEvent.ts b/src/nitro/communication/messages/incoming/moderation/RoomChatlogEvent.ts index b003db5a..53861077 100644 --- a/src/nitro/communication/messages/incoming/moderation/RoomChatlogEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/RoomChatlogEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { RoomChatlogMessageParser } from '../../parser/moderation/RoomChatlogMessageParser'; +import { RoomChatlogMessageParser } from '../../parser'; export class RoomChatlogEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/moderation/RoomVisitsEvent.ts b/src/nitro/communication/messages/incoming/moderation/RoomVisitsEvent.ts index 16f09036..5cd9ff04 100644 --- a/src/nitro/communication/messages/incoming/moderation/RoomVisitsEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/RoomVisitsEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { RoomVisitsMessageParser } from '../../parser/moderation/RoomVisitsMessageParser'; +import { RoomVisitsMessageParser } from '../../parser'; export class RoomVisitsEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/moderation/UserBannedMessageEvent.ts b/src/nitro/communication/messages/incoming/moderation/UserBannedMessageEvent.ts index e6c95b26..0002b04d 100644 --- a/src/nitro/communication/messages/incoming/moderation/UserBannedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/UserBannedMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { UserBannedMessageParser } from '../../parser/moderation'; +import { UserBannedMessageParser } from '../../parser'; export class UserBannedMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/moderation/UserChatlogEvent.ts b/src/nitro/communication/messages/incoming/moderation/UserChatlogEvent.ts index 7393e703..0648c9e3 100644 --- a/src/nitro/communication/messages/incoming/moderation/UserChatlogEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/UserChatlogEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { UserChatlogMessageParser } from '../../parser/moderation/UserChatlogMessageParser'; +import { UserChatlogMessageParser } from '../../parser'; export class UserChatlogEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/moderation/index.ts b/src/nitro/communication/messages/incoming/moderation/index.ts index 34640aef..2bbc0c08 100644 --- a/src/nitro/communication/messages/incoming/moderation/index.ts +++ b/src/nitro/communication/messages/incoming/moderation/index.ts @@ -1,8 +1,4 @@ -export * from './CfhChatlogData'; export * from './CfhChatlogEvent'; -export * from './ChatlineData'; -export * from './ChatRecordData'; -export * from './INamed'; export * from './IssueDeletedMessageEvent'; export * from './IssueInfoMessageEvent'; export * from './IssuePickFailedMessageEvent'; @@ -12,14 +8,8 @@ export * from './ModeratorInitMessageEvent'; export * from './ModeratorMessageEvent'; export * from './ModeratorRoomInfoEvent'; export * from './ModeratorToolPreferencesEvent'; -export * from './ModeratorUserInfoData'; export * from './ModeratorUserInfoEvent'; -export * from './ModRoomData'; export * from './RoomChatlogEvent'; -export * from './RoomModerationData'; -export * from './RoomVisitData'; -export * from './RoomVisitsData'; export * from './RoomVisitsEvent'; export * from './UserBannedMessageEvent'; -export * from './UserChatlogData'; export * from './UserChatlogEvent'; diff --git a/src/nitro/communication/messages/incoming/navigator/CanCreateRoomEvent.ts b/src/nitro/communication/messages/incoming/navigator/CanCreateRoomEvent.ts index 86b921bb..5dbe037e 100644 --- a/src/nitro/communication/messages/incoming/navigator/CanCreateRoomEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/CanCreateRoomEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { CanCreateRoomMessageParser } from '../../parser/navigator/CanCreateRoomMessageParser'; +import { CanCreateRoomMessageParser } from '../../parser'; export class CanCreateRoomEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/navigator/CanCreateRoomEventEvent.ts b/src/nitro/communication/messages/incoming/navigator/CanCreateRoomEventEvent.ts index 3f3b12d0..182d38fb 100644 --- a/src/nitro/communication/messages/incoming/navigator/CanCreateRoomEventEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/CanCreateRoomEventEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { CanCreateRoomEventParser } from '../../parser/navigator/CanCreateRoomEventParser'; +import { CanCreateRoomEventParser } from '../../parser'; export class CanCreateRoomEventEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/navigator/CategoriesWithVisitorCountEvent.ts b/src/nitro/communication/messages/incoming/navigator/CategoriesWithVisitorCountEvent.ts index e8f5d236..8b5d94e9 100644 --- a/src/nitro/communication/messages/incoming/navigator/CategoriesWithVisitorCountEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/CategoriesWithVisitorCountEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { CategoriesWithVisitorCountParser } from '../../parser/navigator/CategoriesWithVisitorCountParser'; +import { CategoriesWithVisitorCountParser } from '../../parser'; export class CategoriesWithVisitorCountEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/navigator/CompetitionRoomsDataMessageEvent.ts b/src/nitro/communication/messages/incoming/navigator/CompetitionRoomsDataMessageEvent.ts index 0120b206..b26a301f 100644 --- a/src/nitro/communication/messages/incoming/navigator/CompetitionRoomsDataMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/CompetitionRoomsDataMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { CompetitionRoomsDataMessageParser } from '../../parser/navigator/CompetitionRoomsDataMessageParser'; +import { CompetitionRoomsDataMessageParser } from '../../parser'; export class CompetitionRoomsDataMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/navigator/ConvertedRoomIdEvent.ts b/src/nitro/communication/messages/incoming/navigator/ConvertedRoomIdEvent.ts index 67173077..48dec87b 100644 --- a/src/nitro/communication/messages/incoming/navigator/ConvertedRoomIdEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/ConvertedRoomIdEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { ConvertedRoomIdMessageParser } from '../../parser/navigator/ConvertedRoomIdMessageParser'; +import { ConvertedRoomIdMessageParser } from '../../parser'; export class ConvertedRoomIdEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/navigator/DoorbellMessageEvent.ts b/src/nitro/communication/messages/incoming/navigator/DoorbellMessageEvent.ts index 755ce96d..a5e20ed6 100644 --- a/src/nitro/communication/messages/incoming/navigator/DoorbellMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/DoorbellMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { DoorbellMessageParser } from '../../parser/navigator/DoorbellMessageParser'; +import { DoorbellMessageParser } from '../../parser'; export class DoorbellMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/navigator/FavouriteChangedEvent.ts b/src/nitro/communication/messages/incoming/navigator/FavouriteChangedEvent.ts index 4b50f6c9..4bf9da8b 100644 --- a/src/nitro/communication/messages/incoming/navigator/FavouriteChangedEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/FavouriteChangedEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { FavouriteChangedMessageParser } from '../../parser/navigator/FavouriteChangedMessageParser'; +import { FavouriteChangedMessageParser } from '../../parser'; export class FavouriteChangedEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/navigator/FavouritesEvent.ts b/src/nitro/communication/messages/incoming/navigator/FavouritesEvent.ts index de00fdcd..1d68628a 100644 --- a/src/nitro/communication/messages/incoming/navigator/FavouritesEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/FavouritesEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { FavouritesMessageParser } from '../../parser/navigator/FavouritesMessageParser'; +import { FavouritesMessageParser } from '../../parser'; export class FavouritesEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/navigator/FlatAccessDeniedMessageEvent.ts b/src/nitro/communication/messages/incoming/navigator/FlatAccessDeniedMessageEvent.ts index 6b7b0ba0..1a5d09e3 100644 --- a/src/nitro/communication/messages/incoming/navigator/FlatAccessDeniedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/FlatAccessDeniedMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { FlatAccessDeniedMessageParser } from '../../parser/navigator/FlatAccessDeniedMessageParser'; +import { FlatAccessDeniedMessageParser } from '../../parser'; export class FlatAccessDeniedMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/navigator/FlatCreatedEvent.ts b/src/nitro/communication/messages/incoming/navigator/FlatCreatedEvent.ts index 2138747b..b225c41a 100644 --- a/src/nitro/communication/messages/incoming/navigator/FlatCreatedEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/FlatCreatedEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { FlatCreatedMessageParser } from '../../parser/navigator/FlatCreatedMessageParser'; +import { FlatCreatedMessageParser } from '../../parser'; export class FlatCreatedEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/navigator/GetGuestRoomResultEvent.ts b/src/nitro/communication/messages/incoming/navigator/GetGuestRoomResultEvent.ts index 478fdb5e..2390984d 100644 --- a/src/nitro/communication/messages/incoming/navigator/GetGuestRoomResultEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/GetGuestRoomResultEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { GetGuestRoomResultMessageParser } from '../../parser/navigator/GetGuestRoomResultMessageParser'; +import { GetGuestRoomResultMessageParser } from '../../parser'; export class GetGuestRoomResultEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/navigator/GuestRoomSearchResultEvent.ts b/src/nitro/communication/messages/incoming/navigator/GuestRoomSearchResultEvent.ts index 468f3ce2..9e0a8de7 100644 --- a/src/nitro/communication/messages/incoming/navigator/GuestRoomSearchResultEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/GuestRoomSearchResultEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { GuestRoomSearchResultMessageParser } from '../../parser/navigator/GuestRoomSearchResultMessageParser'; +import { GuestRoomSearchResultMessageParser } from '../../parser'; export class GuestRoomSearchResultEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/navigator/NavigatorCollapsedEvent.ts b/src/nitro/communication/messages/incoming/navigator/NavigatorCollapsedEvent.ts index e9ac178c..c080ea6f 100644 --- a/src/nitro/communication/messages/incoming/navigator/NavigatorCollapsedEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/NavigatorCollapsedEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { NavigatorCollapsedParser } from '../../parser/navigator/NavigatorCollapsedParser'; +import { NavigatorCollapsedParser } from '../../parser'; export class NavigatorCollapsedEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/navigator/NavigatorHomeRoomEvent.ts b/src/nitro/communication/messages/incoming/navigator/NavigatorHomeRoomEvent.ts index 2462d4f1..cb7f444e 100644 --- a/src/nitro/communication/messages/incoming/navigator/NavigatorHomeRoomEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/NavigatorHomeRoomEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { NavigatorHomeRoomParser } from '../../parser/navigator/NavigatorHomeRoomParser'; +import { NavigatorHomeRoomParser } from '../../parser'; export class NavigatorHomeRoomEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/navigator/NavigatorLiftedEvent.ts b/src/nitro/communication/messages/incoming/navigator/NavigatorLiftedEvent.ts index e1678e9a..3dd343d8 100644 --- a/src/nitro/communication/messages/incoming/navigator/NavigatorLiftedEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/NavigatorLiftedEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { NavigatorLiftedParser } from '../../parser/navigator/NavigatorLiftedParser'; +import { NavigatorLiftedParser } from '../../parser'; export class NavigatorLiftedEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/navigator/NavigatorMetadataEvent.ts b/src/nitro/communication/messages/incoming/navigator/NavigatorMetadataEvent.ts index 9daa396d..715e07d4 100644 --- a/src/nitro/communication/messages/incoming/navigator/NavigatorMetadataEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/NavigatorMetadataEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { NavigatorMetadataParser } from '../../parser/navigator/NavigatorMetadataParser'; +import { NavigatorMetadataParser } from '../../parser'; export class NavigatorMetadataEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/navigator/NavigatorOpenRoomCreatorEvent.ts b/src/nitro/communication/messages/incoming/navigator/NavigatorOpenRoomCreatorEvent.ts index 2fccab30..7d21a096 100644 --- a/src/nitro/communication/messages/incoming/navigator/NavigatorOpenRoomCreatorEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/NavigatorOpenRoomCreatorEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { NavigatorOpenRoomCreatorParser } from '../../parser/navigator/NavigatorOpenRoomCreatorParser'; +import { NavigatorOpenRoomCreatorParser } from '../../parser'; export class NavigatorOpenRoomCreatorEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/navigator/NavigatorSearchEvent.ts b/src/nitro/communication/messages/incoming/navigator/NavigatorSearchEvent.ts index 214d8486..1c6e61c3 100644 --- a/src/nitro/communication/messages/incoming/navigator/NavigatorSearchEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/NavigatorSearchEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { NavigatorSearchParser } from '../../parser/navigator/NavigatorSearchParser'; +import { NavigatorSearchParser } from '../../parser'; export class NavigatorSearchEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/navigator/NavigatorSearchesEvent.ts b/src/nitro/communication/messages/incoming/navigator/NavigatorSearchesEvent.ts index d700cc49..eccd2083 100644 --- a/src/nitro/communication/messages/incoming/navigator/NavigatorSearchesEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/NavigatorSearchesEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { NavigatorSearchesParser } from '../../parser/navigator/NavigatorSearchesParser'; +import { NavigatorSearchesParser } from '../../parser'; export class NavigatorSearchesEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/navigator/NavigatorSettingsEvent.ts b/src/nitro/communication/messages/incoming/navigator/NavigatorSettingsEvent.ts index f6938f84..0ba71859 100644 --- a/src/nitro/communication/messages/incoming/navigator/NavigatorSettingsEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/NavigatorSettingsEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { NavigatorSettingsParser } from '../../parser/navigator/NavigatorSettingsParser'; +import { NavigatorSettingsParser } from '../../parser'; export class NavigatorSettingsEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/navigator/RoomEventCancelEvent.ts b/src/nitro/communication/messages/incoming/navigator/RoomEventCancelEvent.ts index 11a4982e..cd7a2bba 100644 --- a/src/nitro/communication/messages/incoming/navigator/RoomEventCancelEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/RoomEventCancelEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { RoomEventCancelMessageParser } from '../../parser/navigator/RoomEventCancelMessageParser'; +import { RoomEventCancelMessageParser } from '../../parser'; export class RoomEventCancelEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/navigator/RoomEventEvent.ts b/src/nitro/communication/messages/incoming/navigator/RoomEventEvent.ts index 8ea8625f..4aa0c9d8 100644 --- a/src/nitro/communication/messages/incoming/navigator/RoomEventEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/RoomEventEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { RoomEventMessageParser } from '../../parser/navigator/RoomEventMessageParser'; +import { RoomEventMessageParser } from '../../parser'; export class RoomEventEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/navigator/RoomSettingsUpdatedEvent.ts b/src/nitro/communication/messages/incoming/navigator/RoomSettingsUpdatedEvent.ts index e471fb2f..28cc857a 100644 --- a/src/nitro/communication/messages/incoming/navigator/RoomSettingsUpdatedEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/RoomSettingsUpdatedEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { RoomSettingsUpdatedParser } from '../../parser/navigator/RoomSettingsUpdatedParser'; +import { RoomSettingsUpdatedParser } from '../../parser'; export class RoomSettingsUpdatedEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/navigator/RoomThumbnailUpdateResultEvent.ts b/src/nitro/communication/messages/incoming/navigator/RoomThumbnailUpdateResultEvent.ts index 10389881..59262b46 100644 --- a/src/nitro/communication/messages/incoming/navigator/RoomThumbnailUpdateResultEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/RoomThumbnailUpdateResultEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { RoomThumbnailUpdateResultMessageParser } from '../../parser/navigator/RoomThumbnailUpdateResultMessageParser'; +import { RoomThumbnailUpdateResultMessageParser } from '../../parser'; export class RoomThumbnailUpdateResultEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/navigator/UserEventCatsEvent.ts b/src/nitro/communication/messages/incoming/navigator/UserEventCatsEvent.ts index 810361ca..4bd2e56a 100644 --- a/src/nitro/communication/messages/incoming/navigator/UserEventCatsEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/UserEventCatsEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { UserEventCatsMessageParser } from '../../parser/navigator/UserEventCatsMessageParser'; +import { UserEventCatsMessageParser } from '../../parser'; export class UserEventCatsEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/navigator/UserFlatCatsEvent.ts b/src/nitro/communication/messages/incoming/navigator/UserFlatCatsEvent.ts index 1e59c1c5..cb8e4980 100644 --- a/src/nitro/communication/messages/incoming/navigator/UserFlatCatsEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/UserFlatCatsEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { UserFlatCatsMessageParser } from '../../parser/navigator/UserFlatCatsMessageParser'; +import { UserFlatCatsMessageParser } from '../../parser'; export class UserFlatCatsEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/notifications/ActivityPointNotificationMessageEvent.ts b/src/nitro/communication/messages/incoming/notifications/ActivityPointNotificationMessageEvent.ts index 03bd5145..ea72f343 100644 --- a/src/nitro/communication/messages/incoming/notifications/ActivityPointNotificationMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/ActivityPointNotificationMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { ActivityPointNotificationParser } from '../../parser/notifications/ActivityPointNotificationParser'; +import { ActivityPointNotificationParser } from '../../parser'; export class ActivityPointNotificationMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/notifications/BotErrorEvent.ts b/src/nitro/communication/messages/incoming/notifications/BotErrorEvent.ts index 349ec0b3..711d1919 100644 --- a/src/nitro/communication/messages/incoming/notifications/BotErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/BotErrorEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { BotErrorEventParser } from '../../parser/notifications/BotErrorEventParser'; +import { BotErrorEventParser } from '../../parser'; export class BotErrorEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/notifications/HabboBroadcastMessageEvent.ts b/src/nitro/communication/messages/incoming/notifications/HabboBroadcastMessageEvent.ts index 56126506..ad34912e 100644 --- a/src/nitro/communication/messages/incoming/notifications/HabboBroadcastMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/HabboBroadcastMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { HabboBroadcastMessageParser } from '../../parser/notifications/HabboBroadcastMessageParser'; +import { HabboBroadcastMessageParser } from '../../parser'; export class HabboBroadcastMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/notifications/HotelWillShutdownEvent.ts b/src/nitro/communication/messages/incoming/notifications/HotelWillShutdownEvent.ts index 8cef1cca..f89b3f8a 100644 --- a/src/nitro/communication/messages/incoming/notifications/HotelWillShutdownEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/HotelWillShutdownEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { HotelWillShutdownParser } from '../../parser/notifications/HotelWillShutdownParser'; +import { HotelWillShutdownParser } from '../../parser'; export class HotelWillShutdownEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/notifications/MOTDNotificationEvent.ts b/src/nitro/communication/messages/incoming/notifications/MOTDNotificationEvent.ts index 118846af..392ca904 100644 --- a/src/nitro/communication/messages/incoming/notifications/MOTDNotificationEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/MOTDNotificationEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { MOTDNotificationParser } from '../../parser/notifications/MOTDNotificationParser'; +import { MOTDNotificationParser } from '../../parser'; export class MOTDNotificationEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/notifications/NotificationDialogMessageEvent.ts b/src/nitro/communication/messages/incoming/notifications/NotificationDialogMessageEvent.ts index f51c819d..a5d8c63f 100644 --- a/src/nitro/communication/messages/incoming/notifications/NotificationDialogMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/NotificationDialogMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { NotificationDialogMessageParser } from '../../parser/notifications/NotificationDialogMessageParser'; +import { NotificationDialogMessageParser } from '../../parser'; export class NotificationDialogMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/notifications/PetLevelNotificationEvent.ts b/src/nitro/communication/messages/incoming/notifications/PetLevelNotificationEvent.ts index 8d7a0eb0..f32211e9 100644 --- a/src/nitro/communication/messages/incoming/notifications/PetLevelNotificationEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/PetLevelNotificationEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { PetLevelNotificationParser } from '../../parser/notifications/PetLevelNotificationParser'; +import { PetLevelNotificationParser } from '../../parser'; export class PetLevelNotificationEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/notifications/PetPlacingErrorEvent.ts b/src/nitro/communication/messages/incoming/notifications/PetPlacingErrorEvent.ts index baaf48d6..e6eba64c 100644 --- a/src/nitro/communication/messages/incoming/notifications/PetPlacingErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/PetPlacingErrorEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { PetPlacingErrorEventParser } from '../../parser/notifications/PetPlacingErrorEventParser'; +import { PetPlacingErrorEventParser } from '../../parser'; export class PetPlacingErrorEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/notifications/UnseenItemsEvent.ts b/src/nitro/communication/messages/incoming/notifications/UnseenItemsEvent.ts index 177559c9..311ef391 100644 --- a/src/nitro/communication/messages/incoming/notifications/UnseenItemsEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/UnseenItemsEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { UnseenItemsParser } from '../../parser/notifications/UnseenItemsParser'; +import { UnseenItemsParser } from '../../parser'; export class UnseenItemsEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/notifications/index.ts b/src/nitro/communication/messages/incoming/notifications/index.ts index 467abb76..2965aaca 100644 --- a/src/nitro/communication/messages/incoming/notifications/index.ts +++ b/src/nitro/communication/messages/incoming/notifications/index.ts @@ -1,4 +1,3 @@ -export * from './AchievementLevelUpData'; export * from './AchievementNotificationMessageEvent'; export * from './ActivityPointNotificationMessageEvent'; export * from './BotErrorEvent'; diff --git a/src/nitro/communication/messages/incoming/perk/PerkAllowancesMessageEvent.ts b/src/nitro/communication/messages/incoming/perk/PerkAllowancesMessageEvent.ts index 0974db43..a7208550 100644 --- a/src/nitro/communication/messages/incoming/perk/PerkAllowancesMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/perk/PerkAllowancesMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { PerkAllowancesMessageParser } from './../../parser/perk/PerkAllowancesMessageParser'; +import { PerkAllowancesMessageParser } from './../../parser'; export class PerkAllowancesMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/poll/PollContentsEvent.ts b/src/nitro/communication/messages/incoming/poll/PollContentsEvent.ts index 80cbe8c3..3d8e50dc 100644 --- a/src/nitro/communication/messages/incoming/poll/PollContentsEvent.ts +++ b/src/nitro/communication/messages/incoming/poll/PollContentsEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { PollContentsParser } from '../../parser/poll/PollContentsParser'; +import { PollContentsParser } from '../../parser'; export class PollContentsEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/poll/PollErrorEvent.ts b/src/nitro/communication/messages/incoming/poll/PollErrorEvent.ts index 4b1187d8..07d0a363 100644 --- a/src/nitro/communication/messages/incoming/poll/PollErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/poll/PollErrorEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { PollErrorParser } from '../../parser/poll/PollErrorParser'; +import { PollErrorParser } from '../../parser'; export class PollErrorEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/poll/PollOfferEvent.ts b/src/nitro/communication/messages/incoming/poll/PollOfferEvent.ts index f6a4fabc..5e939ffe 100644 --- a/src/nitro/communication/messages/incoming/poll/PollOfferEvent.ts +++ b/src/nitro/communication/messages/incoming/poll/PollOfferEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { PollOfferParser } from '../../parser/poll/PollOfferParser'; +import { PollOfferParser } from '../../parser'; export class PollOfferEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/poll/QuestionAnsweredEvent.ts b/src/nitro/communication/messages/incoming/poll/QuestionAnsweredEvent.ts index 8049c085..61c67532 100644 --- a/src/nitro/communication/messages/incoming/poll/QuestionAnsweredEvent.ts +++ b/src/nitro/communication/messages/incoming/poll/QuestionAnsweredEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { QuestionAnsweredParser } from '../../parser/poll/QuestionAnsweredParser'; +import { QuestionAnsweredParser } from '../../parser'; export class QuestionAnsweredEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/poll/QuestionEvent.ts b/src/nitro/communication/messages/incoming/poll/QuestionEvent.ts index 889c254b..0c457e2c 100644 --- a/src/nitro/communication/messages/incoming/poll/QuestionEvent.ts +++ b/src/nitro/communication/messages/incoming/poll/QuestionEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { QuestionParser } from '../../parser/poll/QuestionParser'; +import { QuestionParser } from '../../parser'; export class QuestionEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/poll/QuestionFinishedEvent.ts b/src/nitro/communication/messages/incoming/poll/QuestionFinishedEvent.ts index 0fb2e103..05e653ec 100644 --- a/src/nitro/communication/messages/incoming/poll/QuestionFinishedEvent.ts +++ b/src/nitro/communication/messages/incoming/poll/QuestionFinishedEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { QuestionFinishedParser } from '../../parser/poll/QuestionFinishedParser'; +import { QuestionFinishedParser } from '../../parser'; export class QuestionFinishedEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/quest/CommunityGoalEarnedPrizesMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/CommunityGoalEarnedPrizesMessageEvent.ts index b472f8eb..a96a452f 100644 --- a/src/nitro/communication/messages/incoming/quest/CommunityGoalEarnedPrizesMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/CommunityGoalEarnedPrizesMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { CommunityGoalEarnedPrizesMessageParser } from '../../parser/quest/CommunityGoalEarnedPrizesMessageParser'; +import { CommunityGoalEarnedPrizesMessageParser } from '../../parser'; export class CommunityGoalEarnedPrizesMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/quest/CommunityGoalHallOfFameMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/CommunityGoalHallOfFameMessageEvent.ts index 30664451..35d5906b 100644 --- a/src/nitro/communication/messages/incoming/quest/CommunityGoalHallOfFameMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/CommunityGoalHallOfFameMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { CommunityGoalHallOfFameMessageParser } from '../../parser/quest/CommunityGoalHallOfFameMessageParser'; +import { CommunityGoalHallOfFameMessageParser } from '../../parser'; export class CommunityGoalHallOfFameMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/quest/CommunityGoalProgressMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/CommunityGoalProgressMessageEvent.ts index 98572cad..4e9ab67c 100644 --- a/src/nitro/communication/messages/incoming/quest/CommunityGoalProgressMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/CommunityGoalProgressMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { CommunityGoalProgressMessageParser } from '../../parser/quest/CommunityGoalProgressMessageParser'; +import { CommunityGoalProgressMessageParser } from '../../parser'; export class CommunityGoalProgressMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/quest/ConcurrentUsersGoalProgressMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/ConcurrentUsersGoalProgressMessageEvent.ts index dc836817..0a945cac 100644 --- a/src/nitro/communication/messages/incoming/quest/ConcurrentUsersGoalProgressMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/ConcurrentUsersGoalProgressMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { ConcurrentUsersGoalProgressMessageParser } from '../../parser/quest/ConcurrentUsersGoalProgressMessageParser'; +import { ConcurrentUsersGoalProgressMessageParser } from '../../parser'; export class ConcurrentUsersGoalProgressMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/quest/EpicPopupMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/EpicPopupMessageEvent.ts index 1630dd45..6cfa8791 100644 --- a/src/nitro/communication/messages/incoming/quest/EpicPopupMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/EpicPopupMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { EpicPopupMessageParser } from '../../parser/quest/EpicPopupMessageParser'; +import { EpicPopupMessageParser } from '../../parser'; export class EpicPopupMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/quest/QuestCancelledMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/QuestCancelledMessageEvent.ts index 61af94b9..35e49c16 100644 --- a/src/nitro/communication/messages/incoming/quest/QuestCancelledMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/QuestCancelledMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { QuestCancelledMessageParser } from '../../parser/quest/QuestCancelledMessageParser'; +import { QuestCancelledMessageParser } from '../../parser'; export class QuestCancelledMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/quest/QuestCompletedMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/QuestCompletedMessageEvent.ts index 19c3115c..c21f5f7a 100644 --- a/src/nitro/communication/messages/incoming/quest/QuestCompletedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/QuestCompletedMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { QuestCompletedMessageParser } from '../../parser/quest/QuestCompletedMessageParser'; +import { QuestCompletedMessageParser } from '../../parser'; export class QuestCompletedMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/quest/QuestDailyMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/QuestDailyMessageEvent.ts index fcef5d7f..539b26a9 100644 --- a/src/nitro/communication/messages/incoming/quest/QuestDailyMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/QuestDailyMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { QuestDailyMessageParser } from '../../parser/quest/QuestDailyMessageParser'; +import { QuestDailyMessageParser } from '../../parser'; export class QuestDailyMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/quest/QuestMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/QuestMessageEvent.ts index f2708a5e..17dc92c0 100644 --- a/src/nitro/communication/messages/incoming/quest/QuestMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/QuestMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { QuestMessageParser } from '../../parser/quest/QuestMessageParser'; +import { QuestMessageParser } from '../../parser'; export class QuestMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/quest/QuestsMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/QuestsMessageEvent.ts index dc1baa9e..bb9a8f7c 100644 --- a/src/nitro/communication/messages/incoming/quest/QuestsMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/QuestsMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { QuestsMessageParser } from '../../parser/quest/QuestsMessageParser'; +import { QuestsMessageParser } from '../../parser'; export class QuestsMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/quest/SeasonalQuestsMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/SeasonalQuestsMessageEvent.ts index 90ab2917..9f65684c 100644 --- a/src/nitro/communication/messages/incoming/quest/SeasonalQuestsMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/SeasonalQuestsMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { SeasonalQuestsParser } from '../../parser/quest/SeasonalQuestsParser'; +import { SeasonalQuestsParser } from '../../parser'; export class SeasonalQuestsMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/quest/index.ts b/src/nitro/communication/messages/incoming/quest/index.ts index 23e9be95..f2b87077 100644 --- a/src/nitro/communication/messages/incoming/quest/index.ts +++ b/src/nitro/communication/messages/incoming/quest/index.ts @@ -1,17 +1,11 @@ -export * from './CommunityGoalData'; export * from './CommunityGoalEarnedPrizesMessageEvent'; -export * from './CommunityGoalHallOfFameData'; export * from './CommunityGoalHallOfFameMessageEvent'; export * from './CommunityGoalProgressMessageEvent'; export * from './ConcurrentUsersGoalProgressMessageEvent'; export * from './EpicPopupMessageEvent'; -export * from './HallOfFameEntryData'; -export * from './ILandingPageUserEntry'; -export * from './PrizeData'; export * from './QuestCancelledMessageEvent'; export * from './QuestCompletedMessageEvent'; export * from './QuestDailyMessageEvent'; -export * from './QuestMessageData'; export * from './QuestMessageEvent'; export * from './QuestsMessageEvent'; export * from './SeasonalQuestsMessageEvent'; diff --git a/src/nitro/communication/messages/incoming/room/access/RoomEnterErrorEvent.ts b/src/nitro/communication/messages/incoming/room/access/RoomEnterErrorEvent.ts index 24fab5f9..2f74e7e7 100644 --- a/src/nitro/communication/messages/incoming/room/access/RoomEnterErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/room/access/RoomEnterErrorEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { CantConnectMessageParser } from '../../../parser/room/access/CantConnectMessageParser'; +import { CantConnectMessageParser } from '../../../parser'; export class RoomEnterErrorEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/access/RoomEnterEvent.ts b/src/nitro/communication/messages/incoming/room/access/RoomEnterEvent.ts index c9aba59a..dfb4c54e 100644 --- a/src/nitro/communication/messages/incoming/room/access/RoomEnterEvent.ts +++ b/src/nitro/communication/messages/incoming/room/access/RoomEnterEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { RoomEnterParser } from '../../../parser/room/access/RoomEnterParser'; +import { RoomEnterParser } from '../../../parser'; export class RoomEnterEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/access/RoomForwardEvent.ts b/src/nitro/communication/messages/incoming/room/access/RoomForwardEvent.ts index 3aa99861..e895cb46 100644 --- a/src/nitro/communication/messages/incoming/room/access/RoomForwardEvent.ts +++ b/src/nitro/communication/messages/incoming/room/access/RoomForwardEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { RoomFowardParser as RoomForwardParser } from '../../../parser/room/access/RoomFowardParser'; +import { RoomFowardParser as RoomForwardParser } from '../../../parser'; export class RoomForwardEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/access/doorbell/RoomDoorbellAcceptedEvent.ts b/src/nitro/communication/messages/incoming/room/access/doorbell/RoomDoorbellAcceptedEvent.ts index ac67b682..508fc70d 100644 --- a/src/nitro/communication/messages/incoming/room/access/doorbell/RoomDoorbellAcceptedEvent.ts +++ b/src/nitro/communication/messages/incoming/room/access/doorbell/RoomDoorbellAcceptedEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../../api'; import { MessageEvent } from '../../../../../../../core'; -import { RoomDoorbellAcceptedParser } from '../../../../parser/room/access/doorbell/RoomDoorbellAcceptedParser'; +import { RoomDoorbellAcceptedParser } from '../../../../parser'; export class RoomDoorbellAcceptedEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsClearEvent.ts b/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsClearEvent.ts index 8660d540..442b2f43 100644 --- a/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsClearEvent.ts +++ b/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsClearEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../../api'; import { MessageEvent } from '../../../../../../../core'; -import { RoomRightsClearParser } from '../../../../parser/room/access/rights/RoomRightsClearParser'; +import { RoomRightsClearParser } from '../../../../parser'; export class RoomRightsClearEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsEvent.ts b/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsEvent.ts index 4c199f1a..ea64b0a5 100644 --- a/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsEvent.ts +++ b/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../../api'; import { MessageEvent } from '../../../../../../../core'; -import { RoomRightsParser } from '../../../../parser/room/access/rights/RoomRightsParser'; +import { RoomRightsParser } from '../../../../parser'; export class RoomRightsEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsOwnerEvent.ts b/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsOwnerEvent.ts index c5b4d877..7f17078c 100644 --- a/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsOwnerEvent.ts +++ b/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsOwnerEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../../api'; import { MessageEvent } from '../../../../../../../core'; -import { RoomRightsOwnerParser } from '../../../../parser/room/access/rights/RoomRightsOwnerParser'; +import { RoomRightsOwnerParser } from '../../../../parser'; export class RoomRightsOwnerEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/bots/BotCommandConfigurationEvent.ts b/src/nitro/communication/messages/incoming/room/bots/BotCommandConfigurationEvent.ts index ef13e99c..b2d469cf 100644 --- a/src/nitro/communication/messages/incoming/room/bots/BotCommandConfigurationEvent.ts +++ b/src/nitro/communication/messages/incoming/room/bots/BotCommandConfigurationEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { BotCommandConfigurationParser } from '../../../parser/room/bots/BotCommandConfigurationParser'; +import { BotCommandConfigurationParser } from '../../../parser'; export class BotCommandConfigurationEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/data/RoomChatSettingsEvent.ts b/src/nitro/communication/messages/incoming/room/data/RoomChatSettingsEvent.ts index d47dc022..2c562416 100644 --- a/src/nitro/communication/messages/incoming/room/data/RoomChatSettingsEvent.ts +++ b/src/nitro/communication/messages/incoming/room/data/RoomChatSettingsEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { RoomChatSettingsParser } from '../../../parser/room/data/RoomChatSettingsParser'; +import { RoomChatSettingsParser } from '../../../parser'; export class RoomChatSettingsEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/data/RoomEntryInfoMessageEvent.ts b/src/nitro/communication/messages/incoming/room/data/RoomEntryInfoMessageEvent.ts index 60909f5d..10a25889 100644 --- a/src/nitro/communication/messages/incoming/room/data/RoomEntryInfoMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/data/RoomEntryInfoMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { RoomEntryInfoMessageParser } from '../../../parser/room/data/RoomEntryInfoMessageParser'; +import { RoomEntryInfoMessageParser } from '../../../parser'; export class RoomEntryInfoMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/data/RoomScoreEvent.ts b/src/nitro/communication/messages/incoming/room/data/RoomScoreEvent.ts index 54401d46..9cbfdb91 100644 --- a/src/nitro/communication/messages/incoming/room/data/RoomScoreEvent.ts +++ b/src/nitro/communication/messages/incoming/room/data/RoomScoreEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { RoomScoreParser } from '../../../parser/room/data/RoomScoreParser'; +import { RoomScoreParser } from '../../../parser'; export class RoomScoreEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/engine/FavoriteMembershipUpdateMessageEvent.ts b/src/nitro/communication/messages/incoming/room/engine/FavoriteMembershipUpdateMessageEvent.ts index ddd822ce..624e2b8d 100644 --- a/src/nitro/communication/messages/incoming/room/engine/FavoriteMembershipUpdateMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/engine/FavoriteMembershipUpdateMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { FavoriteMembershipUpdateMessageParser } from '../../../parser/room/engine/FavoriteMembershipUpdateMessageParser'; +import { FavoriteMembershipUpdateMessageParser } from '../../../parser'; export class FavoriteMembershipUpdateMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/engine/ObjectsDataUpdateEvent.ts b/src/nitro/communication/messages/incoming/room/engine/ObjectsDataUpdateEvent.ts index f4408e8b..1ae8187a 100644 --- a/src/nitro/communication/messages/incoming/room/engine/ObjectsDataUpdateEvent.ts +++ b/src/nitro/communication/messages/incoming/room/engine/ObjectsDataUpdateEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { ObjectsDataUpdateParser } from '../../../parser/room/engine/ObjectsDataUpdateParser'; +import { ObjectsDataUpdateParser } from '../../../parser'; export class ObjectsDataUpdateEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/engine/ObjectsRollingEvent.ts b/src/nitro/communication/messages/incoming/room/engine/ObjectsRollingEvent.ts index 20785f8d..a48969f0 100644 --- a/src/nitro/communication/messages/incoming/room/engine/ObjectsRollingEvent.ts +++ b/src/nitro/communication/messages/incoming/room/engine/ObjectsRollingEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { ObjectsRollingParser } from '../../../parser/room/engine/ObjectsRollingParser'; +import { ObjectsRollingParser } from '../../../parser'; export class ObjectsRollingEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/engine/index.ts b/src/nitro/communication/messages/incoming/room/engine/index.ts index fd42db32..24ceed55 100644 --- a/src/nitro/communication/messages/incoming/room/engine/index.ts +++ b/src/nitro/communication/messages/incoming/room/engine/index.ts @@ -1,3 +1,3 @@ -export * from './ObjectData'; +export * from './FavoriteMembershipUpdateMessageEvent'; export * from './ObjectsDataUpdateEvent'; export * from './ObjectsRollingEvent'; diff --git a/src/nitro/communication/messages/incoming/room/furniture/CustomUserNotificationMessageEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/CustomUserNotificationMessageEvent.ts index 317839ad..4c53a712 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/CustomUserNotificationMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/CustomUserNotificationMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { CustomUserNotificationMessageParser } from '../../../parser/room/furniture/CustomUserNotificationMessageParser'; +import { CustomUserNotificationMessageParser } from '../../../parser'; export class CustomUserNotificationMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/furniture/DiceValueMessageEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/DiceValueMessageEvent.ts index 5aff96b1..826035c1 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/DiceValueMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/DiceValueMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { DiceValueMessageParser } from '../../../parser/room/furniture/DiceValueMessageParser'; +import { DiceValueMessageParser } from '../../../parser'; export class DiceValueMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/furniture/FurnitureAliasesEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/FurnitureAliasesEvent.ts index a190094d..3f844582 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/FurnitureAliasesEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/FurnitureAliasesEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { FurnitureAliasesParser } from '../../../parser/room/furniture/FurnitureAliasesParser'; +import { FurnitureAliasesParser } from '../../../parser'; export class FurnitureAliasesEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/furniture/FurnitureDataEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/FurnitureDataEvent.ts index 1ba2ad1d..c94dbf0d 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/FurnitureDataEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/FurnitureDataEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { FurnitureDataParser } from '../../../parser/room/furniture/FurnitureDataParser'; +import { FurnitureDataParser } from '../../../parser'; export class FurnitureDataEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/furniture/FurnitureStackHeightEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/FurnitureStackHeightEvent.ts index 14d1e4af..95a9ec8f 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/FurnitureStackHeightEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/FurnitureStackHeightEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { FurnitureStackHeightParser } from '../../../parser/room/furniture/FurnitureStackHeightParser'; +import { FurnitureStackHeightParser } from '../../../parser'; export class FurnitureStackHeightEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/furniture/GroupFurniContextMenuInfoMessageEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/GroupFurniContextMenuInfoMessageEvent.ts index eac84321..dbe0a819 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/GroupFurniContextMenuInfoMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/GroupFurniContextMenuInfoMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { GroupFurniContextMenuInfoMessageParser } from '../../../parser/room/furniture/GroupFurniContextMenuInfoMessageParser'; +import { GroupFurniContextMenuInfoMessageParser } from '../../../parser'; export class GroupFurniContextMenuInfoMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/furniture/ItemDataUpdateMessageEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/ItemDataUpdateMessageEvent.ts index f7d896ce..e6035f3e 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/ItemDataUpdateMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/ItemDataUpdateMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { ItemDataUpdateMessageParser } from '../../../parser/room/furniture/ItemDataUpdateMessageParser'; +import { ItemDataUpdateMessageParser } from '../../../parser'; export class ItemDataUpdateMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniFinishedEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniFinishedEvent.ts index a12968e3..63b94d2c 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniFinishedEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniFinishedEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { LoveLockFurniFinishedParser } from '../../../parser/room/furniture/LoveLockFurniFinishedParser'; +import { LoveLockFurniFinishedParser } from '../../../parser'; export class LoveLockFurniFinishedEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniFriendConfirmedEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniFriendConfirmedEvent.ts index 85e521ae..ec8d92f8 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniFriendConfirmedEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniFriendConfirmedEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { LoveLockFurniFriendConfirmedParser } from '../../../parser/room/furniture/LoveLockFurniFriendConfirmedParser'; +import { LoveLockFurniFriendConfirmedParser } from '../../../parser'; export class LoveLockFurniFriendConfirmedEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniStartEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniStartEvent.ts index ff6aa342..2aeb96ec 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniStartEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniStartEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { LoveLockFurniStartParser } from '../../../parser/room/furniture/LoveLockFurniStartParser'; +import { LoveLockFurniStartParser } from '../../../parser'; export class LoveLockFurniStartEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/furniture/OneWayDoorStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/OneWayDoorStatusMessageEvent.ts index 0d157de0..82dd0991 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/OneWayDoorStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/OneWayDoorStatusMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { OneWayDoorStatusMessageParser } from '../../../parser/room/furniture/OneWayDoorStatusMessageParser'; +import { OneWayDoorStatusMessageParser } from '../../../parser'; export class OneWayDoorStatusMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/furniture/RequestSpamWallPostItMessageEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/RequestSpamWallPostItMessageEvent.ts index 65e598ba..a7d2e4a9 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/RequestSpamWallPostItMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/RequestSpamWallPostItMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { RequestSpamWallPostItMessageParser } from '../../../parser/room/furniture/RequestSpamWallPostItMessageParser'; +import { RequestSpamWallPostItMessageParser } from '../../../parser'; export class RequestSpamWallPostItMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/furniture/RoomDimmerPresetsMessageEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/RoomDimmerPresetsMessageEvent.ts index 742a86f6..9de9facb 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/RoomDimmerPresetsMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/RoomDimmerPresetsMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { RoomDimmerPresetsMessageParser } from '../../../parser/room/furniture/RoomDimmerPresetsMessageParser'; +import { RoomDimmerPresetsMessageParser } from '../../../parser'; export class RoomDimmerPresetsEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorAddEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorAddEvent.ts index cb5578d4..f18a33bd 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorAddEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorAddEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../../api'; import { MessageEvent } from '../../../../../../../core'; -import { FurnitureFloorAddParser } from '../../../../parser/room/furniture/floor/FurnitureFloorAddParser'; +import { FurnitureFloorAddParser } from '../../../../parser'; export class FurnitureFloorAddEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorEvent.ts index 5de86d71..eb8894e3 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../../api'; import { MessageEvent } from '../../../../../../../core'; -import { FurnitureFloorParser } from '../../../../parser/room/furniture/floor/FurnitureFloorParser'; +import { FurnitureFloorParser } from '../../../../parser'; export class FurnitureFloorEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorRemoveEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorRemoveEvent.ts index c3acd326..7c8be063 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorRemoveEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorRemoveEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../../api'; import { MessageEvent } from '../../../../../../../core'; -import { FurnitureFloorRemoveParser } from '../../../../parser/room/furniture/floor/FurnitureFloorRemoveParser'; +import { FurnitureFloorRemoveParser } from '../../../../parser'; export class FurnitureFloorRemoveEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorUpdateEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorUpdateEvent.ts index a8d85430..5dfc22f5 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorUpdateEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorUpdateEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../../api'; import { MessageEvent } from '../../../../../../../core'; -import { FurnitureFloorUpdateParser } from '../../../../parser/room/furniture/floor/FurnitureFloorUpdateParser'; +import { FurnitureFloorUpdateParser } from '../../../../parser'; export class FurnitureFloorUpdateEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/furniture/index.ts b/src/nitro/communication/messages/incoming/room/furniture/index.ts index 14bd8bed..df7c0444 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/index.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/index.ts @@ -11,7 +11,6 @@ export * from './LoveLockFurniFriendConfirmedEvent'; export * from './LoveLockFurniStartEvent'; export * from './OneWayDoorStatusMessageEvent'; export * from './RequestSpamWallPostItMessageEvent'; -export * from './RoomDimmerPresetsMessageData'; export * from './RoomDimmerPresetsMessageEvent'; export * from './wall'; export * from './youtube'; diff --git a/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallAddEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallAddEvent.ts index a1e02cdd..705393c9 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallAddEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallAddEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../../api'; import { MessageEvent } from '../../../../../../../core'; -import { FurnitureWallAddParser } from '../../../../parser/room/furniture/wall/FurnitureWallAddParser'; +import { FurnitureWallAddParser } from '../../../../parser'; export class FurnitureWallAddEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallEvent.ts index f61e43ce..a5063fc3 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../../api'; import { MessageEvent } from '../../../../../../../core'; -import { FurnitureWallParser } from '../../../../parser/room/furniture/wall/FurnitureWallParser'; +import { FurnitureWallParser } from '../../../../parser'; export class FurnitureWallEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallRemoveEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallRemoveEvent.ts index 15619e58..909ee088 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallRemoveEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallRemoveEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../../api'; import { MessageEvent } from '../../../../../../../core'; -import { FurnitureWallRemoveParser } from '../../../../parser/room/furniture/wall/FurnitureWallRemoveParser'; +import { FurnitureWallRemoveParser } from '../../../../parser'; export class FurnitureWallRemoveEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallUpdateEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallUpdateEvent.ts index 197f740a..73f8ea0d 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallUpdateEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallUpdateEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../../api'; import { MessageEvent } from '../../../../../../../core'; -import { FurnitureWallUpdateParser } from '../../../../parser/room/furniture/wall/FurnitureWallUpdateParser'; +import { FurnitureWallUpdateParser } from '../../../../parser'; export class FurnitureWallUpdateEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeControlVideoMessageEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeControlVideoMessageEvent.ts index 0a9030f4..eb4f54b4 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeControlVideoMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeControlVideoMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../../api'; import { MessageEvent } from '../../../../../../../core'; -import { YoutubeControlVideoMessageParser } from '../../../../parser/room/furniture/youtube/YoutubeControlVideoMessageParser'; +import { YoutubeControlVideoMessageParser } from '../../../../parser'; export class YoutubeControlVideoMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeDisplayPlaylistsEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeDisplayPlaylistsEvent.ts index fce266d3..1c479179 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeDisplayPlaylistsEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeDisplayPlaylistsEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../../api'; import { MessageEvent } from '../../../../../../../core'; -import { YoutubeDisplayPlaylistsMessageParser } from '../../../../parser/room/furniture/youtube/YoutubeDisplayPlaylistsMessageParser'; +import { YoutubeDisplayPlaylistsMessageParser } from '../../../../parser'; export class YoutubeDisplayPlaylistsEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeDisplayVideoMessageEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeDisplayVideoMessageEvent.ts index 2d65563c..587a1bb6 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeDisplayVideoMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeDisplayVideoMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../../api'; import { MessageEvent } from '../../../../../../../core'; -import { YoutubeDisplayVideoMessageParser } from '../../../../parser/room/furniture/youtube/YoutubeDisplayVideoMessageParser'; +import { YoutubeDisplayVideoMessageParser } from '../../../../parser'; export class YoutubeDisplayVideoMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/index.ts b/src/nitro/communication/messages/incoming/room/index.ts index e692b601..81b327b1 100644 --- a/src/nitro/communication/messages/incoming/room/index.ts +++ b/src/nitro/communication/messages/incoming/room/index.ts @@ -1,9 +1,15 @@ export * from './access'; +export * from './access/doorbell'; +export * from './access/rights'; export * from './bots'; export * from './data'; export * from './engine'; export * from './furniture'; +export * from './furniture/floor'; +export * from './furniture/wall'; +export * from './furniture/youtube'; export * from './mapping'; export * from './pet'; export * from './session'; export * from './unit'; +export * from './unit/chat'; diff --git a/src/nitro/communication/messages/incoming/room/mapping/FloorHeightMapEvent.ts b/src/nitro/communication/messages/incoming/room/mapping/FloorHeightMapEvent.ts index cd329d47..9be5f173 100644 --- a/src/nitro/communication/messages/incoming/room/mapping/FloorHeightMapEvent.ts +++ b/src/nitro/communication/messages/incoming/room/mapping/FloorHeightMapEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { FloorHeightMapMessageParser } from '../../../parser/room/mapping/FloorHeightMapMessageParser'; +import { FloorHeightMapMessageParser } from '../../../parser'; export class FloorHeightMapEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/mapping/RoomEntryTileMessageEvent.ts b/src/nitro/communication/messages/incoming/room/mapping/RoomEntryTileMessageEvent.ts index 63debbc4..aec9d8a6 100644 --- a/src/nitro/communication/messages/incoming/room/mapping/RoomEntryTileMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/mapping/RoomEntryTileMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { RoomEntryTileMessageParser } from '../../../parser/room/mapping/RoomEntryTileMessageParser'; +import { RoomEntryTileMessageParser } from '../../../parser'; export class RoomEntryTileMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/mapping/RoomHeightMapEvent.ts b/src/nitro/communication/messages/incoming/room/mapping/RoomHeightMapEvent.ts index 6a863e44..a60c924e 100644 --- a/src/nitro/communication/messages/incoming/room/mapping/RoomHeightMapEvent.ts +++ b/src/nitro/communication/messages/incoming/room/mapping/RoomHeightMapEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { RoomHeightMapParser } from '../../../parser/room/mapping/RoomHeightMapParser'; +import { RoomHeightMapParser } from '../../../parser'; export class RoomHeightMapEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/mapping/RoomHeightMapUpdateEvent.ts b/src/nitro/communication/messages/incoming/room/mapping/RoomHeightMapUpdateEvent.ts index 36368bb3..1bc2f360 100644 --- a/src/nitro/communication/messages/incoming/room/mapping/RoomHeightMapUpdateEvent.ts +++ b/src/nitro/communication/messages/incoming/room/mapping/RoomHeightMapUpdateEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { RoomHeightMapUpdateParser } from '../../../parser/room/mapping/RoomHeightMapUpdateParser'; +import { RoomHeightMapUpdateParser } from '../../../parser'; export class RoomHeightMapUpdateEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/mapping/RoomOccupiedTilesMessageEvent.ts b/src/nitro/communication/messages/incoming/room/mapping/RoomOccupiedTilesMessageEvent.ts index 081d7284..08b74b4d 100644 --- a/src/nitro/communication/messages/incoming/room/mapping/RoomOccupiedTilesMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/mapping/RoomOccupiedTilesMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { RoomOccupiedTilesMessageParser } from '../../../parser/room/mapping/RoomOccupiedTilesMessageParser'; +import { RoomOccupiedTilesMessageParser } from '../../../parser'; export class RoomOccupiedTilesMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/mapping/RoomPaintEvent.ts b/src/nitro/communication/messages/incoming/room/mapping/RoomPaintEvent.ts index 5843d63a..218c14a1 100644 --- a/src/nitro/communication/messages/incoming/room/mapping/RoomPaintEvent.ts +++ b/src/nitro/communication/messages/incoming/room/mapping/RoomPaintEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { RoomPaintParser } from '../../../parser/room/mapping/RoomPaintParser'; +import { RoomPaintParser } from '../../../parser'; export class RoomPaintEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/mapping/RoomReadyMessageEvent.ts b/src/nitro/communication/messages/incoming/room/mapping/RoomReadyMessageEvent.ts index 07498be7..ee20dd55 100644 --- a/src/nitro/communication/messages/incoming/room/mapping/RoomReadyMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/mapping/RoomReadyMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { RoomReadyMessageParser } from '../../../parser/room/mapping/RoomReadyMessageParser'; +import { RoomReadyMessageParser } from '../../../parser'; export class RoomReadyMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/mapping/RoomVisualizationSettingsEvent.ts b/src/nitro/communication/messages/incoming/room/mapping/RoomVisualizationSettingsEvent.ts index f2b568d3..4ac289bc 100644 --- a/src/nitro/communication/messages/incoming/room/mapping/RoomVisualizationSettingsEvent.ts +++ b/src/nitro/communication/messages/incoming/room/mapping/RoomVisualizationSettingsEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { RoomVisualizationSettingsParser } from '../../../parser/room/mapping/RoomVisualizationSettingsParser'; +import { RoomVisualizationSettingsParser } from '../../../parser'; export class RoomVisualizationSettingsEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/pet/PetFigureUpdateEvent.ts b/src/nitro/communication/messages/incoming/room/pet/PetFigureUpdateEvent.ts index f1037dfc..60b1e492 100644 --- a/src/nitro/communication/messages/incoming/room/pet/PetFigureUpdateEvent.ts +++ b/src/nitro/communication/messages/incoming/room/pet/PetFigureUpdateEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { PetFigureUpdateParser } from '../../../parser/room/pet/PetFigureUpdateParser'; +import { PetFigureUpdateParser } from '../../../parser'; export class PetFigureUpdateEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/pet/PetInfoEvent.ts b/src/nitro/communication/messages/incoming/room/pet/PetInfoEvent.ts index 07adde4f..47ea73f3 100644 --- a/src/nitro/communication/messages/incoming/room/pet/PetInfoEvent.ts +++ b/src/nitro/communication/messages/incoming/room/pet/PetInfoEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { PetInfoParser } from '../../../parser/room/pet/PetInfoParser'; +import { PetInfoParser } from '../../../parser'; export class PetInfoEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/pet/PetStatusUpdateEvent.ts b/src/nitro/communication/messages/incoming/room/pet/PetStatusUpdateEvent.ts index 9d8b9b8a..f80bcee7 100644 --- a/src/nitro/communication/messages/incoming/room/pet/PetStatusUpdateEvent.ts +++ b/src/nitro/communication/messages/incoming/room/pet/PetStatusUpdateEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { PetStatusUpdateParser } from '../../../parser/room/pet/PetStatusUpdateParser'; +import { PetStatusUpdateParser } from '../../../parser'; export class PetStatusUpdateEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/pet/index.ts b/src/nitro/communication/messages/incoming/room/pet/index.ts index b1cdd4fa..147f9643 100644 --- a/src/nitro/communication/messages/incoming/room/pet/index.ts +++ b/src/nitro/communication/messages/incoming/room/pet/index.ts @@ -1,6 +1,4 @@ -export * from './BreedingPetInfo'; -export * from './PetBreedingResultData'; export * from './PetExperienceEvent'; export * from './PetFigureUpdateEvent'; export * from './PetInfoEvent'; -export * from './RarityCategoryData'; +export * from './PetStatusUpdateEvent'; diff --git a/src/nitro/communication/messages/incoming/room/session/YouArePlayingGameEvent.ts b/src/nitro/communication/messages/incoming/room/session/YouArePlayingGameEvent.ts index 3d5fae08..af23b229 100644 --- a/src/nitro/communication/messages/incoming/room/session/YouArePlayingGameEvent.ts +++ b/src/nitro/communication/messages/incoming/room/session/YouArePlayingGameEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { YouArePlayingGameParser } from '../../../parser/room/session/YouArePlayingGameParser'; +import { YouArePlayingGameParser } from '../../../parser'; export class YouArePlayingGameEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/session/YouAreSpectatorMessageEvent.ts b/src/nitro/communication/messages/incoming/room/session/YouAreSpectatorMessageEvent.ts index 68750adb..4285f41e 100644 --- a/src/nitro/communication/messages/incoming/room/session/YouAreSpectatorMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/session/YouAreSpectatorMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { YouAreSpectatorMessageParser } from '../../../parser/room/session/YouAreSpectatorMessageParser'; +import { YouAreSpectatorMessageParser } from '../../../parser'; export class YouAreSpectatorMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/session/index.ts b/src/nitro/communication/messages/incoming/room/session/index.ts index ddd63b6e..0ac722b4 100644 --- a/src/nitro/communication/messages/incoming/room/session/index.ts +++ b/src/nitro/communication/messages/incoming/room/session/index.ts @@ -1 +1,2 @@ export * from './YouArePlayingGameEvent'; +export * from './YouAreSpectatorMessageEvent'; diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitDanceEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitDanceEvent.ts index 8d5e4036..a5a639a4 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitDanceEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitDanceEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { RoomUnitDanceParser } from '../../../parser/room/unit/RoomUnitDanceParser'; +import { RoomUnitDanceParser } from '../../../parser'; export class RoomUnitDanceEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitEffectEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitEffectEvent.ts index 7280fcba..0775c84d 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitEffectEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitEffectEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { RoomUnitEffectParser } from '../../../parser/room/unit/RoomUnitEffectParser'; +import { RoomUnitEffectParser } from '../../../parser'; export class RoomUnitEffectEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitEvent.ts index 5ec05d48..ce157dfd 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { RoomUnitParser } from '../../../parser/room/unit/RoomUnitParser'; +import { RoomUnitParser } from '../../../parser'; export class RoomUnitEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitExpressionEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitExpressionEvent.ts index 593a68b9..bf1e41f4 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitExpressionEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitExpressionEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { RoomUnitExpressionParser } from '../../../parser/room/unit/RoomUnitExpressionParser'; +import { RoomUnitExpressionParser } from '../../../parser'; export class RoomUnitExpressionEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitHandItemEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitHandItemEvent.ts index fe293cdc..7a536e93 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitHandItemEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitHandItemEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { RoomUnitHandItemParser } from '../../../parser/room/unit/RoomUnitHandItemParser'; +import { RoomUnitHandItemParser } from '../../../parser'; export class RoomUnitHandItemEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitHandItemReceivedEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitHandItemReceivedEvent.ts index 4be6b31f..08c480dc 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitHandItemReceivedEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitHandItemReceivedEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { RoomUnitHandItemReceivedParser } from '../../../parser/room/unit/RoomUnitHandItemReceivedParser'; +import { RoomUnitHandItemReceivedParser } from '../../../parser'; export class RoomUnitHandItemReceivedEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitIdleEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitIdleEvent.ts index 42362f56..b7705068 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitIdleEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitIdleEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { RoomUnitIdleParser } from '../../../parser/room/unit/RoomUnitIdleParser'; +import { RoomUnitIdleParser } from '../../../parser'; export class RoomUnitIdleEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitInfoEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitInfoEvent.ts index bc8fafe4..5768cb6e 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitInfoEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitInfoEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { RoomUnitInfoParser } from '../../../parser/room/unit/RoomUnitInfoParser'; +import { RoomUnitInfoParser } from '../../../parser'; export class RoomUnitInfoEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitNumberEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitNumberEvent.ts index 0b28c50e..1ae9cec5 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitNumberEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitNumberEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { RoomUnitNumberParser } from '../../../parser/room/unit/RoomUnitNumberParser'; +import { RoomUnitNumberParser } from '../../../parser'; export class RoomUnitNumberEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitRemoveEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitRemoveEvent.ts index d2200216..4921e234 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitRemoveEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitRemoveEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { RoomUnitRemoveParser } from '../../../parser/room/unit/RoomUnitRemoveParser'; +import { RoomUnitRemoveParser } from '../../../parser'; export class RoomUnitRemoveEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitStatusEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitStatusEvent.ts index 507b3c30..a50fcbfa 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitStatusEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitStatusEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { RoomUnitStatusParser } from '../../../parser/room/unit/RoomUnitStatusParser'; +import { RoomUnitStatusParser } from '../../../parser'; export class RoomUnitStatusEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/unit/chat/FloodControlEvent.ts b/src/nitro/communication/messages/incoming/room/unit/chat/FloodControlEvent.ts index 9bad6179..e06cfe03 100644 --- a/src/nitro/communication/messages/incoming/room/unit/chat/FloodControlEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/chat/FloodControlEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../../api'; import { MessageEvent } from '../../../../../../../core'; -import { FloodControlParser } from '../../../../parser/room/unit/chat/FloodControlParser'; +import { FloodControlParser } from '../../../../parser'; export class FloodControlEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/unit/chat/RemainingMuteEvent.ts b/src/nitro/communication/messages/incoming/room/unit/chat/RemainingMuteEvent.ts index f83c3920..afdde398 100644 --- a/src/nitro/communication/messages/incoming/room/unit/chat/RemainingMuteEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/chat/RemainingMuteEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../../api'; import { MessageEvent } from '../../../../../../../core'; -import { RemainingMuteParser } from '../../../../parser/room/unit/chat/RemainingMuteParser'; +import { RemainingMuteParser } from '../../../../parser'; export class RemainingMuteEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatEvent.ts b/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatEvent.ts index c4485f4a..a3f2701e 100644 --- a/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../../api'; import { MessageEvent } from '../../../../../../../core'; -import { RoomUnitChatParser } from '../../../../parser/room/unit/chat/RoomUnitChatParser'; +import { RoomUnitChatParser } from '../../../../parser'; export class RoomUnitChatEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatShoutEvent.ts b/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatShoutEvent.ts index 19d01883..ff171f6c 100644 --- a/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatShoutEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatShoutEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../../api'; import { MessageEvent } from '../../../../../../../core'; -import { RoomUnitChatParser } from '../../../../parser/room/unit/chat/RoomUnitChatParser'; +import { RoomUnitChatParser } from '../../../../parser'; export class RoomUnitChatShoutEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatWhisperEvent.ts b/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatWhisperEvent.ts index e1ef516b..7292e031 100644 --- a/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatWhisperEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatWhisperEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../../api'; import { MessageEvent } from '../../../../../../../core'; -import { RoomUnitChatParser } from '../../../../parser/room/unit/chat/RoomUnitChatParser'; +import { RoomUnitChatParser } from '../../../../parser'; export class RoomUnitChatWhisperEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitTypingEvent.ts b/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitTypingEvent.ts index fd83a769..f96d9a1d 100644 --- a/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitTypingEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitTypingEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../../api'; import { MessageEvent } from '../../../../../../../core'; -import { RoomUnitTypingParser } from '../../../../parser/room/unit/chat/RoomUnitTypingParser'; +import { RoomUnitTypingParser } from '../../../../parser'; export class RoomUnitTypingEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/roomevents/WiredFurniActionEvent.ts b/src/nitro/communication/messages/incoming/roomevents/WiredFurniActionEvent.ts index 941c2667..663ca50c 100644 --- a/src/nitro/communication/messages/incoming/roomevents/WiredFurniActionEvent.ts +++ b/src/nitro/communication/messages/incoming/roomevents/WiredFurniActionEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { WiredFurniActionParser } from '../../parser/roomevents/WiredFurniActionParser'; +import { WiredFurniActionParser } from '../../parser'; export class WiredFurniActionEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/roomevents/WiredFurniConditionEvent.ts b/src/nitro/communication/messages/incoming/roomevents/WiredFurniConditionEvent.ts index 988000b2..f156ecbe 100644 --- a/src/nitro/communication/messages/incoming/roomevents/WiredFurniConditionEvent.ts +++ b/src/nitro/communication/messages/incoming/roomevents/WiredFurniConditionEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { WiredFurniConditionParser } from '../../parser/roomevents/WiredFurniConditionParser'; +import { WiredFurniConditionParser } from '../../parser'; export class WiredFurniConditionEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/roomevents/WiredFurniTriggerEvent.ts b/src/nitro/communication/messages/incoming/roomevents/WiredFurniTriggerEvent.ts index 055ccd94..3787682c 100644 --- a/src/nitro/communication/messages/incoming/roomevents/WiredFurniTriggerEvent.ts +++ b/src/nitro/communication/messages/incoming/roomevents/WiredFurniTriggerEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { WiredFurniTriggerParser } from '../../parser/roomevents/WiredFurniTriggerParser'; +import { WiredFurniTriggerParser } from '../../parser'; export class WiredFurniTriggerEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/roomevents/WiredOpenEvent.ts b/src/nitro/communication/messages/incoming/roomevents/WiredOpenEvent.ts index 06363d43..e59713ed 100644 --- a/src/nitro/communication/messages/incoming/roomevents/WiredOpenEvent.ts +++ b/src/nitro/communication/messages/incoming/roomevents/WiredOpenEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { WiredOpenParser } from '../../parser/roomevents/WiredOpenParser'; +import { WiredOpenParser } from '../../parser'; export class WiredOpenEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/roomevents/WiredRewardResultMessageEvent.ts b/src/nitro/communication/messages/incoming/roomevents/WiredRewardResultMessageEvent.ts index 7d6444d8..5da652d8 100644 --- a/src/nitro/communication/messages/incoming/roomevents/WiredRewardResultMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/roomevents/WiredRewardResultMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { WiredRewardResultMessageParser } from '../../parser/roomevents/WiredRewardResultMessageParser'; +import { WiredRewardResultMessageParser } from '../../parser'; export class WiredRewardResultMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/roomevents/WiredSaveSuccessEvent.ts b/src/nitro/communication/messages/incoming/roomevents/WiredSaveSuccessEvent.ts index ca8b451a..1cf05937 100644 --- a/src/nitro/communication/messages/incoming/roomevents/WiredSaveSuccessEvent.ts +++ b/src/nitro/communication/messages/incoming/roomevents/WiredSaveSuccessEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { WiredSaveSuccessParser } from '../../parser/roomevents/WiredSaveSuccessParser'; +import { WiredSaveSuccessParser } from '../../parser'; export class WiredSaveSuccessEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/roomevents/WiredValidationErrorEvent.ts b/src/nitro/communication/messages/incoming/roomevents/WiredValidationErrorEvent.ts index a4980dd7..b937130e 100644 --- a/src/nitro/communication/messages/incoming/roomevents/WiredValidationErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/roomevents/WiredValidationErrorEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { WiredValidationErrorParser } from '../../parser/roomevents/WiredValidationErrorParser'; +import { WiredValidationErrorParser } from '../../parser'; export class WiredValidationErrorEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/roomevents/index.ts b/src/nitro/communication/messages/incoming/roomevents/index.ts index fc0b3ca2..0775d57f 100644 --- a/src/nitro/communication/messages/incoming/roomevents/index.ts +++ b/src/nitro/communication/messages/incoming/roomevents/index.ts @@ -1,7 +1,3 @@ -export * from './ConditionDefinition'; -export * from './Triggerable'; -export * from './TriggerDefinition'; -export * from './WiredActionDefinition'; export * from './WiredFurniActionEvent'; export * from './WiredFurniConditionEvent'; export * from './WiredFurniTriggerEvent'; diff --git a/src/nitro/communication/messages/incoming/roomsettings/BannedUsersFromRoomEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/BannedUsersFromRoomEvent.ts index bad0efe0..5611d9e0 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/BannedUsersFromRoomEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/BannedUsersFromRoomEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { BannedUsersFromRoomParser } from '../../parser/roomsettings/BannedUsersFromRoomParser'; +import { BannedUsersFromRoomParser } from '../../parser'; export class BannedUsersFromRoomEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/roomsettings/FlatControllerAddedEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/FlatControllerAddedEvent.ts index 7d606d03..e84d382c 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/FlatControllerAddedEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/FlatControllerAddedEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { FlatControllerAddedParser } from '../../parser/roomsettings/FlatControllerAddedParser'; +import { FlatControllerAddedParser } from '../../parser'; export class FlatControllerAddedEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/roomsettings/FlatControllerRemovedEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/FlatControllerRemovedEvent.ts index 0c033947..8c17c441 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/FlatControllerRemovedEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/FlatControllerRemovedEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { FlatControllerRemovedParser } from '../../parser/roomsettings/FlatControllerRemovedParser'; +import { FlatControllerRemovedParser } from '../../parser'; export class FlatControllerRemovedEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/roomsettings/FlatControllersEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/FlatControllersEvent.ts index 6a366375..8f42575e 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/FlatControllersEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/FlatControllersEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { FlatControllersParser } from '../../parser/roomsettings/FlatControllersParser'; +import { FlatControllersParser } from '../../parser'; export class FlatControllersEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/roomsettings/MuteAllInRoomEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/MuteAllInRoomEvent.ts index 06098950..a9ab9e40 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/MuteAllInRoomEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/MuteAllInRoomEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { MuteAllInRoomParser } from '../../parser/roomsettings/MuteAllInRoomParser'; +import { MuteAllInRoomParser } from '../../parser'; export class MuteAllInRoomEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/roomsettings/NoSuchFlatEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/NoSuchFlatEvent.ts index 08bdea09..a6d8c96d 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/NoSuchFlatEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/NoSuchFlatEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { NoSuchFlatParser } from '../../parser/roomsettings/NoSuchFlatParser'; +import { NoSuchFlatParser } from '../../parser'; export class NoSuchFlatEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsDataEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsDataEvent.ts index 0dac99e1..7e7af183 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsDataEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsDataEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { RoomSettingsDataParser } from '../../parser/roomsettings/RoomSettingsDataParser'; +import { RoomSettingsDataParser } from '../../parser'; export class RoomSettingsDataEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsErrorEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsErrorEvent.ts index ad6b9cf8..ae0ef2d8 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsErrorEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { RoomSettingsErrorParser } from '../../parser/roomsettings/RoomSettingsErrorParser'; +import { RoomSettingsErrorParser } from '../../parser'; export class RoomSettingsErrorEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsSaveErrorEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsSaveErrorEvent.ts index 4f9ed67d..ffd04b42 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsSaveErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsSaveErrorEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { RoomSettingsSaveErrorParser } from '../../parser/roomsettings/RoomSettingsSaveErrorParser'; +import { RoomSettingsSaveErrorParser } from '../../parser'; export class RoomSettingsSaveErrorEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsSavedEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsSavedEvent.ts index 5a03f8bb..6a3573cf 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsSavedEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsSavedEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { RoomSettingsSavedParser } from '../../parser/roomsettings/RoomSettingsSavedParser'; +import { RoomSettingsSavedParser } from '../../parser'; export class RoomSettingsSavedEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/roomsettings/ShowEnforceRoomCategoryDialogEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/ShowEnforceRoomCategoryDialogEvent.ts index f649749a..1c8359dc 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/ShowEnforceRoomCategoryDialogEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/ShowEnforceRoomCategoryDialogEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { ShowEnforceRoomCategoryDialogParser } from '../../parser/roomsettings/ShowEnforceRoomCategoryDialogParser'; +import { ShowEnforceRoomCategoryDialogParser } from '../../parser'; export class ShowEnforceRoomCategoryDialogEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/roomsettings/UserUnbannedFromRoomEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/UserUnbannedFromRoomEvent.ts index 4afb9b6c..4f896eb5 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/UserUnbannedFromRoomEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/UserUnbannedFromRoomEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { UserUnbannedFromRoomParser } from '../../parser/roomsettings/UserUnbannedFromRoomParser'; +import { UserUnbannedFromRoomParser } from '../../parser'; export class UserUnbannedFromRoomEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/roomsettings/index.ts b/src/nitro/communication/messages/incoming/roomsettings/index.ts index a30ed0ec..63327aae 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/index.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/index.ts @@ -1,15 +1,12 @@ -export * from './BannedUserData'; export * from './BannedUsersFromRoomEvent'; export * from './FlatControllerAddedEvent'; -export * from './FlatControllerData'; export * from './FlatControllerRemovedEvent'; export * from './FlatControllersEvent'; -export * from './IFlatUser'; export * from './MuteAllInRoomEvent'; export * from './NoSuchFlatEvent'; -export * from './RoomChatSettings'; -export * from './RoomModerationSettings'; -export * from './RoomSettingsData'; export * from './RoomSettingsDataEvent'; export * from './RoomSettingsErrorEvent'; +export * from './RoomSettingsSavedEvent'; export * from './RoomSettingsSaveErrorEvent'; +export * from './ShowEnforceRoomCategoryDialogEvent'; +export * from './UserUnbannedFromRoomEvent'; diff --git a/src/nitro/communication/messages/incoming/security/AuthenticatedEvent.ts b/src/nitro/communication/messages/incoming/security/AuthenticatedEvent.ts index 4cee03a3..14b3c2ea 100644 --- a/src/nitro/communication/messages/incoming/security/AuthenticatedEvent.ts +++ b/src/nitro/communication/messages/incoming/security/AuthenticatedEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { AuthenticatedParser } from '../../parser/security/AuthenticatedParser'; +import { AuthenticatedParser } from '../../parser'; export class AuthenticatedEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/sound/index.ts b/src/nitro/communication/messages/incoming/sound/index.ts index 7fa245a1..24744f71 100644 --- a/src/nitro/communication/messages/incoming/sound/index.ts +++ b/src/nitro/communication/messages/incoming/sound/index.ts @@ -2,9 +2,7 @@ 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/incoming/talent/TalentTrackMessageEvent.ts b/src/nitro/communication/messages/incoming/talent/TalentTrackMessageEvent.ts index c7066d30..c4e86b2f 100644 --- a/src/nitro/communication/messages/incoming/talent/TalentTrackMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/talent/TalentTrackMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { TalentTrackParser } from '../../parser/talent/TalentTrackParser'; +import { TalentTrackParser } from '../../parser'; export class TalentTrackMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/user/GuildMembershipsMessageEvent.ts b/src/nitro/communication/messages/incoming/user/GuildMembershipsMessageEvent.ts index 2bddbd09..eba5da20 100644 --- a/src/nitro/communication/messages/incoming/user/GuildMembershipsMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/user/GuildMembershipsMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { GuildMembershipsMessageParser } from '../../parser/user/GuildMembershipsMessageParser'; +import { GuildMembershipsMessageParser } from '../../parser'; export class GuildMembershipsMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/user/HabboGroupBadgesMessageEvent.ts b/src/nitro/communication/messages/incoming/user/HabboGroupBadgesMessageEvent.ts index 340df56c..f0764033 100644 --- a/src/nitro/communication/messages/incoming/user/HabboGroupBadgesMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/user/HabboGroupBadgesMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { HabboGroupBadgesMessageParser } from '../../parser/user/HabboGroupBadgesMessageParser'; +import { HabboGroupBadgesMessageParser } from '../../parser'; export class HabboGroupBadgesMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/user/IgnoreResultEvent.ts b/src/nitro/communication/messages/incoming/user/IgnoreResultEvent.ts index 7b57ad74..187677b7 100644 --- a/src/nitro/communication/messages/incoming/user/IgnoreResultEvent.ts +++ b/src/nitro/communication/messages/incoming/user/IgnoreResultEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { IgnoreResultParser } from '../../parser/user/IgnoreResultParser'; +import { IgnoreResultParser } from '../../parser'; export class IgnoreResultEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/user/IgnoredUsersEvent.ts b/src/nitro/communication/messages/incoming/user/IgnoredUsersEvent.ts index d1ef2904..3b238f30 100644 --- a/src/nitro/communication/messages/incoming/user/IgnoredUsersEvent.ts +++ b/src/nitro/communication/messages/incoming/user/IgnoredUsersEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { IgnoredUsersParser } from '../../parser/user/IgnoredUsersParser'; +import { IgnoredUsersParser } from '../../parser'; export class IgnoredUsersEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/user/InClientLinkEvent.ts b/src/nitro/communication/messages/incoming/user/InClientLinkEvent.ts index 389a6634..522a438b 100644 --- a/src/nitro/communication/messages/incoming/user/InClientLinkEvent.ts +++ b/src/nitro/communication/messages/incoming/user/InClientLinkEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { InClientLinkParser } from '../../parser/user/InClientLinkParser'; +import { InClientLinkParser } from '../../parser'; export class InClientLinkEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/user/PetRespectNoficationEvent.ts b/src/nitro/communication/messages/incoming/user/PetRespectNoficationEvent.ts index a57f3c93..dc092f04 100644 --- a/src/nitro/communication/messages/incoming/user/PetRespectNoficationEvent.ts +++ b/src/nitro/communication/messages/incoming/user/PetRespectNoficationEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { PetRespectNotificationParser } from '../../parser/user/PetRespectNotificationParser'; +import { PetRespectNotificationParser } from '../../parser'; export class PetRespectNoficationEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/user/PetSupplementedNotificationEvent.ts b/src/nitro/communication/messages/incoming/user/PetSupplementedNotificationEvent.ts index db0260de..54e634f5 100644 --- a/src/nitro/communication/messages/incoming/user/PetSupplementedNotificationEvent.ts +++ b/src/nitro/communication/messages/incoming/user/PetSupplementedNotificationEvent.ts @@ -1,6 +1,6 @@ -import { PetSupplementedNotificationParser } from '../..'; import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; +import { PetSupplementedNotificationParser } from '../../parser'; export class PetSupplementedNotificationEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/user/RespectReceivedEvent.ts b/src/nitro/communication/messages/incoming/user/RespectReceivedEvent.ts index d070add5..ebff1210 100644 --- a/src/nitro/communication/messages/incoming/user/RespectReceivedEvent.ts +++ b/src/nitro/communication/messages/incoming/user/RespectReceivedEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { RespectReceivedParser } from '../../parser/user/RespectReceivedParser'; +import { RespectReceivedParser } from '../../parser'; export class RespectReceivedEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/user/ScrSendKickbackInfoMessageEvent.ts b/src/nitro/communication/messages/incoming/user/ScrSendKickbackInfoMessageEvent.ts index f80bcf8e..d02b77dc 100644 --- a/src/nitro/communication/messages/incoming/user/ScrSendKickbackInfoMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/user/ScrSendKickbackInfoMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../api'; import { MessageEvent } from '../../../../../core'; -import { ScrSendKickbackInfoMessageParser } from '../../parser/user/ScrSendKickbackInfoMessageParser'; +import { ScrSendKickbackInfoMessageParser } from '../../parser'; export class ScrSendKickbackInfoMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/user/access/UserPermissionsEvent.ts b/src/nitro/communication/messages/incoming/user/access/UserPermissionsEvent.ts index 6f0b2138..7b7f036b 100644 --- a/src/nitro/communication/messages/incoming/user/access/UserPermissionsEvent.ts +++ b/src/nitro/communication/messages/incoming/user/access/UserPermissionsEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { UserPermissionsParser } from '../../../parser/user/access/UserPermissionsParser'; +import { UserPermissionsParser } from '../../../parser'; export class UserPermissionsEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/user/data/RelationshipStatusInfoEvent.ts b/src/nitro/communication/messages/incoming/user/data/RelationshipStatusInfoEvent.ts index b479f9d7..aefe2c2f 100644 --- a/src/nitro/communication/messages/incoming/user/data/RelationshipStatusInfoEvent.ts +++ b/src/nitro/communication/messages/incoming/user/data/RelationshipStatusInfoEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { RelationshipStatusInfoMessageParser } from '../../../parser/user/data/RelationshipStatusInfoMessageParser'; +import { RelationshipStatusInfoMessageParser } from '../../../parser'; export class RelationshipStatusInfoEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/user/data/UserCurrentBadgesEvent.ts b/src/nitro/communication/messages/incoming/user/data/UserCurrentBadgesEvent.ts index 823d01d4..e7148b97 100644 --- a/src/nitro/communication/messages/incoming/user/data/UserCurrentBadgesEvent.ts +++ b/src/nitro/communication/messages/incoming/user/data/UserCurrentBadgesEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { UserCurrentBadgesParser } from '../../../parser/user/data/UserCurrentBadgesParser'; +import { UserCurrentBadgesParser } from '../../../parser'; export class UserCurrentBadgesEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/user/data/UserInfoEvent.ts b/src/nitro/communication/messages/incoming/user/data/UserInfoEvent.ts index b93ee000..88748eec 100644 --- a/src/nitro/communication/messages/incoming/user/data/UserInfoEvent.ts +++ b/src/nitro/communication/messages/incoming/user/data/UserInfoEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { UserInfoParser } from '../../../parser/user/data/UserInfoParser'; +import { UserInfoParser } from '../../../parser'; export class UserInfoEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/user/data/UserNameChangeMessageEvent.ts b/src/nitro/communication/messages/incoming/user/data/UserNameChangeMessageEvent.ts index 09470526..1e8a6b2b 100644 --- a/src/nitro/communication/messages/incoming/user/data/UserNameChangeMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/user/data/UserNameChangeMessageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { UserNameChangeMessageParser } from '../../../parser/user/data/UserNameChangeMessageParser'; +import { UserNameChangeMessageParser } from '../../../parser'; export class UserNameChangeMessageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/user/data/UserProfileEvent.ts b/src/nitro/communication/messages/incoming/user/data/UserProfileEvent.ts index f8e74293..29542132 100644 --- a/src/nitro/communication/messages/incoming/user/data/UserProfileEvent.ts +++ b/src/nitro/communication/messages/incoming/user/data/UserProfileEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { UserProfileParser } from '../../../parser/user/data/UserProfileParser'; +import { UserProfileParser } from '../../../parser'; export class UserProfileEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/user/data/UserSettingsEvent.ts b/src/nitro/communication/messages/incoming/user/data/UserSettingsEvent.ts index 26f478fe..91955756 100644 --- a/src/nitro/communication/messages/incoming/user/data/UserSettingsEvent.ts +++ b/src/nitro/communication/messages/incoming/user/data/UserSettingsEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { UserSettingsParser } from '../../../parser/user/data/UserSettingsParser'; +import { UserSettingsParser } from '../../../parser'; export class UserSettingsEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/user/index.ts b/src/nitro/communication/messages/incoming/user/index.ts index 99528fe9..2d3c6f1b 100644 --- a/src/nitro/communication/messages/incoming/user/index.ts +++ b/src/nitro/communication/messages/incoming/user/index.ts @@ -7,9 +7,10 @@ export * from './IgnoredUsersEvent'; export * from './IgnoreResultEvent'; export * from './InClientLinkEvent'; export * from './inventory'; +export * from './inventory/currency'; +export * from './inventory/subscription'; +export * from './PetRespectNoficationEvent'; export * from './PetSupplementedNotificationEvent'; -export * from './PetSupplementTypeEnum'; export * from './RespectReceivedEvent'; -export * from './ScrKickbackData'; export * from './ScrSendKickbackInfoMessageEvent'; export * from './wardrobe'; diff --git a/src/nitro/communication/messages/incoming/user/inventory/currency/UserCreditsEvent.ts b/src/nitro/communication/messages/incoming/user/inventory/currency/UserCreditsEvent.ts index 10cc5b88..a39e6856 100644 --- a/src/nitro/communication/messages/incoming/user/inventory/currency/UserCreditsEvent.ts +++ b/src/nitro/communication/messages/incoming/user/inventory/currency/UserCreditsEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../../api'; import { MessageEvent } from '../../../../../../../core'; -import { UserCreditsParser } from '../../../../parser/user/inventory/currency/UserCreditsParser'; +import { UserCreditsParser } from '../../../../parser'; export class UserCreditsEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/user/inventory/currency/UserCurrencyEvent.ts b/src/nitro/communication/messages/incoming/user/inventory/currency/UserCurrencyEvent.ts index 74d28130..c872fb91 100644 --- a/src/nitro/communication/messages/incoming/user/inventory/currency/UserCurrencyEvent.ts +++ b/src/nitro/communication/messages/incoming/user/inventory/currency/UserCurrencyEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../../api'; import { MessageEvent } from '../../../../../../../core'; -import { UserCurrencyParser } from '../../../../parser/user/inventory/currency/UserCurrencyParser'; +import { UserCurrencyParser } from '../../../../parser'; export class UserCurrencyEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/user/inventory/subscription/UserSubscriptionEvent.ts b/src/nitro/communication/messages/incoming/user/inventory/subscription/UserSubscriptionEvent.ts index bd864a9e..2b9e1d68 100644 --- a/src/nitro/communication/messages/incoming/user/inventory/subscription/UserSubscriptionEvent.ts +++ b/src/nitro/communication/messages/incoming/user/inventory/subscription/UserSubscriptionEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../../api'; import { MessageEvent } from '../../../../../../../core'; -import { UserSubscriptionParser } from '../../../../parser/user/inventory/subscription/UserSubscriptionParser'; +import { UserSubscriptionParser } from '../../../../parser'; export class UserSubscriptionEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/user/wardrobe/UserWardrobePageEvent.ts b/src/nitro/communication/messages/incoming/user/wardrobe/UserWardrobePageEvent.ts index 8a465ea8..a1b15a51 100644 --- a/src/nitro/communication/messages/incoming/user/wardrobe/UserWardrobePageEvent.ts +++ b/src/nitro/communication/messages/incoming/user/wardrobe/UserWardrobePageEvent.ts @@ -1,6 +1,6 @@ import { IMessageEvent } from '../../../../../../api'; import { MessageEvent } from '../../../../../../core'; -import { UserWardrobePageParser } from '../../../parser/user/wardrobe/UserWardrobePageParser'; +import { UserWardrobePageParser } from '../../../parser'; export class UserWardrobePageEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/outgoing/competition/GetSecondsUntilMessageComposer.ts b/src/nitro/communication/messages/outgoing/competition/GetSecondsUntilMessageComposer.ts index 10c4f4b9..9b6fdc9c 100644 --- a/src/nitro/communication/messages/outgoing/competition/GetSecondsUntilMessageComposer.ts +++ b/src/nitro/communication/messages/outgoing/competition/GetSecondsUntilMessageComposer.ts @@ -1,4 +1,4 @@ -import { IMessageComposer } from '../../../../..'; +import { IMessageComposer } from '../../../../../api'; export class GetSecondsUntilMessageComposer implements IMessageComposer> { @@ -6,7 +6,7 @@ export class GetSecondsUntilMessageComposer implements IMessageComposer> { diff --git a/src/nitro/communication/messages/outgoing/competition/VoteForRoomMessageComposer.ts b/src/nitro/communication/messages/outgoing/competition/VoteForRoomMessageComposer.ts index 9bd15a19..f9a6186f 100644 --- a/src/nitro/communication/messages/outgoing/competition/VoteForRoomMessageComposer.ts +++ b/src/nitro/communication/messages/outgoing/competition/VoteForRoomMessageComposer.ts @@ -1,4 +1,4 @@ -import { IMessageComposer } from '../../../../..'; +import { IMessageComposer } from '../../../../../api'; export class VoteForRoomMessageComposer implements IMessageComposer> { @@ -6,7 +6,7 @@ export class VoteForRoomMessageComposer implements IMessageComposer> { @@ -6,7 +6,7 @@ export class GetForumStatsMessageComposer implements IMessageComposer> { @@ -6,7 +6,7 @@ export class GetForumsListMessageComposer implements IMessageComposer> { diff --git a/src/nitro/communication/messages/outgoing/groupforums/GetThreadMessageComposer.ts b/src/nitro/communication/messages/outgoing/groupforums/GetThreadMessageComposer.ts index e8f4d5b0..6136b1c9 100644 --- a/src/nitro/communication/messages/outgoing/groupforums/GetThreadMessageComposer.ts +++ b/src/nitro/communication/messages/outgoing/groupforums/GetThreadMessageComposer.ts @@ -1,4 +1,4 @@ -import { IMessageComposer } from '../../../../..'; +import { IMessageComposer } from '../../../../../api'; export class GetThreadMessageComposer implements IMessageComposer> { @@ -6,7 +6,7 @@ export class GetThreadMessageComposer implements IMessageComposer> { @@ -6,7 +6,7 @@ export class GetThreadsMessageComposer implements IMessageComposer> { private _data: ConstructorParameters; - constructor(k:number, _arg_2:number, _arg_3:number, _arg_4:number) + constructor(k: number, _arg_2: number, _arg_3: number, _arg_4: number) { this._data = [k, _arg_2, _arg_3, _arg_4]; } diff --git a/src/nitro/communication/messages/outgoing/handshake/ClientHelloMessageComposer.ts b/src/nitro/communication/messages/outgoing/handshake/ClientHelloMessageComposer.ts index e766098d..5d0b161a 100644 --- a/src/nitro/communication/messages/outgoing/handshake/ClientHelloMessageComposer.ts +++ b/src/nitro/communication/messages/outgoing/handshake/ClientHelloMessageComposer.ts @@ -1,6 +1,4 @@ -import { IMessageComposer } from '../../../../../api'; -import { ClientDeviceCategoryEnum } from '../../../../../api/communication/enums/ClientDeviceCategoryEnum'; -import { ClientPlatformEnum } from '../../../../../api/communication/enums/ClientPlatformEnum'; +import { ClientDeviceCategoryEnum, ClientPlatformEnum, IMessageComposer } from '../../../../../api'; import { NitroVersion } from '../../../../../core'; export class ClientHelloMessageComposer implements IMessageComposer> diff --git a/src/nitro/communication/messages/outgoing/handshake/DisconnectMessageComposer.ts b/src/nitro/communication/messages/outgoing/handshake/DisconnectMessageComposer.ts index d7e43d36..cf9dccab 100644 --- a/src/nitro/communication/messages/outgoing/handshake/DisconnectMessageComposer.ts +++ b/src/nitro/communication/messages/outgoing/handshake/DisconnectMessageComposer.ts @@ -1,4 +1,4 @@ -import { IMessageComposer } from '../../../../..'; +import { IMessageComposer } from '../../../../../api'; export class DisconnectMessageComposer implements IMessageComposer> { diff --git a/src/nitro/communication/messages/outgoing/handshake/UniqueIDMessageComposer.ts b/src/nitro/communication/messages/outgoing/handshake/UniqueIDMessageComposer.ts index 58249d81..5edf7d60 100644 --- a/src/nitro/communication/messages/outgoing/handshake/UniqueIDMessageComposer.ts +++ b/src/nitro/communication/messages/outgoing/handshake/UniqueIDMessageComposer.ts @@ -1,12 +1,12 @@ -import { IMessageComposer } from '../../../../..'; +import { IMessageComposer } from '../../../../../api'; export class UniqueIDMessageComposer implements IMessageComposer> { private _data: ConstructorParameters; - constructor(machineId:string, fingerprint:string, flashVersion:string) + constructor(machineId: string, fingerprint: string, flashVersion: string) { - this._data = [ machineId, fingerprint, flashVersion ]; + this._data = [machineId, fingerprint, flashVersion]; } public getMessageArray() diff --git a/src/nitro/communication/messages/outgoing/handshake/VersionCheckMessageComposer.ts b/src/nitro/communication/messages/outgoing/handshake/VersionCheckMessageComposer.ts index 12076b26..7a82a33d 100644 --- a/src/nitro/communication/messages/outgoing/handshake/VersionCheckMessageComposer.ts +++ b/src/nitro/communication/messages/outgoing/handshake/VersionCheckMessageComposer.ts @@ -1,10 +1,10 @@ -import { IMessageComposer } from '../../../../..'; +import { IMessageComposer } from '../../../../../api'; export class VersionCheckMessageComposer implements IMessageComposer> { private _data: ConstructorParameters; - constructor(clientID:number, clientURL:string, externalVariablesURL:string) + constructor(clientID: number, clientURL: string, externalVariablesURL: string) { this._data = [clientID, clientURL, externalVariablesURL]; } diff --git a/src/nitro/communication/messages/outgoing/index.ts b/src/nitro/communication/messages/outgoing/index.ts index 888c8dae..55f55bd2 100644 --- a/src/nitro/communication/messages/outgoing/index.ts +++ b/src/nitro/communication/messages/outgoing/index.ts @@ -15,7 +15,14 @@ export * from './groupforums'; export * from './handshake'; export * from './help'; export * from './inventory'; +export * from './inventory/badges'; +export * from './inventory/bots'; +export * from './inventory/furni'; +export * from './inventory/pets'; +export * from './inventory/trading'; +export * from './inventory/unseen'; export * from './landingview'; +export * from './landingview/votes'; export * from './marketplace'; export * from './moderation'; export * from './navigator'; @@ -24,8 +31,31 @@ export * from './pet'; export * from './poll'; export * from './quest'; export * from './room'; +export * from './room/access'; +export * from './room/action'; +export * from './room/bots'; +export * from './room/data'; +export * from './room/engine'; +export * from './room/furniture'; +export * from './room/furniture/dimmer'; +export * from './room/furniture/floor'; +export * from './room/furniture/logic'; +export * from './room/furniture/mannequin'; +export * from './room/furniture/presents'; +export * from './room/furniture/toner'; +export * from './room/furniture/wall'; +export * from './room/furniture/youtube'; +export * from './room/layout'; +export * from './room/session'; +export * from './room/unit'; +export * from './room/unit/chat'; export * from './roomevents'; export * from './roomsettings'; export * from './sound'; export * from './talent'; export * from './user'; +export * from './user/data'; +export * from './user/inventory'; +export * from './user/inventory/currency'; +export * from './user/inventory/subscription'; +export * from './user/settings'; diff --git a/src/nitro/communication/messages/outgoing/moderation/ModKickMessageComposer.ts b/src/nitro/communication/messages/outgoing/moderation/ModKickMessageComposer.ts index 5d7153a7..ec548280 100644 --- a/src/nitro/communication/messages/outgoing/moderation/ModKickMessageComposer.ts +++ b/src/nitro/communication/messages/outgoing/moderation/ModKickMessageComposer.ts @@ -1,5 +1,5 @@ -import { ModBanMessageComposer } from '..'; import { IMessageComposer } from '../../../../../api'; +import { ModBanMessageComposer } from './ModBanMessageComposer'; export class ModKickMessageComposer implements IMessageComposer> { diff --git a/src/nitro/communication/messages/outgoing/moderation/ModMuteMessageComposer.ts b/src/nitro/communication/messages/outgoing/moderation/ModMuteMessageComposer.ts index 7807dcae..603c4609 100644 --- a/src/nitro/communication/messages/outgoing/moderation/ModMuteMessageComposer.ts +++ b/src/nitro/communication/messages/outgoing/moderation/ModMuteMessageComposer.ts @@ -1,5 +1,5 @@ -import { ModBanMessageComposer } from '.'; import { IMessageComposer } from '../../../../../api'; +import { ModBanMessageComposer } from './ModBanMessageComposer'; export class ModMuteMessageComposer implements IMessageComposer> { diff --git a/src/nitro/communication/messages/outgoing/room/furniture/FurniturePlaceComposer.ts b/src/nitro/communication/messages/outgoing/room/furniture/FurniturePlaceComposer.ts index f72b7bc6..7e6328f5 100644 --- a/src/nitro/communication/messages/outgoing/room/furniture/FurniturePlaceComposer.ts +++ b/src/nitro/communication/messages/outgoing/room/furniture/FurniturePlaceComposer.ts @@ -1,5 +1,4 @@ -import { IMessageComposer } from '../../../../../../api'; -import { RoomObjectCategory } from '../../../../../room/object/RoomObjectCategory'; +import { IMessageComposer, RoomObjectCategory } from '../../../../../../api'; export class FurniturePlaceComposer implements IMessageComposer { diff --git a/src/nitro/communication/messages/outgoing/room/furniture/youtube/SetYoutubeDisplayPlaylistMessageComposer.ts b/src/nitro/communication/messages/outgoing/room/furniture/youtube/SetYoutubeDisplayPlaylistMessageComposer.ts index 4902b528..d652de0c 100644 --- a/src/nitro/communication/messages/outgoing/room/furniture/youtube/SetYoutubeDisplayPlaylistMessageComposer.ts +++ b/src/nitro/communication/messages/outgoing/room/furniture/youtube/SetYoutubeDisplayPlaylistMessageComposer.ts @@ -1,10 +1,10 @@ -import { IMessageComposer } from '../../../../../../..'; +import { IMessageComposer } from '../../../../../../../api'; export class SetYoutubeDisplayPlaylistMessageComposer implements IMessageComposer> { private _data: ConstructorParameters; - constructor(k:number, _arg_2:string) + constructor(k: number, _arg_2: string) { this._data = [k, _arg_2]; } diff --git a/src/nitro/communication/messages/outgoing/room/index.ts b/src/nitro/communication/messages/outgoing/room/index.ts index 7bc75523..0067ee05 100644 --- a/src/nitro/communication/messages/outgoing/room/index.ts +++ b/src/nitro/communication/messages/outgoing/room/index.ts @@ -4,7 +4,16 @@ export * from './bots'; export * from './data'; export * from './engine'; export * from './furniture'; +export * from './furniture/dimmer'; +export * from './furniture/floor'; +export * from './furniture/logic'; +export * from './furniture/mannequin'; +export * from './furniture/presents'; +export * from './furniture/toner'; +export * from './furniture/wall'; +export * from './furniture/youtube'; export * from './layout'; export * from './RedeemItemClothingComposer'; export * from './session'; export * from './unit'; +export * from './unit/chat'; diff --git a/src/nitro/communication/messages/outgoing/user/index.ts b/src/nitro/communication/messages/outgoing/user/index.ts index 62139554..069cce0b 100644 --- a/src/nitro/communication/messages/outgoing/user/index.ts +++ b/src/nitro/communication/messages/outgoing/user/index.ts @@ -3,6 +3,8 @@ export * from './CatalogGroupsComposer'; export * from './data'; export * from './GetHabboGroupBadgesMessageComposer'; export * from './inventory'; +export * from './inventory/currency'; +export * from './inventory/subscription'; export * from './ScrGetKickbackInfoMessageComposer'; export * from './settings'; export * from './UserRespectComposer'; diff --git a/src/nitro/communication/messages/incoming/avatar/OutfitData.ts b/src/nitro/communication/messages/parser/avatar/OutfitData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/avatar/OutfitData.ts rename to src/nitro/communication/messages/parser/avatar/OutfitData.ts diff --git a/src/nitro/communication/messages/parser/avatar/WardrobeMessageParser.ts b/src/nitro/communication/messages/parser/avatar/WardrobeMessageParser.ts index 6f287a98..8b59378a 100644 --- a/src/nitro/communication/messages/parser/avatar/WardrobeMessageParser.ts +++ b/src/nitro/communication/messages/parser/avatar/WardrobeMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { OutfitData } from '../../incoming'; +import { OutfitData } from './OutfitData'; export class WardrobeMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/avatar/index.ts b/src/nitro/communication/messages/parser/avatar/index.ts index fa085295..ca0d3358 100644 --- a/src/nitro/communication/messages/parser/avatar/index.ts +++ b/src/nitro/communication/messages/parser/avatar/index.ts @@ -1,4 +1,5 @@ export * from './ChangeUserNameResultMessageParser'; export * from './CheckUserNameResultMessageParser'; export * from './FigureUpdateParser'; +export * from './OutfitData'; export * from './WardrobeMessageParser'; diff --git a/src/nitro/communication/messages/incoming/callforhelp/CallForHelpCategoryData.ts b/src/nitro/communication/messages/parser/callforhelp/CallForHelpCategoryData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/callforhelp/CallForHelpCategoryData.ts rename to src/nitro/communication/messages/parser/callforhelp/CallForHelpCategoryData.ts diff --git a/src/nitro/communication/messages/incoming/callforhelp/CallForHelpTopicData.ts b/src/nitro/communication/messages/parser/callforhelp/CallForHelpTopicData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/callforhelp/CallForHelpTopicData.ts rename to src/nitro/communication/messages/parser/callforhelp/CallForHelpTopicData.ts diff --git a/src/nitro/communication/messages/parser/callforhelp/CfhSanctionMessageParser.ts b/src/nitro/communication/messages/parser/callforhelp/CfhSanctionMessageParser.ts index b7fec6ce..40cccad6 100644 --- a/src/nitro/communication/messages/parser/callforhelp/CfhSanctionMessageParser.ts +++ b/src/nitro/communication/messages/parser/callforhelp/CfhSanctionMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { CfhSanctionTypeData } from '../../incoming/callforhelp'; +import { CfhSanctionTypeData } from './CfhSanctionTypeData'; export class CfhSanctionMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/incoming/callforhelp/CfhSanctionTypeData.ts b/src/nitro/communication/messages/parser/callforhelp/CfhSanctionTypeData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/callforhelp/CfhSanctionTypeData.ts rename to src/nitro/communication/messages/parser/callforhelp/CfhSanctionTypeData.ts diff --git a/src/nitro/communication/messages/parser/callforhelp/CfhTopicsInitMessageParser.ts b/src/nitro/communication/messages/parser/callforhelp/CfhTopicsInitMessageParser.ts index e6e165ee..e1179a36 100644 --- a/src/nitro/communication/messages/parser/callforhelp/CfhTopicsInitMessageParser.ts +++ b/src/nitro/communication/messages/parser/callforhelp/CfhTopicsInitMessageParser.ts @@ -1,6 +1,5 @@ -import { IMessageDataWrapper } from '../../../../../api'; -import { CallForHelpCategoryData } from '../../incoming/callforhelp/CallForHelpCategoryData'; -import { IMessageParser } from './../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; +import { CallForHelpCategoryData } from './CallForHelpCategoryData'; export class CfhTopicsInitMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/callforhelp/SanctionStatusMessageParser.ts b/src/nitro/communication/messages/parser/callforhelp/SanctionStatusMessageParser.ts index d25c3ed7..17c0ba41 100644 --- a/src/nitro/communication/messages/parser/callforhelp/SanctionStatusMessageParser.ts +++ b/src/nitro/communication/messages/parser/callforhelp/SanctionStatusMessageParser.ts @@ -1,5 +1,4 @@ -import { IMessageDataWrapper } from '../../../../../api'; -import { IMessageParser } from './../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; export class SanctionStatusMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/callforhelp/index.ts b/src/nitro/communication/messages/parser/callforhelp/index.ts index 2064142a..578158fd 100644 --- a/src/nitro/communication/messages/parser/callforhelp/index.ts +++ b/src/nitro/communication/messages/parser/callforhelp/index.ts @@ -1,3 +1,6 @@ +export * from './CallForHelpCategoryData'; +export * from './CallForHelpTopicData'; export * from './CfhSanctionMessageParser'; +export * from './CfhSanctionTypeData'; export * from './CfhTopicsInitMessageParser'; export * from './SanctionStatusMessageParser'; diff --git a/src/nitro/communication/messages/parser/camera/CameraPublishStatusMessageParser.ts b/src/nitro/communication/messages/parser/camera/CameraPublishStatusMessageParser.ts index 5b89f4fb..e8e6be8e 100644 --- a/src/nitro/communication/messages/parser/camera/CameraPublishStatusMessageParser.ts +++ b/src/nitro/communication/messages/parser/camera/CameraPublishStatusMessageParser.ts @@ -1,5 +1,4 @@ -import { IMessageDataWrapper } from '../../../../../api'; -import { IMessageParser } from './../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; export class CameraPublishStatusMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/camera/CameraPurchaseOKMessageParser.ts b/src/nitro/communication/messages/parser/camera/CameraPurchaseOKMessageParser.ts index c189cfb8..bab980e4 100644 --- a/src/nitro/communication/messages/parser/camera/CameraPurchaseOKMessageParser.ts +++ b/src/nitro/communication/messages/parser/camera/CameraPurchaseOKMessageParser.ts @@ -1,5 +1,4 @@ -import { IMessageDataWrapper } from '../../../../../api'; -import { IMessageParser } from './../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; export class CameraPurchaseOKMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/camera/CameraStorageUrlMessageParser.ts b/src/nitro/communication/messages/parser/camera/CameraStorageUrlMessageParser.ts index e66aa413..c4101814 100644 --- a/src/nitro/communication/messages/parser/camera/CameraStorageUrlMessageParser.ts +++ b/src/nitro/communication/messages/parser/camera/CameraStorageUrlMessageParser.ts @@ -1,5 +1,4 @@ -import { IMessageDataWrapper } from '../../../../../api'; -import { IMessageParser } from './../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; export class CameraStorageUrlMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/camera/CompetitionStatusMessageParser.ts b/src/nitro/communication/messages/parser/camera/CompetitionStatusMessageParser.ts index 8039cf6f..104e3efb 100644 --- a/src/nitro/communication/messages/parser/camera/CompetitionStatusMessageParser.ts +++ b/src/nitro/communication/messages/parser/camera/CompetitionStatusMessageParser.ts @@ -1,5 +1,4 @@ -import { IMessageDataWrapper } from '../../../../../api'; -import { IMessageParser } from './../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; export class CompetitionStatusMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/camera/InitCameraMessageParser.ts b/src/nitro/communication/messages/parser/camera/InitCameraMessageParser.ts index 4e3bf31e..9fe81f31 100644 --- a/src/nitro/communication/messages/parser/camera/InitCameraMessageParser.ts +++ b/src/nitro/communication/messages/parser/camera/InitCameraMessageParser.ts @@ -1,5 +1,4 @@ -import { IMessageDataWrapper } from '../../../../../api'; -import { IMessageParser } from './../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; export class InitCameraMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/camera/ThumbnailStatusMessageParser.ts b/src/nitro/communication/messages/parser/camera/ThumbnailStatusMessageParser.ts index 0f61955b..021bb6eb 100644 --- a/src/nitro/communication/messages/parser/camera/ThumbnailStatusMessageParser.ts +++ b/src/nitro/communication/messages/parser/camera/ThumbnailStatusMessageParser.ts @@ -1,5 +1,4 @@ -import { IMessageDataWrapper } from '../../../../../api'; -import { IMessageParser } from './../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; export class ThumbnailStatusMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/campaign/CampaignCalendarDataMessageParser.ts b/src/nitro/communication/messages/parser/campaign/CampaignCalendarDataMessageParser.ts index 5a775e9a..920deff0 100644 --- a/src/nitro/communication/messages/parser/campaign/CampaignCalendarDataMessageParser.ts +++ b/src/nitro/communication/messages/parser/campaign/CampaignCalendarDataMessageParser.ts @@ -1,5 +1,4 @@ -import { IMessageDataWrapper } from '../../../../../api'; -import { IMessageParser } from './../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; import { CampaignCalendarData } from './CampaignCalendarData'; export class CampaignCalendarDataMessageParser implements IMessageParser diff --git a/src/nitro/communication/messages/parser/campaign/CampaignCalendarDoorOpenedMessageParser.ts b/src/nitro/communication/messages/parser/campaign/CampaignCalendarDoorOpenedMessageParser.ts index e4964544..c297bd5c 100644 --- a/src/nitro/communication/messages/parser/campaign/CampaignCalendarDoorOpenedMessageParser.ts +++ b/src/nitro/communication/messages/parser/campaign/CampaignCalendarDoorOpenedMessageParser.ts @@ -1,5 +1,4 @@ -import { IMessageDataWrapper } from '../../../../../api'; -import { IMessageParser } from './../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; export class CampaignCalendarDoorOpenedMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/catalog/BonusRareInfoMessageParser.ts b/src/nitro/communication/messages/parser/catalog/BonusRareInfoMessageParser.ts index 689b9299..b24250ef 100644 --- a/src/nitro/communication/messages/parser/catalog/BonusRareInfoMessageParser.ts +++ b/src/nitro/communication/messages/parser/catalog/BonusRareInfoMessageParser.ts @@ -1,5 +1,4 @@ -import { IMessageDataWrapper } from '../../../../../api'; -import { IMessageParser } from './../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; export class BonusRareInfoMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/catalog/BuildersClubFurniCountMessageParser.ts b/src/nitro/communication/messages/parser/catalog/BuildersClubFurniCountMessageParser.ts index 18fc6440..a37a6c45 100644 --- a/src/nitro/communication/messages/parser/catalog/BuildersClubFurniCountMessageParser.ts +++ b/src/nitro/communication/messages/parser/catalog/BuildersClubFurniCountMessageParser.ts @@ -1,5 +1,4 @@ -import { IMessageDataWrapper } from '../../../../../api'; -import { IMessageParser } from './../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; export class BuildersClubFurniCountMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/catalog/BuildersClubSubscriptionStatusMessageParser.ts b/src/nitro/communication/messages/parser/catalog/BuildersClubSubscriptionStatusMessageParser.ts index cd2182a3..b32d6c3e 100644 --- a/src/nitro/communication/messages/parser/catalog/BuildersClubSubscriptionStatusMessageParser.ts +++ b/src/nitro/communication/messages/parser/catalog/BuildersClubSubscriptionStatusMessageParser.ts @@ -1,5 +1,4 @@ -import { IMessageDataWrapper } from '../../../../../api'; -import { IMessageParser } from './../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; export class BuildersClubSubscriptionStatusMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/incoming/catalog/BundleDiscountRuleset.ts b/src/nitro/communication/messages/parser/catalog/BundleDiscountRuleset.ts similarity index 100% rename from src/nitro/communication/messages/incoming/catalog/BundleDiscountRuleset.ts rename to src/nitro/communication/messages/parser/catalog/BundleDiscountRuleset.ts diff --git a/src/nitro/communication/messages/parser/catalog/BundleDiscountRulesetMessageParser.ts b/src/nitro/communication/messages/parser/catalog/BundleDiscountRulesetMessageParser.ts index 64091212..408e4ce7 100644 --- a/src/nitro/communication/messages/parser/catalog/BundleDiscountRulesetMessageParser.ts +++ b/src/nitro/communication/messages/parser/catalog/BundleDiscountRulesetMessageParser.ts @@ -1,6 +1,5 @@ -import { IMessageDataWrapper } from '../../../../../api'; -import { BundleDiscountRuleset } from '../../incoming'; -import { IMessageParser } from './../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; +import { BundleDiscountRuleset } from './BundleDiscountRuleset'; export class BundleDiscountRulesetMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/catalog/CatalogIndexMessageParser.ts b/src/nitro/communication/messages/parser/catalog/CatalogIndexMessageParser.ts index 6aca7fb6..2803afa4 100644 --- a/src/nitro/communication/messages/parser/catalog/CatalogIndexMessageParser.ts +++ b/src/nitro/communication/messages/parser/catalog/CatalogIndexMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { NodeData } from '../../incoming/catalog/NodeData'; +import { NodeData } from './NodeData'; export class CatalogIndexMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/incoming/catalog/CatalogLocalizationData.ts b/src/nitro/communication/messages/parser/catalog/CatalogLocalizationData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/catalog/CatalogLocalizationData.ts rename to src/nitro/communication/messages/parser/catalog/CatalogLocalizationData.ts diff --git a/src/nitro/communication/messages/incoming/catalog/CatalogPageMessageOfferData.ts b/src/nitro/communication/messages/parser/catalog/CatalogPageMessageOfferData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/catalog/CatalogPageMessageOfferData.ts rename to src/nitro/communication/messages/parser/catalog/CatalogPageMessageOfferData.ts diff --git a/src/nitro/communication/messages/parser/catalog/CatalogPageMessageParser.ts b/src/nitro/communication/messages/parser/catalog/CatalogPageMessageParser.ts index 95802a25..a1725d2f 100644 --- a/src/nitro/communication/messages/parser/catalog/CatalogPageMessageParser.ts +++ b/src/nitro/communication/messages/parser/catalog/CatalogPageMessageParser.ts @@ -1,7 +1,7 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { CatalogLocalizationData } from '../../incoming/catalog/CatalogLocalizationData'; -import { CatalogPageMessageOfferData } from '../../incoming/catalog/CatalogPageMessageOfferData'; -import { FrontPageItem } from '../../incoming/catalog/FrontPageItem'; +import { CatalogLocalizationData } from './CatalogLocalizationData'; +import { CatalogPageMessageOfferData } from './CatalogPageMessageOfferData'; +import { FrontPageItem } from './FrontPageItem'; export class CatalogPageMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/incoming/catalog/CatalogPageMessageProductData.ts b/src/nitro/communication/messages/parser/catalog/CatalogPageMessageProductData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/catalog/CatalogPageMessageProductData.ts rename to src/nitro/communication/messages/parser/catalog/CatalogPageMessageProductData.ts diff --git a/src/nitro/communication/messages/incoming/catalog/ClubGiftData.ts b/src/nitro/communication/messages/parser/catalog/ClubGiftData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/catalog/ClubGiftData.ts rename to src/nitro/communication/messages/parser/catalog/ClubGiftData.ts diff --git a/src/nitro/communication/messages/parser/catalog/ClubGiftInfoParser.ts b/src/nitro/communication/messages/parser/catalog/ClubGiftInfoParser.ts index aff67226..42b41c5f 100644 --- a/src/nitro/communication/messages/parser/catalog/ClubGiftInfoParser.ts +++ b/src/nitro/communication/messages/parser/catalog/ClubGiftInfoParser.ts @@ -1,6 +1,6 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { CatalogPageMessageOfferData } from '../../incoming/catalog/CatalogPageMessageOfferData'; -import { ClubGiftData } from '../../incoming/catalog/ClubGiftData'; +import { CatalogPageMessageOfferData } from './CatalogPageMessageOfferData'; +import { ClubGiftData } from './ClubGiftData'; export class ClubGiftInfoParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/catalog/ClubGiftSelectedParser.ts b/src/nitro/communication/messages/parser/catalog/ClubGiftSelectedParser.ts index 6f07b627..3ee5b438 100644 --- a/src/nitro/communication/messages/parser/catalog/ClubGiftSelectedParser.ts +++ b/src/nitro/communication/messages/parser/catalog/ClubGiftSelectedParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { CatalogPageMessageProductData } from '../../incoming'; +import { CatalogPageMessageProductData } from './CatalogPageMessageProductData'; export class ClubGiftSelectedParser implements IMessageParser { diff --git a/src/nitro/communication/messages/incoming/catalog/ClubOfferData.ts b/src/nitro/communication/messages/parser/catalog/ClubOfferData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/catalog/ClubOfferData.ts rename to src/nitro/communication/messages/parser/catalog/ClubOfferData.ts diff --git a/src/nitro/communication/messages/incoming/catalog/ClubOfferExtendedData.ts b/src/nitro/communication/messages/parser/catalog/ClubOfferExtendedData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/catalog/ClubOfferExtendedData.ts rename to src/nitro/communication/messages/parser/catalog/ClubOfferExtendedData.ts diff --git a/src/nitro/communication/messages/incoming/catalog/FrontPageItem.ts b/src/nitro/communication/messages/parser/catalog/FrontPageItem.ts similarity index 93% rename from src/nitro/communication/messages/incoming/catalog/FrontPageItem.ts rename to src/nitro/communication/messages/parser/catalog/FrontPageItem.ts index 2e9224c1..68863f11 100644 --- a/src/nitro/communication/messages/incoming/catalog/FrontPageItem.ts +++ b/src/nitro/communication/messages/parser/catalog/FrontPageItem.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper } from '../../../../../api'; -import { Nitro } from '../../../../Nitro'; +import { PixiApplicationProxy } from '../../../../../pixi-proxy'; export class FrontPageItem { @@ -62,7 +62,7 @@ export class FrontPageItem const time = wrapper.readInt(); - this._expirationTime = ((time > 0) ? ((time * 1000) + Nitro.instance.time) : 0); + this._expirationTime = ((time > 0) ? ((time * 1000) + PixiApplicationProxy.instance.ticker.lastTime) : 0); return true; } diff --git a/src/nitro/communication/messages/parser/catalog/HabboClubExtendOfferMessageParser.ts b/src/nitro/communication/messages/parser/catalog/HabboClubExtendOfferMessageParser.ts index d3710b30..61540eb1 100644 --- a/src/nitro/communication/messages/parser/catalog/HabboClubExtendOfferMessageParser.ts +++ b/src/nitro/communication/messages/parser/catalog/HabboClubExtendOfferMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { ClubOfferExtendedData } from '../../incoming/catalog/ClubOfferExtendedData'; +import { ClubOfferExtendedData } from './ClubOfferExtendedData'; export class HabboClubExtendOfferMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/catalog/HabboClubOffersMessageParser.ts b/src/nitro/communication/messages/parser/catalog/HabboClubOffersMessageParser.ts index fdeac900..0ab86821 100644 --- a/src/nitro/communication/messages/parser/catalog/HabboClubOffersMessageParser.ts +++ b/src/nitro/communication/messages/parser/catalog/HabboClubOffersMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { ClubOfferData } from '../../incoming/catalog/ClubOfferData'; +import { ClubOfferData } from './ClubOfferData'; export class HabboClubOffersMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/incoming/catalog/INodeData.ts b/src/nitro/communication/messages/parser/catalog/INodeData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/catalog/INodeData.ts rename to src/nitro/communication/messages/parser/catalog/INodeData.ts diff --git a/src/nitro/communication/messages/incoming/catalog/NodeData.ts b/src/nitro/communication/messages/parser/catalog/NodeData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/catalog/NodeData.ts rename to src/nitro/communication/messages/parser/catalog/NodeData.ts diff --git a/src/nitro/communication/messages/parser/catalog/ProductOfferMessageParser.ts b/src/nitro/communication/messages/parser/catalog/ProductOfferMessageParser.ts index a5948bcc..7f4c5a81 100644 --- a/src/nitro/communication/messages/parser/catalog/ProductOfferMessageParser.ts +++ b/src/nitro/communication/messages/parser/catalog/ProductOfferMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { CatalogPageMessageOfferData } from '../../incoming/catalog/CatalogPageMessageOfferData'; +import { CatalogPageMessageOfferData } from './CatalogPageMessageOfferData'; export class ProductOfferMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/incoming/catalog/PurchaseOKMessageOfferData.ts b/src/nitro/communication/messages/parser/catalog/PurchaseOKMessageOfferData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/catalog/PurchaseOKMessageOfferData.ts rename to src/nitro/communication/messages/parser/catalog/PurchaseOKMessageOfferData.ts diff --git a/src/nitro/communication/messages/parser/catalog/PurchaseOKMessageParser.ts b/src/nitro/communication/messages/parser/catalog/PurchaseOKMessageParser.ts index 8076dddf..a6e5a635 100644 --- a/src/nitro/communication/messages/parser/catalog/PurchaseOKMessageParser.ts +++ b/src/nitro/communication/messages/parser/catalog/PurchaseOKMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { PurchaseOKMessageOfferData } from '../../incoming/catalog/PurchaseOKMessageOfferData'; +import { PurchaseOKMessageOfferData } from './PurchaseOKMessageOfferData'; export class PurchaseOKMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/catalog/SeasonalCalendarDailyOfferMessageParser.ts b/src/nitro/communication/messages/parser/catalog/SeasonalCalendarDailyOfferMessageParser.ts index fe4951ef..7d9fdd61 100644 --- a/src/nitro/communication/messages/parser/catalog/SeasonalCalendarDailyOfferMessageParser.ts +++ b/src/nitro/communication/messages/parser/catalog/SeasonalCalendarDailyOfferMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { CatalogPageMessageOfferData } from '../../incoming'; +import { CatalogPageMessageOfferData } from './CatalogPageMessageOfferData'; export class SeasonalCalendarDailyOfferMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/incoming/catalog/TargetedOfferData.ts b/src/nitro/communication/messages/parser/catalog/TargetedOfferData.ts similarity index 95% rename from src/nitro/communication/messages/incoming/catalog/TargetedOfferData.ts rename to src/nitro/communication/messages/parser/catalog/TargetedOfferData.ts index 12436b34..a01d4af5 100644 --- a/src/nitro/communication/messages/incoming/catalog/TargetedOfferData.ts +++ b/src/nitro/communication/messages/parser/catalog/TargetedOfferData.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper } from '../../../../../api'; -import { Nitro } from '../../../../Nitro'; +import { PixiApplicationProxy } from '../../../../../pixi-proxy'; export class TargetedOfferData { @@ -31,7 +31,7 @@ export class TargetedOfferData this._Str_9772 = wrapper.readInt(); const time = wrapper.readInt(); - this._expirationTime = ((time > 0) ? ((time * 1000) + Nitro.instance.time) : 0); + this._expirationTime = ((time > 0) ? ((time * 1000) + PixiApplicationProxy.instance.ticker.lastTime) : 0); this._title = wrapper.readString(); this._Str_1858 = wrapper.readString(); diff --git a/src/nitro/communication/messages/parser/catalog/TargetedOfferParser.ts b/src/nitro/communication/messages/parser/catalog/TargetedOfferParser.ts index ec756b4a..27d591e4 100644 --- a/src/nitro/communication/messages/parser/catalog/TargetedOfferParser.ts +++ b/src/nitro/communication/messages/parser/catalog/TargetedOfferParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { TargetedOfferData } from '../../incoming/catalog/TargetedOfferData'; +import { TargetedOfferData } from './TargetedOfferData'; export class TargetedOfferParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/catalog/index.ts b/src/nitro/communication/messages/parser/catalog/index.ts index 5afbef31..b5c41cd2 100644 --- a/src/nitro/communication/messages/parser/catalog/index.ts +++ b/src/nitro/communication/messages/parser/catalog/index.ts @@ -1,31 +1,43 @@ export * from './BonusRareInfoMessageParser'; export * from './BuildersClubFurniCountMessageParser'; export * from './BuildersClubSubscriptionStatusMessageParser'; +export * from './BundleDiscountRuleset'; export * from './BundleDiscountRulesetMessageParser'; export * from './CatalogIndexMessageParser'; +export * from './CatalogLocalizationData'; export * from './CatalogPageExpirationParser'; +export * from './CatalogPageMessageOfferData'; export * from './CatalogPageMessageParser'; +export * from './CatalogPageMessageProductData'; export * from './CatalogPageWithEarliestExpiryMessageParser'; export * from './CatalogPublishedMessageParser'; +export * from './ClubGiftData'; export * from './ClubGiftInfoParser'; export * from './ClubGiftSelectedParser'; +export * from './ClubOfferData'; +export * from './ClubOfferExtendedData'; export * from './DirectSMSClubBuyAvailableMessageParser'; +export * from './FrontPageItem'; export * from './GiftReceiverNotFoundParser'; export * from './GiftWrappingConfigurationParser'; export * from './HabboClubExtendOfferMessageParser'; export * from './HabboClubOffersMessageParser'; +export * from './INodeData'; export * from './IsOfferGiftableMessageParser'; export * from './LimitedEditionSoldOutParser'; export * from './LimitedOfferAppearingNextMessageParser'; +export * from './NodeData'; export * from './NotEnoughBalanceMessageParser'; export * from './ProductOfferMessageParser'; export * from './PurchaseErrorMessageParser'; export * from './PurchaseNotAllowedMessageParser'; +export * from './PurchaseOKMessageOfferData'; export * from './PurchaseOKMessageParser'; export * from './RoomAdPurchaseInfoEventParser'; export * from './SeasonalCalendarDailyOfferMessageParser'; export * from './SellablePetPaletteData'; export * from './SellablePetPalettesParser'; +export * from './TargetedOfferData'; export * from './TargetedOfferNotFoundParser'; export * from './TargetedOfferParser'; export * from './VoucherRedeemErrorMessageParser'; diff --git a/src/nitro/communication/messages/parser/crafting/CraftableProductsMessageParser.ts b/src/nitro/communication/messages/parser/crafting/CraftableProductsMessageParser.ts index c021329f..af122ae2 100644 --- a/src/nitro/communication/messages/parser/crafting/CraftableProductsMessageParser.ts +++ b/src/nitro/communication/messages/parser/crafting/CraftableProductsMessageParser.ts @@ -1,5 +1,4 @@ -import { IMessageDataWrapper } from '../../../../../api'; -import { IMessageParser } from './../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; import { CraftingResultObjectParser } from './CraftingResultObjectParser'; export class CraftableProductsMessageParser implements IMessageParser diff --git a/src/nitro/communication/messages/parser/crafting/CraftingRecipeMessageParser.ts b/src/nitro/communication/messages/parser/crafting/CraftingRecipeMessageParser.ts index d890abce..3bb2761d 100644 --- a/src/nitro/communication/messages/parser/crafting/CraftingRecipeMessageParser.ts +++ b/src/nitro/communication/messages/parser/crafting/CraftingRecipeMessageParser.ts @@ -1,5 +1,4 @@ -import { IMessageDataWrapper } from '../../../../../api'; -import { IMessageParser } from './../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; import { CraftingRecipeIngredientParser } from './CraftingRecipeIngredientParser'; export class CraftingRecipeMessageParser implements IMessageParser diff --git a/src/nitro/communication/messages/parser/crafting/CraftingRecipesAvailableMessageParser.ts b/src/nitro/communication/messages/parser/crafting/CraftingRecipesAvailableMessageParser.ts index 5601112d..5cc33b52 100644 --- a/src/nitro/communication/messages/parser/crafting/CraftingRecipesAvailableMessageParser.ts +++ b/src/nitro/communication/messages/parser/crafting/CraftingRecipesAvailableMessageParser.ts @@ -1,5 +1,4 @@ -import { IMessageDataWrapper } from '../../../../../api'; -import { IMessageParser } from './../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; export class CraftingRecipesAvailableMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/crafting/CraftingResultMessageParser.ts b/src/nitro/communication/messages/parser/crafting/CraftingResultMessageParser.ts index 9d53d245..6695bac3 100644 --- a/src/nitro/communication/messages/parser/crafting/CraftingResultMessageParser.ts +++ b/src/nitro/communication/messages/parser/crafting/CraftingResultMessageParser.ts @@ -1,5 +1,4 @@ -import { IMessageDataWrapper } from '../../../../../api'; -import { IMessageParser } from './../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; import { CraftingResultObjectParser } from './CraftingResultObjectParser'; export class CraftingResultMessageParser implements IMessageParser diff --git a/src/nitro/communication/messages/incoming/friendlist/AcceptFriendFailureData.ts b/src/nitro/communication/messages/parser/friendlist/AcceptFriendFailureData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/friendlist/AcceptFriendFailureData.ts rename to src/nitro/communication/messages/parser/friendlist/AcceptFriendFailureData.ts diff --git a/src/nitro/communication/messages/parser/friendlist/AcceptFriendResultParser.ts b/src/nitro/communication/messages/parser/friendlist/AcceptFriendResultParser.ts index fd8ce60c..ee28a4cd 100644 --- a/src/nitro/communication/messages/parser/friendlist/AcceptFriendResultParser.ts +++ b/src/nitro/communication/messages/parser/friendlist/AcceptFriendResultParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { AcceptFriendFailerData } from '../../incoming/friendlist/AcceptFriendFailureData'; +import { AcceptFriendFailerData } from './AcceptFriendFailureData'; export class AcceptFriendResultParser implements IMessageParser { diff --git a/src/nitro/communication/messages/incoming/friendlist/FriendCategoryData.ts b/src/nitro/communication/messages/parser/friendlist/FriendCategoryData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/friendlist/FriendCategoryData.ts rename to src/nitro/communication/messages/parser/friendlist/FriendCategoryData.ts diff --git a/src/nitro/communication/messages/parser/friendlist/FriendListFragmentMessageParser.ts b/src/nitro/communication/messages/parser/friendlist/FriendListFragmentMessageParser.ts index 0ae13366..eeb2e40b 100644 --- a/src/nitro/communication/messages/parser/friendlist/FriendListFragmentMessageParser.ts +++ b/src/nitro/communication/messages/parser/friendlist/FriendListFragmentMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { FriendParser } from '../../incoming/friendlist/FriendParser'; +import { FriendParser } from './FriendParser'; export class FriendListFragmentParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/friendlist/FriendListUpdateParser.ts b/src/nitro/communication/messages/parser/friendlist/FriendListUpdateParser.ts index d3cf5889..8817bea7 100644 --- a/src/nitro/communication/messages/parser/friendlist/FriendListUpdateParser.ts +++ b/src/nitro/communication/messages/parser/friendlist/FriendListUpdateParser.ts @@ -1,6 +1,6 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { FriendCategoryData } from '../../incoming/friendlist/FriendCategoryData'; -import { FriendParser } from '../../incoming/friendlist/FriendParser'; +import { FriendCategoryData } from './FriendCategoryData'; +import { FriendParser } from './FriendParser'; export class FriendListUpdateParser implements IMessageParser { diff --git a/src/nitro/communication/messages/incoming/friendlist/FriendParser.ts b/src/nitro/communication/messages/parser/friendlist/FriendParser.ts similarity index 100% rename from src/nitro/communication/messages/incoming/friendlist/FriendParser.ts rename to src/nitro/communication/messages/parser/friendlist/FriendParser.ts diff --git a/src/nitro/communication/messages/incoming/friendlist/FriendRequestData.ts b/src/nitro/communication/messages/parser/friendlist/FriendRequestData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/friendlist/FriendRequestData.ts rename to src/nitro/communication/messages/parser/friendlist/FriendRequestData.ts diff --git a/src/nitro/communication/messages/parser/friendlist/FriendRequestsParser.ts b/src/nitro/communication/messages/parser/friendlist/FriendRequestsParser.ts index c0740672..140fe05a 100644 --- a/src/nitro/communication/messages/parser/friendlist/FriendRequestsParser.ts +++ b/src/nitro/communication/messages/parser/friendlist/FriendRequestsParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { FriendRequestData } from '../../incoming/friendlist/FriendRequestData'; +import { FriendRequestData } from './FriendRequestData'; export class FriendRequestsParser implements IMessageParser { diff --git a/src/nitro/communication/messages/incoming/friendlist/HabboSearchResultData.ts b/src/nitro/communication/messages/parser/friendlist/HabboSearchResultData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/friendlist/HabboSearchResultData.ts rename to src/nitro/communication/messages/parser/friendlist/HabboSearchResultData.ts diff --git a/src/nitro/communication/messages/parser/friendlist/HabboSearchResultParser.ts b/src/nitro/communication/messages/parser/friendlist/HabboSearchResultParser.ts index 4be2047a..646927b9 100644 --- a/src/nitro/communication/messages/parser/friendlist/HabboSearchResultParser.ts +++ b/src/nitro/communication/messages/parser/friendlist/HabboSearchResultParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { HabboSearchResultData } from '../../incoming/friendlist/HabboSearchResultData'; +import { HabboSearchResultData } from './HabboSearchResultData'; export class HabboSearchResultParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/friendlist/MessengerInitParser.ts b/src/nitro/communication/messages/parser/friendlist/MessengerInitParser.ts index 2164d37a..8b722b83 100644 --- a/src/nitro/communication/messages/parser/friendlist/MessengerInitParser.ts +++ b/src/nitro/communication/messages/parser/friendlist/MessengerInitParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { FriendCategoryData } from '../../incoming/friendlist/FriendCategoryData'; +import { FriendCategoryData } from './FriendCategoryData'; export class MessengerInitParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/friendlist/NewFriendRequestMessageParser.ts b/src/nitro/communication/messages/parser/friendlist/NewFriendRequestMessageParser.ts index 41be856a..e18b5a1b 100644 --- a/src/nitro/communication/messages/parser/friendlist/NewFriendRequestMessageParser.ts +++ b/src/nitro/communication/messages/parser/friendlist/NewFriendRequestMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { FriendRequestData } from '../../incoming/friendlist/FriendRequestData'; +import { FriendRequestData } from './FriendRequestData'; export class NewFriendRequestParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/friendlist/index.ts b/src/nitro/communication/messages/parser/friendlist/index.ts index df062ace..6542588d 100644 --- a/src/nitro/communication/messages/parser/friendlist/index.ts +++ b/src/nitro/communication/messages/parser/friendlist/index.ts @@ -1,10 +1,15 @@ +export * from './AcceptFriendFailureData'; export * from './AcceptFriendResultParser'; export * from './FindFriendsProcessResultParser'; export * from './FollowFriendFailedParser'; +export * from './FriendCategoryData'; export * from './FriendListFragmentMessageParser'; export * from './FriendListUpdateParser'; export * from './FriendNotificationParser'; +export * from './FriendParser'; +export * from './FriendRequestData'; export * from './FriendRequestsParser'; +export * from './HabboSearchResultData'; export * from './HabboSearchResultParser'; export * from './InstantMessageErrorParser'; export * from './MessageErrorParser'; diff --git a/src/nitro/communication/messages/parser/group/GroupSettingsParser.ts b/src/nitro/communication/messages/parser/group/GroupSettingsParser.ts index 88087cac..9b03d189 100644 --- a/src/nitro/communication/messages/parser/group/GroupSettingsParser.ts +++ b/src/nitro/communication/messages/parser/group/GroupSettingsParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { GroupDataBadgePart } from './utils/GroupDataBadgePart'; +import { GroupDataBadgePart } from './utils'; export class GroupSettingsParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/help/GuideReportingStatusMessageParser.ts b/src/nitro/communication/messages/parser/help/GuideReportingStatusMessageParser.ts index 086ad61d..1ea03626 100644 --- a/src/nitro/communication/messages/parser/help/GuideReportingStatusMessageParser.ts +++ b/src/nitro/communication/messages/parser/help/GuideReportingStatusMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { PendingGuideTicketData } from './common/PendingGuideTicketData'; +import { PendingGuideTicketData } from './PendingGuideTicketData'; export class GuideReportingStatusMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/help/common/PendingGuideTicketData.ts b/src/nitro/communication/messages/parser/help/PendingGuideTicketData.ts similarity index 100% rename from src/nitro/communication/messages/parser/help/common/PendingGuideTicketData.ts rename to src/nitro/communication/messages/parser/help/PendingGuideTicketData.ts diff --git a/src/nitro/communication/messages/parser/help/index.ts b/src/nitro/communication/messages/parser/help/index.ts index 114865fa..684885f7 100644 --- a/src/nitro/communication/messages/parser/help/index.ts +++ b/src/nitro/communication/messages/parser/help/index.ts @@ -23,5 +23,6 @@ export * from './GuideTicketCreationResultMessageParser'; export * from './GuideTicketResolutionMessageParser'; export * from './HotelMergeNameChangeParser'; export * from './IssueCloseNotificationMessageParser'; +export * from './PendingGuideTicketData'; export * from './QuizDataMessageParser'; export * from './QuizResultsMessageParser'; diff --git a/src/nitro/communication/messages/parser/index.ts b/src/nitro/communication/messages/parser/index.ts index 4fa447b0..5cffada6 100644 --- a/src/nitro/communication/messages/parser/index.ts +++ b/src/nitro/communication/messages/parser/index.ts @@ -14,22 +14,56 @@ export * from './friendlist'; export * from './game'; export * from './generic'; export * from './group'; +export * from './group/utils'; +export * from './groupforums'; export * from './handshake'; export * from './help'; export * from './inventory'; +export * from './inventory/achievements'; +export * from './inventory/avatareffect'; +export * from './inventory/badges'; +export * from './inventory/clothing'; +export * from './inventory/furniture'; +export * from './inventory/pets'; +export * from './inventory/purse'; +export * from './inventory/trading'; export * from './landingview'; +export * from './landingview/votes'; export * from './marketplace'; export * from './moderation'; export * from './mysterybox'; export * from './navigator'; +export * from './navigator/utils'; export * from './notifications'; export * from './perk'; +export * from './perk/common'; export * from './poll'; export * from './quest'; export * from './room'; +export * from './room/access'; +export * from './room/access/doorbell'; +export * from './room/access/rights'; +export * from './room/bots'; +export * from './room/data'; +export * from './room/engine'; +export * from './room/furniture'; +export * from './room/furniture/floor'; +export * from './room/furniture/wall'; +export * from './room/furniture/youtube'; +export * from './room/mapping'; +export * from './room/pet'; +export * from './room/session'; +export * from './room/unit'; +export * from './room/unit/chat'; export * from './roomevents'; export * from './roomsettings'; export * from './security'; export * from './sound'; export * from './talent'; export * from './user'; +export * from './user/access'; +export * from './user/data'; +export * from './user/inventory'; +export * from './user/inventory/currency'; +export * from './user/inventory/subscription'; +export * from './user/wardrobe'; diff --git a/src/nitro/communication/messages/incoming/inventory/achievements/AchievementData.ts b/src/nitro/communication/messages/parser/inventory/achievements/AchievementData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/inventory/achievements/AchievementData.ts rename to src/nitro/communication/messages/parser/inventory/achievements/AchievementData.ts diff --git a/src/nitro/communication/messages/parser/inventory/achievements/AchievementParser.ts b/src/nitro/communication/messages/parser/inventory/achievements/AchievementParser.ts index bb0615d5..c59bd8b0 100644 --- a/src/nitro/communication/messages/parser/inventory/achievements/AchievementParser.ts +++ b/src/nitro/communication/messages/parser/inventory/achievements/AchievementParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../../api'; -import { AchievementData } from '../../../incoming/inventory/achievements/AchievementData'; +import { AchievementData } from './AchievementData'; export class AchievementParser implements IMessageParser { diff --git a/src/nitro/communication/messages/incoming/inventory/achievements/AchievementResolutionData.ts b/src/nitro/communication/messages/parser/inventory/achievements/AchievementResolutionData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/inventory/achievements/AchievementResolutionData.ts rename to src/nitro/communication/messages/parser/inventory/achievements/AchievementResolutionData.ts diff --git a/src/nitro/communication/messages/parser/inventory/achievements/AchievementsParser.ts b/src/nitro/communication/messages/parser/inventory/achievements/AchievementsParser.ts index 25f4c5cb..83866560 100644 --- a/src/nitro/communication/messages/parser/inventory/achievements/AchievementsParser.ts +++ b/src/nitro/communication/messages/parser/inventory/achievements/AchievementsParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../../api'; -import { AchievementData } from '../../../incoming/inventory/achievements/AchievementData'; +import { AchievementData } from './AchievementData'; export class AchievementsParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/inventory/achievements/index.ts b/src/nitro/communication/messages/parser/inventory/achievements/index.ts index f8a65d08..3b5ad932 100644 --- a/src/nitro/communication/messages/parser/inventory/achievements/index.ts +++ b/src/nitro/communication/messages/parser/inventory/achievements/index.ts @@ -1,3 +1,5 @@ +export * from './AchievementData'; export * from './AchievementParser'; +export * from './AchievementResolutionData'; export * from './AchievementsParser'; export * from './AchievementsScoreParser'; diff --git a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffect.ts b/src/nitro/communication/messages/parser/inventory/avatareffect/AvatarEffect.ts similarity index 100% rename from src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffect.ts rename to src/nitro/communication/messages/parser/inventory/avatareffect/AvatarEffect.ts diff --git a/src/nitro/communication/messages/parser/inventory/avatareffect/AvatarEffectsParser.ts b/src/nitro/communication/messages/parser/inventory/avatareffect/AvatarEffectsParser.ts index 04075669..411a6a3f 100644 --- a/src/nitro/communication/messages/parser/inventory/avatareffect/AvatarEffectsParser.ts +++ b/src/nitro/communication/messages/parser/inventory/avatareffect/AvatarEffectsParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../../api'; -import { AvatarEffect } from '../../../incoming/inventory/avatareffect/AvatarEffect'; +import { AvatarEffect } from './AvatarEffect'; export class AvatarEffectsParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/inventory/avatareffect/index.ts b/src/nitro/communication/messages/parser/inventory/avatareffect/index.ts index e914bf14..ff677c43 100644 --- a/src/nitro/communication/messages/parser/inventory/avatareffect/index.ts +++ b/src/nitro/communication/messages/parser/inventory/avatareffect/index.ts @@ -1,3 +1,4 @@ +export * from './AvatarEffect'; export * from './AvatarEffectActivatedParser'; export * from './AvatarEffectAddedParser'; export * from './AvatarEffectExpiredParser'; diff --git a/src/nitro/communication/messages/parser/inventory/furniture/FurnitureListAddOrUpdateParser.ts b/src/nitro/communication/messages/parser/inventory/furniture/FurnitureListAddOrUpdateParser.ts index 236282e8..2cef26b3 100644 --- a/src/nitro/communication/messages/parser/inventory/furniture/FurnitureListAddOrUpdateParser.ts +++ b/src/nitro/communication/messages/parser/inventory/furniture/FurnitureListAddOrUpdateParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../../api'; -import { FurnitureListItemParser } from './utils/FurnitureListItemParser'; +import { FurnitureListItemParser } from './FurnitureListItemParser'; export class FurnitureListAddOrUpdateParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/inventory/furniture/utils/FurnitureListItemParser.ts b/src/nitro/communication/messages/parser/inventory/furniture/FurnitureListItemParser.ts similarity index 94% rename from src/nitro/communication/messages/parser/inventory/furniture/utils/FurnitureListItemParser.ts rename to src/nitro/communication/messages/parser/inventory/furniture/FurnitureListItemParser.ts index 7f0c7514..983a3fc7 100644 --- a/src/nitro/communication/messages/parser/inventory/furniture/utils/FurnitureListItemParser.ts +++ b/src/nitro/communication/messages/parser/inventory/furniture/FurnitureListItemParser.ts @@ -1,7 +1,7 @@ -import { IMessageDataWrapper, IObjectData } from '../../../../../../../api'; -import { Nitro } from '../../../../../../Nitro'; -import { IFurnitureItemData } from '../../../../incoming/inventory/furni/IFurnitureItemData'; -import { FurnitureDataParser } from '../../../room/furniture/FurnitureDataParser'; +import { IMessageDataWrapper, IObjectData } from '../../../../../../api'; +import { PixiApplicationProxy } from '../../../../../../pixi-proxy'; +import { FurnitureDataParser } from '../../room'; +import { IFurnitureItemData } from './IFurnitureItemData'; export class FurnitureListItemParser implements IFurnitureItemData { @@ -76,7 +76,7 @@ export class FurnitureListItemParser implements IFurnitureItemData this._isGroupable = wrapper.readBoolean(); this._sellable = wrapper.readBoolean(); this._secondsToExpiration = wrapper.readInt(); - this._expirationTimeStamp = Nitro.instance.time; + this._expirationTimeStamp = PixiApplicationProxy.instance.ticker.lastTime; if (this.secondsToExpiration > -1) { diff --git a/src/nitro/communication/messages/parser/inventory/furniture/FurnitureListParser.ts b/src/nitro/communication/messages/parser/inventory/furniture/FurnitureListParser.ts index 4e879094..2d09d24c 100644 --- a/src/nitro/communication/messages/parser/inventory/furniture/FurnitureListParser.ts +++ b/src/nitro/communication/messages/parser/inventory/furniture/FurnitureListParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../../api'; -import { FurnitureListItemParser } from './utils/FurnitureListItemParser'; +import { FurnitureListItemParser } from './FurnitureListItemParser'; export class FurnitureListParser implements IMessageParser { diff --git a/src/nitro/communication/messages/incoming/inventory/furni/IFurnitureItemData.ts b/src/nitro/communication/messages/parser/inventory/furniture/IFurnitureItemData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/inventory/furni/IFurnitureItemData.ts rename to src/nitro/communication/messages/parser/inventory/furniture/IFurnitureItemData.ts diff --git a/src/nitro/communication/messages/parser/inventory/furniture/index.ts b/src/nitro/communication/messages/parser/inventory/furniture/index.ts index b274870f..a56120a5 100644 --- a/src/nitro/communication/messages/parser/inventory/furniture/index.ts +++ b/src/nitro/communication/messages/parser/inventory/furniture/index.ts @@ -1,7 +1,8 @@ export * from './FurnitureListAddOrUpdateParser'; export * from './FurnitureListInvalidateParser'; +export * from './FurnitureListItemParser'; export * from './FurnitureListParser'; export * from './FurnitureListRemovedParser'; export * from './FurniturePostItPlacedParser'; +export * from './IFurnitureItemData'; export * from './PresentOpenedMessageParser'; -export * from './utils'; diff --git a/src/nitro/communication/messages/parser/inventory/furniture/utils/index.ts b/src/nitro/communication/messages/parser/inventory/furniture/utils/index.ts deleted file mode 100644 index 3c910a1f..00000000 --- a/src/nitro/communication/messages/parser/inventory/furniture/utils/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './FurnitureListItemParser'; diff --git a/src/nitro/communication/messages/parser/inventory/pets/ConfirmBreedingRequestParser.ts b/src/nitro/communication/messages/parser/inventory/pets/ConfirmBreedingRequestParser.ts index c8612bc1..a219bd0b 100644 --- a/src/nitro/communication/messages/parser/inventory/pets/ConfirmBreedingRequestParser.ts +++ b/src/nitro/communication/messages/parser/inventory/pets/ConfirmBreedingRequestParser.ts @@ -1,6 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../../api'; -import { BreedingPetInfo } from '../../../incoming/room/pet/BreedingPetInfo'; -import { RarityCategoryData } from '../../../incoming/room/pet/RarityCategoryData'; +import { BreedingPetInfo, RarityCategoryData } from '../../room'; export class ConfirmBreedingRequestParser implements IMessageParser { diff --git a/src/nitro/communication/messages/incoming/inventory/trading/ItemDataStructure.ts b/src/nitro/communication/messages/parser/inventory/trading/ItemDataStructure.ts similarity index 93% rename from src/nitro/communication/messages/incoming/inventory/trading/ItemDataStructure.ts rename to src/nitro/communication/messages/parser/inventory/trading/ItemDataStructure.ts index 832a2b97..1ac29479 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/ItemDataStructure.ts +++ b/src/nitro/communication/messages/parser/inventory/trading/ItemDataStructure.ts @@ -1,7 +1,7 @@ import { IMessageDataWrapper, IObjectData } from '../../../../../../api'; -import { Nitro } from '../../../../../Nitro'; -import { FurnitureDataParser } from '../../../parser/room/furniture/FurnitureDataParser'; -import { IFurnitureItemData } from '../furni/IFurnitureItemData'; +import { PixiApplicationProxy } from '../../../../../../pixi-proxy'; +import { FurnitureDataParser } from '../../room'; +import { IFurnitureItemData } from '../furniture'; export class ItemDataStructure implements IFurnitureItemData { @@ -34,7 +34,7 @@ export class ItemDataStructure implements IFurnitureItemData this._isGroupable = wrapper.readBoolean(); this._stuffData = FurnitureDataParser.parseObjectData(wrapper); this._secondsToExpiration = -1; - this._expirationTimeStamp = Nitro.instance.time; + this._expirationTimeStamp = PixiApplicationProxy.instance.ticker.lastTime; this._hasRentPeriodStarted = false; this._creationDay = wrapper.readInt(); this._creationMonth = wrapper.readInt(); diff --git a/src/nitro/communication/messages/parser/inventory/trading/TradingListItemParser.ts b/src/nitro/communication/messages/parser/inventory/trading/TradingListItemParser.ts index d1ebe1aa..a8c53b64 100644 --- a/src/nitro/communication/messages/parser/inventory/trading/TradingListItemParser.ts +++ b/src/nitro/communication/messages/parser/inventory/trading/TradingListItemParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../../api'; -import { ItemDataStructure } from '../../../incoming/inventory/trading/ItemDataStructure'; +import { ItemDataStructure } from './ItemDataStructure'; export class TradingListItemParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/inventory/trading/index.ts b/src/nitro/communication/messages/parser/inventory/trading/index.ts index 2f363f23..e7f12aad 100644 --- a/src/nitro/communication/messages/parser/inventory/trading/index.ts +++ b/src/nitro/communication/messages/parser/inventory/trading/index.ts @@ -1,3 +1,4 @@ +export * from './ItemDataStructure'; export * from './TradingAcceptParser'; export * from './TradingCloseParser'; export * from './TradingCompletedParser'; diff --git a/src/nitro/communication/messages/incoming/landingview/PromoArticleData.ts b/src/nitro/communication/messages/parser/landingview/PromoArticleData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/landingview/PromoArticleData.ts rename to src/nitro/communication/messages/parser/landingview/PromoArticleData.ts diff --git a/src/nitro/communication/messages/parser/landingview/PromoArticlesMessageParser.ts b/src/nitro/communication/messages/parser/landingview/PromoArticlesMessageParser.ts index ab05a70a..f4db272a 100644 --- a/src/nitro/communication/messages/parser/landingview/PromoArticlesMessageParser.ts +++ b/src/nitro/communication/messages/parser/landingview/PromoArticlesMessageParser.ts @@ -1,6 +1,5 @@ -import { IMessageDataWrapper } from '../../../../../api'; -import { PromoArticleData } from '../../incoming/landingview/PromoArticleData'; -import { IMessageParser } from './../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; +import { PromoArticleData } from './PromoArticleData'; export class PromoArticlesMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/landingview/index.ts b/src/nitro/communication/messages/parser/landingview/index.ts index 40b224db..2d3eae4a 100644 --- a/src/nitro/communication/messages/parser/landingview/index.ts +++ b/src/nitro/communication/messages/parser/landingview/index.ts @@ -1,2 +1,3 @@ +export * from './PromoArticleData'; export * from './PromoArticlesMessageParser'; export * from './votes'; diff --git a/src/nitro/communication/messages/parser/landingview/votes/CommunityVoteReceivedParser.ts b/src/nitro/communication/messages/parser/landingview/votes/CommunityVoteReceivedParser.ts index 55c84a9d..cd744030 100644 --- a/src/nitro/communication/messages/parser/landingview/votes/CommunityVoteReceivedParser.ts +++ b/src/nitro/communication/messages/parser/landingview/votes/CommunityVoteReceivedParser.ts @@ -1,5 +1,4 @@ -import { IMessageDataWrapper } from '../../../../../../api'; -import { IMessageParser } from './../../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../../api'; export class CommunityVoteReceivedParser implements IMessageParser { diff --git a/src/nitro/communication/messages/incoming/marketplace/MarketplaceOffer.ts b/src/nitro/communication/messages/parser/marketplace/MarketplaceOffer.ts similarity index 100% rename from src/nitro/communication/messages/incoming/marketplace/MarketplaceOffer.ts rename to src/nitro/communication/messages/parser/marketplace/MarketplaceOffer.ts diff --git a/src/nitro/communication/messages/parser/marketplace/MarketplaceOffersParser.ts b/src/nitro/communication/messages/parser/marketplace/MarketplaceOffersParser.ts index 16e13b10..159fd31f 100644 --- a/src/nitro/communication/messages/parser/marketplace/MarketplaceOffersParser.ts +++ b/src/nitro/communication/messages/parser/marketplace/MarketplaceOffersParser.ts @@ -1,8 +1,6 @@ -import { IMessageDataWrapper, IMessageParser, IObjectData } from '../../../../../api'; -import { ObjectDataFactory } from '../../../../room/object/data/ObjectDataFactory'; -import { LegacyDataType } from '../../../../room/object/data/type/LegacyDataType'; -import { MarketplaceOffer } from '../../incoming/marketplace/MarketplaceOffer'; -import { FurnitureDataParser } from '../room/furniture/FurnitureDataParser'; +import { IMessageDataWrapper, IMessageParser, IObjectData, LegacyDataType, ObjectDataFactory } from '../../../../../api'; +import { FurnitureDataParser } from '../room'; +import { MarketplaceOffer } from './MarketplaceOffer'; export class MarketplaceOffersParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/marketplace/MarketplaceOwnOffersParser.ts b/src/nitro/communication/messages/parser/marketplace/MarketplaceOwnOffersParser.ts index 7d068984..077eaaee 100644 --- a/src/nitro/communication/messages/parser/marketplace/MarketplaceOwnOffersParser.ts +++ b/src/nitro/communication/messages/parser/marketplace/MarketplaceOwnOffersParser.ts @@ -1,7 +1,5 @@ -import { IMessageDataWrapper, IMessageParser, IObjectData } from '../../../../../api'; -import { ObjectDataFactory } from '../../../../room/object/data/ObjectDataFactory'; -import { LegacyDataType } from '../../../../room/object/data/type/LegacyDataType'; -import { MarketplaceOffer } from '../../incoming/marketplace/MarketplaceOffer'; +import { IMessageDataWrapper, IMessageParser, IObjectData, LegacyDataType, ObjectDataFactory } from '../../../../../api'; +import { MarketplaceOffer } from './MarketplaceOffer'; export class MarketplaceOwnOffersParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/marketplace/index.ts b/src/nitro/communication/messages/parser/marketplace/index.ts index 9060c6a3..3b77f7e5 100644 --- a/src/nitro/communication/messages/parser/marketplace/index.ts +++ b/src/nitro/communication/messages/parser/marketplace/index.ts @@ -4,6 +4,7 @@ export * from './MarketplaceCanMakeOfferResultParser'; export * from './MarketplaceConfigurationMessageParser'; export * from './MarketplaceItemPostedParser'; export * from './MarketplaceItemStatsParser'; +export * from './MarketplaceOffer'; export * from './MarketplaceOfferData'; export * from './MarketplaceOffersParser'; export * from './MarketplaceOwnOffersParser'; diff --git a/src/nitro/communication/messages/incoming/moderation/CfhChatlogData.ts b/src/nitro/communication/messages/parser/moderation/CfhChatlogData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/moderation/CfhChatlogData.ts rename to src/nitro/communication/messages/parser/moderation/CfhChatlogData.ts diff --git a/src/nitro/communication/messages/parser/moderation/CfhChatlogMessageParser.ts b/src/nitro/communication/messages/parser/moderation/CfhChatlogMessageParser.ts index 8911a54f..53267253 100644 --- a/src/nitro/communication/messages/parser/moderation/CfhChatlogMessageParser.ts +++ b/src/nitro/communication/messages/parser/moderation/CfhChatlogMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { CfhChatlogData } from '../../incoming/moderation/CfhChatlogData'; +import { CfhChatlogData } from './CfhChatlogData'; export class CfhChatlogMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/incoming/moderation/ChatRecordData.ts b/src/nitro/communication/messages/parser/moderation/ChatRecordData.ts similarity index 78% rename from src/nitro/communication/messages/incoming/moderation/ChatRecordData.ts rename to src/nitro/communication/messages/parser/moderation/ChatRecordData.ts index d1a66382..4414b1b3 100644 --- a/src/nitro/communication/messages/incoming/moderation/ChatRecordData.ts +++ b/src/nitro/communication/messages/parser/moderation/ChatRecordData.ts @@ -1,4 +1,4 @@ -import { IMessageDataWrapper } from '../../../../..'; +import { IMessageDataWrapper } from '../../../../../api'; import { ChatlineData } from './ChatlineData'; export class ChatRecordData @@ -11,9 +11,9 @@ export class ChatRecordData public static readonly TYPE_SELFIE = 5; public static readonly TYPE_PHOTO = 6; - private _recordType:number; - private _context:Map; - private _chatlog:ChatlineData[]; + private _recordType: number; + private _context: Map; + private _chatlog: ChatlineData[]; constructor(wrapper: IMessageDataWrapper) { @@ -23,12 +23,12 @@ export class ChatRecordData this._recordType = wrapper.readByte(); const contextCount = wrapper.readShort(); - for(let i = 0; i < contextCount; i++) + for (let i = 0; i < contextCount; i++) { const key = wrapper.readString(); const type = wrapper.readByte(); - switch(type) + switch (type) { case 0: this._context.set(key, wrapper.readBoolean()); @@ -46,7 +46,7 @@ export class ChatRecordData const chatCount = wrapper.readShort(); - for(let i = 0; i < chatCount; i++) + for (let i = 0; i < chatCount; i++) { const timestamp = wrapper.readString(); const habboId = wrapper.readInt(); @@ -58,37 +58,37 @@ export class ChatRecordData } } - public get recordType():number + public get recordType(): number { return this._recordType; } - public get context():Map + public get context(): Map { return this._context; } - public get chatlog():ChatlineData[] + public get chatlog(): ChatlineData[] { return this._chatlog; } - public get roomId():number + public get roomId(): number { return this.getInt('roomId'); } - public get roomName():string + public get roomName(): string { return this._context.get('roomName') as string; } - public get groupId():number + public get groupId(): number { return this.getInt('groupId'); } - public get threadId():number + public get threadId(): number { return this.getInt('threadId'); } @@ -98,10 +98,10 @@ export class ChatRecordData return this.getInt('messageId'); } - private getInt(k:string): number + private getInt(k: string): number { const value = this._context.get(k); - if(!value) + if (!value) { return 0; } diff --git a/src/nitro/communication/messages/incoming/moderation/ChatlineData.ts b/src/nitro/communication/messages/parser/moderation/ChatlineData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/moderation/ChatlineData.ts rename to src/nitro/communication/messages/parser/moderation/ChatlineData.ts diff --git a/src/nitro/communication/messages/incoming/moderation/INamed.ts b/src/nitro/communication/messages/parser/moderation/INamed.ts similarity index 100% rename from src/nitro/communication/messages/incoming/moderation/INamed.ts rename to src/nitro/communication/messages/parser/moderation/INamed.ts diff --git a/src/nitro/communication/messages/parser/moderation/IssueMessageData.ts b/src/nitro/communication/messages/parser/moderation/IssueMessageData.ts index b4897653..6b5ea58d 100644 --- a/src/nitro/communication/messages/parser/moderation/IssueMessageData.ts +++ b/src/nitro/communication/messages/parser/moderation/IssueMessageData.ts @@ -1,4 +1,4 @@ -import { Nitro } from '../../../../Nitro'; +import { PixiApplicationProxy } from '../../../../../pixi-proxy'; import { PatternMatchData } from './PatternMatchData'; export class IssueMessageData @@ -29,7 +29,7 @@ export class IssueMessageData constructor(issueId: number, state: number, categoryId: number, reportedCategoryId: number, issueAgeinMs: number, priority: number, groupingId: number, reporterUserId: number, reporterUsername: string, reportedUserId: number, reportedUsername: string, pickerUserId: number, pickerUsername: string, message: string, - chatRecordId: number, patterns:PatternMatchData[]) + chatRecordId: number, patterns: PatternMatchData[]) { this._issueId = issueId; this._state = state; @@ -47,7 +47,7 @@ export class IssueMessageData this._message = message; this._chatRecordId = chatRecordId; this._patterns = patterns; - this._creationTimeInMilliseconds = Nitro.instance.time; //getTimer() + this._creationTimeInMilliseconds = PixiApplicationProxy.instance.ticker.lastTime; //getTimer() } public get issueId(): number @@ -133,11 +133,11 @@ export class IssueMessageData public dispose(): void { - if(this.disposed) + if (this.disposed) { return; } - for(const k of this._patterns) + for (const k of this._patterns) { k.dispose(); } diff --git a/src/nitro/communication/messages/incoming/moderation/ModRoomData.ts b/src/nitro/communication/messages/parser/moderation/ModRoomData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/moderation/ModRoomData.ts rename to src/nitro/communication/messages/parser/moderation/ModRoomData.ts diff --git a/src/nitro/communication/messages/parser/moderation/ModeratorRoomInfoMessageParser.ts b/src/nitro/communication/messages/parser/moderation/ModeratorRoomInfoMessageParser.ts index d15da50c..547f285f 100644 --- a/src/nitro/communication/messages/parser/moderation/ModeratorRoomInfoMessageParser.ts +++ b/src/nitro/communication/messages/parser/moderation/ModeratorRoomInfoMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { RoomModerationData } from '../../incoming/moderation/RoomModerationData'; +import { RoomModerationData } from './RoomModerationData'; export class ModeratorRoomInfoMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/incoming/moderation/ModeratorUserInfoData.ts b/src/nitro/communication/messages/parser/moderation/ModeratorUserInfoData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/moderation/ModeratorUserInfoData.ts rename to src/nitro/communication/messages/parser/moderation/ModeratorUserInfoData.ts diff --git a/src/nitro/communication/messages/parser/moderation/ModeratorUserInfoMessageParser.ts b/src/nitro/communication/messages/parser/moderation/ModeratorUserInfoMessageParser.ts index 01aec884..5e9ffcd4 100644 --- a/src/nitro/communication/messages/parser/moderation/ModeratorUserInfoMessageParser.ts +++ b/src/nitro/communication/messages/parser/moderation/ModeratorUserInfoMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { ModeratorUserInfoData } from '../../incoming/moderation/ModeratorUserInfoData'; +import { ModeratorUserInfoData } from './ModeratorUserInfoData'; export class ModeratorUserInfoMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/moderation/RoomChatlogMessageParser.ts b/src/nitro/communication/messages/parser/moderation/RoomChatlogMessageParser.ts index 56fa74b3..b0bc1a51 100644 --- a/src/nitro/communication/messages/parser/moderation/RoomChatlogMessageParser.ts +++ b/src/nitro/communication/messages/parser/moderation/RoomChatlogMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { ChatRecordData } from '../../incoming/moderation/ChatRecordData'; +import { ChatRecordData } from './ChatRecordData'; export class RoomChatlogMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/incoming/moderation/RoomModerationData.ts b/src/nitro/communication/messages/parser/moderation/RoomModerationData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/moderation/RoomModerationData.ts rename to src/nitro/communication/messages/parser/moderation/RoomModerationData.ts diff --git a/src/nitro/communication/messages/incoming/moderation/RoomVisitData.ts b/src/nitro/communication/messages/parser/moderation/RoomVisitData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/moderation/RoomVisitData.ts rename to src/nitro/communication/messages/parser/moderation/RoomVisitData.ts diff --git a/src/nitro/communication/messages/incoming/moderation/RoomVisitsData.ts b/src/nitro/communication/messages/parser/moderation/RoomVisitsData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/moderation/RoomVisitsData.ts rename to src/nitro/communication/messages/parser/moderation/RoomVisitsData.ts diff --git a/src/nitro/communication/messages/parser/moderation/RoomVisitsMessageParser.ts b/src/nitro/communication/messages/parser/moderation/RoomVisitsMessageParser.ts index db04e421..1d7f0111 100644 --- a/src/nitro/communication/messages/parser/moderation/RoomVisitsMessageParser.ts +++ b/src/nitro/communication/messages/parser/moderation/RoomVisitsMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { RoomVisitsData } from '../../incoming/moderation/RoomVisitsData'; +import { RoomVisitsData } from './RoomVisitsData'; export class RoomVisitsMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/incoming/moderation/UserChatlogData.ts b/src/nitro/communication/messages/parser/moderation/UserChatlogData.ts similarity index 88% rename from src/nitro/communication/messages/incoming/moderation/UserChatlogData.ts rename to src/nitro/communication/messages/parser/moderation/UserChatlogData.ts index c3416568..7be2bce5 100644 --- a/src/nitro/communication/messages/incoming/moderation/UserChatlogData.ts +++ b/src/nitro/communication/messages/parser/moderation/UserChatlogData.ts @@ -1,4 +1,4 @@ -import { IMessageDataWrapper } from '../../../../..'; +import { IMessageDataWrapper } from '../../../../../api'; import { ChatRecordData } from './ChatRecordData'; export class UserChatlogData @@ -12,7 +12,7 @@ export class UserChatlogData this._userId = wrapper.readInt(); this._username = wrapper.readString(); const size = wrapper.readInt(); - for(let i = 0; i < size; i++) + for (let i = 0; i < size; i++) { this._roomChatlogs.push(new ChatRecordData(wrapper)); } diff --git a/src/nitro/communication/messages/parser/moderation/UserChatlogMessageParser.ts b/src/nitro/communication/messages/parser/moderation/UserChatlogMessageParser.ts index 2b7427b8..faf8e8d7 100644 --- a/src/nitro/communication/messages/parser/moderation/UserChatlogMessageParser.ts +++ b/src/nitro/communication/messages/parser/moderation/UserChatlogMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { UserChatlogData } from '../../incoming/moderation/UserChatlogData'; +import { UserChatlogData } from './UserChatlogData'; export class UserChatlogMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/moderation/index.ts b/src/nitro/communication/messages/parser/moderation/index.ts index 9dac902e..4d7d3a34 100644 --- a/src/nitro/communication/messages/parser/moderation/index.ts +++ b/src/nitro/communication/messages/parser/moderation/index.ts @@ -1,4 +1,8 @@ +export * from './CfhChatlogData'; export * from './CfhChatlogMessageParser'; +export * from './ChatlineData'; +export * from './ChatRecordData'; +export * from './INamed'; export * from './IssueDeletedMessageParser'; export * from './IssueInfoMessageParser'; export * from './IssueMessageData'; @@ -10,9 +14,15 @@ export * from './ModeratorInitMessageParser'; export * from './ModeratorMessageParser'; export * from './ModeratorRoomInfoMessageParser'; export * from './ModeratorToolPreferencesMessageParser'; +export * from './ModeratorUserInfoData'; export * from './ModeratorUserInfoMessageParser'; +export * from './ModRoomData'; export * from './PatternMatchData'; export * from './RoomChatlogMessageParser'; +export * from './RoomModerationData'; +export * from './RoomVisitData'; +export * from './RoomVisitsData'; export * from './RoomVisitsMessageParser'; export * from './UserBannedMessageParser'; +export * from './UserChatlogData'; export * from './UserChatlogMessageParser'; diff --git a/src/nitro/communication/messages/parser/navigator/CategoriesWithVisitorCountParser.ts b/src/nitro/communication/messages/parser/navigator/CategoriesWithVisitorCountParser.ts index 069f6803..1c2ffdd4 100644 --- a/src/nitro/communication/messages/parser/navigator/CategoriesWithVisitorCountParser.ts +++ b/src/nitro/communication/messages/parser/navigator/CategoriesWithVisitorCountParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { CategoriesWithVisitorCountData } from './utils/CategoriesWithVisitorCountData'; +import { CategoriesWithVisitorCountData } from './utils'; export class CategoriesWithVisitorCountParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/navigator/CompetitionRoomsDataMessageParser.ts b/src/nitro/communication/messages/parser/navigator/CompetitionRoomsDataMessageParser.ts index 65111b20..f9b5b449 100644 --- a/src/nitro/communication/messages/parser/navigator/CompetitionRoomsDataMessageParser.ts +++ b/src/nitro/communication/messages/parser/navigator/CompetitionRoomsDataMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { CompetitionRoomsData } from './utils/CompetitionRoomsData'; +import { CompetitionRoomsData } from './utils'; export class CompetitionRoomsDataMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/navigator/GetGuestRoomResultMessageParser.ts b/src/nitro/communication/messages/parser/navigator/GetGuestRoomResultMessageParser.ts index 68d3d965..9a52a384 100644 --- a/src/nitro/communication/messages/parser/navigator/GetGuestRoomResultMessageParser.ts +++ b/src/nitro/communication/messages/parser/navigator/GetGuestRoomResultMessageParser.ts @@ -1,7 +1,6 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { RoomChatSettings } from '../../incoming/roomsettings/RoomChatSettings'; -import { RoomModerationSettings } from '../../incoming/roomsettings/RoomModerationSettings'; -import { RoomDataParser } from '../room/data/RoomDataParser'; +import { RoomDataParser } from '../room'; +import { RoomChatSettings, RoomModerationSettings } from '../roomsettings'; export class GetGuestRoomResultMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/navigator/GuestRoomSearchResultMessageParser.ts b/src/nitro/communication/messages/parser/navigator/GuestRoomSearchResultMessageParser.ts index e02b83d3..d0fb2088 100644 --- a/src/nitro/communication/messages/parser/navigator/GuestRoomSearchResultMessageParser.ts +++ b/src/nitro/communication/messages/parser/navigator/GuestRoomSearchResultMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { GuestRoomSearchResultData } from './utils/GuestRoomSearchResultData'; +import { GuestRoomSearchResultData } from './utils'; export class GuestRoomSearchResultMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/navigator/NavigatorMetadataParser.ts b/src/nitro/communication/messages/parser/navigator/NavigatorMetadataParser.ts index 126566b6..828979e5 100644 --- a/src/nitro/communication/messages/parser/navigator/NavigatorMetadataParser.ts +++ b/src/nitro/communication/messages/parser/navigator/NavigatorMetadataParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { NavigatorTopLevelContext } from './utils/NavigatorTopLevelContext'; +import { NavigatorTopLevelContext } from './utils'; export class NavigatorMetadataParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/navigator/NavigatorSearchParser.ts b/src/nitro/communication/messages/parser/navigator/NavigatorSearchParser.ts index 865715b6..925c2d3f 100644 --- a/src/nitro/communication/messages/parser/navigator/NavigatorSearchParser.ts +++ b/src/nitro/communication/messages/parser/navigator/NavigatorSearchParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { NavigatorSearchResultSet } from './utils/NavigatorSearchResultSet'; +import { NavigatorSearchResultSet } from './utils'; export class NavigatorSearchParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/navigator/NavigatorSearchesParser.ts b/src/nitro/communication/messages/parser/navigator/NavigatorSearchesParser.ts index 4ee8abea..bf8c321c 100644 --- a/src/nitro/communication/messages/parser/navigator/NavigatorSearchesParser.ts +++ b/src/nitro/communication/messages/parser/navigator/NavigatorSearchesParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { NavigatorSavedSearch } from './utils/NavigatorSavedSearch'; +import { NavigatorSavedSearch } from './utils'; export class NavigatorSearchesParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/navigator/RoomEventMessageParser.ts b/src/nitro/communication/messages/parser/navigator/RoomEventMessageParser.ts index 4453ca17..beebfa74 100644 --- a/src/nitro/communication/messages/parser/navigator/RoomEventMessageParser.ts +++ b/src/nitro/communication/messages/parser/navigator/RoomEventMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { RoomEventData } from './utils/RoomEventData'; +import { RoomEventData } from './utils'; export class RoomEventMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/navigator/utils/GuestRoomSearchResultData.ts b/src/nitro/communication/messages/parser/navigator/utils/GuestRoomSearchResultData.ts index 18687c77..03d49f84 100644 --- a/src/nitro/communication/messages/parser/navigator/utils/GuestRoomSearchResultData.ts +++ b/src/nitro/communication/messages/parser/navigator/utils/GuestRoomSearchResultData.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper } from '../../../../../../api'; -import { RoomDataParser } from '../../room/data/RoomDataParser'; +import { RoomDataParser } from '../../room'; import { OfficialRoomEntryData } from './OfficialRoomEntryData'; export class GuestRoomSearchResultData diff --git a/src/nitro/communication/messages/parser/navigator/utils/NavigatorSearchResultList.ts b/src/nitro/communication/messages/parser/navigator/utils/NavigatorSearchResultList.ts index 90353f2a..e720fcc1 100644 --- a/src/nitro/communication/messages/parser/navigator/utils/NavigatorSearchResultList.ts +++ b/src/nitro/communication/messages/parser/navigator/utils/NavigatorSearchResultList.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper } from '../../../../../../api'; -import { RoomDataParser } from '../../room/data/RoomDataParser'; +import { RoomDataParser } from '../../room'; export class NavigatorSearchResultList { diff --git a/src/nitro/communication/messages/parser/navigator/utils/index.ts b/src/nitro/communication/messages/parser/navigator/utils/index.ts index 3cbb6205..7b9f1824 100644 --- a/src/nitro/communication/messages/parser/navigator/utils/index.ts +++ b/src/nitro/communication/messages/parser/navigator/utils/index.ts @@ -1,5 +1,6 @@ export * from './CategoriesWithVisitorCountData'; export * from './CompetitionRoomsData'; +export * from './GuestRoomSearchResultData'; export * from './NavigatorSavedSearch'; export * from './NavigatorSearchResultList'; export * from './NavigatorSearchResultSet'; diff --git a/src/nitro/communication/messages/incoming/notifications/AchievementLevelUpData.ts b/src/nitro/communication/messages/parser/notifications/AchievementLevelUpData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/notifications/AchievementLevelUpData.ts rename to src/nitro/communication/messages/parser/notifications/AchievementLevelUpData.ts diff --git a/src/nitro/communication/messages/parser/notifications/AchievementNotificationMessageParser.ts b/src/nitro/communication/messages/parser/notifications/AchievementNotificationMessageParser.ts index c34d4f22..dd09e538 100644 --- a/src/nitro/communication/messages/parser/notifications/AchievementNotificationMessageParser.ts +++ b/src/nitro/communication/messages/parser/notifications/AchievementNotificationMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { AchievementLevelUpData } from '../../incoming'; +import { AchievementLevelUpData } from './AchievementLevelUpData'; export class AchievementNotificationMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/notifications/PetLevelNotificationParser.ts b/src/nitro/communication/messages/parser/notifications/PetLevelNotificationParser.ts index 959f7586..d16a04f7 100644 --- a/src/nitro/communication/messages/parser/notifications/PetLevelNotificationParser.ts +++ b/src/nitro/communication/messages/parser/notifications/PetLevelNotificationParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { PetFigureDataParser } from '../inventory/pets/PetFigureDataParser'; +import { PetFigureDataParser } from '../inventory'; export class PetLevelNotificationParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/notifications/index.ts b/src/nitro/communication/messages/parser/notifications/index.ts index 3716cd8d..0bad95e6 100644 --- a/src/nitro/communication/messages/parser/notifications/index.ts +++ b/src/nitro/communication/messages/parser/notifications/index.ts @@ -1,3 +1,4 @@ +export * from './AchievementLevelUpData'; export * from './AchievementNotificationMessageParser'; export * from './ActivityPointNotificationParser'; export * from './BotErrorEventParser'; diff --git a/src/nitro/communication/messages/parser/perk/PerkAllowancesMessageParser.ts b/src/nitro/communication/messages/parser/perk/PerkAllowancesMessageParser.ts index b9593a74..a54bb783 100644 --- a/src/nitro/communication/messages/parser/perk/PerkAllowancesMessageParser.ts +++ b/src/nitro/communication/messages/parser/perk/PerkAllowancesMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { PerkData } from './common/PerkData'; +import { PerkData } from './common'; export class PerkAllowancesMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/incoming/quest/CommunityGoalData.ts b/src/nitro/communication/messages/parser/quest/CommunityGoalData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/quest/CommunityGoalData.ts rename to src/nitro/communication/messages/parser/quest/CommunityGoalData.ts diff --git a/src/nitro/communication/messages/parser/quest/CommunityGoalEarnedPrizesMessageParser.ts b/src/nitro/communication/messages/parser/quest/CommunityGoalEarnedPrizesMessageParser.ts index 3b1d9252..e02a2863 100644 --- a/src/nitro/communication/messages/parser/quest/CommunityGoalEarnedPrizesMessageParser.ts +++ b/src/nitro/communication/messages/parser/quest/CommunityGoalEarnedPrizesMessageParser.ts @@ -1,6 +1,5 @@ -import { IMessageDataWrapper } from '../../../../../api'; -import { PrizeData } from '../../incoming/quest/PrizeData'; -import { IMessageParser } from './../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; +import { PrizeData } from './PrizeData'; export class CommunityGoalEarnedPrizesMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/incoming/quest/CommunityGoalHallOfFameData.ts b/src/nitro/communication/messages/parser/quest/CommunityGoalHallOfFameData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/quest/CommunityGoalHallOfFameData.ts rename to src/nitro/communication/messages/parser/quest/CommunityGoalHallOfFameData.ts diff --git a/src/nitro/communication/messages/parser/quest/CommunityGoalHallOfFameMessageParser.ts b/src/nitro/communication/messages/parser/quest/CommunityGoalHallOfFameMessageParser.ts index c6c7a8e7..8a97697d 100644 --- a/src/nitro/communication/messages/parser/quest/CommunityGoalHallOfFameMessageParser.ts +++ b/src/nitro/communication/messages/parser/quest/CommunityGoalHallOfFameMessageParser.ts @@ -1,6 +1,5 @@ -import { IMessageDataWrapper } from '../../../../../api'; -import { CommunityGoalHallOfFameData } from '../../incoming/quest/CommunityGoalHallOfFameData'; -import { IMessageParser } from './../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; +import { CommunityGoalHallOfFameData } from './CommunityGoalHallOfFameData'; export class CommunityGoalHallOfFameMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/quest/CommunityGoalProgressMessageParser.ts b/src/nitro/communication/messages/parser/quest/CommunityGoalProgressMessageParser.ts index 9c01a898..0e84527a 100644 --- a/src/nitro/communication/messages/parser/quest/CommunityGoalProgressMessageParser.ts +++ b/src/nitro/communication/messages/parser/quest/CommunityGoalProgressMessageParser.ts @@ -1,6 +1,5 @@ -import { IMessageDataWrapper } from '../../../../../api'; -import { CommunityGoalData } from '../../incoming/quest/CommunityGoalData'; -import { IMessageParser } from './../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; +import { CommunityGoalData } from './CommunityGoalData'; export class CommunityGoalProgressMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/quest/ConcurrentUsersGoalProgressMessageParser.ts b/src/nitro/communication/messages/parser/quest/ConcurrentUsersGoalProgressMessageParser.ts index ac062726..a507cea4 100644 --- a/src/nitro/communication/messages/parser/quest/ConcurrentUsersGoalProgressMessageParser.ts +++ b/src/nitro/communication/messages/parser/quest/ConcurrentUsersGoalProgressMessageParser.ts @@ -1,5 +1,4 @@ -import { IMessageDataWrapper } from '../../../../../api'; -import { IMessageParser } from './../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; export class ConcurrentUsersGoalProgressMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/quest/EpicPopupMessageParser.ts b/src/nitro/communication/messages/parser/quest/EpicPopupMessageParser.ts index a74b97f2..a3151d04 100644 --- a/src/nitro/communication/messages/parser/quest/EpicPopupMessageParser.ts +++ b/src/nitro/communication/messages/parser/quest/EpicPopupMessageParser.ts @@ -1,5 +1,4 @@ -import { IMessageDataWrapper } from '../../../../../api'; -import { IMessageParser } from './../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; export class EpicPopupMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/incoming/quest/HallOfFameEntryData.ts b/src/nitro/communication/messages/parser/quest/HallOfFameEntryData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/quest/HallOfFameEntryData.ts rename to src/nitro/communication/messages/parser/quest/HallOfFameEntryData.ts diff --git a/src/nitro/communication/messages/incoming/quest/ILandingPageUserEntry.ts b/src/nitro/communication/messages/parser/quest/ILandingPageUserEntry.ts similarity index 100% rename from src/nitro/communication/messages/incoming/quest/ILandingPageUserEntry.ts rename to src/nitro/communication/messages/parser/quest/ILandingPageUserEntry.ts diff --git a/src/nitro/communication/messages/incoming/quest/PrizeData.ts b/src/nitro/communication/messages/parser/quest/PrizeData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/quest/PrizeData.ts rename to src/nitro/communication/messages/parser/quest/PrizeData.ts diff --git a/src/nitro/communication/messages/parser/quest/QuestCancelledMessageParser.ts b/src/nitro/communication/messages/parser/quest/QuestCancelledMessageParser.ts index b4756a42..e4a618a2 100644 --- a/src/nitro/communication/messages/parser/quest/QuestCancelledMessageParser.ts +++ b/src/nitro/communication/messages/parser/quest/QuestCancelledMessageParser.ts @@ -1,5 +1,4 @@ -import { IMessageDataWrapper } from '../../../../../api'; -import { IMessageParser } from './../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; export class QuestCancelledMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/quest/QuestCompletedMessageParser.ts b/src/nitro/communication/messages/parser/quest/QuestCompletedMessageParser.ts index e1adc7d9..071161d9 100644 --- a/src/nitro/communication/messages/parser/quest/QuestCompletedMessageParser.ts +++ b/src/nitro/communication/messages/parser/quest/QuestCompletedMessageParser.ts @@ -1,6 +1,5 @@ -import { IMessageDataWrapper } from '../../../../../api'; -import { QuestMessageData } from '../../incoming/quest/QuestMessageData'; -import { IMessageParser } from './../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; +import { QuestMessageData } from './QuestMessageData'; export class QuestCompletedMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/quest/QuestDailyMessageParser.ts b/src/nitro/communication/messages/parser/quest/QuestDailyMessageParser.ts index d42f1def..9e3095f1 100644 --- a/src/nitro/communication/messages/parser/quest/QuestDailyMessageParser.ts +++ b/src/nitro/communication/messages/parser/quest/QuestDailyMessageParser.ts @@ -1,6 +1,5 @@ -import { IMessageDataWrapper } from '../../../../../api'; -import { QuestMessageData } from '../../incoming/quest/QuestMessageData'; -import { IMessageParser } from './../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; +import { QuestMessageData } from './QuestMessageData'; export class QuestDailyMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/incoming/quest/QuestMessageData.ts b/src/nitro/communication/messages/parser/quest/QuestMessageData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/quest/QuestMessageData.ts rename to src/nitro/communication/messages/parser/quest/QuestMessageData.ts diff --git a/src/nitro/communication/messages/parser/quest/QuestMessageParser.ts b/src/nitro/communication/messages/parser/quest/QuestMessageParser.ts index 2dfa9848..b4f3153e 100644 --- a/src/nitro/communication/messages/parser/quest/QuestMessageParser.ts +++ b/src/nitro/communication/messages/parser/quest/QuestMessageParser.ts @@ -1,6 +1,5 @@ -import { IMessageDataWrapper } from '../../../../../api'; -import { QuestMessageData } from '../../incoming/quest/QuestMessageData'; -import { IMessageParser } from './../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; +import { QuestMessageData } from './QuestMessageData'; export class QuestMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/quest/QuestsMessageParser.ts b/src/nitro/communication/messages/parser/quest/QuestsMessageParser.ts index c8ccb12f..c30c928f 100644 --- a/src/nitro/communication/messages/parser/quest/QuestsMessageParser.ts +++ b/src/nitro/communication/messages/parser/quest/QuestsMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { QuestMessageData } from '../../incoming/quest/QuestMessageData'; +import { QuestMessageData } from './QuestMessageData'; export class QuestsMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/quest/SeasonalQuestsParser.ts b/src/nitro/communication/messages/parser/quest/SeasonalQuestsParser.ts index b0c1feca..56250f3b 100644 --- a/src/nitro/communication/messages/parser/quest/SeasonalQuestsParser.ts +++ b/src/nitro/communication/messages/parser/quest/SeasonalQuestsParser.ts @@ -1,6 +1,5 @@ -import { IMessageDataWrapper } from '../../../../../api'; -import { QuestMessageData } from '../../incoming/quest/QuestMessageData'; -import { IMessageParser } from './../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; +import { QuestMessageData } from './QuestMessageData'; export class SeasonalQuestsParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/quest/index.ts b/src/nitro/communication/messages/parser/quest/index.ts index c96e9fed..1185da4f 100644 --- a/src/nitro/communication/messages/parser/quest/index.ts +++ b/src/nitro/communication/messages/parser/quest/index.ts @@ -1,11 +1,17 @@ +export * from './CommunityGoalData'; export * from './CommunityGoalEarnedPrizesMessageParser'; +export * from './CommunityGoalHallOfFameData'; export * from './CommunityGoalHallOfFameMessageParser'; export * from './CommunityGoalProgressMessageParser'; export * from './ConcurrentUsersGoalProgressMessageParser'; export * from './EpicPopupMessageParser'; +export * from './HallOfFameEntryData'; +export * from './ILandingPageUserEntry'; +export * from './PrizeData'; export * from './QuestCancelledMessageParser'; export * from './QuestCompletedMessageParser'; export * from './QuestDailyMessageParser'; +export * from './QuestMessageData'; export * from './QuestMessageParser'; export * from './QuestsMessageParser'; export * from './SeasonalQuestsParser'; diff --git a/src/nitro/communication/messages/parser/room/data/RoomChatSettingsParser.ts b/src/nitro/communication/messages/parser/room/data/RoomChatSettingsParser.ts index e9eb0dc8..03aa79dd 100644 --- a/src/nitro/communication/messages/parser/room/data/RoomChatSettingsParser.ts +++ b/src/nitro/communication/messages/parser/room/data/RoomChatSettingsParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../../api'; -import { RoomChatSettings } from '../../../incoming/roomsettings/RoomChatSettings'; +import { RoomChatSettings } from '../../roomsettings'; export class RoomChatSettingsParser implements IMessageParser { diff --git a/src/nitro/communication/messages/incoming/room/engine/ObjectData.ts b/src/nitro/communication/messages/parser/room/engine/ObjectData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/room/engine/ObjectData.ts rename to src/nitro/communication/messages/parser/room/engine/ObjectData.ts diff --git a/src/nitro/communication/messages/parser/room/engine/ObjectsDataUpdateParser.ts b/src/nitro/communication/messages/parser/room/engine/ObjectsDataUpdateParser.ts index dc453b0e..3ae67dd6 100644 --- a/src/nitro/communication/messages/parser/room/engine/ObjectsDataUpdateParser.ts +++ b/src/nitro/communication/messages/parser/room/engine/ObjectsDataUpdateParser.ts @@ -1,6 +1,6 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../../api'; -import { ObjectData } from '../../../incoming/room/engine/ObjectData'; -import { FurnitureDataParser } from '../furniture/FurnitureDataParser'; +import { FurnitureDataParser } from '../furniture'; +import { ObjectData } from './ObjectData'; export class ObjectsDataUpdateParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/room/engine/ObjectsRollingParser.ts b/src/nitro/communication/messages/parser/room/engine/ObjectsRollingParser.ts index 20746001..8c3023b0 100644 --- a/src/nitro/communication/messages/parser/room/engine/ObjectsRollingParser.ts +++ b/src/nitro/communication/messages/parser/room/engine/ObjectsRollingParser.ts @@ -1,6 +1,4 @@ -import { IMessageDataWrapper, IMessageParser } from '../../../../../../api'; -import { Vector3d } from '../../../../../../room/utils/Vector3d'; -import { ObjectRolling } from '../../../../../room/utils/ObjectRolling'; +import { IMessageDataWrapper, IMessageParser, ObjectRolling, Vector3d } from '../../../../../../api'; export class ObjectsRollingParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/room/engine/index.ts b/src/nitro/communication/messages/parser/room/engine/index.ts index c7fadf66..ba275c9a 100644 --- a/src/nitro/communication/messages/parser/room/engine/index.ts +++ b/src/nitro/communication/messages/parser/room/engine/index.ts @@ -1,3 +1,4 @@ export * from './FavoriteMembershipUpdateMessageParser'; +export * from './ObjectData'; export * from './ObjectsDataUpdateParser'; export * from './ObjectsRollingParser'; diff --git a/src/nitro/communication/messages/parser/room/furniture/FurnitureDataParser.ts b/src/nitro/communication/messages/parser/room/furniture/FurnitureDataParser.ts index 4892e9fe..5cfa8c3d 100644 --- a/src/nitro/communication/messages/parser/room/furniture/FurnitureDataParser.ts +++ b/src/nitro/communication/messages/parser/room/furniture/FurnitureDataParser.ts @@ -1,5 +1,4 @@ -import { IMessageDataWrapper, IMessageParser, IObjectData } from '../../../../../../api'; -import { ObjectDataFactory } from '../../../../../room/object/data/ObjectDataFactory'; +import { IMessageDataWrapper, IMessageParser, IObjectData, ObjectDataFactory } from '../../../../../../api'; export class FurnitureDataParser implements IMessageParser { diff --git a/src/nitro/communication/messages/incoming/room/furniture/RoomDimmerPresetsMessageData.ts b/src/nitro/communication/messages/parser/room/furniture/RoomDimmerPresetsMessageData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/room/furniture/RoomDimmerPresetsMessageData.ts rename to src/nitro/communication/messages/parser/room/furniture/RoomDimmerPresetsMessageData.ts diff --git a/src/nitro/communication/messages/parser/room/furniture/RoomDimmerPresetsMessageParser.ts b/src/nitro/communication/messages/parser/room/furniture/RoomDimmerPresetsMessageParser.ts index 06fa89e5..b2ad1d41 100644 --- a/src/nitro/communication/messages/parser/room/furniture/RoomDimmerPresetsMessageParser.ts +++ b/src/nitro/communication/messages/parser/room/furniture/RoomDimmerPresetsMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../../api'; -import { RoomDimmerPresetsMessageData } from '../../../incoming/room/furniture/RoomDimmerPresetsMessageData'; +import { RoomDimmerPresetsMessageData } from './RoomDimmerPresetsMessageData'; export class RoomDimmerPresetsMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/room/furniture/index.ts b/src/nitro/communication/messages/parser/room/furniture/index.ts index ab6f2312..2dde056c 100644 --- a/src/nitro/communication/messages/parser/room/furniture/index.ts +++ b/src/nitro/communication/messages/parser/room/furniture/index.ts @@ -11,6 +11,7 @@ export * from './LoveLockFurniFriendConfirmedParser'; export * from './LoveLockFurniStartParser'; export * from './OneWayDoorStatusMessageParser'; export * from './RequestSpamWallPostItMessageParser'; +export * from './RoomDimmerPresetsMessageData'; export * from './RoomDimmerPresetsMessageParser'; export * from './wall'; export * from './youtube'; diff --git a/src/nitro/communication/messages/parser/room/furniture/youtube/YoutubeDisplayVideoMessageParser.ts b/src/nitro/communication/messages/parser/room/furniture/youtube/YoutubeDisplayVideoMessageParser.ts index dea012d4..150f8954 100644 --- a/src/nitro/communication/messages/parser/room/furniture/youtube/YoutubeDisplayVideoMessageParser.ts +++ b/src/nitro/communication/messages/parser/room/furniture/youtube/YoutubeDisplayVideoMessageParser.ts @@ -1,5 +1,4 @@ -import { IMessageParser } from '../../../../../../..'; -import { IMessageDataWrapper } from '../../../../../../../api'; +import { IMessageDataWrapper, IMessageParser } from '../../../../../../../api'; export class YoutubeDisplayVideoMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/room/index.ts b/src/nitro/communication/messages/parser/room/index.ts index e692b601..81b327b1 100644 --- a/src/nitro/communication/messages/parser/room/index.ts +++ b/src/nitro/communication/messages/parser/room/index.ts @@ -1,9 +1,15 @@ export * from './access'; +export * from './access/doorbell'; +export * from './access/rights'; export * from './bots'; export * from './data'; export * from './engine'; export * from './furniture'; +export * from './furniture/floor'; +export * from './furniture/wall'; +export * from './furniture/youtube'; export * from './mapping'; export * from './pet'; export * from './session'; export * from './unit'; +export * from './unit/chat'; diff --git a/src/nitro/communication/messages/parser/room/mapping/FloorHeightMapMessageParser.ts b/src/nitro/communication/messages/parser/room/mapping/FloorHeightMapMessageParser.ts index 75ea692c..f7080745 100644 --- a/src/nitro/communication/messages/parser/room/mapping/FloorHeightMapMessageParser.ts +++ b/src/nitro/communication/messages/parser/room/mapping/FloorHeightMapMessageParser.ts @@ -1,8 +1,9 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../../api'; -import { RoomPlaneParser } from '../../../../../room/object/RoomPlaneParser'; export class FloorHeightMapMessageParser implements IMessageParser { + public static TILE_BLOCKED: number = -110; + private _model: string; private _width: number; private _height: number; @@ -76,7 +77,7 @@ export class FloorHeightMapMessageParser implements IMessageParser while (subIterator < width) { - heightMap.push(RoomPlaneParser.TILE_BLOCKED); + heightMap.push(FloorHeightMapMessageParser.TILE_BLOCKED); subIterator++; } @@ -103,7 +104,7 @@ export class FloorHeightMapMessageParser implements IMessageParser while (subIterator < text.length) { const char = text.charAt(subIterator); - let height = RoomPlaneParser.TILE_BLOCKED; + let height = FloorHeightMapMessageParser.TILE_BLOCKED; if ((char !== 'x') && (char !== 'X')) height = parseInt(char, 36); diff --git a/src/nitro/communication/messages/incoming/room/pet/BreedingPetInfo.ts b/src/nitro/communication/messages/parser/room/pet/BreedingPetInfo.ts similarity index 100% rename from src/nitro/communication/messages/incoming/room/pet/BreedingPetInfo.ts rename to src/nitro/communication/messages/parser/room/pet/BreedingPetInfo.ts diff --git a/src/nitro/communication/messages/incoming/room/pet/PetBreedingResultData.ts b/src/nitro/communication/messages/parser/room/pet/PetBreedingResultData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/room/pet/PetBreedingResultData.ts rename to src/nitro/communication/messages/parser/room/pet/PetBreedingResultData.ts diff --git a/src/nitro/communication/messages/parser/room/pet/PetFigureUpdateParser.ts b/src/nitro/communication/messages/parser/room/pet/PetFigureUpdateParser.ts index bbcb7fca..1fc26a18 100644 --- a/src/nitro/communication/messages/parser/room/pet/PetFigureUpdateParser.ts +++ b/src/nitro/communication/messages/parser/room/pet/PetFigureUpdateParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../../api'; -import { PetFigureDataParser } from '../../inventory/pets/PetFigureDataParser'; +import { PetFigureDataParser } from '../../inventory'; export class PetFigureUpdateParser implements IMessageParser { diff --git a/src/nitro/communication/messages/incoming/room/pet/RarityCategoryData.ts b/src/nitro/communication/messages/parser/room/pet/RarityCategoryData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/room/pet/RarityCategoryData.ts rename to src/nitro/communication/messages/parser/room/pet/RarityCategoryData.ts diff --git a/src/nitro/communication/messages/parser/room/pet/index.ts b/src/nitro/communication/messages/parser/room/pet/index.ts index a85d5ff2..578e77b5 100644 --- a/src/nitro/communication/messages/parser/room/pet/index.ts +++ b/src/nitro/communication/messages/parser/room/pet/index.ts @@ -1,4 +1,7 @@ +export * from './BreedingPetInfo'; +export * from './PetBreedingResultData'; export * from './PetExperienceParser'; export * from './PetFigureUpdateParser'; export * from './PetInfoParser'; export * from './PetStatusUpdateParser'; +export * from './RarityCategoryData'; diff --git a/src/nitro/communication/messages/parser/room/unit/RoomUnitParser.ts b/src/nitro/communication/messages/parser/room/unit/RoomUnitParser.ts index 5498e0c5..acf3f297 100644 --- a/src/nitro/communication/messages/parser/room/unit/RoomUnitParser.ts +++ b/src/nitro/communication/messages/parser/room/unit/RoomUnitParser.ts @@ -1,5 +1,4 @@ -import { IMessageDataWrapper, IMessageParser } from '../../../../../../api'; -import { RoomObjectType } from '../../../../../room/object/RoomObjectType'; +import { IMessageDataWrapper, IMessageParser, RoomObjectType } from '../../../../../../api'; import { UserMessageData } from './UserMessageData'; export class RoomUnitParser implements IMessageParser diff --git a/src/nitro/communication/messages/incoming/roomevents/ConditionDefinition.ts b/src/nitro/communication/messages/parser/roomevents/ConditionDefinition.ts similarity index 100% rename from src/nitro/communication/messages/incoming/roomevents/ConditionDefinition.ts rename to src/nitro/communication/messages/parser/roomevents/ConditionDefinition.ts diff --git a/src/nitro/communication/messages/incoming/roomevents/TriggerDefinition.ts b/src/nitro/communication/messages/parser/roomevents/TriggerDefinition.ts similarity index 100% rename from src/nitro/communication/messages/incoming/roomevents/TriggerDefinition.ts rename to src/nitro/communication/messages/parser/roomevents/TriggerDefinition.ts diff --git a/src/nitro/communication/messages/incoming/roomevents/Triggerable.ts b/src/nitro/communication/messages/parser/roomevents/Triggerable.ts similarity index 100% rename from src/nitro/communication/messages/incoming/roomevents/Triggerable.ts rename to src/nitro/communication/messages/parser/roomevents/Triggerable.ts diff --git a/src/nitro/communication/messages/incoming/roomevents/WiredActionDefinition.ts b/src/nitro/communication/messages/parser/roomevents/WiredActionDefinition.ts similarity index 100% rename from src/nitro/communication/messages/incoming/roomevents/WiredActionDefinition.ts rename to src/nitro/communication/messages/parser/roomevents/WiredActionDefinition.ts diff --git a/src/nitro/communication/messages/parser/roomevents/WiredFurniActionParser.ts b/src/nitro/communication/messages/parser/roomevents/WiredFurniActionParser.ts index 1b23cf12..0d18cfbb 100644 --- a/src/nitro/communication/messages/parser/roomevents/WiredFurniActionParser.ts +++ b/src/nitro/communication/messages/parser/roomevents/WiredFurniActionParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { WiredActionDefinition } from '../../incoming/roomevents/WiredActionDefinition'; +import { WiredActionDefinition } from './WiredActionDefinition'; export class WiredFurniActionParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/roomevents/WiredFurniConditionParser.ts b/src/nitro/communication/messages/parser/roomevents/WiredFurniConditionParser.ts index ca18be73..ef9284d2 100644 --- a/src/nitro/communication/messages/parser/roomevents/WiredFurniConditionParser.ts +++ b/src/nitro/communication/messages/parser/roomevents/WiredFurniConditionParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { ConditionDefinition } from '../../incoming/roomevents/ConditionDefinition'; +import { ConditionDefinition } from './ConditionDefinition'; export class WiredFurniConditionParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/roomevents/WiredFurniTriggerParser.ts b/src/nitro/communication/messages/parser/roomevents/WiredFurniTriggerParser.ts index c5c0938f..1984dd4e 100644 --- a/src/nitro/communication/messages/parser/roomevents/WiredFurniTriggerParser.ts +++ b/src/nitro/communication/messages/parser/roomevents/WiredFurniTriggerParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { TriggerDefinition } from '../../incoming/roomevents/TriggerDefinition'; +import { TriggerDefinition } from './TriggerDefinition'; export class WiredFurniTriggerParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/roomevents/index.ts b/src/nitro/communication/messages/parser/roomevents/index.ts index a0b2373d..cca201ea 100644 --- a/src/nitro/communication/messages/parser/roomevents/index.ts +++ b/src/nitro/communication/messages/parser/roomevents/index.ts @@ -1,3 +1,7 @@ +export * from './ConditionDefinition'; +export * from './Triggerable'; +export * from './TriggerDefinition'; +export * from './WiredActionDefinition'; export * from './WiredFurniActionParser'; export * from './WiredFurniConditionParser'; export * from './WiredFurniTriggerParser'; diff --git a/src/nitro/communication/messages/incoming/roomsettings/BannedUserData.ts b/src/nitro/communication/messages/parser/roomsettings/BannedUserData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/roomsettings/BannedUserData.ts rename to src/nitro/communication/messages/parser/roomsettings/BannedUserData.ts diff --git a/src/nitro/communication/messages/parser/roomsettings/BannedUsersFromRoomParser.ts b/src/nitro/communication/messages/parser/roomsettings/BannedUsersFromRoomParser.ts index eb6935c9..5cff08c1 100644 --- a/src/nitro/communication/messages/parser/roomsettings/BannedUsersFromRoomParser.ts +++ b/src/nitro/communication/messages/parser/roomsettings/BannedUsersFromRoomParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { BannedUserData } from '../../incoming/roomsettings/BannedUserData'; +import { BannedUserData } from './BannedUserData'; export class BannedUsersFromRoomParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/roomsettings/FlatControllerAddedParser.ts b/src/nitro/communication/messages/parser/roomsettings/FlatControllerAddedParser.ts index 2f0c4152..5475b1cd 100644 --- a/src/nitro/communication/messages/parser/roomsettings/FlatControllerAddedParser.ts +++ b/src/nitro/communication/messages/parser/roomsettings/FlatControllerAddedParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { FlatControllerData } from '../../incoming/roomsettings/FlatControllerData'; +import { FlatControllerData } from './FlatControllerData'; export class FlatControllerAddedParser implements IMessageParser { diff --git a/src/nitro/communication/messages/incoming/roomsettings/FlatControllerData.ts b/src/nitro/communication/messages/parser/roomsettings/FlatControllerData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/roomsettings/FlatControllerData.ts rename to src/nitro/communication/messages/parser/roomsettings/FlatControllerData.ts diff --git a/src/nitro/communication/messages/incoming/roomsettings/IFlatUser.ts b/src/nitro/communication/messages/parser/roomsettings/IFlatUser.ts similarity index 100% rename from src/nitro/communication/messages/incoming/roomsettings/IFlatUser.ts rename to src/nitro/communication/messages/parser/roomsettings/IFlatUser.ts diff --git a/src/nitro/communication/messages/incoming/roomsettings/RoomChatSettings.ts b/src/nitro/communication/messages/parser/roomsettings/RoomChatSettings.ts similarity index 100% rename from src/nitro/communication/messages/incoming/roomsettings/RoomChatSettings.ts rename to src/nitro/communication/messages/parser/roomsettings/RoomChatSettings.ts diff --git a/src/nitro/communication/messages/incoming/roomsettings/RoomModerationSettings.ts b/src/nitro/communication/messages/parser/roomsettings/RoomModerationSettings.ts similarity index 100% rename from src/nitro/communication/messages/incoming/roomsettings/RoomModerationSettings.ts rename to src/nitro/communication/messages/parser/roomsettings/RoomModerationSettings.ts diff --git a/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsData.ts b/src/nitro/communication/messages/parser/roomsettings/RoomSettingsData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/roomsettings/RoomSettingsData.ts rename to src/nitro/communication/messages/parser/roomsettings/RoomSettingsData.ts diff --git a/src/nitro/communication/messages/parser/roomsettings/RoomSettingsDataParser.ts b/src/nitro/communication/messages/parser/roomsettings/RoomSettingsDataParser.ts index e63318f4..da7dd24a 100644 --- a/src/nitro/communication/messages/parser/roomsettings/RoomSettingsDataParser.ts +++ b/src/nitro/communication/messages/parser/roomsettings/RoomSettingsDataParser.ts @@ -1,7 +1,7 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { RoomChatSettings } from '../../incoming/roomsettings/RoomChatSettings'; -import { RoomModerationSettings } from '../../incoming/roomsettings/RoomModerationSettings'; -import { RoomSettingsData } from '../../incoming/roomsettings/RoomSettingsData'; +import { RoomChatSettings } from './RoomChatSettings'; +import { RoomModerationSettings } from './RoomModerationSettings'; +import { RoomSettingsData } from './RoomSettingsData'; export class RoomSettingsDataParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/roomsettings/index.ts b/src/nitro/communication/messages/parser/roomsettings/index.ts index f16ece47..383ff7b3 100644 --- a/src/nitro/communication/messages/parser/roomsettings/index.ts +++ b/src/nitro/communication/messages/parser/roomsettings/index.ts @@ -1,10 +1,18 @@ +export * from './BannedUserData'; export * from './BannedUsersFromRoomParser'; export * from './FlatControllerAddedParser'; +export * from './FlatControllerData'; export * from './FlatControllerRemovedParser'; export * from './FlatControllersParser'; +export * from './IFlatUser'; export * from './MuteAllInRoomParser'; export * from './NoSuchFlatParser'; +export * from './RoomChatSettings'; +export * from './RoomModerationSettings'; +export * from './RoomSettingsData'; export * from './RoomSettingsDataParser'; export * from './RoomSettingsErrorParser'; export * from './RoomSettingsSavedParser'; export * from './RoomSettingsSaveErrorParser'; +export * from './ShowEnforceRoomCategoryDialogParser'; +export * from './UserUnbannedFromRoomParser'; diff --git a/src/nitro/communication/messages/incoming/sound/PlayListEntry.ts b/src/nitro/communication/messages/parser/sound/PlayListEntry.ts similarity index 100% rename from src/nitro/communication/messages/incoming/sound/PlayListEntry.ts rename to src/nitro/communication/messages/parser/sound/PlayListEntry.ts diff --git a/src/nitro/communication/messages/parser/sound/PlayListMessageParser.ts b/src/nitro/communication/messages/parser/sound/PlayListMessageParser.ts index 39b3eabe..b4a7ca90 100644 --- a/src/nitro/communication/messages/parser/sound/PlayListMessageParser.ts +++ b/src/nitro/communication/messages/parser/sound/PlayListMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { PlayListEntry } from '../../incoming/sound'; +import { PlayListEntry } from './PlayListEntry'; export class PlayListMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/sound/PlayListSongAddedMessageParser.ts b/src/nitro/communication/messages/parser/sound/PlayListSongAddedMessageParser.ts index 5ab93b5e..18aec175 100644 --- a/src/nitro/communication/messages/parser/sound/PlayListSongAddedMessageParser.ts +++ b/src/nitro/communication/messages/parser/sound/PlayListSongAddedMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { PlayListEntry } from '../../incoming/sound'; +import { PlayListEntry } from './PlayListEntry'; export class PlayListSongAddedMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/incoming/sound/SongInfoEntry.ts b/src/nitro/communication/messages/parser/sound/SongInfoEntry.ts similarity index 86% rename from src/nitro/communication/messages/incoming/sound/SongInfoEntry.ts rename to src/nitro/communication/messages/parser/sound/SongInfoEntry.ts index 1981a5c6..0bef6653 100644 --- a/src/nitro/communication/messages/incoming/sound/SongInfoEntry.ts +++ b/src/nitro/communication/messages/parser/sound/SongInfoEntry.ts @@ -1,4 +1,4 @@ -import { PlayListEntry } from '.'; +import { PlayListEntry } from './PlayListEntry'; export class SongInfoEntry extends PlayListEntry { diff --git a/src/nitro/communication/messages/parser/sound/TraxSongInfoMessageParser.ts b/src/nitro/communication/messages/parser/sound/TraxSongInfoMessageParser.ts index bfaed063..93845bf7 100644 --- a/src/nitro/communication/messages/parser/sound/TraxSongInfoMessageParser.ts +++ b/src/nitro/communication/messages/parser/sound/TraxSongInfoMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { SongInfoEntry } from '../../incoming/sound/SongInfoEntry'; +import { SongInfoEntry } from './SongInfoEntry'; export class TraxSongInfoMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/sound/index.ts b/src/nitro/communication/messages/parser/sound/index.ts index edf11c6d..2fc0d7ab 100644 --- a/src/nitro/communication/messages/parser/sound/index.ts +++ b/src/nitro/communication/messages/parser/sound/index.ts @@ -2,7 +2,9 @@ export * from './JukeboxPlayListFullMessageParser'; export * from './JukeboxSongDisksMessageParser'; export * from './NowPlayingMessageParser'; export * from './OfficialSongIdMessageParser'; +export * from './PlayListEntry'; export * from './PlayListMessageParser'; export * from './PlayListSongAddedMessageParser'; +export * from './SongInfoEntry'; export * from './TraxSongInfoMessageParser'; export * from './UserSongDisksInventoryMessageParser'; diff --git a/src/nitro/communication/messages/parser/user/PetRespectNotificationParser.ts b/src/nitro/communication/messages/parser/user/PetRespectNotificationParser.ts index 47ba0c2a..d42eed24 100644 --- a/src/nitro/communication/messages/parser/user/PetRespectNotificationParser.ts +++ b/src/nitro/communication/messages/parser/user/PetRespectNotificationParser.ts @@ -1,6 +1,5 @@ -import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { PetType } from '../../../../avatar/pets/PetType'; -import { PetData } from '../inventory/pets/PetData'; +import { IMessageDataWrapper, IMessageParser, PetType } from '../../../../../api'; +import { PetData } from '../inventory'; export class PetRespectNotificationParser implements IMessageParser { diff --git a/src/nitro/communication/messages/incoming/user/PetSupplementTypeEnum.ts b/src/nitro/communication/messages/parser/user/PetSupplementTypeEnum.ts similarity index 100% rename from src/nitro/communication/messages/incoming/user/PetSupplementTypeEnum.ts rename to src/nitro/communication/messages/parser/user/PetSupplementTypeEnum.ts diff --git a/src/nitro/communication/messages/incoming/user/ScrKickbackData.ts b/src/nitro/communication/messages/parser/user/ScrKickbackData.ts similarity index 100% rename from src/nitro/communication/messages/incoming/user/ScrKickbackData.ts rename to src/nitro/communication/messages/parser/user/ScrKickbackData.ts diff --git a/src/nitro/communication/messages/parser/user/ScrSendKickbackInfoMessageParser.ts b/src/nitro/communication/messages/parser/user/ScrSendKickbackInfoMessageParser.ts index 05e84675..d65a4ef3 100644 --- a/src/nitro/communication/messages/parser/user/ScrSendKickbackInfoMessageParser.ts +++ b/src/nitro/communication/messages/parser/user/ScrSendKickbackInfoMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { ScrKickbackData } from '../../incoming/user/ScrKickbackData'; +import { ScrKickbackData } from './ScrKickbackData'; export class ScrSendKickbackInfoMessageParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/user/index.ts b/src/nitro/communication/messages/parser/user/index.ts index 4c210911..20a21fc1 100644 --- a/src/nitro/communication/messages/parser/user/index.ts +++ b/src/nitro/communication/messages/parser/user/index.ts @@ -1,15 +1,20 @@ export * from './access'; export * from './ApproveNameResultParser'; export * from './data'; +export * from './GuildMembershipsMessageParser'; export * from './HabboGroupBadgesMessageParser'; export * from './HabboGroupEntryData'; export * from './IgnoredUsersParser'; export * from './IgnoreResultParser'; export * from './InClientLinkParser'; export * from './inventory'; +export * from './inventory/currency'; +export * from './inventory/subscription'; export * from './PetRespectNotificationParser'; export * from './PetSupplementedNotificationParser'; +export * from './PetSupplementTypeEnum'; export * from './RespectReceivedParser'; export * from './RoomEntryData'; +export * from './ScrKickbackData'; export * from './ScrSendKickbackInfoMessageParser'; export * from './wardrobe'; diff --git a/src/nitro/room/RoomContentLoader.ts b/src/nitro/room/RoomContentLoader.ts index 5fbcca71..17094d5b 100644 --- a/src/nitro/room/RoomContentLoader.ts +++ b/src/nitro/room/RoomContentLoader.ts @@ -1,13 +1,10 @@ import { BaseTexture, Resource, Texture } from '@pixi/core'; import { Loader, LoaderResource } from '@pixi/loaders'; import { Spritesheet } from '@pixi/spritesheet'; -import { FurnitureType, IAssetData, IEventDispatcher, IFurnitureData, IFurnitureDataListener, IGraphicAssetCollection, IGraphicAssetGifCollection, INitroLogger, IPetColorResult, IRoomContentListener, IRoomContentLoader, IRoomObject, ISessionDataManager } from '../../api'; +import { FurnitureType, IAssetData, IEventDispatcher, IFurnitureData, IFurnitureDataListener, IGraphicAssetCollection, IGraphicAssetGifCollection, INitroLogger, IPetColorResult, IRoomContentListener, IRoomContentLoader, IRoomObject, ISessionDataManager, RoomObjectCategory, RoomObjectUserType, RoomObjectVariable } from '../../api'; import { GraphicAssetCollection, GraphicAssetGifCollection, NitroBundle, NitroEvent, NitroLogger } from '../../core'; import { RoomContentLoadedEvent } from '../../room/events/RoomContentLoadedEvent'; import { Nitro } from '../Nitro'; -import { RoomObjectCategory } from './object/RoomObjectCategory'; -import { RoomObjectUserType } from './object/RoomObjectUserType'; -import { RoomObjectVariable } from './object/RoomObjectVariable'; import { RoomObjectVisualizationType } from './object/RoomObjectVisualizationType'; import { PetColorResult } from './PetColorResult'; diff --git a/src/nitro/room/RoomEngine.ts b/src/nitro/room/RoomEngine.ts index 32fc1530..91070740 100644 --- a/src/nitro/room/RoomEngine.ts +++ b/src/nitro/room/RoomEngine.ts @@ -1,11 +1,12 @@ import { RenderTexture, Resource, Texture } from '@pixi/core'; import { Container, DisplayObject } from '@pixi/display'; import { Matrix, Point, Rectangle } from '@pixi/math'; -import { IConnection, IDisposable, IFurnitureStackingHeightMap, IImageResult, ILegacyWallGeometry, IMessageComposer, INitroCommunicationManager, IObjectData, IPetColorResult, IPetCustomPart, IRoomContentListener, IRoomContentLoader, IRoomCreator, IRoomEngine, IRoomEngineServices, IRoomGeometry, IRoomInstance, IRoomManager, IRoomManagerListener, IRoomObject, IRoomObjectController, IRoomObjectLogicFactory, IRoomObjectVisualizationFactory, IRoomRenderer, IRoomRendererFactory, IRoomRenderingCanvas, IRoomSessionManager, ISelectedRoomObjectData, ISessionDataManager, ITileObjectMap, IUpdateReceiver, IVector3D, RoomControllerLevel, ToolbarIconEnum } from '../../api'; -import { IGetImageListener } from '../../api/nitro/room/IGetImageListener'; +import { IConnection, IDisposable, IFurnitureStackingHeightMap, IGetImageListener, IImageResult, ILegacyWallGeometry, IMessageComposer, INitroCommunicationManager, IObjectData, IPetColorResult, IPetCustomPart, IRoomContentListener, IRoomContentLoader, IRoomCreator, IRoomEngine, IRoomEngineServices, IRoomGeometry, IRoomInstance, IRoomManager, IRoomManagerListener, IRoomObject, IRoomObjectController, IRoomObjectLogicFactory, IRoomObjectVisualizationFactory, IRoomRenderer, IRoomRendererFactory, IRoomRenderingCanvas, IRoomSessionManager, ISelectedRoomObjectData, ISessionDataManager, ITileObjectMap, IUpdateReceiver, IVector3D, RoomControllerLevel, RoomObjectCategory, RoomObjectUserType, RoomObjectVariable, ToolbarIconEnum, Vector3d } from '../../api'; +import { ObjectDataFactory } from '../../api/nitro/room/object/data/ObjectDataFactory'; +import { LegacyDataType } from '../../api/nitro/room/object/data/type/LegacyDataType'; import { NitroEvent, NitroManager } from '../../core'; import { NitroSprite, TextureUtils } from '../../pixi-proxy'; -import { NumberBank, RoomEnterEffect, RoomGeometry, RoomInstance, RoomObjectEvent, RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomRendererFactory, Vector3d } from '../../room'; +import { NumberBank, RoomEnterEffect, RoomGeometry, RoomInstance, RoomObjectEvent, RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomRendererFactory } from '../../room'; import { PetFigureData } from '../avatar/pets/PetFigureData'; import { RenderRoomMessageComposer, RenderRoomThumbnailMessageComposer } from '../communication'; import { NitroToolbarAnimateIconEvent } from '../events/NitroToolbarAnimateIconEvent'; @@ -55,13 +56,8 @@ import { ObjectRoomPlanePropertyUpdateMessage } from './messages/ObjectRoomPlane import { ObjectRoomPlaneVisibilityUpdateMessage } from './messages/ObjectRoomPlaneVisibilityUpdateMessage'; import { ObjectRoomUpdateMessage } from './messages/ObjectRoomUpdateMessage'; import { ObjectStateUpdateMessage } from './messages/ObjectStateUpdateMessage'; -import { ObjectDataFactory } from './object/data/ObjectDataFactory'; -import { LegacyDataType } from './object/data/type/LegacyDataType'; import { RoomLogic } from './object/logic/room/RoomLogic'; import { RoomMapData } from './object/RoomMapData'; -import { RoomObjectCategory } from './object/RoomObjectCategory'; -import { RoomObjectUserType } from './object/RoomObjectUserType'; -import { RoomObjectVariable } from './object/RoomObjectVariable'; import { RoomObjectVisualizationFactory } from './object/RoomObjectVisualizationFactory'; import { RoomContentLoader } from './RoomContentLoader'; import { RoomMessageHandler } from './RoomMessageHandler'; diff --git a/src/nitro/room/RoomMessageHandler.ts b/src/nitro/room/RoomMessageHandler.ts index 982b7320..604d4fa5 100644 --- a/src/nitro/room/RoomMessageHandler.ts +++ b/src/nitro/room/RoomMessageHandler.ts @@ -1,8 +1,6 @@ -import { IConnection, IRoomCreator, IVector3D } from '../../api'; +import { IConnection, IRoomCreator, IVector3D, LegacyDataType, ObjectRolling, PetType, RoomObjectType, RoomObjectUserType, RoomObjectVariable, Vector3d } from '../../api'; import { Disposable } from '../../core'; -import { Vector3d } from '../../room'; import { AvatarGuideStatus } from '../avatar/enum/AvatarGuideStatus'; -import { PetType } from '../avatar/pets/PetType'; import { ObjectsDataUpdateEvent, PetExperienceEvent } from '../communication'; import { GuideSessionEndedMessageEvent } from '../communication/messages/incoming/help/GuideSessionEndedMessageEvent'; import { GuideSessionErrorMessageEvent } from '../communication/messages/incoming/help/GuideSessionErrorMessageEvent'; @@ -51,15 +49,10 @@ import { GetRoomEntryDataMessageComposer } from '../communication/messages/outgo import { FurnitureFloorDataParser } from '../communication/messages/parser/room/furniture/floor/FurnitureFloorDataParser'; import { FurnitureWallDataParser } from '../communication/messages/parser/room/furniture/wall/FurnitureWallDataParser'; import { RoomEntryTileMessageParser } from '../communication/messages/parser/room/mapping/RoomEntryTileMessageParser'; -import { RoomObjectType } from '../room/object/RoomObjectType'; -import { LegacyDataType } from './object/data/type/LegacyDataType'; -import { RoomObjectUserType } from './object/RoomObjectUserType'; -import { RoomObjectVariable } from './object/RoomObjectVariable'; import { RoomPlaneParser } from './object/RoomPlaneParser'; import { RoomVariableEnum } from './RoomVariableEnum'; import { FurnitureStackingHeightMap } from './utils/FurnitureStackingHeightMap'; import { LegacyWallGeometry } from './utils/LegacyWallGeometry'; -import { ObjectRolling } from './utils/ObjectRolling'; export class RoomMessageHandler extends Disposable { diff --git a/src/nitro/room/RoomObjectEventHandler.ts b/src/nitro/room/RoomObjectEventHandler.ts index edba6c8e..6f980d60 100644 --- a/src/nitro/room/RoomObjectEventHandler.ts +++ b/src/nitro/room/RoomObjectEventHandler.ts @@ -1,6 +1,6 @@ -import { IFurnitureStackingHeightMap, ILegacyWallGeometry, IObjectData, IRoomCanvasMouseListener, IRoomEngineServices, IRoomGeometry, IRoomObject, IRoomObjectController, IRoomObjectEventManager, ISelectedRoomObjectData, IVector3D, RoomObjectPlacementSource } from '../../api'; +import { IFurnitureStackingHeightMap, ILegacyWallGeometry, IObjectData, IRoomCanvasMouseListener, IRoomEngineServices, IRoomGeometry, IRoomObject, IRoomObjectController, IRoomObjectEventManager, ISelectedRoomObjectData, IVector3D, RoomObjectCategory, RoomObjectPlacementSource, RoomObjectType, RoomObjectUserType, RoomObjectVariable, Vector3d } from '../../api'; import { Disposable, NitroLogger } from '../../core'; -import { RoomEnterEffect, RoomId, Vector3d } from '../../room'; +import { RoomEnterEffect, RoomId } from '../../room'; import { RoomObjectEvent } from '../../room/events/RoomObjectEvent'; import { RoomObjectMouseEvent } from '../../room/events/RoomObjectMouseEvent'; import { RoomSpriteMouseEvent } from '../../room/events/RoomSpriteMouseEvent'; @@ -54,11 +54,7 @@ import { ObjectDataUpdateMessage } from './messages/ObjectDataUpdateMessage'; import { ObjectSelectedMessage } from './messages/ObjectSelectedMessage'; import { ObjectTileCursorUpdateMessage } from './messages/ObjectTileCursorUpdateMessage'; import { ObjectVisibilityUpdateMessage } from './messages/ObjectVisibilityUpdateMessage'; -import { RoomObjectCategory } from './object/RoomObjectCategory'; import { RoomObjectOperationType } from './object/RoomObjectOperationType'; -import { RoomObjectType } from './object/RoomObjectType'; -import { RoomObjectUserType } from './object/RoomObjectUserType'; -import { RoomObjectVariable } from './object/RoomObjectVariable'; import { SelectedRoomObjectData } from './utils/SelectedRoomObjectData'; export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMouseListener, IRoomObjectEventManager diff --git a/src/nitro/room/events/RoomObjectWallMouseEvent.ts b/src/nitro/room/events/RoomObjectWallMouseEvent.ts index 6eccf8a8..d283e4c5 100644 --- a/src/nitro/room/events/RoomObjectWallMouseEvent.ts +++ b/src/nitro/room/events/RoomObjectWallMouseEvent.ts @@ -1,5 +1,5 @@ -import { IRoomObject, IVector3D } from '../../../api'; -import { RoomObjectMouseEvent, Vector3d } from '../../../room'; +import { IRoomObject, IVector3D, Vector3d } from '../../../api'; +import { RoomObjectMouseEvent } from '../../../room'; export class RoomObjectWallMouseEvent extends RoomObjectMouseEvent { diff --git a/src/nitro/room/messages/ObjectRoomMaskUpdateMessage.ts b/src/nitro/room/messages/ObjectRoomMaskUpdateMessage.ts index e513d42c..562edaf0 100644 --- a/src/nitro/room/messages/ObjectRoomMaskUpdateMessage.ts +++ b/src/nitro/room/messages/ObjectRoomMaskUpdateMessage.ts @@ -1,5 +1,5 @@ -import { IVector3D } from '../../../api'; -import { RoomObjectUpdateMessage, Vector3d } from '../../../room'; +import { IVector3D, Vector3d } from '../../../api'; +import { RoomObjectUpdateMessage } from '../../../room'; export class ObjectRoomMaskUpdateMessage extends RoomObjectUpdateMessage { diff --git a/src/nitro/room/messages/ObjectTileCursorUpdateMessage.ts b/src/nitro/room/messages/ObjectTileCursorUpdateMessage.ts index 63d9e23b..67a37c74 100644 --- a/src/nitro/room/messages/ObjectTileCursorUpdateMessage.ts +++ b/src/nitro/room/messages/ObjectTileCursorUpdateMessage.ts @@ -1,5 +1,5 @@ +import { Vector3d } from '../../../api'; import { RoomObjectUpdateMessage } from '../../../room/messages/RoomObjectUpdateMessage'; -import { Vector3d } from '../../../room/utils/Vector3d'; export class ObjectTileCursorUpdateMessage extends RoomObjectUpdateMessage { diff --git a/src/nitro/room/object/RoomPlaneBitmapMaskData.ts b/src/nitro/room/object/RoomPlaneBitmapMaskData.ts index 8300848e..c6fbaf3a 100644 --- a/src/nitro/room/object/RoomPlaneBitmapMaskData.ts +++ b/src/nitro/room/object/RoomPlaneBitmapMaskData.ts @@ -1,5 +1,4 @@ -import { IVector3D } from '../../../api'; -import { Vector3d } from '../../../room'; +import { IVector3D, Vector3d } from '../../../api'; export class RoomPlaneBitmapMaskData { diff --git a/src/nitro/room/object/RoomPlaneData.ts b/src/nitro/room/object/RoomPlaneData.ts index 88e41a05..ac396a17 100644 --- a/src/nitro/room/object/RoomPlaneData.ts +++ b/src/nitro/room/object/RoomPlaneData.ts @@ -1,5 +1,4 @@ -import { IVector3D } from '../../../api'; -import { Vector3d } from '../../../room'; +import { IVector3D, Vector3d } from '../../../api'; import { RoomPlaneMaskData } from './RoomPlaneMaskData'; export class RoomPlaneData diff --git a/src/nitro/room/object/RoomPlaneParser.ts b/src/nitro/room/object/RoomPlaneParser.ts index 5b76cc76..e0532e67 100644 --- a/src/nitro/room/object/RoomPlaneParser.ts +++ b/src/nitro/room/object/RoomPlaneParser.ts @@ -1,6 +1,5 @@ import { Point } from '@pixi/math'; -import { IVector3D } from '../../../api'; -import { Vector3d } from '../../../room'; +import { IVector3D, Vector3d } from '../../../api'; import { RoomFloorHole } from './RoomFloorHole'; import { RoomMapData } from './RoomMapData'; import { RoomPlaneData } from './RoomPlaneData'; diff --git a/src/nitro/room/object/RoomWallData.ts b/src/nitro/room/object/RoomWallData.ts index f5058a81..b715f8e3 100644 --- a/src/nitro/room/object/RoomWallData.ts +++ b/src/nitro/room/object/RoomWallData.ts @@ -1,6 +1,5 @@ import { Point } from '@pixi/math'; -import { IVector3D } from '../../../api'; -import { Vector3d } from '../../../room'; +import { IVector3D, Vector3d } from '../../../api'; export class RoomWallData { diff --git a/src/nitro/room/object/data/index.ts b/src/nitro/room/object/data/index.ts deleted file mode 100644 index 42d55b17..00000000 --- a/src/nitro/room/object/data/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from './ObjectDataBase'; -export * from './ObjectDataFactory'; -export * from './type'; diff --git a/src/nitro/room/object/index.ts b/src/nitro/room/object/index.ts index 15acd938..eaa84951 100644 --- a/src/nitro/room/object/index.ts +++ b/src/nitro/room/object/index.ts @@ -1,14 +1,9 @@ -export * from './data'; export * from './logic'; export * from './RoomFloorHole'; export * from './RoomMapData'; export * from './RoomMapMaskData'; -export * from './RoomObjectCategory'; export * from './RoomObjectLogicType'; export * from './RoomObjectOperationType'; -export * from './RoomObjectType'; -export * from './RoomObjectUserType'; -export * from './RoomObjectVariable'; export * from './RoomObjectVisualizationFactory'; export * from './RoomObjectVisualizationType'; export * from './RoomPlaneBitmapMaskData'; diff --git a/src/nitro/room/object/logic/MovingObjectLogic.ts b/src/nitro/room/object/logic/MovingObjectLogic.ts index 0cbfa2df..9989dda8 100644 --- a/src/nitro/room/object/logic/MovingObjectLogic.ts +++ b/src/nitro/room/object/logic/MovingObjectLogic.ts @@ -1,7 +1,6 @@ -import { IRoomObjectController, IRoomObjectUpdateMessage, IVector3D } from '../../../../api'; -import { RoomObjectLogicBase, Vector3d } from '../../../../room'; +import { IRoomObjectController, IRoomObjectUpdateMessage, IVector3D, RoomObjectVariable, Vector3d } from '../../../../api'; +import { RoomObjectLogicBase } from '../../../../room'; import { ObjectMoveUpdateMessage } from '../../messages/ObjectMoveUpdateMessage'; -import { RoomObjectVariable } from '../RoomObjectVariable'; export class MovingObjectLogic extends RoomObjectLogicBase { diff --git a/src/nitro/room/object/logic/avatar/AvatarLogic.ts b/src/nitro/room/object/logic/avatar/AvatarLogic.ts index 8c494661..34bcb9f7 100644 --- a/src/nitro/room/object/logic/avatar/AvatarLogic.ts +++ b/src/nitro/room/object/logic/avatar/AvatarLogic.ts @@ -1,6 +1,6 @@ -import { IRoomGeometry, IRoomObjectModel } from '../../../../../api'; -import { RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomSpriteMouseEvent, Vector3d } from '../../../../../room'; +import { IRoomGeometry, IRoomObjectModel, RoomObjectVariable, Vector3d } from '../../../../../api'; +import { RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room'; import { AvatarAction } from '../../../../avatar/enum/AvatarAction'; import { Nitro } from '../../../../Nitro'; import { MouseEventType } from '../../../../ui/MouseEventType'; @@ -25,7 +25,6 @@ import { ObjectAvatarSleepUpdateMessage } from '../../../messages/ObjectAvatarSl import { ObjectAvatarTypingUpdateMessage } from '../../../messages/ObjectAvatarTypingUpdateMessage'; import { ObjectAvatarUpdateMessage } from '../../../messages/ObjectAvatarUpdateMessage'; import { ObjectAvatarUseObjectUpdateMessage } from '../../../messages/ObjectAvatarUseObjectUpdateMessage'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { MovingObjectLogic } from '../MovingObjectLogic'; export class AvatarLogic extends MovingObjectLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureAchievementResolutionLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureAchievementResolutionLogic.ts index 853734b0..f596e75f 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureAchievementResolutionLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureAchievementResolutionLogic.ts @@ -1,9 +1,9 @@ +import { RoomObjectVariable } from '../../../../../api'; import { RoomObjectEvent, RoomObjectUpdateMessage } from '../../../../../room'; import { RoomObjectBadgeAssetEvent } from '../../../events/RoomObjectBadgeAssetEvent'; import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; import { ObjectGroupBadgeUpdateMessage } from '../../../messages/ObjectGroupBadgeUpdateMessage'; import { ObjectSelectedMessage } from '../../../messages/ObjectSelectedMessage'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureBadgeDisplayLogic } from './FurnitureBadgeDisplayLogic'; export class FurnitureAchievementResolutionLogic extends FurnitureBadgeDisplayLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureBadgeDisplayLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureBadgeDisplayLogic.ts index 56d02f27..2c220366 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureBadgeDisplayLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureBadgeDisplayLogic.ts @@ -1,11 +1,10 @@ +import { RoomObjectVariable, StringDataType } from '../../../../../api'; import { PixiApplicationProxy } from '../../../../../pixi-proxy'; import { RoomObjectUpdateMessage } from '../../../../../room'; import { RoomObjectBadgeAssetEvent } from '../../../events/RoomObjectBadgeAssetEvent'; import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; import { ObjectDataUpdateMessage } from '../../../messages/ObjectDataUpdateMessage'; import { ObjectGroupBadgeUpdateMessage } from '../../../messages/ObjectGroupBadgeUpdateMessage'; -import { StringDataType } from '../../data/type/StringDataType'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureBadgeDisplayLogic extends FurnitureLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureChangeStateWhenStepOnLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureChangeStateWhenStepOnLogic.ts index 604f32e1..b2fa6aa3 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureChangeStateWhenStepOnLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureChangeStateWhenStepOnLogic.ts @@ -1,6 +1,5 @@ -import { IAssetData } from '../../../../../api'; +import { IAssetData, RoomObjectVariable } from '../../../../../api'; import { RoomToObjectOwnAvatarMoveEvent } from '../../../events/RoomToObjectOwnAvatarMoveEvent'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureChangeStateWhenStepOnLogic extends FurnitureLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureClothingChangeLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureClothingChangeLogic.ts index bc455b74..1befdeac 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureClothingChangeLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureClothingChangeLogic.ts @@ -1,8 +1,7 @@ -import { IAssetData } from '../../../../../api'; +import { IAssetData, RoomObjectVariable } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room'; import { RoomObjectWidgetRequestEvent } from '../../../events'; import { ObjectDataUpdateMessage } from '../../../messages'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureClothingChangeLogic extends FurnitureLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureCrackableLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureCrackableLogic.ts index 0fa5073e..a9a8ac82 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureCrackableLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureCrackableLogic.ts @@ -1,6 +1,6 @@ +import { RoomObjectVariable } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room'; import { RoomWidgetEnumItemExtradataParameter } from '../../../../ui/widget/enums/RoomWidgetEnumItemExtradataParameter'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureCrackableLogic extends FurnitureLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureCreditLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureCreditLogic.ts index b67b3305..4d6b1f36 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureCreditLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureCreditLogic.ts @@ -1,6 +1,5 @@ -import { IAssetData } from '../../../../../api'; +import { IAssetData, RoomObjectVariable } from '../../../../../api'; import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureCreditLogic extends FurnitureLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureCustomStackHeightLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureCustomStackHeightLogic.ts index 4e98a62f..c0ccc4e0 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureCustomStackHeightLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureCustomStackHeightLogic.ts @@ -1,6 +1,5 @@ -import { IAssetData } from '../../../../../api'; +import { IAssetData, RoomObjectVariable } from '../../../../../api'; import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; export class FurnitureCustomStackHeightLogic extends FurnitureMultiStateLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureEditableInternalLinkLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureEditableInternalLinkLogic.ts index a276450a..9b4d3cef 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureEditableInternalLinkLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureEditableInternalLinkLogic.ts @@ -1,8 +1,7 @@ -import { IAssetData, IRoomGeometry } from '../../../../../api'; +import { IAssetData, IRoomGeometry, RoomObjectVariable } from '../../../../../api'; import { RoomSpriteMouseEvent } from '../../../../../room'; import { MouseEventType } from '../../../../ui/MouseEventType'; import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureEditableInternalLinkLogic extends FurnitureLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureEditableRoomLinkLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureEditableRoomLinkLogic.ts index 1a16c65c..3f9206b8 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureEditableRoomLinkLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureEditableRoomLinkLogic.ts @@ -1,6 +1,5 @@ -import { IAssetData } from '../../../../../api'; +import { IAssetData, RoomObjectVariable } from '../../../../../api'; import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureEditableRoomLinkLogic extends FurnitureLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureExternalImageLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureExternalImageLogic.ts index e76f735a..6ae4e5d5 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureExternalImageLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureExternalImageLogic.ts @@ -1,6 +1,5 @@ -import { IAssetData } from '../../../../../api'; +import { IAssetData, RoomObjectVariable } from '../../../../../api'; import { RoomObjectWidgetRequestEvent } from '../../../events'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; export class FurnitureExternalImageLogic extends FurnitureMultiStateLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureFireworksLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureFireworksLogic.ts index a12e1333..3fedbb3d 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureFireworksLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureFireworksLogic.ts @@ -1,8 +1,7 @@ -import { IAssetData, IParticleSystem, IRoomGeometry } from '../../../../../api'; +import { IAssetData, IParticleSystem, IRoomGeometry, RoomObjectVariable } from '../../../../../api'; import { RoomObjectEvent, RoomSpriteMouseEvent } from '../../../../../room'; import { MouseEventType } from '../../../../ui/MouseEventType'; import { RoomObjectStateChangedEvent } from '../../../events/RoomObjectStateChangedEvent'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureFireworksLogic extends FurnitureLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureFloorHoleLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureFloorHoleLogic.ts index 5657bf39..83817ea5 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureFloorHoleLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureFloorHoleLogic.ts @@ -1,7 +1,7 @@ -import { RoomObjectUpdateMessage, Vector3d } from '../../../../../room'; +import { RoomObjectVariable, Vector3d } from '../../../../../api'; +import { RoomObjectUpdateMessage } from '../../../../../room'; import { RoomObjectFloorHoleEvent } from '../../../events/RoomObjectFloorHoleEvent'; import { ObjectDataUpdateMessage } from '../../../messages/ObjectDataUpdateMessage'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; export class FurnitureFloorHoleLogic extends FurnitureMultiStateLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureFriendFurniLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureFriendFurniLogic.ts index f0cefb8b..81512cdc 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureFriendFurniLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureFriendFurniLogic.ts @@ -1,10 +1,8 @@ -import { IAssetData } from '../../../../../api'; +import { IAssetData, RoomObjectVariable, StringDataType } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room'; import { ContextMenuEnum } from '../../../../ui'; import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; import { ObjectDataUpdateMessage } from '../../../messages/ObjectDataUpdateMessage'; -import { StringDataType } from '../../data/type/StringDataType'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; export class FurnitureFriendFurniLogic extends FurnitureMultiStateLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureGroupForumTerminalLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureGroupForumTerminalLogic.ts index c2d24fed..1d3ea01e 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureGroupForumTerminalLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureGroupForumTerminalLogic.ts @@ -1,5 +1,5 @@ +import { RoomObjectVariable } from '../../../../../api'; import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureGuildCustomizedLogic } from './FurnitureGuildCustomizedLogic'; export class FurnitureGroupForumTerminalLogic extends FurnitureGuildCustomizedLogic @@ -17,12 +17,12 @@ export class FurnitureGroupForumTerminalLogic extends FurnitureGuildCustomizedLo { super.updateGroupId(id); - this.object.model.setValue(RoomObjectVariable.FURNITURE_INTERNAL_LINK, `groupforum/${ id }`); + this.object.model.setValue(RoomObjectVariable.FURNITURE_INTERNAL_LINK, `groupforum/${id}`); } public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.INERNAL_LINK, this.object)); diff --git a/src/nitro/room/object/logic/furniture/FurnitureGuildCustomizedLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureGuildCustomizedLogic.ts index 4bf84158..e34ea6e3 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureGuildCustomizedLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureGuildCustomizedLogic.ts @@ -1,12 +1,10 @@ -import { IRoomGeometry } from '../../../../../api'; +import { IRoomGeometry, RoomObjectVariable, StringDataType } from '../../../../../api'; import { PixiApplicationProxy } from '../../../../../pixi-proxy'; import { RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room'; import { MouseEventType } from '../../../../ui'; import { RoomObjectBadgeAssetEvent, RoomObjectWidgetRequestEvent } from '../../../events'; import { ObjectGroupBadgeUpdateMessage, ObjectSelectedMessage } from '../../../messages'; import { ObjectDataUpdateMessage } from '../../../messages/ObjectDataUpdateMessage'; -import { StringDataType } from '../../data/type/StringDataType'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; export class FurnitureGuildCustomizedLogic extends FurnitureMultiStateLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureHighScoreLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureHighScoreLogic.ts index 0f95cc24..878e4b5c 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureHighScoreLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureHighScoreLogic.ts @@ -1,7 +1,7 @@ +import { RoomObjectVariable } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room'; import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; import { ObjectDataUpdateMessage } from '../../../messages/ObjectDataUpdateMessage'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureHighScoreLogic extends FurnitureLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureIceStormLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureIceStormLogic.ts index 21e48eec..0a71490f 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureIceStormLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureIceStormLogic.ts @@ -1,6 +1,6 @@ +import { LegacyDataType } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room'; import { ObjectDataUpdateMessage } from '../../../messages/ObjectDataUpdateMessage'; -import { LegacyDataType } from '../../data/type/LegacyDataType'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; export class FurnitureIceStormLogic extends FurnitureMultiStateLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureInternalLinkLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureInternalLinkLogic.ts index 3690aba5..590b91e0 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureInternalLinkLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureInternalLinkLogic.ts @@ -1,8 +1,7 @@ -import { IAssetData, IRoomGeometry } from '../../../../../api'; +import { IAssetData, IRoomGeometry, RoomObjectVariable } from '../../../../../api'; import { RoomSpriteMouseEvent } from '../../../../../room'; import { MouseEventType } from '../../../../ui/MouseEventType'; import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureInternalLinkLogic extends FurnitureLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureJukeboxLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureJukeboxLogic.ts index 736c5815..c80aec22 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureJukeboxLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureJukeboxLogic.ts @@ -1,10 +1,10 @@ +import { RoomObjectVariable } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room'; import { RoomWidgetEnumItemExtradataParameter } from '../../../../ui'; import { RoomObjectStateChangedEvent } from '../../../events'; import { RoomObjectFurnitureActionEvent } from '../../../events/RoomObjectFurnitureActionEvent'; import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; import { ObjectDataUpdateMessage } from '../../../messages'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; export class FurnitureJukeboxLogic extends FurnitureMultiStateLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureLogic.ts index 49fb4e16..f74aac02 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureLogic.ts @@ -1,5 +1,5 @@ -import { IAssetData, IRoomGeometry, IRoomObjectController, IRoomObjectModel, IVector3D } from '../../../../../api'; -import { RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomSpriteMouseEvent, Vector3d } from '../../../../../room'; +import { IAssetData, IRoomGeometry, IRoomObjectController, IRoomObjectModel, IVector3D, RoomObjectVariable, Vector3d } from '../../../../../api'; +import { RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room'; import { Nitro } from '../../../../Nitro'; import { MouseEventType } from '../../../../ui/MouseEventType'; import { RoomObjectRoomAdEvent } from '../../../events'; @@ -10,7 +10,6 @@ import { ObjectHeightUpdateMessage } from '../../../messages/ObjectHeightUpdateM import { ObjectItemDataUpdateMessage } from '../../../messages/ObjectItemDataUpdateMessage'; import { ObjectMoveUpdateMessage } from '../../../messages/ObjectMoveUpdateMessage'; import { ObjectSelectedMessage } from '../../../messages/ObjectSelectedMessage'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { MovingObjectLogic } from '../MovingObjectLogic'; export class FurnitureLogic extends MovingObjectLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureMannequinLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureMannequinLogic.ts index a1312aad..b1fe2320 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureMannequinLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureMannequinLogic.ts @@ -1,8 +1,7 @@ +import { MapDataType, RoomObjectVariable } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room'; import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; import { ObjectDataUpdateMessage } from '../../../messages/ObjectDataUpdateMessage'; -import { MapDataType } from '../../data/type/MapDataType'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureMannequinLogic extends FurnitureLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureMultiHeightLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureMultiHeightLogic.ts index b568a32b..f1629c6a 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureMultiHeightLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureMultiHeightLogic.ts @@ -1,5 +1,4 @@ -import { IAssetData } from '../../../../../api'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; +import { IAssetData, RoomObjectVariable } from '../../../../../api'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; export class FurnitureMultiHeightLogic extends FurnitureMultiStateLogic diff --git a/src/nitro/room/object/logic/furniture/FurniturePetCustomizationLogic.ts b/src/nitro/room/object/logic/furniture/FurniturePetCustomizationLogic.ts index aa3633ea..3663142d 100644 --- a/src/nitro/room/object/logic/furniture/FurniturePetCustomizationLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurniturePetCustomizationLogic.ts @@ -1,14 +1,14 @@ +import { RoomObjectVariable } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room'; import { RoomWidgetEnumItemExtradataParameter } from '../../../../ui'; import { RoomObjectWidgetRequestEvent } from '../../../events'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureLogic } from './FurnitureLogic'; export class FurniturePetCustomizationLogic extends FurnitureLogic { public getEventTypes(): string[] { - const types = [ RoomObjectWidgetRequestEvent.PET_PRODUCT_MENU ]; + const types = [RoomObjectWidgetRequestEvent.PET_PRODUCT_MENU]; return this.mergeTypes(super.getEventTypes(), types); } @@ -17,9 +17,9 @@ export class FurniturePetCustomizationLogic extends FurnitureLogic { super.processUpdateMessage(message); - if(!this.object) return; + if (!this.object) return; - if(this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) + if (this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) { this.object.model.setValue(RoomWidgetEnumItemExtradataParameter.INFOSTAND_EXTRA_PARAM, RoomWidgetEnumItemExtradataParameter.USABLE_PRODUCT); } @@ -27,7 +27,7 @@ export class FurniturePetCustomizationLogic extends FurnitureLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.PET_PRODUCT_MENU, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurniturePlanetSystemLogic.ts b/src/nitro/room/object/logic/furniture/FurniturePlanetSystemLogic.ts index 66f0d747..9b804bd0 100644 --- a/src/nitro/room/object/logic/furniture/FurniturePlanetSystemLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurniturePlanetSystemLogic.ts @@ -1,5 +1,4 @@ -import { IAssetData, IAssetLogicPlanetSystem } from '../../../../../api'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; +import { IAssetData, IAssetLogicPlanetSystem, RoomObjectVariable } from '../../../../../api'; import { FurnitureLogic } from './FurnitureLogic'; export class FurniturePlanetSystemLogic extends FurnitureLogic diff --git a/src/nitro/room/object/logic/furniture/FurniturePresentLogic.ts b/src/nitro/room/object/logic/furniture/FurniturePresentLogic.ts index 194bd567..1768d521 100644 --- a/src/nitro/room/object/logic/furniture/FurniturePresentLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurniturePresentLogic.ts @@ -1,12 +1,10 @@ -import { IAssetData, IParticleSystem, IRoomGeometry } from '../../../../../api'; +import { IAssetData, IParticleSystem, IRoomGeometry, MapDataType, RoomObjectVariable } from '../../../../../api'; import { RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room'; import { MouseEventType } from '../../../../ui/MouseEventType'; import { RoomObjectFurnitureActionEvent } from '../../../events/RoomObjectFurnitureActionEvent'; import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; import { ObjectDataUpdateMessage } from '../../../messages/ObjectDataUpdateMessage'; import { ObjectModelDataUpdateMessage } from '../../../messages/ObjectModelDataUpdateMessage'; -import { MapDataType } from '../../data/type/MapDataType'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureLogic } from './FurnitureLogic'; export class FurniturePresentLogic extends FurnitureLogic diff --git a/src/nitro/room/object/logic/furniture/FurniturePushableLogic.ts b/src/nitro/room/object/logic/furniture/FurniturePushableLogic.ts index 3eaecdc0..b5df5a8e 100644 --- a/src/nitro/room/object/logic/furniture/FurniturePushableLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurniturePushableLogic.ts @@ -1,7 +1,7 @@ -import { RoomObjectUpdateMessage, Vector3d } from '../../../../../room'; +import { LegacyDataType, Vector3d } from '../../../../../api'; +import { RoomObjectUpdateMessage } from '../../../../../room'; import { ObjectDataUpdateMessage } from '../../../messages/ObjectDataUpdateMessage'; import { ObjectMoveUpdateMessage } from '../../../messages/ObjectMoveUpdateMessage'; -import { LegacyDataType } from '../../data/type/LegacyDataType'; import { MovingObjectLogic } from '../MovingObjectLogic'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; diff --git a/src/nitro/room/object/logic/furniture/FurnitureRentableSpaceLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureRentableSpaceLogic.ts index 17706197..6d710e0e 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureRentableSpaceLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureRentableSpaceLogic.ts @@ -1,7 +1,7 @@ +import { RoomObjectVariable } from '../../../../../api'; import { AdvancedMap } from '../../../../../core'; import { RoomWidgetEnum } from '../../../../ui'; import { RoomObjectDataRequestEvent } from '../../../events'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureRentableSpaceLogic extends FurnitureLogic @@ -19,9 +19,9 @@ export class FurnitureRentableSpaceLogic extends FurnitureLogic { super.update(time); - if(this.object && this.object.model) + if (this.object && this.object.model) { - if(!this.object.model.getValue(RoomObjectVariable.SESSION_CURRENT_USER_ID)) + if (!this.object.model.getValue(RoomObjectVariable.SESSION_CURRENT_USER_ID)) { this.eventDispatcher.dispatchEvent(new RoomObjectDataRequestEvent(RoomObjectDataRequestEvent.RODRE_CURRENT_USER_ID, this.object)); } @@ -29,9 +29,9 @@ export class FurnitureRentableSpaceLogic extends FurnitureLogic const renterId = this.object.model.getValue>(RoomObjectVariable.FURNITURE_DATA).getValue('renterId'); const userId = this.object.model.getValue(RoomObjectVariable.SESSION_CURRENT_USER_ID); - if(renterId) + if (renterId) { - if(parseInt(renterId) === userId) this.object.setState(2, 0); + if (parseInt(renterId) === userId) this.object.setState(2, 0); else this.object.setState(1, 0); } else diff --git a/src/nitro/room/object/logic/furniture/FurnitureRoomBackgroundColorLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureRoomBackgroundColorLogic.ts index 31195915..cc6ded53 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureRoomBackgroundColorLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureRoomBackgroundColorLogic.ts @@ -1,11 +1,9 @@ -import { IRoomGeometry } from '../../../../../api'; +import { IRoomGeometry, NumberDataType, RoomObjectVariable } from '../../../../../api'; import { RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room'; import { MouseEventType } from '../../../../ui/MouseEventType'; import { RoomObjectHSLColorEnableEvent } from '../../../events/RoomObjectHSLColorEnableEvent'; import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; import { ObjectDataUpdateMessage } from '../../../messages/ObjectDataUpdateMessage'; -import { NumberDataType } from '../../data/type/NumberDataType'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; export class FurnitureRoomBackgroundColorLogic extends FurnitureMultiStateLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureRoomBillboardLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureRoomBillboardLogic.ts index 62970458..24cc0f6f 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureRoomBillboardLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureRoomBillboardLogic.ts @@ -1,7 +1,6 @@ -import { IRoomObjectModel } from '../../../../../api'; +import { IRoomObjectModel, RoomObjectVariable } from '../../../../../api'; import { HabboWebTools } from '../../../../utils'; import { RoomObjectRoomAdEvent } from '../../../events'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureRoomBrandingLogic } from './FurnitureRoomBrandingLogic'; export class FurnitureRoomBillboardLogic extends FurnitureRoomBrandingLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureRoomBrandingLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureRoomBrandingLogic.ts index 33a677ee..f2f211d4 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureRoomBrandingLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureRoomBrandingLogic.ts @@ -1,6 +1,6 @@ import { BaseTexture, Texture } from '@pixi/core'; import { decompressFrames, parseGIF } from 'gifuct-js'; -import { IAssetData, IRoomGeometry } from '../../../../../api'; +import { IAssetData, IRoomGeometry, MapDataType, RoomObjectVariable } from '../../../../../api'; import { RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room'; import { Nitro } from '../../../../Nitro'; import { MouseEventType } from '../../../../ui'; @@ -8,8 +8,6 @@ import { RoomWidgetEnumItemExtradataParameter } from '../../../../ui/widget/enum import { RoomObjectRoomAdEvent } from '../../../events'; import { ObjectAdUpdateMessage } from '../../../messages/ObjectAdUpdateMessage'; import { ObjectDataUpdateMessage } from '../../../messages/ObjectDataUpdateMessage'; -import { MapDataType } from '../../data/type/MapDataType'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureRoomBrandingLogic extends FurnitureLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureRoomDimmerLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureRoomDimmerLogic.ts index 6d09d99e..5aa0ea78 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureRoomDimmerLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureRoomDimmerLogic.ts @@ -1,8 +1,8 @@ +import { RoomObjectVariable } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room'; import { RoomObjectDimmerStateUpdateEvent } from '../../../events/RoomObjectDimmerStateUpdateEvent'; import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; import { ObjectDataUpdateMessage } from '../../../messages/ObjectDataUpdateMessage'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureRoomDimmerLogic extends FurnitureLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureSongDiskLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureSongDiskLogic.ts index 98ae5ebf..8e99fcd9 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureSongDiskLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureSongDiskLogic.ts @@ -1,6 +1,6 @@ +import { RoomObjectVariable } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room'; import { RoomWidgetEnumItemExtradataParameter } from '../../../../ui'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureSongDiskLogic extends FurnitureLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureSoundBlockLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureSoundBlockLogic.ts index db09bd29..2da23156 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureSoundBlockLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureSoundBlockLogic.ts @@ -1,8 +1,7 @@ -import { IAssetData } from '../../../../../api'; +import { IAssetData, RoomObjectVariable } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room'; import { RoomObjectSamplePlaybackEvent } from '../../../events/RoomObjectSamplePlaybackEvent'; import { ObjectDataUpdateMessage } from '../../../messages/ObjectDataUpdateMessage'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; export class FurnitureSoundBlockLogic extends FurnitureMultiStateLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureSoundMachineLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureSoundMachineLogic.ts index c66beadb..d63580e3 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureSoundMachineLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureSoundMachineLogic.ts @@ -1,8 +1,8 @@ +import { RoomObjectVariable } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room'; import { RoomWidgetEnumItemExtradataParameter } from '../../../../ui'; import { RoomObjectFurnitureActionEvent } from '../../../events/RoomObjectFurnitureActionEvent'; import { ObjectDataUpdateMessage } from '../../../messages'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; export class FurnitureSoundMachineLogic extends FurnitureMultiStateLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureStickieLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureStickieLogic.ts index bfb01276..a1723055 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureStickieLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureStickieLogic.ts @@ -1,9 +1,8 @@ -import { IAssetData } from '../../../../../api'; +import { IAssetData, RoomObjectVariable } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room'; import { RoomObjectFurnitureActionEvent } from '../../../events/RoomObjectFurnitureActionEvent'; import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; import { ObjectItemDataUpdateMessage } from '../../../messages/ObjectItemDataUpdateMessage'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureStickieLogic extends FurnitureLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureVoteCounterLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureVoteCounterLogic.ts index dbef3a67..afce5be5 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureVoteCounterLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureVoteCounterLogic.ts @@ -1,9 +1,8 @@ +import { RoomObjectVariable, VoteDataType } from '../../../../../api'; import { PixiApplicationProxy } from '../../../../../pixi-proxy'; import { RoomObjectUpdateMessage } from '../../../../../room'; import { Nitro } from '../../../../Nitro'; import { ObjectDataUpdateMessage } from '../../../messages/ObjectDataUpdateMessage'; -import { VoteDataType } from '../../data/type/VoteDataType'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; export class FurnitureVoteCounterLogic extends FurnitureMultiStateLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureVoteMajorityLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureVoteMajorityLogic.ts index 11519ca0..1c263aec 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureVoteMajorityLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureVoteMajorityLogic.ts @@ -1,7 +1,6 @@ +import { RoomObjectVariable, VoteDataType } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room'; import { ObjectDataUpdateMessage } from '../../../messages/ObjectDataUpdateMessage'; -import { VoteDataType } from '../../data/type/VoteDataType'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; export class FurnitureVoteMajorityLogic extends FurnitureMultiStateLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureWindowLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureWindowLogic.ts index ee11caeb..a4e04f8f 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureWindowLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureWindowLogic.ts @@ -1,5 +1,4 @@ -import { IAssetData } from '../../../../../api'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; +import { IAssetData, RoomObjectVariable } from '../../../../../api'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; export class FurnitureWindowLogic extends FurnitureMultiStateLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureYoutubeLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureYoutubeLogic.ts index accabc6a..be9e99ca 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureYoutubeLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureYoutubeLogic.ts @@ -1,6 +1,6 @@ +import { RoomObjectVariable } from '../../../../../api'; import { RoomObjectWidgetRequestEvent } from '../../../events'; import { RoomObjectDataRequestEvent } from '../../../events/RoomObjectDataRequestEvent'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureYoutubeLogic extends FurnitureLogic @@ -19,7 +19,7 @@ export class FurnitureYoutubeLogic extends FurnitureLogic { super.update(time); - if(!this.object.model.getValue(RoomObjectVariable.SESSION_URL_PREFIX)) + if (!this.object.model.getValue(RoomObjectVariable.SESSION_URL_PREFIX)) { this.eventDispatcher.dispatchEvent(new RoomObjectDataRequestEvent(RoomObjectDataRequestEvent.RODRE_URL_PREFIX, this.object)); } @@ -27,7 +27,7 @@ export class FurnitureYoutubeLogic extends FurnitureLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.YOUTUBE, this.object)); } diff --git a/src/nitro/room/object/logic/pet/PetLogic.ts b/src/nitro/room/object/logic/pet/PetLogic.ts index 4460f52a..054ea19a 100644 --- a/src/nitro/room/object/logic/pet/PetLogic.ts +++ b/src/nitro/room/object/logic/pet/PetLogic.ts @@ -1,7 +1,6 @@ -import { IAssetData, IRoomGeometry, IRoomObjectModel } from '../../../../../api'; -import { RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomSpriteMouseEvent, Vector3d } from '../../../../../room'; +import { IAssetData, IRoomGeometry, IRoomObjectModel, PetType, RoomObjectVariable, Vector3d } from '../../../../../api'; +import { RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room'; import { PetFigureData } from '../../../../avatar/pets/PetFigureData'; -import { PetType } from '../../../../avatar/pets/PetType'; import { MouseEventType } from '../../../../ui/MouseEventType'; import { RoomObjectMoveEvent } from '../../../events/RoomObjectMoveEvent'; import { ObjectAvatarExperienceUpdateMessage } from '../../../messages'; @@ -12,7 +11,6 @@ import { ObjectAvatarPostureUpdateMessage } from '../../../messages/ObjectAvatar import { ObjectAvatarSelectedMessage } from '../../../messages/ObjectAvatarSelectedMessage'; import { ObjectAvatarSleepUpdateMessage } from '../../../messages/ObjectAvatarSleepUpdateMessage'; import { ObjectAvatarUpdateMessage } from '../../../messages/ObjectAvatarUpdateMessage'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { MovingObjectLogic } from '../MovingObjectLogic'; export class PetLogic extends MovingObjectLogic diff --git a/src/nitro/room/object/logic/room/RoomLogic.ts b/src/nitro/room/object/logic/room/RoomLogic.ts index 68a0c9ff..31bbce8b 100644 --- a/src/nitro/room/object/logic/room/RoomLogic.ts +++ b/src/nitro/room/object/logic/room/RoomLogic.ts @@ -1,6 +1,6 @@ import { Point } from '@pixi/math'; -import { IRoomGeometry, IRoomObjectModel } from '../../../../../api'; -import { ColorConverter, RoomObjectEvent, RoomObjectLogicBase, RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomSpriteMouseEvent, Vector3d } from '../../../../../room'; +import { IRoomGeometry, IRoomObjectModel, RoomObjectVariable, Vector3d } from '../../../../../api'; +import { ColorConverter, RoomObjectEvent, RoomObjectLogicBase, RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room'; import { Nitro } from '../../../../Nitro'; import { MouseEventType } from '../../../../ui/MouseEventType'; import { RoomObjectTileMouseEvent } from '../../../events/RoomObjectTileMouseEvent'; @@ -13,7 +13,6 @@ import { ObjectRoomPlanePropertyUpdateMessage } from '../../../messages/ObjectRo import { ObjectRoomPlaneVisibilityUpdateMessage } from '../../../messages/ObjectRoomPlaneVisibilityUpdateMessage'; import { ObjectRoomUpdateMessage } from '../../../messages/ObjectRoomUpdateMessage'; import { RoomMapData } from '../../RoomMapData'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { RoomPlaneBitmapMaskData } from '../../RoomPlaneBitmapMaskData'; import { RoomPlaneBitmapMaskParser } from '../../RoomPlaneBitmapMaskParser'; import { RoomPlaneData } from '../../RoomPlaneData'; diff --git a/src/nitro/room/object/logic/room/SelectionArrowLogic.ts b/src/nitro/room/object/logic/room/SelectionArrowLogic.ts index 2622a585..bc9b96d9 100644 --- a/src/nitro/room/object/logic/room/SelectionArrowLogic.ts +++ b/src/nitro/room/object/logic/room/SelectionArrowLogic.ts @@ -1,7 +1,6 @@ -import { IAssetData } from '../../../../../api'; +import { IAssetData, RoomObjectVariable } from '../../../../../api'; import { RoomObjectLogicBase, RoomObjectUpdateMessage } from '../../../../../room'; import { ObjectVisibilityUpdateMessage } from '../../../messages/ObjectVisibilityUpdateMessage'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; export class SelectionArrowLogic extends RoomObjectLogicBase { diff --git a/src/nitro/room/object/logic/room/TileCursorLogic.ts b/src/nitro/room/object/logic/room/TileCursorLogic.ts index 0953c0c7..aea39aad 100644 --- a/src/nitro/room/object/logic/room/TileCursorLogic.ts +++ b/src/nitro/room/object/logic/room/TileCursorLogic.ts @@ -1,7 +1,6 @@ -import { IAssetData } from '../../../../../api'; +import { IAssetData, RoomObjectVariable } from '../../../../../api'; import { RoomObjectLogicBase, RoomObjectUpdateMessage } from '../../../../../room'; import { ObjectTileCursorUpdateMessage } from '../../../messages/ObjectTileCursorUpdateMessage'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; export class TileCursorLogic extends RoomObjectLogicBase { diff --git a/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts b/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts index 4c98790d..ee84984d 100644 --- a/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts +++ b/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts @@ -1,6 +1,6 @@ import { BLEND_MODES } from '@pixi/constants'; import { Resource, Texture } from '@pixi/core'; -import { AlphaTolerance, IGraphicAsset, IObjectVisualizationData, IRoomGeometry, IRoomObject, IRoomObjectModel, RoomObjectSpriteType } from '../../../../../api'; +import { AlphaTolerance, IGraphicAsset, IObjectVisualizationData, IRoomGeometry, IRoomObject, IRoomObjectModel, RoomObjectSpriteType, RoomObjectVariable } from '../../../../../api'; import { AdvancedMap } from '../../../../../core'; import { RoomObjectSpriteVisualization } from '../../../../../room'; import { AvatarAction } from '../../../../avatar/enum/AvatarAction'; @@ -9,7 +9,6 @@ import { AvatarSetType } from '../../../../avatar/enum/AvatarSetType'; import { IAvatarEffectListener } from '../../../../avatar/IAvatarEffectListener'; import { IAvatarImage } from '../../../../avatar/IAvatarImage'; import { IAvatarImageListener } from '../../../../avatar/IAvatarImageListener'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { ExpressionAdditionFactory } from './additions/ExpressionAdditionFactory'; import { FloatingIdleZAddition } from './additions/FloatingIdleZAddition'; import { GameClickTargetAddition } from './additions/GameClickTargetAddition'; diff --git a/src/nitro/room/object/visualization/furniture/FurnitureAnimatedVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureAnimatedVisualization.ts index 9dfafe4f..70fc3084 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureAnimatedVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureAnimatedVisualization.ts @@ -1,5 +1,4 @@ -import { IObjectVisualizationData } from '../../../../../api'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; +import { IObjectVisualizationData, RoomObjectVariable } from '../../../../../api'; import { RoomObjectVisualizationType } from '../../RoomObjectVisualizationType'; import { AnimationData } from '../data/AnimationData'; import { AnimationFrame } from '../data/AnimationFrame'; diff --git a/src/nitro/room/object/visualization/furniture/FurnitureBadgeDisplayVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureBadgeDisplayVisualization.ts index e31b4d86..d8c28eff 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureBadgeDisplayVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureBadgeDisplayVisualization.ts @@ -1,4 +1,4 @@ -import { RoomObjectVariable } from '../../RoomObjectVariable'; +import { RoomObjectVariable } from '../../../../../api'; import { FurnitureAnimatedVisualization } from './FurnitureAnimatedVisualization'; export class FurnitureBadgeDisplayVisualization extends FurnitureAnimatedVisualization @@ -27,22 +27,22 @@ export class FurnitureBadgeDisplayVisualization extends FurnitureAnimatedVisuali const badgeStatus = this.object.model.getValue(RoomObjectVariable.FURNITURE_BADGE_IMAGE_STATUS); const badgeId = this.object.model.getValue(RoomObjectVariable.FURNITURE_BADGE_ASSET_NAME); - if(badgeStatus === -1) + if (badgeStatus === -1) { this._badgeAssetNameNormalScale = ''; this._badgeAssetNameSmallScale = ''; } - else if((badgeStatus === 1) && (badgeId !== this._badgeId)) + else if ((badgeStatus === 1) && (badgeId !== this._badgeId)) { this._badgeId = badgeId; this._badgeAssetNameNormalScale = this._badgeId; - if(this._badgeAssetNameSmallScale === '') this._badgeAssetNameSmallScale = this._badgeAssetNameNormalScale + '_32'; + if (this._badgeAssetNameSmallScale === '') this._badgeAssetNameSmallScale = this._badgeAssetNameNormalScale + '_32'; const visibleInState = this.object.model.getValue(RoomObjectVariable.FURNITURE_BADGE_VISIBLE_IN_STATE); - if(!isNaN(visibleInState)) this._badgeVisibleInState = visibleInState; + if (!isNaN(visibleInState)) this._badgeVisibleInState = visibleInState; updateModel = true; } @@ -54,9 +54,9 @@ export class FurnitureBadgeDisplayVisualization extends FurnitureAnimatedVisuali { const tag = this.getLayerTag(scale, this.direction, layerId); - if((tag !== FurnitureBadgeDisplayVisualization.BADGE) || ((this._badgeVisibleInState !== -1) && (this.object.getState(0) !== this._badgeVisibleInState))) return super.getSpriteAssetName(scale, layerId); + if ((tag !== FurnitureBadgeDisplayVisualization.BADGE) || ((this._badgeVisibleInState !== -1) && (this.object.getState(0) !== this._badgeVisibleInState))) return super.getSpriteAssetName(scale, layerId); - if(scale === 32) return this._badgeAssetNameSmallScale; + if (scale === 32) return this._badgeAssetNameSmallScale; return this._badgeAssetNameNormalScale; } @@ -65,13 +65,13 @@ export class FurnitureBadgeDisplayVisualization extends FurnitureAnimatedVisuali { let offset = super.getLayerXOffset(scale, direction, layerId); - if(this.getLayerTag(scale, direction, layerId) === FurnitureBadgeDisplayVisualization.BADGE) + if (this.getLayerTag(scale, direction, layerId) === FurnitureBadgeDisplayVisualization.BADGE) { const asset = this.getAsset(((scale === 32) ? this._badgeAssetNameSmallScale : this._badgeAssetNameNormalScale), layerId); - if(asset) + if (asset) { - if(scale === 64) offset += ((40 - asset.width) / 2); + if (scale === 64) offset += ((40 - asset.width) / 2); else offset += ((20 - asset.width) / 2); } } @@ -83,13 +83,13 @@ export class FurnitureBadgeDisplayVisualization extends FurnitureAnimatedVisuali { let offset = super.getLayerYOffset(scale, direction, layerId); - if(this.getLayerTag(scale, direction, layerId) === FurnitureBadgeDisplayVisualization.BADGE) + if (this.getLayerTag(scale, direction, layerId) === FurnitureBadgeDisplayVisualization.BADGE) { const asset = this.getAsset(((scale === 32) ? this._badgeAssetNameSmallScale : this._badgeAssetNameNormalScale), layerId); - if(asset) + if (asset) { - if(scale === 64) offset += ((40 - asset.height) / 2); + if (scale === 64) offset += ((40 - asset.height) / 2); else offset += ((20 - asset.height) / 2); } } diff --git a/src/nitro/room/object/visualization/furniture/FurnitureBrandedImageVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureBrandedImageVisualization.ts index cdcd6c1d..bf6a6b67 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureBrandedImageVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureBrandedImageVisualization.ts @@ -1,7 +1,7 @@ import { Resource, Texture } from '@pixi/core'; +import { RoomObjectVariable } from '../../../../../api'; import { GraphicAssetGifCollection } from '../../../../../core'; import { Nitro } from '../../../../Nitro'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureVisualization } from './FurnitureVisualization'; export class FurnitureBrandedImageVisualization extends FurnitureVisualization diff --git a/src/nitro/room/object/visualization/furniture/FurnitureExternalImageVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureExternalImageVisualization.ts index fa60c2d2..952acff9 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureExternalImageVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureExternalImageVisualization.ts @@ -1,4 +1,4 @@ -import { RoomObjectVariable } from '../../RoomObjectVariable'; +import { RoomObjectVariable } from '../../../../../api'; import { FurnitureDynamicThumbnailVisualization } from './FurnitureDynamicThumbnailVisualization'; export class FurnitureExternalImageVisualization extends FurnitureDynamicThumbnailVisualization @@ -16,15 +16,15 @@ export class FurnitureExternalImageVisualization extends FurnitureDynamicThumbna protected getThumbnailURL(): string { - if(!this.object) return null; + if (!this.object) return null; - if(this._url) return this._url; + if (this._url) return this._url; const jsonString = this.object.model.getValue(RoomObjectVariable.FURNITURE_DATA); - if(!jsonString || jsonString === '') return null; + if (!jsonString || jsonString === '') return null; - if(this.object.type.indexOf('') >= 0) + if (this.object.type.indexOf('') >= 0) { this._typePrefix = (this.object.type.indexOf('') >= 0) ? '' : 'postcards/selfie/'; } @@ -44,7 +44,7 @@ export class FurnitureExternalImageVisualization extends FurnitureDynamicThumbna { url = url.replace('.png', '_small.png'); - if(url.indexOf('.png') === -1) url = (url + '_small.png'); + if (url.indexOf('.png') === -1) url = (url + '_small.png'); return url; } diff --git a/src/nitro/room/object/visualization/furniture/FurnitureFireworksVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureFireworksVisualization.ts index 0669084a..db337c12 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureFireworksVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureFireworksVisualization.ts @@ -1,6 +1,5 @@ -import { IParticleSystem } from '../../../../../api'; +import { IParticleSystem, RoomObjectVariable } from '../../../../../api'; import { AdvancedMap, NitroLogger } from '../../../../../core'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureAnimatedVisualization } from './FurnitureAnimatedVisualization'; import { FurnitureParticleSystem } from './FurnitureParticleSystem'; diff --git a/src/nitro/room/object/visualization/furniture/FurnitureGiftWrappedFireworksVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureGiftWrappedFireworksVisualization.ts index eafdeae9..89a61b83 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureGiftWrappedFireworksVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureGiftWrappedFireworksVisualization.ts @@ -1,5 +1,4 @@ -import { IRoomGeometry } from '../../../../../api'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; +import { IRoomGeometry, RoomObjectVariable } from '../../../../../api'; import { FurnitureFireworksVisualization } from './FurnitureFireworksVisualization'; export class FurnitureGiftWrappedFireworksVisualization extends FurnitureFireworksVisualization diff --git a/src/nitro/room/object/visualization/furniture/FurnitureGiftWrappedVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureGiftWrappedVisualization.ts index 8d44b3cc..7bc84ea7 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureGiftWrappedVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureGiftWrappedVisualization.ts @@ -1,5 +1,4 @@ -import { IRoomGeometry } from '../../../../../api'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; +import { IRoomGeometry, RoomObjectVariable } from '../../../../../api'; import { FurnitureVisualization } from './FurnitureVisualization'; export class FurnitureGiftWrappedVisualization extends FurnitureVisualization diff --git a/src/nitro/room/object/visualization/furniture/FurnitureGuildCustomizedVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureGuildCustomizedVisualization.ts index c564ca15..1b273f2f 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureGuildCustomizedVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureGuildCustomizedVisualization.ts @@ -1,5 +1,4 @@ -import { IGraphicAsset, IRoomObjectSprite } from '../../../../../api'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; +import { IGraphicAsset, IRoomObjectSprite, RoomObjectVariable } from '../../../../../api'; import { FurnitureAnimatedVisualization } from './FurnitureAnimatedVisualization'; export class FurnitureGuildCustomizedVisualization extends FurnitureAnimatedVisualization diff --git a/src/nitro/room/object/visualization/furniture/FurnitureGuildIsometricBadgeVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureGuildIsometricBadgeVisualization.ts index 57840d80..1d957036 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureGuildIsometricBadgeVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureGuildIsometricBadgeVisualization.ts @@ -1,5 +1,4 @@ -import { IGraphicAsset, IRoomObjectSprite } from '../../../../../api'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; +import { IGraphicAsset, IRoomObjectSprite, RoomObjectVariable } from '../../../../../api'; import { IsometricImageFurniVisualization } from './IsometricImageFurniVisualization'; export class FurnitureGuildIsometricBadgeVisualization extends IsometricImageFurniVisualization diff --git a/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualization.ts index 40c88418..8b90fd6a 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualization.ts @@ -1,7 +1,6 @@ -import { IObjectVisualizationData } from '../../../../../api'; +import { IObjectVisualizationData, RoomObjectVariable } from '../../../../../api'; import { AvatarSetType } from '../../../../avatar/enum/AvatarSetType'; import { IAvatarImageListener } from '../../../../avatar/IAvatarImageListener'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureMannequinVisualizationData } from './FurnitureMannequinVisualizationData'; import { FurnitureVisualization } from './FurnitureVisualization'; diff --git a/src/nitro/room/object/visualization/furniture/FurniturePlanetSystemVisualization.ts b/src/nitro/room/object/visualization/furniture/FurniturePlanetSystemVisualization.ts index 865f955b..b7941613 100644 --- a/src/nitro/room/object/visualization/furniture/FurniturePlanetSystemVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurniturePlanetSystemVisualization.ts @@ -1,6 +1,4 @@ -import { IAssetLogicPlanetSystem } from '../../../../../api'; -import { Vector3d } from '../../../../../room'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; +import { IAssetLogicPlanetSystem, RoomObjectVariable, Vector3d } from '../../../../../api'; import { FurnitureAnimatedVisualization } from './FurnitureAnimatedVisualization'; import { FurniturePlanetSystemVisualizationPlanetObject } from './FurniturePlanetSystemVisualizationPlanetObject'; diff --git a/src/nitro/room/object/visualization/furniture/FurniturePlanetSystemVisualizationPlanetObject.ts b/src/nitro/room/object/visualization/furniture/FurniturePlanetSystemVisualizationPlanetObject.ts index b3bad212..ee75d584 100644 --- a/src/nitro/room/object/visualization/furniture/FurniturePlanetSystemVisualizationPlanetObject.ts +++ b/src/nitro/room/object/visualization/furniture/FurniturePlanetSystemVisualizationPlanetObject.ts @@ -1,4 +1,4 @@ -import { Vector3d } from '../../../../../room'; +import { Vector3d } from '../../../../../api'; export class FurniturePlanetSystemVisualizationPlanetObject { @@ -27,9 +27,9 @@ export class FurniturePlanetSystemVisualizationPlanetObject this._children = []; } - public dispose():void + public dispose(): void { - while(this._children.length > 0) + while (this._children.length > 0) { const child = this._children.shift(); @@ -37,13 +37,13 @@ export class FurniturePlanetSystemVisualizationPlanetObject } } - public update(offsets: Vector3d[], rootPosition: Vector3d, scale: number):void + public update(offsets: Vector3d[], rootPosition: Vector3d, scale: number): void { this._position = (this._position + (this._arcSpeed / FurniturePlanetSystemVisualizationPlanetObject.SYSTEM_TEMPO)); offsets[this._index] = this.getPositionVector(rootPosition, scale); - for(const child of this._children) child.update(offsets, this._positionVector, scale); + for (const child of this._children) child.update(offsets, this._positionVector, scale); } public getPositionVector(position: Vector3d, scale: number): Vector3d @@ -55,14 +55,14 @@ export class FurniturePlanetSystemVisualizationPlanetObject this._positionVector.y = ((((sine + cos) * (scale / 2)) * 0.5) - (this._height * (scale / 2))); this._positionVector.z = -(Math.trunc(((4 * (cos + sine)) - 0.7))); - if(position) this._positionVector.add(position); + if (position) this._positionVector.add(position); return this._positionVector; } - public addChild(planetObject: FurniturePlanetSystemVisualizationPlanetObject):void + public addChild(planetObject: FurniturePlanetSystemVisualizationPlanetObject): void { - if(this._children.indexOf(planetObject) >= 0) return; + if (this._children.indexOf(planetObject) >= 0) return; this._children.push(planetObject); } @@ -74,11 +74,11 @@ export class FurniturePlanetSystemVisualizationPlanetObject public getChild(name: string): FurniturePlanetSystemVisualizationPlanetObject { - for(const child of this._children) + for (const child of this._children) { - if(child.name === name) return child; + if (child.name === name) return child; - if(child.hasChild(name)) return child.getChild(name); + if (child.hasChild(name)) return child.getChild(name); } return null; diff --git a/src/nitro/room/object/visualization/furniture/FurnitureSoundBlockVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureSoundBlockVisualization.ts index 3f60e213..02c814e9 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureSoundBlockVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureSoundBlockVisualization.ts @@ -1,4 +1,4 @@ -import { RoomObjectVariable } from '../../RoomObjectVariable'; +import { RoomObjectVariable } from '../../../../../api'; import { FurnitureAnimatedVisualization } from './FurnitureAnimatedVisualization'; export class FurnitureSoundBlockVisualization extends FurnitureAnimatedVisualization diff --git a/src/nitro/room/object/visualization/furniture/FurnitureVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureVisualization.ts index 8dc9c6e1..0be29b11 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureVisualization.ts @@ -1,6 +1,5 @@ -import { AlphaTolerance, IGraphicAsset, IObjectVisualizationData, IRoomGeometry, IRoomObjectSprite } from '../../../../../api'; +import { AlphaTolerance, IGraphicAsset, IObjectVisualizationData, IRoomGeometry, IRoomObjectSprite, RoomObjectVariable } from '../../../../../api'; import { RoomObjectSpriteVisualization } from '../../../../../room'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { RoomObjectVisualizationType } from '../../RoomObjectVisualizationType'; import { ColorData } from '../data/ColorData'; import { LayerData } from '../data/LayerData'; diff --git a/src/nitro/room/object/visualization/furniture/FurnitureVoteCounterVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureVoteCounterVisualization.ts index 4557b904..bcf8b185 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureVoteCounterVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureVoteCounterVisualization.ts @@ -1,4 +1,4 @@ -import { RoomObjectVariable } from '../../RoomObjectVariable'; +import { RoomObjectVariable } from '../../../../../api'; import { FurnitureAnimatedVisualization } from './FurnitureAnimatedVisualization'; export class FurnitureVoteCounterVisualization extends FurnitureAnimatedVisualization @@ -20,7 +20,7 @@ export class FurnitureVoteCounterVisualization extends FurnitureAnimatedVisualiz const result = this.object.model.getValue(RoomObjectVariable.FURNITURE_VOTE_COUNTER_COUNT); const tag = this.getLayerTag(scale, this.direction, layerId); - switch(tag) + switch (tag) { case FurnitureVoteCounterVisualization.ONES_SPRITE: return (result % 10); case FurnitureVoteCounterVisualization.TENS_SPRITE: return ((result / 10) % 10); @@ -33,11 +33,11 @@ export class FurnitureVoteCounterVisualization extends FurnitureAnimatedVisualiz { const result = this.object.model.getValue(RoomObjectVariable.FURNITURE_VOTE_COUNTER_COUNT); - if(result === FurnitureVoteCounterVisualization.HIDE_COUNTER_SCORE) + if (result === FurnitureVoteCounterVisualization.HIDE_COUNTER_SCORE) { const tag = this.getLayerTag(scale, direction, layerId); - switch(tag) + switch (tag) { case FurnitureVoteCounterVisualization.ONES_SPRITE: case FurnitureVoteCounterVisualization.TENS_SPRITE: diff --git a/src/nitro/room/object/visualization/furniture/FurnitureVoteMajorityVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureVoteMajorityVisualization.ts index 2cfd3586..3fd373a9 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureVoteMajorityVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureVoteMajorityVisualization.ts @@ -1,4 +1,4 @@ -import { RoomObjectVariable } from '../../RoomObjectVariable'; +import { RoomObjectVariable } from '../../../../../api'; import { FurnitureAnimatedVisualization } from './FurnitureAnimatedVisualization'; export class FurnitureVoteMajorityVisualization extends FurnitureAnimatedVisualization @@ -14,7 +14,7 @@ export class FurnitureVoteMajorityVisualization extends FurnitureAnimatedVisuali const result = this.object.model.getValue(RoomObjectVariable.FURNITURE_VOTE_MAJORITY_RESULT); const tag = this.getLayerTag(scale, this.direction, layerId); - switch(tag) + switch (tag) { case FurnitureVoteMajorityVisualization.ONES_SPRITE: return (result % 10); case FurnitureVoteMajorityVisualization.TENS_SPRITE: return ((result / 10) % 10); @@ -27,11 +27,11 @@ export class FurnitureVoteMajorityVisualization extends FurnitureAnimatedVisuali { const result = this.object.model.getValue(RoomObjectVariable.FURNITURE_VOTE_MAJORITY_RESULT); - if(((!(FurnitureVoteMajorityVisualization.HIDE_RESULTS_STATES.indexOf(this.object.getState(0)) === -1)) || (result === FurnitureVoteMajorityVisualization.HIDE_RESULTS_VALUE))) + if (((!(FurnitureVoteMajorityVisualization.HIDE_RESULTS_STATES.indexOf(this.object.getState(0)) === -1)) || (result === FurnitureVoteMajorityVisualization.HIDE_RESULTS_VALUE))) { const tag = this.getLayerTag(scale, direction, layerId); - switch(tag) + switch (tag) { case FurnitureVoteMajorityVisualization.ONES_SPRITE: case FurnitureVoteMajorityVisualization.TENS_SPRITE: diff --git a/src/nitro/room/object/visualization/furniture/FurnitureYoutubeVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureYoutubeVisualization.ts index 89a43e56..8fb3261a 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureYoutubeVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureYoutubeVisualization.ts @@ -1,4 +1,4 @@ -import { RoomObjectVariable } from '../../RoomObjectVariable'; +import { RoomObjectVariable } from '../../../../../api'; import { FurnitureDynamicThumbnailVisualization } from './FurnitureDynamicThumbnailVisualization'; export class FurnitureYoutubeVisualization extends FurnitureDynamicThumbnailVisualization @@ -7,11 +7,11 @@ export class FurnitureYoutubeVisualization extends FurnitureDynamicThumbnailVisu protected getThumbnailURL(): string { - if(!this.object) return null; + if (!this.object) return null; const furnitureData = this.object.model.getValue<{ [index: string]: string }>(RoomObjectVariable.FURNITURE_DATA); - if(furnitureData) return (furnitureData[FurnitureYoutubeVisualization.THUMBNAIL_URL] || null); + if (furnitureData) return (furnitureData[FurnitureYoutubeVisualization.THUMBNAIL_URL] || null); return null; } diff --git a/src/nitro/room/object/visualization/pet/PetVisualization.ts b/src/nitro/room/object/visualization/pet/PetVisualization.ts index b3196510..e3fe3ca2 100644 --- a/src/nitro/room/object/visualization/pet/PetVisualization.ts +++ b/src/nitro/room/object/visualization/pet/PetVisualization.ts @@ -1,7 +1,6 @@ import { Resource, Texture } from '@pixi/core'; -import { IGraphicAsset, IObjectVisualizationData, IRoomGeometry } from '../../../../../api'; +import { IGraphicAsset, IObjectVisualizationData, IRoomGeometry, RoomObjectVariable } from '../../../../../api'; import { Nitro } from '../../../../Nitro'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { RoomObjectVisualizationType } from '../../RoomObjectVisualizationType'; import { AnimationData } from '../data/AnimationData'; import { AnimationStateData } from '../data/AnimationStateData'; diff --git a/src/nitro/room/object/visualization/room/RoomPlane.ts b/src/nitro/room/object/visualization/room/RoomPlane.ts index 83a5cb53..7e2318fb 100644 --- a/src/nitro/room/object/visualization/room/RoomPlane.ts +++ b/src/nitro/room/object/visualization/room/RoomPlane.ts @@ -1,9 +1,8 @@ import { RenderTexture, Resource, Texture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; import { Matrix, Point, Rectangle } from '@pixi/math'; -import { IRoomGeometry, IRoomPlane, IVector3D } from '../../../../../api'; +import { IRoomGeometry, IRoomPlane, IVector3D, Vector3d } from '../../../../../api'; import { NitroRenderTexture, TextureUtils } from '../../../../../pixi-proxy'; -import { Vector3d } from '../../../../../room'; import { PlaneMaskManager } from './mask/PlaneMaskManager'; import { PlaneDrawingData } from './PlaneDrawingData'; import { PlaneVisualizationLayer } from './rasterizer/basic/PlaneVisualizationLayer'; diff --git a/src/nitro/room/object/visualization/room/RoomVisualization.ts b/src/nitro/room/object/visualization/room/RoomVisualization.ts index a400cd48..11457d07 100644 --- a/src/nitro/room/object/visualization/room/RoomVisualization.ts +++ b/src/nitro/room/object/visualization/room/RoomVisualization.ts @@ -1,11 +1,10 @@ import { RenderTexture, Resource, Texture } from '@pixi/core'; import { Rectangle } from '@pixi/math'; -import { AlphaTolerance, IObjectVisualizationData, IPlaneVisualization, IRoomGeometry, IRoomObjectModel, IRoomObjectSprite, IRoomPlane, RoomObjectSpriteType } from '../../../../../api'; +import { AlphaTolerance, IObjectVisualizationData, IPlaneVisualization, IRoomGeometry, IRoomObjectModel, IRoomObjectSprite, IRoomPlane, RoomObjectSpriteType, RoomObjectVariable, Vector3d } from '../../../../../api'; import { AdvancedMap } from '../../../../../core'; -import { RoomObjectSpriteVisualization, Vector3d } from '../../../../../room'; +import { RoomObjectSpriteVisualization } from '../../../../../room'; import { RoomMapData } from '../../RoomMapData'; import { RoomMapMaskData } from '../../RoomMapMaskData'; -import { RoomObjectVariable } from '../../RoomObjectVariable'; import { RoomPlaneBitmapMaskData } from '../../RoomPlaneBitmapMaskData'; import { RoomPlaneBitmapMaskParser } from '../../RoomPlaneBitmapMaskParser'; import { RoomPlaneData } from '../../RoomPlaneData'; diff --git a/src/nitro/room/object/visualization/room/TileCursorVisualization.ts b/src/nitro/room/object/visualization/room/TileCursorVisualization.ts index 5ca24676..122ade26 100644 --- a/src/nitro/room/object/visualization/room/TileCursorVisualization.ts +++ b/src/nitro/room/object/visualization/room/TileCursorVisualization.ts @@ -1,4 +1,4 @@ -import { RoomObjectVariable } from '../../RoomObjectVariable'; +import { RoomObjectVariable } from '../../../../../api'; import { FurnitureAnimatedVisualization } from '../furniture/FurnitureAnimatedVisualization'; export class TileCursorVisualization extends FurnitureAnimatedVisualization @@ -14,7 +14,7 @@ export class TileCursorVisualization extends FurnitureAnimatedVisualization protected getLayerYOffset(scale: number, direction: number, layerId: number): number { - if(layerId === 1) + if (layerId === 1) { this._tileHeight = this.object.model.getValue(RoomObjectVariable.TILE_CURSOR_HEIGHT); @@ -23,4 +23,4 @@ export class TileCursorVisualization extends FurnitureAnimatedVisualization return super.getLayerYOffset(scale, direction, layerId); } -} \ No newline at end of file +} diff --git a/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapePlane.ts b/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapePlane.ts index 9f784d6d..338d992e 100644 --- a/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapePlane.ts +++ b/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapePlane.ts @@ -1,6 +1,5 @@ import { Graphics } from '@pixi/graphics'; -import { IVector3D } from '../../../../../../../api'; -import { Vector3d } from '../../../../../../../room'; +import { IVector3D, Vector3d } from '../../../../../../../api'; import { Plane } from '../basic/Plane'; export class LandscapePlane extends Plane diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/FloorPlane.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/FloorPlane.ts index b2b4f1ef..94ca347e 100644 --- a/src/nitro/room/object/visualization/room/rasterizer/basic/FloorPlane.ts +++ b/src/nitro/room/object/visualization/room/rasterizer/basic/FloorPlane.ts @@ -1,6 +1,5 @@ import { Graphics } from '@pixi/graphics'; -import { IVector3D } from '../../../../../../../api'; -import { Vector3d } from '../../../../../../../room'; +import { IVector3D, Vector3d } from '../../../../../../../api'; import { Plane } from './Plane'; export class FloorPlane extends Plane diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCellColumn.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCellColumn.ts index 4066b131..59e0737c 100644 --- a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCellColumn.ts +++ b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCellColumn.ts @@ -1,7 +1,6 @@ import { Graphics } from '@pixi/graphics'; -import { IVector3D } from '../../../../../../../api'; +import { IVector3D, Vector3d } from '../../../../../../../api'; import { NitroRenderTexture } from '../../../../../../../pixi-proxy'; -import { Vector3d } from '../../../../../../../room'; import { PlaneMaterialCell } from './PlaneMaterialCell'; export class PlaneMaterialCellColumn diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCellMatrix.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCellMatrix.ts index b861fd8c..3147965f 100644 --- a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCellMatrix.ts +++ b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCellMatrix.ts @@ -1,8 +1,7 @@ import { Graphics } from '@pixi/graphics'; import { Point, Rectangle } from '@pixi/math'; -import { IVector3D } from '../../../../../../../api'; +import { IVector3D, Vector3d } from '../../../../../../../api'; import { TextureUtils } from '../../../../../../../pixi-proxy'; -import { Vector3d } from '../../../../../../../room'; import { RoomVisualization } from '../../RoomVisualization'; import { Randomizer } from '../../utils/Randomizer'; import { PlaneMaterialCell } from './PlaneMaterialCell'; diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneRasterizer.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneRasterizer.ts index fd93fd38..787696d8 100644 --- a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneRasterizer.ts +++ b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneRasterizer.ts @@ -1,8 +1,8 @@ import { Resource, Texture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; import { Point } from '@pixi/math'; -import { IGraphicAsset, IGraphicAssetCollection, IRoomGeometry, IVector3D } from '../../../../../../../api'; -import { Rasterizer, RoomGeometry, Vector3d } from '../../../../../../../room'; +import { IGraphicAsset, IGraphicAssetCollection, IRoomGeometry, IVector3D, Vector3d } from '../../../../../../../api'; +import { Rasterizer, RoomGeometry } from '../../../../../../../room'; import { PlaneBitmapData } from '../../utils/PlaneBitmapData'; import { IPlaneRasterizer } from '../IPlaneRasterizer'; import { FloorPlane } from './FloorPlane'; diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneVisualization.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneVisualization.ts index bb14f3d6..fea1866f 100644 --- a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneVisualization.ts +++ b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneVisualization.ts @@ -1,6 +1,5 @@ import { Graphics } from '@pixi/graphics'; -import { IDisposable, IGraphicAssetCollection, IRoomGeometry, IVector3D } from '../../../../../../../api'; -import { Vector3d } from '../../../../../../../room'; +import { IDisposable, IGraphicAssetCollection, IRoomGeometry, IVector3D, Vector3d } from '../../../../../../../api'; import { PlaneVisualizationAnimationLayer } from '../animated/PlaneVisualizationAnimationLayer'; import { PlaneMaterial } from './PlaneMaterial'; import { PlaneVisualizationLayer } from './PlaneVisualizationLayer'; diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/WallPlane.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/WallPlane.ts index 6ab6c31e..a1d053e5 100644 --- a/src/nitro/room/object/visualization/room/rasterizer/basic/WallPlane.ts +++ b/src/nitro/room/object/visualization/room/rasterizer/basic/WallPlane.ts @@ -1,6 +1,5 @@ import { Graphics } from '@pixi/graphics'; -import { IVector3D } from '../../../../../../../api'; -import { Vector3d } from '../../../../../../../room'; +import { IVector3D, Vector3d } from '../../../../../../../api'; import { Plane } from './Plane'; export class WallPlane extends Plane diff --git a/src/nitro/room/preview/RoomPreviewer.ts b/src/nitro/room/preview/RoomPreviewer.ts index 3b7b0fcb..f35b6761 100644 --- a/src/nitro/room/preview/RoomPreviewer.ts +++ b/src/nitro/room/preview/RoomPreviewer.ts @@ -2,19 +2,15 @@ import { RenderTexture, Texture } from '@pixi/core'; import { Container, DisplayObject } from '@pixi/display'; import { Point, Rectangle } from '@pixi/math'; import { Sprite } from '@pixi/sprite'; -import { IGetImageListener, IImageResult, IObjectData, IRoomEngine, IRoomObjectController, IRoomRenderingCanvas, IVector3D } from '../../../api'; +import { IGetImageListener, IImageResult, IObjectData, IRoomEngine, IRoomObjectController, IRoomRenderingCanvas, IVector3D, LegacyDataType, RoomObjectCategory, RoomObjectUserType, RoomObjectVariable, Vector3d } from '../../../api'; import { NitroSprite } from '../../../pixi-proxy'; -import { RoomId, Vector3d } from '../../../room'; +import { RoomId } from '../../../room'; import { FloorHeightMapMessageParser } from '../../communication/messages/parser/room/mapping/FloorHeightMapMessageParser'; import { RoomEntryTileMessageParser } from '../../communication/messages/parser/room/mapping/RoomEntryTileMessageParser'; import { Nitro } from '../../Nitro'; import { RoomEngineEvent } from '../events/RoomEngineEvent'; import { RoomEngineObjectEvent } from '../events/RoomEngineObjectEvent'; import { ObjectRoomMapUpdateMessage } from '../messages/ObjectRoomMapUpdateMessage'; -import { LegacyDataType } from '../object/data/type/LegacyDataType'; -import { RoomObjectCategory } from '../object/RoomObjectCategory'; -import { RoomObjectUserType } from '../object/RoomObjectUserType'; -import { RoomObjectVariable } from '../object/RoomObjectVariable'; import { RoomPlaneParser } from '../object/RoomPlaneParser'; import { RoomEngine } from '../RoomEngine'; import { LegacyWallGeometry } from '../utils/LegacyWallGeometry'; diff --git a/src/nitro/room/utils/LegacyWallGeometry.ts b/src/nitro/room/utils/LegacyWallGeometry.ts index 30e60b68..625265de 100644 --- a/src/nitro/room/utils/LegacyWallGeometry.ts +++ b/src/nitro/room/utils/LegacyWallGeometry.ts @@ -1,5 +1,4 @@ -import { ILegacyWallGeometry, IVector3D } from '../../../api'; -import { Vector3d } from '../../../room'; +import { ILegacyWallGeometry, IVector3D, Vector3d } from '../../../api'; export class LegacyWallGeometry implements ILegacyWallGeometry { diff --git a/src/nitro/room/utils/RoomCamera.ts b/src/nitro/room/utils/RoomCamera.ts index e5be4b34..b8d80fd7 100644 --- a/src/nitro/room/utils/RoomCamera.ts +++ b/src/nitro/room/utils/RoomCamera.ts @@ -1,5 +1,4 @@ -import { IVector3D } from '../../../api'; -import { Vector3d } from '../../../room'; +import { IVector3D, Vector3d } from '../../../api'; export class RoomCamera { diff --git a/src/nitro/room/utils/RoomFurnitureData.ts b/src/nitro/room/utils/RoomFurnitureData.ts index f516c007..9520b9f2 100644 --- a/src/nitro/room/utils/RoomFurnitureData.ts +++ b/src/nitro/room/utils/RoomFurnitureData.ts @@ -1,5 +1,4 @@ -import { IObjectData, IVector3D } from '../../../api'; -import { Vector3d } from '../../../room'; +import { IObjectData, IVector3D, Vector3d } from '../../../api'; export class RoomFurnitureData { diff --git a/src/nitro/room/utils/SelectedRoomObjectData.ts b/src/nitro/room/utils/SelectedRoomObjectData.ts index 21925f50..e03af7ec 100644 --- a/src/nitro/room/utils/SelectedRoomObjectData.ts +++ b/src/nitro/room/utils/SelectedRoomObjectData.ts @@ -1,5 +1,4 @@ -import { IObjectData, ISelectedRoomObjectData, IVector3D } from '../../../api'; -import { Vector3d } from '../../../room'; +import { IObjectData, ISelectedRoomObjectData, IVector3D, Vector3d } from '../../../api'; export class SelectedRoomObjectData implements ISelectedRoomObjectData { diff --git a/src/nitro/room/utils/SpriteDataCollector.ts b/src/nitro/room/utils/SpriteDataCollector.ts index 4514d4e7..deac7d38 100644 --- a/src/nitro/room/utils/SpriteDataCollector.ts +++ b/src/nitro/room/utils/SpriteDataCollector.ts @@ -1,8 +1,6 @@ import { Point, Rectangle } from '@pixi/math'; -import { IPlaneDrawingData, IPlaneVisualization, IRoomObjectSpriteVisualization, IRoomPlane, IRoomRenderingCanvas, RoomObjectSpriteData } from '../../../api'; +import { IPlaneDrawingData, IPlaneVisualization, IRoomObjectSpriteVisualization, IRoomPlane, IRoomRenderingCanvas, RoomObjectCategory, RoomObjectSpriteData, Vector3d } from '../../../api'; import { PixiApplicationProxy } from '../../../pixi-proxy'; -import { Vector3d } from '../../../room/utils'; -import { RoomObjectCategory } from '../object/RoomObjectCategory'; import { PlaneDrawingData } from '../object/visualization/room/PlaneDrawingData'; import { RoomEngine } from '../RoomEngine'; diff --git a/src/nitro/room/utils/TileObjectMap.ts b/src/nitro/room/utils/TileObjectMap.ts index f80ff5e5..2afa9b07 100644 --- a/src/nitro/room/utils/TileObjectMap.ts +++ b/src/nitro/room/utils/TileObjectMap.ts @@ -1,6 +1,5 @@ -import { IRoomObject, ITileObjectMap } from '../../../api'; +import { IRoomObject, ITileObjectMap, RoomObjectVariable } from '../../../api'; import { NitroLogger } from '../../../core'; -import { RoomObjectVariable } from '../object/RoomObjectVariable'; export class TileObjectMap implements ITileObjectMap { diff --git a/src/nitro/room/utils/index.ts b/src/nitro/room/utils/index.ts index 57643832..82645dc1 100644 --- a/src/nitro/room/utils/index.ts +++ b/src/nitro/room/utils/index.ts @@ -1,6 +1,5 @@ export * from './FurnitureStackingHeightMap'; export * from './LegacyWallGeometry'; -export * from './ObjectRolling'; export * from './RoomCamera'; export * from './RoomData'; export * from './RoomFurnitureData'; diff --git a/src/nitro/session/RoomSession.ts b/src/nitro/session/RoomSession.ts index 76c929ca..a3b34210 100644 --- a/src/nitro/session/RoomSession.ts +++ b/src/nitro/session/RoomSession.ts @@ -1,7 +1,6 @@ import { IConnection, IRoomSession, RoomControllerLevel, RoomTradingLevelEnum } from '../../api'; import { Disposable } from '../../core'; -import { CompostPlantMessageComposer, FurnitureMultiStateComposer, HarvestPetMessageComposer, PetMountComposer, PollAnswerComposer, PollRejectComposer, PollStartComposer, RemovePetSaddleComposer, TogglePetBreedingComposer, TogglePetRidingComposer, UsePetProductComposer } from '../communication'; -import { RoomModerationSettings } from '../communication/messages/incoming/roomsettings/RoomModerationSettings'; +import { CompostPlantMessageComposer, FurnitureMultiStateComposer, HarvestPetMessageComposer, PetMountComposer, PollAnswerComposer, PollRejectComposer, PollStartComposer, RemovePetSaddleComposer, RoomModerationSettings, TogglePetBreedingComposer, TogglePetRidingComposer, UsePetProductComposer } from '../communication'; import { RoomDoorbellAccessComposer } from '../communication/messages/outgoing/room/access/RoomDoorbellAccessComposer'; import { RoomEnterComposer } from '../communication/messages/outgoing/room/access/RoomEnterComposer'; import { RoomAmbassadorAlertComposer } from '../communication/messages/outgoing/room/action/RoomAmbassadorAlertComposer'; diff --git a/src/nitro/session/events/RoomSessionPetBreedingResultEvent.ts b/src/nitro/session/events/RoomSessionPetBreedingResultEvent.ts index 60151a6c..8f4c27ca 100644 --- a/src/nitro/session/events/RoomSessionPetBreedingResultEvent.ts +++ b/src/nitro/session/events/RoomSessionPetBreedingResultEvent.ts @@ -1,5 +1,5 @@ import { IRoomSession } from '../../../api'; -import { PetBreedingResultData } from '../../communication/messages/incoming/room/pet/PetBreedingResultData'; +import { PetBreedingResultData } from '../../communication'; import { RoomSessionEvent } from './RoomSessionEvent'; export class RoomSessionPetBreedingResultEvent extends RoomSessionEvent diff --git a/src/nitro/session/handler/RoomChatHandler.ts b/src/nitro/session/handler/RoomChatHandler.ts index 744a60ac..9980d28b 100644 --- a/src/nitro/session/handler/RoomChatHandler.ts +++ b/src/nitro/session/handler/RoomChatHandler.ts @@ -7,8 +7,8 @@ import { RoomUnitChatWhisperEvent } from '../../communication/messages/incoming/ import { RoomUnitHandItemReceivedEvent } from '../../communication/messages/incoming/room/unit/RoomUnitHandItemReceivedEvent'; import { PetRespectNoficationEvent } from '../../communication/messages/incoming/user/PetRespectNoficationEvent'; import { PetSupplementedNotificationEvent } from '../../communication/messages/incoming/user/PetSupplementedNotificationEvent'; -import { PetSupplementTypeEnum } from '../../communication/messages/incoming/user/PetSupplementTypeEnum'; import { RespectReceivedEvent } from '../../communication/messages/incoming/user/RespectReceivedEvent'; +import { PetSupplementTypeEnum } from '../../communication/messages/parser/user/PetSupplementTypeEnum'; import { SystemChatStyleEnum } from '../../ui/widget/enums/SystemChatStyleEnum'; import { RoomSessionChatEvent } from '../events/RoomSessionChatEvent'; import { BaseHandler } from './BaseHandler'; diff --git a/src/nitro/sound/music/MusicManager.ts b/src/nitro/sound/music/MusicManager.ts index 4f6a54bb..c03fbdff 100644 --- a/src/nitro/sound/music/MusicManager.ts +++ b/src/nitro/sound/music/MusicManager.ts @@ -1,4 +1,5 @@ import { NitroEvent, NitroManager } from '../../../core'; +import { SongInfoEntry } from '../../communication'; import { JukeboxPlayListFullMessageEvent } from '../../communication/messages/incoming/sound/JukeboxPlayListFullMessageEvent'; import { JukeboxSongDisksMessageEvent } from '../../communication/messages/incoming/sound/JukeboxSongDisksMessageEvent'; import { NowPlayingMessageEvent } from '../../communication/messages/incoming/sound/NowPlayingMessageEvent'; @@ -9,7 +10,6 @@ import { Nitro } from '../../Nitro'; import { RoomObjectSoundMachineEvent } from '../../room/events/RoomObjectSoundMachineEvent'; import { SongStartRequestData } from '../common/SongStartRequestData'; import { SoundManagerEvent } from '../events/SoundManagerEvent'; -import { SongInfoEntry } from './../../communication/messages/incoming/sound/SongInfoEntry'; import { IMusicManager } from './IMusicManager'; import { MusicPriorities } from './MusicPriorities'; diff --git a/src/room/object/RoomObject.ts b/src/room/object/RoomObject.ts index 2bb72446..618737c5 100644 --- a/src/room/object/RoomObject.ts +++ b/src/room/object/RoomObject.ts @@ -1,6 +1,5 @@ -import { IRoomObjectController, IRoomObjectEventHandler, IRoomObjectModel, IRoomObjectMouseHandler, IRoomObjectUpdateMessage, IRoomObjectVisualization, IVector3D } from '../../api'; +import { IRoomObjectController, IRoomObjectEventHandler, IRoomObjectModel, IRoomObjectMouseHandler, IRoomObjectUpdateMessage, IRoomObjectVisualization, IVector3D, Vector3d } from '../../api'; import { Disposable } from '../../core'; -import { Vector3d } from '../utils/Vector3d'; import { RoomObjectModel } from './RoomObjectModel'; export class RoomObject extends Disposable implements IRoomObjectController diff --git a/src/room/renderer/RoomSpriteCanvas.ts b/src/room/renderer/RoomSpriteCanvas.ts index ed522c92..74e17908 100644 --- a/src/room/renderer/RoomSpriteCanvas.ts +++ b/src/room/renderer/RoomSpriteCanvas.ts @@ -3,12 +3,12 @@ import { Container, DisplayObject } from '@pixi/display'; import { Graphics } from '@pixi/graphics'; import { Matrix, Point, Rectangle } from '@pixi/math'; import { Sprite } from '@pixi/sprite'; -import { IRoomCanvasMouseListener, IRoomGeometry, IRoomObject, IRoomObjectSprite, IRoomObjectSpriteVisualization, IRoomRenderingCanvas, IRoomSpriteCanvasContainer, IRoomSpriteMouseEvent, RoomObjectSpriteData, RoomObjectSpriteType } from '../../api'; +import { IRoomCanvasMouseListener, IRoomGeometry, IRoomObject, IRoomObjectSprite, IRoomObjectSpriteVisualization, IRoomRenderingCanvas, IRoomSpriteCanvasContainer, IRoomSpriteMouseEvent, RoomObjectSpriteData, RoomObjectSpriteType, Vector3d } from '../../api'; import { Nitro } from '../../nitro/Nitro'; import { MouseEventType } from '../../nitro/ui/MouseEventType'; import { NitroContainer, NitroSprite, PixiApplicationProxy } from '../../pixi-proxy'; import { RoomSpriteMouseEvent } from '../events'; -import { RoomEnterEffect, RoomGeometry, RoomRotatingEffect, RoomShakingEffect, Vector3d } from '../utils'; +import { RoomEnterEffect, RoomGeometry, RoomRotatingEffect, RoomShakingEffect } from '../utils'; import { RoomObjectCache, RoomObjectCacheItem } from './cache'; import { ExtendedSprite, ObjectMouseData, SortableSprite } from './utils'; diff --git a/src/room/renderer/cache/RoomObjectLocationCacheItem.ts b/src/room/renderer/cache/RoomObjectLocationCacheItem.ts index ed91ae25..80bbe8b4 100644 --- a/src/room/renderer/cache/RoomObjectLocationCacheItem.ts +++ b/src/room/renderer/cache/RoomObjectLocationCacheItem.ts @@ -1,5 +1,4 @@ -import { IRoomGeometry, IRoomObject, IVector3D } from '../../../api'; -import { Vector3d } from '../../utils'; +import { IRoomGeometry, IRoomObject, IVector3D, Vector3d } from '../../../api'; export class RoomObjectLocationCacheItem { diff --git a/src/room/utils/ColorConverter.ts b/src/room/utils/ColorConverter.ts index dbeabe8f..bff18b18 100644 --- a/src/room/utils/ColorConverter.ts +++ b/src/room/utils/ColorConverter.ts @@ -1,5 +1,4 @@ -import { IVector3D } from '../../api'; -import { Vector3d } from './Vector3d'; +import { IVector3D, Vector3d } from '../../api'; export class ColorConverter { diff --git a/src/room/utils/RoomGeometry.ts b/src/room/utils/RoomGeometry.ts index e243b077..ec555b03 100644 --- a/src/room/utils/RoomGeometry.ts +++ b/src/room/utils/RoomGeometry.ts @@ -1,6 +1,5 @@ import { Point } from '@pixi/math'; -import { IRoomGeometry, IVector3D } from '../../api'; -import { Vector3d } from './Vector3d'; +import { IRoomGeometry, IVector3D, Vector3d } from '../../api'; export class RoomGeometry implements IRoomGeometry { diff --git a/src/room/utils/index.ts b/src/room/utils/index.ts index b1a9c9e1..3320cc3f 100644 --- a/src/room/utils/index.ts +++ b/src/room/utils/index.ts @@ -8,4 +8,3 @@ export * from './RoomId'; export * from './RoomRotatingEffect'; export * from './RoomShakingEffect'; export * from './SpriteUtilities'; -export * from './Vector3d';