More changes

src/api/nitro/communication/INitroCommunicationDemo.ts

@@ -0,0 +1,6 @@
+import { INitroManager } from '../../common';
+
+export interface INitroCommunicationDemo extends INitroManager
+{
+
+}

src/api/nitro/communication/INitroCommunicationManager.ts

@@ -0,0 +1,11 @@
+import { INitroManager } from '../../common';
+import { IConnection, IMessageEvent } from '../../communication';
+import { INitroCommunicationDemo } from './INitroCommunicationDemo';
+
+export interface INitroCommunicationManager extends INitroManager
+{
+    registerMessageEvent(event: IMessageEvent): IMessageEvent;
+    removeMessageEvent(event: IMessageEvent): void;
+    demo: INitroCommunicationDemo;
+    connection: IConnection;
+}

src/api/nitro/communication/index.ts

@@ -0,0 +1,2 @@
+export * from './INitroCommunicationDemo';
+export * from './INitroCommunicationManager';

src/api/nitro/index.ts

@@ -1 +1,3 @@
+export * from './communication';
 export * from './IRoomContentLoader';
+export * from './session';

src/api/nitro/session/IGroupInformationManager.ts

@@ -0,0 +1,7 @@
+import { IDisposable } from '../../common';
+
+export interface IGroupInformationManager extends IDisposable
+{
+    init(): void;
+    getGroupBadge(groupId: number): string;
+}

src/api/nitro/session/IIgnoredUsersManager.ts

@@ -0,0 +1,9 @@
+export interface IIgnoredUsersManager 
+{
+    init(): void;
+    requestIgnoredUsers(): void;
+    ignoreUserId(id: number): void;
+    ignoreUser(name: string): void;
+    unignoreUser(name: string): void;
+    isIgnored(name: string): boolean;
+}

src/api/nitro/session/IRoomHandlerListener.ts

@@ -1,4 +1,4 @@
-import { IEventDispatcher } from '../../api';
+import { IEventDispatcher } from '../../common';
 import { IRoomSession } from './IRoomSession';
 
 export interface IRoomHandlerListener

src/api/nitro/session/IRoomModerationSettings.ts

@@ -0,0 +1,6 @@
+export interface IRoomModerationSettings
+{
+    readonly allowMute: number;
+    readonly allowKick: number;
+    readonly allowBan: number;
+}

src/api/nitro/session/IRoomSession.ts

@@ -1,6 +1,7 @@
-import { IConnection, IDisposable } from '../../api';
-import { RoomModerationSettings } from '../communication/messages/incoming/roomsettings/RoomModerationSettings';
-import { UserDataManager } from './UserDataManager';
+import { IDisposable } from '../../common';
+import { IConnection } from '../../communication';
+import { IRoomModerationSettings } from './IRoomModerationSettings';
+import { IUserDataManager } from './IUserDataManager';
 
 export interface IRoomSession extends IDisposable
 {
@@ -45,7 +46,7 @@ export interface IRoomSession extends IDisposable
     harvestPet(id: number): void;
     compostPlant(id: number): void;
     connection: IConnection;
-    userDataManager: UserDataManager;
+    userDataManager: IUserDataManager;
     roomId: number;
     state: string;
     tradeMode: number;
@@ -58,5 +59,5 @@ export interface IRoomSession extends IDisposable
     isRoomOwner: boolean;
     isDecorating: boolean;
     isSpectator: boolean;
-    moderationSettings: RoomModerationSettings;
+    moderationSettings: IRoomModerationSettings;
 }

src/api/nitro/session/IRoomSessionManager.ts

@@ -1,5 +1,5 @@
-import { INitroManager } from '../../api';
-import { INitroCommunicationManager } from '../communication/INitroCommunicationManager';
+import { INitroManager } from '../../common';
+import { INitroCommunicationManager } from '../communication';
 import { IRoomSession } from './IRoomSession';
 
 export interface IRoomSessionManager extends INitroManager

src/api/nitro/session/IRoomUserData.ts

@@ -0,0 +1,26 @@
+export interface IRoomUserData
+{
+    readonly roomIndex: number;
+    activityPoints: number;
+    name: string;
+    type: number;
+    sex: string;
+    figure: string;
+    custom: string;
+    webID: number;
+    groupId: number;
+    groupName: string;
+    groupStatus: number;
+    ownerId: number;
+    ownerName: string;
+    rarityLevel: number;
+    hasSaddle: boolean;
+    isRiding: boolean;
+    canBreed: boolean;
+    canHarvest: boolean;
+    canRevive: boolean;
+    hasBreedingPermission: boolean;
+    petLevel: number;
+    botSkills: number[];
+    isModerator: boolean;
+}

src/api/nitro/session/ISessionDataManager.ts

@@ -1,11 +1,11 @@
 import { Resource, Texture } from '@pixi/core';
-import { INitroManager } from '../../api';
-import { INitroCommunicationManager } from '../communication/INitroCommunicationManager';
-import { IFurnitureData } from './furniture/IFurnitureData';
-import { IFurnitureDataListener } from './furniture/IFurnitureDataListener';
-import { GroupInformationManager } from './GroupInformationManager';
-import { IgnoredUsersManager } from './IgnoredUsersManager';
-import { IProductData } from './product/IProductData';
+import { INitroManager } from '../../common';
+import { INitroCommunicationManager } from '../communication';
+import { IFurnitureData } from './IFurnitureData';
+import { IFurnitureDataListener } from './IFurnitureDataListener';
+import { IGroupInformationManager } from './IGroupInformationManager';
+import { IIgnoredUsersManager } from './IIgnoredUsersManager';
+import { IProductData } from './IProductData';
 
 export interface ISessionDataManager extends INitroManager
 {
@@ -36,8 +36,8 @@ export interface ISessionDataManager extends INitroManager
     figure: string;
     gender: string;
     realName: string;
-    ignoredUsersManager: IgnoredUsersManager;
-    groupInformationManager: GroupInformationManager;
+    ignoredUsersManager: IIgnoredUsersManager;
+    groupInformationManager: IGroupInformationManager;
     respectsReceived: number;
     respectsLeft: number;
     respectsPetLeft: number;

src/api/nitro/session/IUserDataManager.ts

@@ -0,0 +1,26 @@
+import { IConnection } from '../../communication';
+import { IRoomUserData } from './IRoomUserData';
+
+export interface IUserDataManager
+{
+    setConnection(connection: IConnection): void;
+    getUserData(webID: number): IRoomUserData;
+    getPetData(webID: number): IRoomUserData;
+    getBotData(webID: number): IRoomUserData;
+    getRentableBotData(webID: number): IRoomUserData;
+    getDataByType(webID: number, type: number): IRoomUserData;
+    getUserDataByIndex(roomIndex: number): IRoomUserData;
+    getUserDataByName(name: string): IRoomUserData;
+    updateUserData(data: IRoomUserData): void;
+    removeUserData(roomIndex: number): void;
+    getUserBadges(userId: number): string[];
+    setUserBadges(userId: number, badges: string[]): void;
+    updateFigure(roomIndex: number, figure: string, sex: string, hasSaddle: boolean, isRiding: boolean): void;
+    updateName(roomIndex: number, name: string): void;
+    updateMotto(roomIndex: number, custom: string): void;
+    updateAchievementScore(roomIndex: number, score: number): void;
+    updatePetLevel(roomIndex: number, level: number): void;
+    updatePetBreedingStatus(roomIndex: number, canBreed: boolean, canHarvest: boolean, canRevive: boolean, hasBreedingPermission: boolean): void;
+    requestPetInfo(id: number): void;
+    connection: IConnection;
+}

src/api/nitro/session/index.ts

@@ -0,0 +1,14 @@
+export * from './FurnitureType';
+export * from './IFurnitureData';
+export * from './IFurnitureDataListener';
+export * from './IGroupInformationManager';
+export * from './IIgnoredUsersManager';
+export * from './IProductData';
+export * from './IProductDataListener';
+export * from './IRoomHandlerListener';
+export * from './IRoomModerationSettings';
+export * from './IRoomSession';
+export * from './IRoomSessionManager';
+export * from './IRoomUserData';
+export * from './ISessionDataManager';
+export * from './IUserDataManager';

src/nitro/INitro.ts

@@ -1,13 +1,10 @@
 import { Application } from '@pixi/app';
 import { Ticker } from '@pixi/ticker';
-import { IEventDispatcher, ILinkEventTracker, INitroCore, IRoomManager, IWorkerEventTracker } from '../api';
+import { IEventDispatcher, ILinkEventTracker, INitroCommunicationManager, INitroCore, IRoomManager, IRoomSessionManager, ISessionDataManager, IWorkerEventTracker } from '../api';
 import { IAvatarRenderManager } from './avatar/IAvatarRenderManager';
 import { IRoomCameraWidgetManager } from './camera/IRoomCameraWidgetManager';
-import { INitroCommunicationManager } from './communication/INitroCommunicationManager';
 import { INitroLocalizationManager } from './localization/INitroLocalizationManager';
 import { IRoomEngine } from './room/IRoomEngine';
-import { IRoomSessionManager } from './session/IRoomSessionManager';
-import { ISessionDataManager } from './session/ISessionDataManager';
 import { ISoundManager } from './sound/ISoundManager';
 
 export interface INitro

src/nitro/Nitro.ts

@@ -2,7 +2,8 @@ import { Application, IApplicationOptions } from '@pixi/app';
 import { SCALE_MODES } from '@pixi/constants';
 import { settings } from '@pixi/settings';
 import { Ticker } from '@pixi/ticker';
-import { IEventDispatcher, ILinkEventTracker, INitroCore, IRoomManager, IWorkerEventTracker } from '../api';
+import { IEventDispatcher, ILinkEventTracker, INitroCore, IRoomManager, IRoomSessionManager, ISessionDataManager, IWorkerEventTracker } from '../api';
+import { INitroCommunicationManager } from '../api/nitro/communication/INitroCommunicationManager';
 import { ConfigurationEvent, EventDispatcher, NitroCore, NitroEvent } from '../core';
 import { PixiApplicationProxy } from '../pixi-proxy';
 import { RoomManager } from '../room/RoomManager';
@@ -10,7 +11,6 @@ import { AvatarRenderManager } from './avatar/AvatarRenderManager';
 import { IAvatarRenderManager } from './avatar/IAvatarRenderManager';
 import { IRoomCameraWidgetManager } from './camera/IRoomCameraWidgetManager';
 import { RoomCameraWidgetManager } from './camera/RoomCameraWidgetManager';
-import { INitroCommunicationManager } from './communication/INitroCommunicationManager';
 import { NitroCommunicationManager } from './communication/NitroCommunicationManager';
 import { LegacyExternalInterface } from './externalInterface/LegacyExternalInterface';
 import { GameMessageHandler } from './game/GameMessageHandler';
@@ -21,8 +21,6 @@ import './Plugins';
 import { RoomEngineEvent } from './room/events/RoomEngineEvent';
 import { IRoomEngine } from './room/IRoomEngine';
 import { RoomEngine } from './room/RoomEngine';
-import { IRoomSessionManager } from './session/IRoomSessionManager';
-import { ISessionDataManager } from './session/ISessionDataManager';
 import { RoomSessionManager } from './session/RoomSessionManager';
 import { SessionDataManager } from './session/SessionDataManager';
 import { ISoundManager } from './sound/ISoundManager';

src/nitro/communication/INitroCommunicationManager.ts

@@ -1,10 +0,0 @@
-import { IConnection, IMessageEvent, INitroManager } from '../../api';
-import { NitroCommunicationDemo } from './demo/NitroCommunicationDemo';
-
-export interface INitroCommunicationManager extends INitroManager
-{
-    registerMessageEvent(event: IMessageEvent): IMessageEvent;
-    removeMessageEvent(event: IMessageEvent): void;
-    demo: NitroCommunicationDemo;
-    connection: IConnection;
-}

src/nitro/communication/NitroCommunicationManager.ts

@@ -1,9 +1,8 @@
-import { ICommunicationManager, IConnection, IConnectionStateListener, IMessageConfiguration, IMessageEvent } from '../../api';
+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 { INitroCommunicationManager } from './INitroCommunicationManager';
 import { NitroMessages } from './NitroMessages';
 
 export class NitroCommunicationManager extends NitroManager implements INitroCommunicationManager, IConnectionStateListener
@@ -12,7 +11,7 @@ export class NitroCommunicationManager extends NitroManager implements INitroCom
     private _connection: IConnection;
     private _messages: IMessageConfiguration;
 
-    private _demo: NitroCommunicationDemo;
+    private _demo: INitroCommunicationDemo;
 
     constructor(communication: ICommunicationManager)
     {
@@ -106,7 +105,7 @@ export class NitroCommunicationManager extends NitroManager implements INitroCom
         this._connection.removeMessageEvent(event);
     }
 
-    public get demo(): NitroCommunicationDemo
+    public get demo(): INitroCommunicationDemo
     {
         return this._demo;
     }

src/nitro/communication/demo/NitroCommunicationDemo.ts

@@ -1,7 +1,7 @@
-import { IConnection } from '../../../api';
+import { IConnection, INitroCommunicationDemo } from '../../../api';
+import { INitroCommunicationManager } from '../../../api/nitro/communication/INitroCommunicationManager';
 import { NitroManager, SocketConnectionEvent } from '../../../core';
 import { Nitro } from '../../Nitro';
-import { INitroCommunicationManager } from '../INitroCommunicationManager';
 import { ClientPingEvent } from '../messages/incoming/client/ClientPingEvent';
 import { AuthenticatedEvent } from '../messages/incoming/security/AuthenticatedEvent';
 import { ClientHelloMessageComposer } from '../messages/outgoing/handshake/ClientHelloMessageComposer';
@@ -10,7 +10,7 @@ import { PongMessageComposer } from '../messages/outgoing/handshake/PongMessageC
 import { SSOTicketMessageComposer } from '../messages/outgoing/handshake/SSOTicketMessageComposer';
 import { NitroCommunicationDemoEvent } from './NitroCommunicationDemoEvent';
 
-export class NitroCommunicationDemo extends NitroManager
+export class NitroCommunicationDemo extends NitroManager implements INitroCommunicationDemo
 {
     private _communication: INitroCommunicationManager;
 

src/nitro/communication/index.ts

@@ -1,5 +1,4 @@
 export * from './demo';
-export * from './INitroCommunicationManager';
 export * from './messages';
 export * from './NitroCommunicationManager';
 export * from './NitroMessages';

src/nitro/communication/messages/incoming/roomsettings/RoomModerationSettings.ts

@@ -1,6 +1,6 @@
-import { IMessageDataWrapper } from '../../../../../api';
+import { IMessageDataWrapper, IRoomModerationSettings } from '../../../../../api';
 
-export class RoomModerationSettings
+export class RoomModerationSettings implements IRoomModerationSettings
 {
     public static MODERATION_LEVEL_NONE: number = 0;
     public static MODERATION_LEVEL_USER_WITH_RIGHTS: number = 1;

src/nitro/localization/NitroLocalizationManager.ts

@@ -1,5 +1,5 @@
-import { NitroManager } from '../../core';
-import { INitroCommunicationManager } from '../communication/INitroCommunicationManager';
+import { INitroCommunicationManager } from '../../api/nitro/communication/INitroCommunicationManager';
+import { NitroManager } from '../../core';
 import { BadgePointLimitsEvent } from '../communication/messages/incoming/inventory/badges/BadgePointLimitsEvent';
 import { Nitro } from '../Nitro';
 import { BadgeBaseAndLevel } from './BadgeBaseAndLevel';

src/nitro/room/IRoomCreator.ts

@@ -1,6 +1,4 @@
-import { IRoomInstance, IRoomObjectController, IVector3D } from '../../api';
-import { IRoomSessionManager } from '../session/IRoomSessionManager';
-import { ISessionDataManager } from '../session/ISessionDataManager';
+import { IRoomInstance, IRoomObjectController, IRoomSessionManager, ISessionDataManager, IVector3D } from '../../api';
 import { IObjectData } from './object/data/IObjectData';
 import { RoomMapData } from './object/RoomMapData';
 import { FurnitureStackingHeightMap } from './utils/FurnitureStackingHeightMap';

src/nitro/room/IRoomEngine.ts

@@ -1,11 +1,8 @@
 import { RenderTexture } from '@pixi/core';
 import { DisplayObject } from '@pixi/display';
 import { Point, Rectangle } from '@pixi/math';
-import { INitroManager, IRoomGeometry, IRoomManager, IRoomObject, IRoomObjectController, IRoomObjectLogicFactory, IRoomObjectVisualizationFactory, IRoomRendererFactory, IRoomRenderingCanvas } from '../../api';
-import { IVector3D } from '../../api/room/IVector3D';
+import { INitroManager, IRoomGeometry, IRoomManager, IRoomObject, IRoomObjectController, IRoomObjectLogicFactory, IRoomObjectVisualizationFactory, IRoomRendererFactory, IRoomRenderingCanvas, IRoomSessionManager, ISessionDataManager, IVector3D } from '../../api';
 import { PetCustomPart } from '../avatar/pets/PetCustomPart';
-import { IRoomSessionManager } from '../session/IRoomSessionManager';
-import { ISessionDataManager } from '../session/ISessionDataManager';
 import { IGetImageListener } from './IGetImageListener';
 import { ImageResult } from './ImageResult';
 import { IObjectData } from './object/data/IObjectData';

src/nitro/room/IRoomEngineServices.ts

@@ -1,6 +1,4 @@
-import { IConnection, IEventDispatcher, IRoomInstance, IRoomObjectController, IRoomRenderingCanvas, IVector3D } from '../../api';
-import { IRoomSessionManager } from '../session/IRoomSessionManager';
-import { ISessionDataManager } from '../session/ISessionDataManager';
+import { IConnection, IEventDispatcher, IRoomInstance, IRoomObjectController, IRoomRenderingCanvas, IRoomSessionManager, ISessionDataManager, IVector3D } from '../../api';
 import { IObjectData } from './object/data/IObjectData';
 import { FurnitureStackingHeightMap } from './utils/FurnitureStackingHeightMap';
 import { LegacyWallGeometry } from './utils/LegacyWallGeometry';

src/nitro/room/RoomContentLoader.ts

@@ -1,15 +1,10 @@
 import { BaseTexture, Resource, Texture } from '@pixi/core';
 import { Loader, LoaderResource } from '@pixi/loaders';
 import { Spritesheet } from '@pixi/spritesheet';
-import { IAssetData, IEventDispatcher, IGraphicAssetCollection, INitroLogger, IRoomContentLoader } from '../../api';
-import { IRoomObject } from '../../api/room/object/IRoomObject';
+import { FurnitureType, IAssetData, IEventDispatcher, IFurnitureData, IFurnitureDataListener, IGraphicAssetCollection, INitroLogger, IRoomContentLoader, IRoomObject, ISessionDataManager } from '../../api';
 import { GraphicAssetCollection, GraphicAssetGifCollection, NitroBundle, NitroEvent, NitroLogger } from '../../core';
 import { RoomContentLoadedEvent } from '../../room/events/RoomContentLoadedEvent';
 import { Nitro } from '../Nitro';
-import { FurnitureType } from '../session/furniture/FurnitureType';
-import { IFurnitureData } from '../session/furniture/IFurnitureData';
-import { IFurnitureDataListener } from '../session/furniture/IFurnitureDataListener';
-import { ISessionDataManager } from '../session/ISessionDataManager';
 import { IRoomContentListener } from './IRoomContentListener';
 import { RoomObjectCategory } from './object/RoomObjectCategory';
 import { RoomObjectUserType } from './object/RoomObjectUserType';

src/nitro/room/RoomEngine.ts

@@ -1,22 +1,19 @@
 import { RenderTexture, Resource, Texture } from '@pixi/core';
 import { Container, DisplayObject } from '@pixi/display';
 import { Matrix, Point, Rectangle } from '@pixi/math';
-import { IConnection, IDisposable, IMessageComposer, IRoomGeometry, IRoomInstance, IRoomManager, IRoomManagerListener, IRoomObject, IRoomObjectController, IRoomObjectLogicFactory, IRoomObjectVisualizationFactory, IRoomRenderer, IRoomRendererFactory, IRoomRenderingCanvas, IUpdateReceiver, IVector3D } from '../../api';
+import { IConnection, IDisposable, IMessageComposer, INitroCommunicationManager, IRoomGeometry, IRoomInstance, IRoomManager, IRoomManagerListener, IRoomObject, IRoomObjectController, IRoomObjectLogicFactory, IRoomObjectVisualizationFactory, IRoomRenderer, IRoomRendererFactory, IRoomRenderingCanvas, IRoomSessionManager, ISessionDataManager, IUpdateReceiver, IVector3D } from '../../api';
 import { NitroEvent, NitroManager } from '../../core';
 import { NitroSprite, TextureUtils } from '../../pixi-proxy';
 import { NumberBank, RoomEnterEffect, RoomGeometry, RoomInstance, RoomObjectEvent, RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomRendererFactory, Vector3d } from '../../room';
 import { PetCustomPart } from '../avatar/pets/PetCustomPart';
 import { PetFigureData } from '../avatar/pets/PetFigureData';
 import { RenderRoomMessageComposer, RenderRoomThumbnailMessageComposer } from '../communication';
-import { INitroCommunicationManager } from '../communication/INitroCommunicationManager';
 import { ToolbarIconEnum } from '../enums/ToolbarIconEnum';
 import { NitroToolbarAnimateIconEvent } from '../events/NitroToolbarAnimateIconEvent';
 import { Nitro } from '../Nitro';
 import { RoomControllerLevel } from '../session/enum/RoomControllerLevel';
 import { BadgeImageReadyEvent } from '../session/events/BadgeImageReadyEvent';
 import { RoomSessionEvent } from '../session/events/RoomSessionEvent';
-import { IRoomSessionManager } from '../session/IRoomSessionManager';
-import { ISessionDataManager } from '../session/ISessionDataManager';
 import { MouseEventType } from '../ui/MouseEventType';
 import { FurniId } from '../utils/FurniId';
 import { RoomDragEvent } from './events';

src/nitro/session/GroupInformationManager.ts

@@ -1,10 +1,10 @@
-import { IDisposable, IMessageEvent } from '../../api';
+import { IDisposable, IGroupInformationManager, IMessageEvent } from '../../api';
 import { RoomReadyMessageEvent } from '../communication';
 import { HabboGroupBadgesMessageEvent } from '../communication/messages/incoming/user/HabboGroupBadgesMessageEvent';
 import { GetHabboGroupBadgesMessageComposer } from '../communication/messages/outgoing/user/GetHabboGroupBadgesMessageComposer';
 import { SessionDataManager } from './SessionDataManager';
 
-export class GroupInformationManager implements IDisposable
+export class GroupInformationManager implements IDisposable, IGroupInformationManager
 {
     private _sessionDataManager: SessionDataManager;
     private _groupBadges: Map<number, string>;

src/nitro/session/IgnoredUsersManager.ts

@@ -1,4 +1,4 @@
-import { IDisposable, IMessageEvent } from '../../api';
+import { IDisposable, IIgnoredUsersManager, IMessageEvent } from '../../api';
 import { IgnoredUsersEvent } from '../communication/messages/incoming/user/IgnoredUsersEvent';
 import { IgnoreResultEvent } from '../communication/messages/incoming/user/IgnoreResultEvent';
 import { GetIgnoredUsersComposer } from '../communication/messages/outgoing/user/data/GetIgnoredUsersComposer';
@@ -7,7 +7,7 @@ import { IgnoreUserIdComposer } from '../communication/messages/outgoing/user/da
 import { UnignoreUserComposer } from '../communication/messages/outgoing/user/data/UnignoreUserComposer';
 import { SessionDataManager } from './SessionDataManager';
 
-export class IgnoredUsersManager implements IDisposable
+export class IgnoredUsersManager implements IDisposable, IIgnoredUsersManager
 {
     private _sessionDataManager: SessionDataManager;
     private _ignoredUsers: string[];

src/nitro/session/RoomSession.ts

@@ -1,4 +1,4 @@
-import { IConnection } from '../../api';
+import { IConnection, IRoomSession } 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';
@@ -29,7 +29,6 @@ import { UserMottoComposer } from '../communication/messages/outgoing/user/data/
 import { RoomControllerLevel } from './enum/RoomControllerLevel';
 import { RoomTradingLevelEnum } from './enum/RoomTradingLevelEnum';
 import { RoomSessionEvent } from './events/RoomSessionEvent';
-import { IRoomSession } from './IRoomSession';
 import { UserDataManager } from './UserDataManager';
 
 export class RoomSession extends Disposable implements IRoomSession

src/nitro/session/RoomSessionManager.ts

@@ -1,5 +1,5 @@
+import { INitroCommunicationManager, IRoomHandlerListener, IRoomSession, IRoomSessionManager } from '../../api';
 import { NitroManager } from '../../core';
-import { INitroCommunicationManager } from '../communication/INitroCommunicationManager';
 import { RoomEngineEvent } from '../room/events/RoomEngineEvent';
 import { IRoomEngine } from '../room/IRoomEngine';
 import { RoomSessionEvent } from './events/RoomSessionEvent';
@@ -14,9 +14,6 @@ import { RoomPresentHandler } from './handler/RoomPresentHandler';
 import { RoomSessionHandler } from './handler/RoomSessionHandler';
 import { RoomUsersHandler } from './handler/RoomUsersHandler';
 import { WordQuizHandler } from './handler/WordQuizHandler';
-import { IRoomHandlerListener } from './IRoomHandlerListener';
-import { IRoomSession } from './IRoomSession';
-import { IRoomSessionManager } from './IRoomSessionManager';
 import { RoomSession } from './RoomSession';
 
 export class RoomSessionManager extends NitroManager implements IRoomSessionManager, IRoomHandlerListener

src/nitro/session/RoomUserData.ts

@@ -1,4 +1,6 @@
-export class RoomUserData
+import { IRoomUserData } from '../../api';
+
+export class RoomUserData implements IRoomUserData
 {
     private _roomIndex: number = -1;
     private _name: string = '';

src/nitro/session/SessionDataManager.ts

@@ -1,8 +1,7 @@
 import { Resource, Texture } from '@pixi/core';
-import { IMessageComposer } from '../../api';
+import { IFurnitureData, IFurnitureDataListener, IGroupInformationManager, IMessageComposer, INitroCommunicationManager, IProductData, IProductDataListener, ISessionDataManager } from '../../api';
 import { NitroEvent, NitroManager } from '../../core';
 import { FigureUpdateEvent, MysteryBoxKeysEvent } from '../communication';
-import { INitroCommunicationManager } from '../communication/INitroCommunicationManager';
 import { AvailabilityStatusMessageEvent } from '../communication/messages/incoming/availability/AvailabilityStatusMessageEvent';
 import { ChangeUserNameResultMessageEvent } from '../communication/messages/incoming/avatar/ChangeUserNameResultMessageEvent';
 import { NoobnessLevelMessageEvent } from '../communication/messages/incoming/handshake/NoobnessLevelMessageEvent';
@@ -24,13 +23,8 @@ import { MysteryBoxKeysUpdateEvent } from './events';
 import { SessionDataPreferencesEvent } from './events/SessionDataPreferencesEvent';
 import { UserNameUpdateEvent } from './events/UserNameUpdateEvent';
 import { FurnitureDataLoader } from './furniture/FurnitureDataLoader';
-import { IFurnitureData } from './furniture/IFurnitureData';
-import { IFurnitureDataListener } from './furniture/IFurnitureDataListener';
 import { GroupInformationManager } from './GroupInformationManager';
 import { IgnoredUsersManager } from './IgnoredUsersManager';
-import { ISessionDataManager } from './ISessionDataManager';
-import { IProductData } from './product/IProductData';
-import { IProductDataListener } from './product/IProductDataListener';
 import { ProductDataLoader } from './product/ProductDataLoader';
 
 export class SessionDataManager extends NitroManager implements ISessionDataManager
@@ -48,7 +42,7 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana
     private _canChangeName: boolean;
 
     private _ignoredUsersManager: IgnoredUsersManager;
-    private _groupInformationManager: GroupInformationManager;
+    private _groupInformationManager: IGroupInformationManager;
 
     private _clubLevel: number;
     private _securityLevel: number;
@@ -601,7 +595,7 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana
         return this._ignoredUsersManager;
     }
 
-    public get groupInformationManager(): GroupInformationManager
+    public get groupInformationManager(): IGroupInformationManager
     {
         return this._groupInformationManager;
     }

src/nitro/session/UserDataManager.ts

@@ -1,8 +1,7 @@
-import { IConnection } from '../../api';
+import { IConnection, IRoomUserData } from '../../api';
 import { Disposable } from '../../core';
 import { RequestPetInfoComposer } from '../communication/messages/outgoing/pet/RequestPetInfoComposer';
 import { UserCurrentBadgesComposer } from '../communication/messages/outgoing/user/data/UserCurrentBadgesComposer';
-import { RoomUserData } from './RoomUserData';
 
 export class UserDataManager extends Disposable
 {
@@ -13,8 +12,8 @@ export class UserDataManager extends Disposable
 
     private _connection: IConnection;
 
-    private _userDataByType: Map<number, Map<number, RoomUserData>>;
-    private _userDataByRoomIndex: Map<number, RoomUserData>;
+    private _userDataByType: Map<number, Map<number, IRoomUserData>>;
+    private _userDataByRoomIndex: Map<number, IRoomUserData>;
     private _userBadges: Map<number, string[]>;
 
     constructor()
@@ -38,27 +37,27 @@ export class UserDataManager extends Disposable
         this._connection = connection;
     }
 
-    public getUserData(webID: number): RoomUserData
+    public getUserData(webID: number): IRoomUserData
     {
         return this.getDataByType(webID, UserDataManager.TYPE_USER);
     }
 
-    public getPetData(webID: number): RoomUserData
+    public getPetData(webID: number): IRoomUserData
     {
         return this.getDataByType(webID, UserDataManager.TYPE_PET);
     }
 
-    public getBotData(webID: number): RoomUserData
+    public getBotData(webID: number): IRoomUserData
     {
         return this.getDataByType(webID, UserDataManager.TYPE_BOT);
     }
 
-    public getRentableBotData(webID: number): RoomUserData
+    public getRentableBotData(webID: number): IRoomUserData
     {
         return this.getDataByType(webID, UserDataManager.TYPE_RENTABLE_BOT);
     }
 
-    public getDataByType(webID: number, type: number): RoomUserData
+    public getDataByType(webID: number, type: number): IRoomUserData
     {
         const existing = this._userDataByType.get(type);
 
@@ -71,7 +70,7 @@ export class UserDataManager extends Disposable
         return userData;
     }
 
-    public getUserDataByIndex(roomIndex: number): RoomUserData
+    public getUserDataByIndex(roomIndex: number): IRoomUserData
     {
         const existing = this._userDataByRoomIndex.get(roomIndex);
 
@@ -80,7 +79,7 @@ export class UserDataManager extends Disposable
         return existing;
     }
 
-    public getUserDataByName(name: string): RoomUserData
+    public getUserDataByName(name: string): IRoomUserData
     {
         for (const userData of this._userDataByRoomIndex.values())
         {
@@ -92,7 +91,7 @@ export class UserDataManager extends Disposable
         return null;
     }
 
-    public updateUserData(data: RoomUserData): void
+    public updateUserData(data: IRoomUserData): void
     {
         if (!data) return;
 

src/nitro/session/events/RoomSessionChatEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../IRoomSession';
+import { IRoomSession } from '../../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionChatEvent extends RoomSessionEvent

src/nitro/session/events/RoomSessionConfirmPetBreedingEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../IRoomSession';
+import { IRoomSession } from '../../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionConfirmPetBreedingEvent extends RoomSessionEvent

src/nitro/session/events/RoomSessionConfirmPetBreedingResultEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../IRoomSession';
+import { IRoomSession } from '../../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionConfirmPetBreedingResultEvent extends RoomSessionEvent

src/nitro/session/events/RoomSessionDanceEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../IRoomSession';
+import { IRoomSession } from '../../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionDanceEvent extends RoomSessionEvent
@@ -25,4 +25,4 @@ export class RoomSessionDanceEvent extends RoomSessionEvent
     {
         return this._danceId;
     }
-}
+}

src/nitro/session/events/RoomSessionDimmerPresetsEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../IRoomSession';
+import { IRoomSession } from '../../../api';
 import { RoomSessionDimmerPresetsEventPresetItem } from './RoomSessionDimmerPresetsEventPresetItem';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
@@ -23,7 +23,7 @@ export class RoomSessionDimmerPresetsEvent extends RoomSessionEvent
 
     public getPreset(id: number): RoomSessionDimmerPresetsEventPresetItem
     {
-        if((id < 0) || (id >= this._presets.length)) return null;
+        if ((id < 0) || (id >= this._presets.length)) return null;
 
         return this._presets[id];
     }

src/nitro/session/events/RoomSessionDoorbellEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../IRoomSession';
+import { IRoomSession } from '../../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionDoorbellEvent extends RoomSessionEvent
@@ -20,4 +20,4 @@ export class RoomSessionDoorbellEvent extends RoomSessionEvent
     {
         return this._userName;
     }
-}
+}

src/nitro/session/events/RoomSessionErrorMessageEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../IRoomSession';
+import { IRoomSession } from '../../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionErrorMessageEvent extends RoomSessionEvent
@@ -18,7 +18,7 @@ export class RoomSessionErrorMessageEvent extends RoomSessionEvent
 
     private _message: string;
 
-    constructor(k: string, _arg_2: IRoomSession, _arg_3: string=null)
+    constructor(k: string, _arg_2: IRoomSession, _arg_3: string = null)
     {
         super(k, _arg_2);
 
@@ -29,4 +29,4 @@ export class RoomSessionErrorMessageEvent extends RoomSessionEvent
     {
         return this._message;
     }
-}
+}

src/nitro/session/events/RoomSessionEvent.ts

@@ -1,5 +1,5 @@
+import { IRoomSession } from '../../../api';
 import { NitroEvent } from '../../../core';
-import { IRoomSession } from '../IRoomSession';
 
 export class RoomSessionEvent extends NitroEvent
 {

src/nitro/session/events/RoomSessionFavoriteGroupUpdateEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../IRoomSession';
+import { IRoomSession } from '../../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionFavoriteGroupUpdateEvent extends RoomSessionEvent

src/nitro/session/events/RoomSessionFriendRequestEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../IRoomSession';
+import { IRoomSession } from '../../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionFriendRequestEvent extends RoomSessionEvent

src/nitro/session/events/RoomSessionNestBreedingSuccessEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../IRoomSession';
+import { IRoomSession } from '../../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionNestBreedingSuccessEvent extends RoomSessionEvent

src/nitro/session/events/RoomSessionPetBreedingEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../IRoomSession';
+import { IRoomSession } from '../../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionPetBreedingEvent extends RoomSessionEvent

src/nitro/session/events/RoomSessionPetBreedingResultEvent.ts

@@ -1,5 +1,5 @@
-import { PetBreedingResultData } from '../../communication/messages/incoming/room/pet/PetBreedingResultData';
-import { IRoomSession } from '../IRoomSession';
+import { IRoomSession } from '../../../api';
+import { PetBreedingResultData } from '../../communication/messages/incoming/room/pet/PetBreedingResultData';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionPetBreedingResultEvent extends RoomSessionEvent

src/nitro/session/events/RoomSessionPetCommandsUpdateEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../IRoomSession';
+import { IRoomSession } from '../../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionPetCommandsUpdateEvent extends RoomSessionEvent
@@ -32,4 +32,4 @@ export class RoomSessionPetCommandsUpdateEvent extends RoomSessionEvent
     {
         return this._enabledCommandIds;
     }
-}
+}

src/nitro/session/events/RoomSessionPetFigureUpdateEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../IRoomSession';
+import { IRoomSession } from '../../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionPetFigureUpdateEvent extends RoomSessionEvent

src/nitro/session/events/RoomSessionPetInfoUpdateEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../IRoomSession';
+import { IRoomSession } from '../../../api';
 import { RoomPetData } from '../RoomPetData';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
@@ -15,7 +15,7 @@ export class RoomSessionPetInfoUpdateEvent extends RoomSessionEvent
         this._petInfo = _arg_2;
     }
 
-    public get petInfo():RoomPetData
+    public get petInfo(): RoomPetData
     {
         return this._petInfo;
     }

src/nitro/session/events/RoomSessionPetLevelUpdateEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../IRoomSession';
+import { IRoomSession } from '../../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionPetLevelUpdateEvent extends RoomSessionEvent

src/nitro/session/events/RoomSessionPetPackageEvent.ts

@@ -1,5 +1,5 @@
-import { PetFigureDataParser } from '../../communication/messages/parser/inventory/pets/PetFigureDataParser';
-import { IRoomSession } from '../IRoomSession';
+import { IRoomSession } from '../../../api';
+import { PetFigureDataParser } from '../../communication/messages/parser/inventory/pets/PetFigureDataParser';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionPetPackageEvent extends RoomSessionEvent
@@ -8,7 +8,7 @@ export class RoomSessionPetPackageEvent extends RoomSessionEvent
     public static RSOPPE_OPEN_PET_PACKAGE_RESULT: string = 'RSOPPE_OPEN_PET_PACKAGE_RESULT';
 
     private _objectId: number = -1;
-    private _figureData:PetFigureDataParser;
+    private _figureData: PetFigureDataParser;
     private _nameValidationStatus: number = 0;
     private _nameValidationInfo: string = null;
 
@@ -26,7 +26,7 @@ export class RoomSessionPetPackageEvent extends RoomSessionEvent
         return this._objectId;
     }
 
-    public get figureData():PetFigureDataParser
+    public get figureData(): PetFigureDataParser
     {
         return this._figureData;
     }

src/nitro/session/events/RoomSessionPetStatusUpdateEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../IRoomSession';
+import { IRoomSession } from '../../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionPetStatusUpdateEvent extends RoomSessionEvent

src/nitro/session/events/RoomSessionPollEvent.ts

@@ -1,5 +1,5 @@
-import { PollQuestion } from '../../communication/messages/parser/poll/PollQuestion';
-import { IRoomSession } from '../IRoomSession';
+import { IRoomSession } from '../../../api';
+import { PollQuestion } from '../../communication/messages/parser/poll/PollQuestion';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 

src/nitro/session/events/RoomSessionPresentEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../IRoomSession';
+import { IRoomSession } from '../../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionPresentEvent extends RoomSessionEvent

src/nitro/session/events/RoomSessionPropertyUpdateEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../IRoomSession';
+import { IRoomSession } from '../../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionPropertyUpdateEvent extends RoomSessionEvent
@@ -9,4 +9,4 @@ export class RoomSessionPropertyUpdateEvent extends RoomSessionEvent
     {
         super(k, _arg_2);
     }
-}
+}

src/nitro/session/events/RoomSessionQueueEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../IRoomSession';
+import { IRoomSession } from '../../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionQueueEvent extends RoomSessionEvent

src/nitro/session/events/RoomSessionSpectatorModeEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../IRoomSession';
+import { IRoomSession } from '../../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionSpectatorModeEvent extends RoomSessionEvent

src/nitro/session/events/RoomSessionUserBadgesEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../IRoomSession';
+import { IRoomSession } from '../../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionUserBadgesEvent extends RoomSessionEvent
@@ -26,4 +26,4 @@ export class RoomSessionUserBadgesEvent extends RoomSessionEvent
     {
         return this._badges;
     }
-}
+}

src/nitro/session/events/RoomSessionUserDataUpdateEvent.ts

@@ -1,22 +1,21 @@
-import { IRoomSession } from '../IRoomSession';
-import { RoomUserData } from '../RoomUserData';
+import { IRoomSession, IRoomUserData } from '../../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionUserDataUpdateEvent extends RoomSessionEvent
 {
     public static USER_DATA_UPDATED: string = 'RMUDUE_USER_DATA_UPDATED';
 
-    private _addedUsers: RoomUserData[];
+    private _addedUsers: IRoomUserData[];
 
-    constructor(session: IRoomSession, addedUsers: RoomUserData[])
+    constructor(session: IRoomSession, addedUsers: IRoomUserData[])
     {
         super(RoomSessionUserDataUpdateEvent.USER_DATA_UPDATED, session);
 
         this._addedUsers = addedUsers;
     }
 
-    public get addedUsers(): RoomUserData[]
+    public get addedUsers(): IRoomUserData[]
     {
         return this._addedUsers;
     }
-}
+}

src/nitro/session/events/RoomSessionUserFigureUpdateEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../IRoomSession';
+import { IRoomSession } from '../../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionUserFigureUpdateEvent extends RoomSessionEvent

src/nitro/session/events/RoomSessionVoteEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../IRoomSession';
+import { IRoomSession } from '../../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 
@@ -12,7 +12,7 @@ export class RoomSessionVoteEvent extends RoomSessionEvent
     private _SafeStr_7651: string[];
     private _SafeStr_7654: number = 0;
 
-    constructor(_arg_1: string, _arg_2: IRoomSession, _arg_3: string, _arg_4: string[], _arg_5: string[]=null, _arg_6: number=0)
+    constructor(_arg_1: string, _arg_2: IRoomSession, _arg_3: string, _arg_4: string[], _arg_5: string[] = null, _arg_6: number = 0)
     {
         super(_arg_1, _arg_2);
 
@@ -21,7 +21,7 @@ export class RoomSessionVoteEvent extends RoomSessionEvent
         this._question = _arg_3;
         this._choices = _arg_4;
         this._SafeStr_7651 = _arg_5;
-        if(this._SafeStr_7651 == null)
+        if (this._SafeStr_7651 == null)
         {
             this._SafeStr_7651 = [];
         }

src/nitro/session/events/RoomSessionWordQuizEvent.ts

@@ -1,5 +1,5 @@
-import { IQuestion } from '../../communication/messages/parser/poll/QuestionParser';
-import { IRoomSession } from '../IRoomSession';
+import { IRoomSession } from '../../../api';
+import { IQuestion } from '../../communication/messages/parser/poll/QuestionParser';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionWordQuizEvent extends RoomSessionEvent

src/nitro/session/furniture/FurnitureData.ts

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

src/nitro/session/furniture/FurnitureDataLoader.ts

@@ -1,8 +1,7 @@
+import { FurnitureType, IFurnitureData } from '../../../api';
 import { EventDispatcher, NitroEvent, NitroLogger } from '../../../core';
 import { INitroLocalizationManager } from '../../localization/INitroLocalizationManager';
 import { FurnitureData } from './FurnitureData';
-import { FurnitureType } from './FurnitureType';
-import { IFurnitureData } from './IFurnitureData';
 
 export class FurnitureDataLoader extends EventDispatcher
 {

src/nitro/session/furniture/index.ts

@@ -1,5 +1,2 @@
 export * from './FurnitureData';
 export * from './FurnitureDataLoader';
-export * from './FurnitureType';
-export * from './IFurnitureData';
-export * from './IFurnitureDataListener';

src/nitro/session/handler/BaseHandler.ts

@@ -1,6 +1,5 @@
-import { IConnection } from '../../../api';
+import { IConnection, IRoomHandlerListener } from '../../../api';
 import { Disposable } from '../../../core';
-import { IRoomHandlerListener } from '../IRoomHandlerListener';
 
 export class BaseHandler extends Disposable
 {

src/nitro/session/handler/GenericErrorHandler.ts

@@ -1,8 +1,7 @@
-import { IConnection } from '../../../api';
+import { IConnection, IRoomHandlerListener } from '../../../api';
 import { GenericErrorEvent } from '../../communication/messages/incoming/generic/GenericErrorEvent';
 import { GenericErrorEnum } from '../enum/GenericErrorEnum';
 import { RoomSessionErrorMessageEvent } from '../events/RoomSessionErrorMessageEvent';
-import { IRoomHandlerListener } from '../IRoomHandlerListener';
 import { BaseHandler } from './BaseHandler';
 
 export class GenericErrorHandler extends BaseHandler

src/nitro/session/handler/PollHandler.ts

@@ -1,9 +1,8 @@
-import { IConnection } from '../../../api';
+import { IConnection, IRoomHandlerListener } from '../../../api';
 import { PollContentsEvent } from '../../communication/messages/incoming/poll/PollContentsEvent';
 import { PollErrorEvent } from '../../communication/messages/incoming/poll/PollErrorEvent';
 import { PollOfferEvent } from '../../communication/messages/incoming/poll/PollOfferEvent';
 import { RoomSessionPollEvent } from '../events/RoomSessionPollEvent';
-import { IRoomHandlerListener } from '../IRoomHandlerListener';
 import { BaseHandler } from './BaseHandler';
 
 export class PollHandler extends BaseHandler

src/nitro/session/handler/RoomChatHandler.ts

@@ -1,4 +1,4 @@
-import { IConnection } from '../../../api';
+import { IConnection, IRoomHandlerListener } from '../../../api';
 import { FloodControlEvent } from '../../communication/messages/incoming/room/unit/chat/FloodControlEvent';
 import { RemainingMuteEvent } from '../../communication/messages/incoming/room/unit/chat/RemainingMuteEvent';
 import { RoomUnitChatEvent } from '../../communication/messages/incoming/room/unit/chat/RoomUnitChatEvent';
@@ -11,7 +11,6 @@ import { PetSupplementTypeEnum } from '../../communication/messages/incoming/use
 import { RespectReceivedEvent } from '../../communication/messages/incoming/user/RespectReceivedEvent';
 import { SystemChatStyleEnum } from '../../ui/widget/enums/SystemChatStyleEnum';
 import { RoomSessionChatEvent } from '../events/RoomSessionChatEvent';
-import { IRoomHandlerListener } from '../IRoomHandlerListener';
 import { BaseHandler } from './BaseHandler';
 
 export class RoomChatHandler extends BaseHandler

src/nitro/session/handler/RoomDataHandler.ts

@@ -1,8 +1,7 @@
-import { IConnection } from '../../../api';
+import { IConnection, IRoomHandlerListener } from '../../../api';
 import { GetGuestRoomResultEvent } from '../../communication/messages/incoming/navigator/GetGuestRoomResultEvent';
 import { RoomSessionEvent } from '../events/RoomSessionEvent';
 import { RoomSessionPropertyUpdateEvent } from '../events/RoomSessionPropertyUpdateEvent';
-import { IRoomHandlerListener } from '../IRoomHandlerListener';
 import { BaseHandler } from './BaseHandler';
 
 export class RoomDataHandler extends BaseHandler

src/nitro/session/handler/RoomDimmerPresetsHandler.ts

@@ -1,7 +1,6 @@
-import { IConnection } from '../../../api';
+import { IConnection, IRoomHandlerListener } from '../../../api';
 import { RoomDimmerPresetsEvent } from '../../communication/messages/incoming/room/furniture/RoomDimmerPresetsMessageEvent';
 import { RoomSessionDimmerPresetsEvent } from '../events/RoomSessionDimmerPresetsEvent';
-import { IRoomHandlerListener } from '../IRoomHandlerListener';
 import { BaseHandler } from './BaseHandler';
 
 export class RoomDimmerPresetsHandler extends BaseHandler

src/nitro/session/handler/RoomPermissionsHandler.ts

@@ -1,9 +1,8 @@
-import { IConnection } from '../../../api';
+import { IConnection, IRoomHandlerListener } from '../../../api';
 import { RoomRightsClearEvent } from '../../communication/messages/incoming/room/access/rights/RoomRightsClearEvent';
 import { RoomRightsEvent } from '../../communication/messages/incoming/room/access/rights/RoomRightsEvent';
 import { RoomRightsOwnerEvent } from '../../communication/messages/incoming/room/access/rights/RoomRightsOwnerEvent';
 import { RoomControllerLevel } from '../enum/RoomControllerLevel';
-import { IRoomHandlerListener } from '../IRoomHandlerListener';
 import { BaseHandler } from './BaseHandler';
 
 export class RoomPermissionsHandler extends BaseHandler

src/nitro/session/handler/RoomPresentHandler.ts

@@ -1,7 +1,6 @@
-import { IConnection } from '../../../api';
+import { IConnection, IRoomHandlerListener } from '../../../api';
 import { PresentOpenedMessageEvent } from '../../communication/messages/incoming/inventory/furni/gifts/PresentOpenedMessageEvent';
 import { RoomSessionPresentEvent } from '../events/RoomSessionPresentEvent';
-import { IRoomHandlerListener } from '../IRoomHandlerListener';
 import { BaseHandler } from './BaseHandler';
 
 export class RoomPresentHandler extends BaseHandler

src/nitro/session/handler/RoomSessionHandler.ts

@@ -1,4 +1,4 @@
-import { IConnection } from '../../../api';
+import { IConnection, IRoomHandlerListener } from '../../../api';
 import { DesktopViewEvent } from '../../communication/messages/incoming/desktop/DesktopViewEvent';
 import { FlatAccessDeniedMessageEvent } from '../../communication/messages/incoming/navigator/FlatAccessDeniedMessageEvent';
 import { RoomDoorbellAcceptedEvent } from '../../communication/messages/incoming/room/access/doorbell/RoomDoorbellAcceptedEvent';
@@ -7,7 +7,6 @@ import { RoomReadyMessageEvent } from '../../communication/messages/incoming/roo
 import { YouAreSpectatorMessageEvent } from '../../communication/messages/incoming/room/session/YouAreSpectatorMessageEvent';
 import { GoToFlatMessageComposer } from '../../communication/messages/outgoing/room/session/GoToFlatMessageComposer';
 import { RoomSessionDoorbellEvent } from '../events/RoomSessionDoorbellEvent';
-import { IRoomHandlerListener } from '../IRoomHandlerListener';
 import { RoomSessionSpectatorModeEvent } from './../events/RoomSessionSpectatorModeEvent';
 import { BaseHandler } from './BaseHandler';
 

src/nitro/session/handler/RoomUsersHandler.ts

@@ -1,4 +1,4 @@
-import { IConnection } from '../../../api';
+import { IConnection, IRoomHandlerListener, IRoomUserData } from '../../../api';
 import { PetFigureUpdateEvent } from '../../communication';
 import { NewFriendRequestEvent } from '../../communication/messages/incoming/friendlist/NewFriendRequestEvent';
 import { DoorbellMessageEvent } from '../../communication/messages/incoming/navigator/DoorbellMessageEvent';
@@ -22,7 +22,6 @@ import { RoomSessionFriendRequestEvent } from '../events/RoomSessionFriendReques
 import { RoomSessionPetInfoUpdateEvent } from '../events/RoomSessionPetInfoUpdateEvent';
 import { RoomSessionUserBadgesEvent } from '../events/RoomSessionUserBadgesEvent';
 import { RoomSessionUserDataUpdateEvent } from '../events/RoomSessionUserDataUpdateEvent';
-import { IRoomHandlerListener } from '../IRoomHandlerListener';
 import { RoomPetData } from '../RoomPetData';
 import { RoomUserData } from '../RoomUserData';
 import { BaseHandler } from './BaseHandler';
@@ -59,7 +58,7 @@ export class RoomUsersHandler extends BaseHandler
 
         const users = event.getParser().users;
 
-        const usersToAdd: RoomUserData[] = [];
+        const usersToAdd: IRoomUserData[] = [];
 
         if (users && users.length)
         {

src/nitro/session/handler/WordQuizHandler.ts

@@ -1,9 +1,8 @@
-import { IConnection } from '../../../api';
+import { IConnection, IRoomHandlerListener } from '../../../api';
 import { QuestionAnsweredEvent } from '../../communication/messages/incoming/poll/QuestionAnsweredEvent';
 import { QuestionEvent } from '../../communication/messages/incoming/poll/QuestionEvent';
 import { QuestionFinishedEvent } from '../../communication/messages/incoming/poll/QuestionFinishedEvent';
 import { RoomSessionWordQuizEvent } from '../events/RoomSessionWordQuizEvent';
-import { IRoomHandlerListener } from '../IRoomHandlerListener';
 import { BaseHandler } from './BaseHandler';
 
 export class WordQuizHandler extends BaseHandler

src/nitro/session/index.ts

@@ -5,10 +5,6 @@ export * from './furniture';
 export * from './HabboClubLevelEnum';
 export * from './handler';
 export * from './IgnoredUsersManager';
-export * from './IRoomHandlerListener';
-export * from './IRoomSession';
-export * from './IRoomSessionManager';
-export * from './ISessionDataManager';
 export * from './product';
 export * from './RoomPetData';
 export * from './RoomSession';

src/nitro/session/product/ProductData.ts

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

src/nitro/session/product/ProductDataLoader.ts

@@ -1,5 +1,5 @@
-import { EventDispatcher, NitroEvent } from '../../../core';
-import { IProductData } from './IProductData';
+import { IProductData } from '../../../api';
+import { EventDispatcher, NitroEvent } from '../../../core';
 import { ProductData } from './ProductData';
 
 export class ProductDataLoader extends EventDispatcher

src/nitro/session/product/index.ts

@@ -1,4 +1,2 @@
-export * from './IProductData';
-export * from './IProductDataListener';
 export * from './ProductData';
 export * from './ProductDataLoader';