More changes

src/api/nitro/avatar/pet/index.ts

@@ -1 +1,2 @@
 export * from './IPetCustomPart';
+export * from './PetType';

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';

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

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
 {

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

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
 {

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';

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
 {

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
 {

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

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';

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
 {

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
 {

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

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
 {

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
 {

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
 {

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
 {

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
 {

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';

src/api/nitro/room/utils/ObjectRolling.ts

@@ -1,4 +1,4 @@
-import { IVector3D } from '../../../api';
+import { IVector3D } from '../../../room';
 
 export class ObjectRolling
 {

src/api/nitro/room/utils/index.ts

@@ -1,3 +1,4 @@
 export * from './IFurnitureStackingHeightMap';
 export * from './ILegacyWallGeometry';
 export * from './ITileObjectMap';
+export * from './ObjectRolling';

src/api/room/Vector3d.ts

@@ -1,4 +1,4 @@
-import { IVector3D } from '../../api';
+import { IVector3D } from './IVector3D';
 
 export class Vector3d implements IVector3D
 {

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';

src/nitro/avatar/pets/index.ts

@@ -1,3 +1,2 @@
 export * from './PetCustomPart';
 export * from './PetFigureData';
-export * from './PetType';

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

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

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
 {

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
 {

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
 {

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';

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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';

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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';

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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;
     }

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
 {

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
 {

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;
     }

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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';

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {