Move some files around

src/api/INitroCore.ts

@@ -1,9 +0,0 @@
-import { IDisposable } from './common';
-import { ICommunicationManager } from './communication';
-import { IConfigurationManager } from './configuration';
-
-export interface INitroCore extends IDisposable
-{
-    configuration: IConfigurationManager;
-    communication: ICommunicationManager;
-}

src/api/communication/ICommunicationManager.ts

@@ -1,8 +0,0 @@
-import { IDisposable } from '../common';
-import { IConnection } from './IConnection';
-import { IConnectionStateListener } from './IConnectionStateListener';
-
-export interface ICommunicationManager extends IDisposable
-{
-    createConnection(stateListener?: IConnectionStateListener): IConnection;
-}

src/api/communication/index.ts

@@ -1,10 +0,0 @@
-export * from './enums';
-export * from './ICodec';
-export * from './ICommunicationManager';
-export * from './IConnection';
-export * from './IConnectionStateListener';
-export * from './IMessageComposer';
-export * from './IMessageConfiguration';
-export * from './IMessageDataWrapper';
-export * from './IMessageEvent';
-export * from './IMessageParser';

src/api/index.ts

@@ -3,6 +3,7 @@ export * from './asset/animation';
 export * from './asset/logic';
 export * from './asset/logic/model';
 export * from './asset/logic/particlesystem';
+export * from './asset/room-visualization';
 export * from './asset/spritesheet';
 export * from './asset/visualization';
 export * from './asset/visualization/animation';
@@ -10,10 +11,6 @@ export * from './asset/visualization/color';
 export * from './asset/visualization/gestures';
 export * from './asset/visualization/postures';
 export * from './common';
-export * from './communication';
-export * from './communication/enums';
-export * from './configuration';
-export * from './INitroCore';
 export * from './nitro';
 export * from './nitro/avatar';
 export * from './nitro/avatar/actions';
@@ -24,6 +21,8 @@ export * from './nitro/avatar/pet';
 export * from './nitro/avatar/structure';
 export * from './nitro/camera';
 export * from './nitro/communication';
+export * from './nitro/communication/enums';
+export * from './nitro/configuration';
 export * from './nitro/enums';
 export * from './nitro/localization';
 export * from './nitro/room';

src/api/nitro/communication/ICodec.ts

@@ -1,4 +1,4 @@
-import { IBinaryWriter } from '../utils';
+import { IBinaryWriter } from '../../utils';
 import { IConnection } from './IConnection';
 import { IMessageDataWrapper } from './IMessageDataWrapper';
 

src/api/nitro/communication/IConnection.ts

@@ -1,4 +1,4 @@
-import { IEventDispatcher } from '../common';
+import { IEventDispatcher } from '../../common';
 import { IMessageComposer } from './IMessageComposer';
 import { IMessageConfiguration } from './IMessageConfiguration';
 import { IMessageEvent } from './IMessageEvent';

src/api/nitro/communication/IMessageDataWrapper.ts

@@ -1,4 +1,4 @@
-import { IBinaryReader } from '../utils';
+import { IBinaryReader } from '../../utils';
 
 export interface IMessageDataWrapper
 {

src/api/nitro/communication/INitroCommunicationManager.ts

@@ -1,5 +1,6 @@
 import { INitroManager } from '../../common';
-import { IConnection, IMessageEvent } from '../../communication';
+import { IConnection } from './IConnection';
+import { IMessageEvent } from './IMessageEvent';
 import { INitroCommunicationDemo } from './INitroCommunicationDemo';
 
 export interface INitroCommunicationManager extends INitroManager

src/api/nitro/communication/index.ts

@@ -1,2 +1,11 @@
+export * from './ICodec';
+export * from './IConnection';
+export * from './IConnectionStateListener';
+export * from './IMessageComposer';
+export * from './IMessageConfiguration';
+export * from './IMessageDataWrapper';
+export * from './IMessageEvent';
+export * from './IMessageParser';
 export * from './INitroCommunicationDemo';
 export * from './INitroCommunicationManager';
+export * from './enums';

src/api/nitro/configuration/IConfigurationManager.ts

@@ -1,3 +1,3 @@
-import { INitroManager } from '../common';
+import { INitroManager } from '../../common';
 
 export type IConfigurationManager = INitroManager

src/api/nitro/configuration/NitroConfiguration.ts

@@ -1,4 +1,4 @@
-import { NitroLogger } from '../common';
+import { NitroLogger } from '../../common';
 
 export class NitroConfiguration
 {

src/api/nitro/index.ts

@@ -7,6 +7,7 @@ export * from './avatar/pet';
 export * from './avatar/structure';
 export * from './camera';
 export * from './communication';
+export * from './configuration';
 export * from './enums';
 export * from './localization';
 export * from './room';

src/api/nitro/room/object/data/ObjectDataBase.ts

@@ -1,5 +1,5 @@
-import { IMessageDataWrapper } from '../../../../communication';
 import { IRoomObjectModel } from '../../../../room';
+import { IMessageDataWrapper } from '../../../communication';
 import { RoomObjectVariable } from '../RoomObjectVariable';
 import { IObjectData } from './IObjectData';
 import { ObjectDataFlags } from './ObjectDataFlags';

src/api/nitro/room/object/data/type/CrackableDataType.ts

@@ -1,5 +1,5 @@
-import { IMessageDataWrapper } from '../../../../../communication';
 import { IRoomObjectModel } from '../../../../../room';
+import { IMessageDataWrapper } from '../../../../communication';
 import { RoomObjectVariable } from '../../RoomObjectVariable';
 import { IObjectData } from '../IObjectData';
 import { ObjectDataBase } from '../ObjectDataBase';

src/api/nitro/room/object/data/type/EmptyDataType.ts

@@ -1,5 +1,5 @@
-import { IMessageDataWrapper } from '../../../../../communication';
 import { IRoomObjectModel } from '../../../../../room';
+import { IMessageDataWrapper } from '../../../../communication';
 import { RoomObjectVariable } from '../../RoomObjectVariable';
 import { IObjectData } from '../IObjectData';
 import { ObjectDataBase } from '../ObjectDataBase';

src/api/nitro/room/object/data/type/HighScoreDataType.ts

@@ -1,5 +1,5 @@
-import { IMessageDataWrapper } from '../../../../../communication';
 import { IRoomObjectModel } from '../../../../../room';
+import { IMessageDataWrapper } from '../../../../communication';
 import { RoomObjectVariable } from '../../RoomObjectVariable';
 import { IObjectData } from '../IObjectData';
 import { ObjectDataBase } from '../ObjectDataBase';

src/api/nitro/room/object/data/type/LegacyDataType.ts

@@ -1,5 +1,5 @@
-import { IMessageDataWrapper } from '../../../../../communication';
 import { IRoomObjectModel } from '../../../../../room';
+import { IMessageDataWrapper } from '../../../../communication';
 import { RoomObjectVariable } from '../../RoomObjectVariable';
 import { IObjectData } from '../IObjectData';
 import { ObjectDataBase } from '../ObjectDataBase';

src/api/nitro/room/object/data/type/MapDataType.ts

@@ -1,5 +1,5 @@
-import { IMessageDataWrapper } from '../../../../../communication';
 import { IRoomObjectModel } from '../../../../../room';
+import { IMessageDataWrapper } from '../../../../communication';
 import { RoomObjectVariable } from '../../RoomObjectVariable';
 import { IObjectData } from '../IObjectData';
 import { ObjectDataBase } from '../ObjectDataBase';

src/api/nitro/room/object/data/type/NumberDataType.ts

@@ -1,5 +1,5 @@
-import { IMessageDataWrapper } from '../../../../../communication';
 import { IRoomObjectModel } from '../../../../../room';
+import { IMessageDataWrapper } from '../../../../communication';
 import { RoomObjectVariable } from '../../RoomObjectVariable';
 import { IObjectData } from '../IObjectData';
 import { ObjectDataBase } from '../ObjectDataBase';

src/api/nitro/room/object/data/type/StringDataType.ts

@@ -1,5 +1,5 @@
-import { IMessageDataWrapper } from '../../../../../communication';
 import { IRoomObjectModel } from '../../../../../room';
+import { IMessageDataWrapper } from '../../../../communication';
 import { RoomObjectVariable } from '../../RoomObjectVariable';
 import { IObjectData } from '../IObjectData';
 import { ObjectDataBase } from '../ObjectDataBase';

src/api/nitro/room/object/data/type/VoteDataType.ts

@@ -1,5 +1,5 @@
-import { IMessageDataWrapper } from '../../../../../communication';
 import { IRoomObjectModel } from '../../../../../room';
+import { IMessageDataWrapper } from '../../../../communication';
 import { RoomObjectVariable } from '../../RoomObjectVariable';
 import { IObjectData } from '../IObjectData';
 import { ObjectDataBase } from '../ObjectDataBase';

src/api/nitro/session/IRoomSession.ts

@@ -1,5 +1,5 @@
 import { IDisposable } from '../../common';
-import { IConnection } from '../../communication';
+import { IConnection } from '../communication';
 import { IRoomModerationSettings } from './IRoomModerationSettings';
 import { IUserDataManager } from './IUserDataManager';
 

src/api/nitro/session/IUserDataManager.ts

@@ -1,4 +1,4 @@
-import { IConnection } from '../../communication';
+import { IConnection } from '../communication';
 import { IRoomUserData } from './IRoomUserData';
 
 export interface IUserDataManager

src/common/Disposable.ts

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

src/common/EventDispatcher.ts

@@ -1,4 +1,4 @@
-import { IDisposable, IEventDispatcher, INitroEvent, NitroLogger } from '../../api';
+import { IDisposable, IEventDispatcher, INitroEvent, NitroLogger } from '../api';
 import { Disposable } from './Disposable';
 
 export class EventDispatcher extends Disposable implements IEventDispatcher, IDisposable

src/common/NitroManager.ts

@@ -1,4 +1,4 @@
-import { IEventDispatcher, INitroManager } from '../../api';
+import { IEventDispatcher, INitroManager } from '../api';
 import { Disposable } from './Disposable';
 import { EventDispatcher } from './EventDispatcher';
 

src/core/NitroCore.ts

@@ -1,41 +0,0 @@
-import { ICommunicationManager, IConfigurationManager, INitroCore } from '../api';
-import { Disposable } from './common';
-import { CommunicationManager } from './communication';
-import { ConfigurationManager } from './configuration';
-import { NitroVersion } from './NitroVersion';
-
-export class NitroCore extends Disposable implements INitroCore
-{
-    private _configuration: IConfigurationManager;
-    private _communication: ICommunicationManager;
-
-    constructor()
-    {
-        super();
-
-        NitroVersion.sayHello();
-
-        this._configuration = new ConfigurationManager();
-        this._communication = new CommunicationManager();
-    }
-
-    protected onDispose(): void
-    {
-        if(this._communication)
-        {
-            this._communication.dispose();
-
-            this._communication = null;
-        }
-    }
-
-    public get configuration(): IConfigurationManager
-    {
-        return this._configuration;
-    }
-
-    public get communication(): ICommunicationManager
-    {
-        return this._communication;
-    }
-}

src/core/communication/CommunicationManager.ts

@@ -1,50 +0,0 @@
-import { ICommunicationManager, IConnection, IConnectionStateListener, IUpdateReceiver } from '../../api';
-import { Disposable } from '../common';
-import { SocketConnection } from './SocketConnection';
-
-export class CommunicationManager extends Disposable implements ICommunicationManager, IUpdateReceiver
-{
-    private _connections: IConnection[];
-
-    constructor()
-    {
-        super();
-
-        this._connections = [];
-    }
-
-    protected onDispose(): void
-    {
-        if(!this._connections || !this._connections.length) return;
-
-        for(const connection of this._connections.values()) connection && connection.dispose();
-    }
-
-    public createConnection(stateListener: IConnectionStateListener = null): IConnection
-    {
-        const connection = new SocketConnection(this, stateListener);
-
-        if(!connection) return;
-
-        this._connections.push(connection);
-
-        return connection;
-    }
-
-    public update(time: number): void
-    {
-        let index = 0;
-
-        while(index < this._connections.length)
-        {
-            const connection = this._connections[index];
-
-            connection.processReceivedData();
-
-            if(this.disposed) return;
-
-            if(connection.disposed) this._connections.splice(index, 1);
-            else index++;
-        }
-    }
-}

src/core/communication/index.ts

@@ -1,5 +0,0 @@
-export * from './codec';
-export * from './codec/evawire';
-export * from './CommunicationManager';
-export * from './messages';
-export * from './SocketConnection';

src/core/communication/messages/index.ts

@@ -1 +0,0 @@
-export * from './MessageClassManager';

src/core/index.ts

@@ -1,8 +0,0 @@
-export * from './common';
-export * from './communication';
-export * from './communication/codec';
-export * from './communication/codec/evawire';
-export * from './communication/messages';
-export * from './configuration';
-export * from './NitroCore';
-export * from './NitroVersion';

src/events/core/ConfigurationEvent.ts

@@ -1,4 +1,4 @@
-import { NitroEvent } from '../../events';
+import { NitroEvent } from './NitroEvent';
 
 export class ConfigurationEvent extends NitroEvent
 {

src/events/core/index.ts

@@ -1,3 +1,4 @@
+export * from './ConfigurationEvent';
 export * from './MessageEvent';
 export * from './NitroEvent';
 export * from './SocketConnectionEvent';

src/index.ts

@@ -1,5 +1,5 @@
 export * from './api';
-export * from './core';
+export * from './common';
 export * from './events';
 export * from './nitro';
 export * from './pixi-proxy';

src/nitro/INitro.ts

@@ -1,5 +1,5 @@
 import { Application } from '@pixi/app';
-import { IAvatarRenderManager, IEventDispatcher, ILinkEventTracker, INitroCommunicationManager, INitroCore, INitroLocalizationManager, IRoomCameraWidgetManager, IRoomEngine, IRoomManager, IRoomSessionManager, ISessionDataManager, ISoundManager } from '../api';
+import { IAvatarRenderManager, IConfigurationManager, IEventDispatcher, ILinkEventTracker, INitroCommunicationManager, INitroLocalizationManager, IRoomCameraWidgetManager, IRoomEngine, IRoomManager, IRoomSessionManager, ISessionDataManager, ISoundManager } from '../api';
 
 export interface INitro
 {
@@ -13,7 +13,7 @@ export interface INitro
     removeLinkEventTracker(tracker: ILinkEventTracker): void;
     createLinkEvent(link: string): void;
     application: Application;
-    core: INitroCore;
+    configuration: IConfigurationManager;
     events: IEventDispatcher;
     localization: INitroLocalizationManager;
     communication: INitroCommunicationManager;

src/nitro/Nitro.ts

@@ -1,19 +1,21 @@
 import { Application, IApplicationOptions } from '@pixi/app';
 import { SCALE_MODES } from '@pixi/constants';
 import { settings } from '@pixi/settings';
-import { IAvatarRenderManager, IEventDispatcher, ILinkEventTracker, INitroCommunicationManager, INitroCore, INitroLocalizationManager, IRoomCameraWidgetManager, IRoomEngine, IRoomManager, IRoomSessionManager, ISessionDataManager, ISoundManager, NitroConfiguration, NitroLogger } from '../api';
-import { ConfigurationEvent, EventDispatcher, NitroCore } from '../core';
-import { NitroEvent, RoomEngineEvent } from '../events';
+import { IAvatarRenderManager, IConfigurationManager, IEventDispatcher, ILinkEventTracker, INitroCommunicationManager, INitroLocalizationManager, IRoomCameraWidgetManager, IRoomEngine, IRoomManager, IRoomSessionManager, ISessionDataManager, ISoundManager, NitroConfiguration, NitroLogger } from '../api';
+import { EventDispatcher } from '../common';
+import { ConfigurationEvent, NitroEvent, RoomEngineEvent } from '../events';
 import { GetTicker, PixiApplicationProxy } from '../pixi-proxy';
 import { RoomManager } from '../room';
+import { INitro } from './INitro';
+import { NitroVersion } from './NitroVersion';
+import './Plugins';
 import { AvatarRenderManager } from './avatar';
 import { RoomCameraWidgetManager } from './camera';
 import { NitroCommunicationManager } from './communication';
+import { ConfigurationManager } from './configuration';
 import { LegacyExternalInterface } from './externalInterface';
 import { GameMessageHandler } from './game';
-import { INitro } from './INitro';
 import { NitroLocalizationManager } from './localization';
-import './Plugins';
 import { LandscapeRasterizer, RoomEngine } from './room';
 import { RoomSessionManager, SessionDataManager } from './session';
 import { SoundManager } from './sound';
@@ -34,7 +36,7 @@ export class Nitro implements INitro
     private static INSTANCE: INitro = null;
 
     private _application: Application;
-    private _core: INitroCore;
+    private _configuration: IConfigurationManager;
     private _events: IEventDispatcher;
     private _communication: INitroCommunicationManager;
     private _localization: INitroLocalizationManager;
@@ -50,14 +52,14 @@ export class Nitro implements INitro
     private _isReady: boolean;
     private _isDisposed: boolean;
 
-    constructor(core: INitroCore, options?: IApplicationOptions)
+    constructor(options?: IApplicationOptions)
     {
         if(!Nitro.INSTANCE) Nitro.INSTANCE = this;
 
         this._application = new PixiApplicationProxy(options);
-        this._core = core;
+        this._configuration = new ConfigurationManager();
         this._events = new EventDispatcher();
-        this._communication = new NitroCommunicationManager(core.communication);
+        this._communication = new NitroCommunicationManager();
         this._localization = new NitroLocalizationManager(this._communication);
         this._avatar = new AvatarRenderManager();
         this._roomEngine = new RoomEngine(this._communication);
@@ -71,12 +73,14 @@ export class Nitro implements INitro
         this._isReady = false;
         this._isDisposed = false;
 
-        this._core.configuration.events.addEventListener(ConfigurationEvent.LOADED, this.onConfigurationLoadedEvent.bind(this));
+        this._configuration.events.addEventListener(ConfigurationEvent.LOADED, this.onConfigurationLoadedEvent.bind(this));
         this._roomEngine.events.addEventListener(RoomEngineEvent.ENGINE_INITIALIZED, this.onRoomEngineReady.bind(this));
     }
 
     public static bootstrap(): void
     {
+        NitroVersion.sayHello();
+
         if(Nitro.INSTANCE)
         {
             Nitro.INSTANCE.dispose();
@@ -86,7 +90,7 @@ export class Nitro implements INitro
 
         const canvas = document.createElement('canvas');
 
-        const instance = new this(new NitroCore(), {
+        const instance = new this({
             autoDensity: false,
             width: window.innerWidth,
             height: window.innerHeight,
@@ -283,9 +287,9 @@ export class Nitro implements INitro
         return this._application;
     }
 
-    public get core(): INitroCore
+    public get configuration(): IConfigurationManager
     {
-        return this._core;
+        return this._configuration;
     }
 
     public get events(): IEventDispatcher

src/nitro/avatar/AvatarAssetDownloadLibrary.ts

@@ -1,5 +1,5 @@
 import { IAssetManager, IAvatarAssetDownloadLibrary } from '../../api';
-import { EventDispatcher } from '../../core';
+import { EventDispatcher } from '../../common';
 import { AvatarRenderLibraryEvent } from '../../events';
 
 export class AvatarAssetDownloadLibrary extends EventDispatcher implements IAvatarAssetDownloadLibrary

src/nitro/avatar/AvatarAssetDownloadManager.ts

@@ -1,5 +1,5 @@
 import { IAssetManager, IAvatarFigureContainer, IAvatarImageListener, INitroEvent, NitroConfiguration, NitroLogger } from '../../api';
-import { EventDispatcher } from '../../core';
+import { EventDispatcher } from '../../common';
 import { AvatarRenderEvent, AvatarRenderLibraryEvent, NitroEvent } from '../../events';
 import { AvatarAssetDownloadLibrary } from './AvatarAssetDownloadLibrary';
 import { AvatarStructure } from './AvatarStructure';

src/nitro/avatar/AvatarRenderManager.ts

@@ -1,5 +1,5 @@
 import { AvatarSetType, GetAssetManager, IAssetManager, IAvatarEffectListener, IAvatarFigureContainer, IAvatarImage, IAvatarImageListener, IAvatarRenderManager, IFigureData, IFigurePartSet, IFigureSetData, IGraphicAsset, INitroEvent, IStructureData, NitroConfiguration, NitroLogger } from '../../api';
-import { NitroManager } from '../../core';
+import { NitroManager } from '../../common';
 import { AvatarRenderEvent, NitroEvent } from '../../events';
 import { FigureDataContainer } from '../utils';
 import { AssetAliasCollection } from './alias';

src/nitro/avatar/AvatarStructure.ts

@@ -1,10 +1,10 @@
 import { Point } from '@pixi/math';
 import { AvatarDirectionAngle, IActionDefinition, IActiveActionData, IAssetAnimation, IAssetManager, IAvatarFigureContainer, IAvatarImage, IAvatarRenderManager, IFigureData, IFigurePartSet, IPartColor, IStructureData } from '../../api';
-import { EventDispatcher } from '../../core';
-import { ActionDefinition, AvatarActionManager } from './actions';
-import { Animation, AnimationManager, AvatarAnimationLayerData } from './animation';
+import { EventDispatcher } from '../../common';
 import { AvatarImagePartContainer } from './AvatarImagePartContainer';
 import { AvatarRenderManager } from './AvatarRenderManager';
+import { ActionDefinition, AvatarActionManager } from './actions';
+import { Animation, AnimationManager, AvatarAnimationLayerData } from './animation';
 import { AvatarModelGeometry } from './geometry';
 import { AnimationAction, AvatarAnimationData, AvatarAnimationFrame, AvatarCanvas, FigureSetData, PartSetsData } from './structure';
 

src/nitro/avatar/EffectAssetDownloadLibrary.ts

@@ -1,5 +1,5 @@
 import { IAssetAnimation, IAssetManager, IEffectAssetDownloadLibrary } from '../../api';
-import { EventDispatcher } from '../../core';
+import { EventDispatcher } from '../../common';
 import { AvatarRenderEffectLibraryEvent } from '../../events';
 
 export class EffectAssetDownloadLibrary extends EventDispatcher implements IEffectAssetDownloadLibrary

src/nitro/avatar/EffectAssetDownloadManager.ts

@@ -1,5 +1,5 @@
 import { IAssetManager, IAvatarEffectListener, INitroEvent, NitroConfiguration, NitroLogger } from '../../api';
-import { EventDispatcher } from '../../core';
+import { EventDispatcher } from '../../common';
 import { AvatarRenderEffectLibraryEvent, AvatarRenderEvent, NitroEvent } from '../../events';
 import { AvatarStructure } from './AvatarStructure';
 import { EffectAssetDownloadLibrary } from './EffectAssetDownloadLibrary';

src/nitro/avatar/structure/AvatarStructureDownload.ts

@@ -1,5 +1,5 @@
 import { IFigureSetData, NitroLogger } from '../../../api';
-import { EventDispatcher } from '../../../core';
+import { EventDispatcher } from '../../../common';
 import { NitroEvent } from '../../../events';
 
 export class AvatarStructureDownload extends EventDispatcher

src/nitro/camera/RoomCameraWidgetManager.ts

@@ -1,7 +1,7 @@
 import { Texture } from '@pixi/core';
 import { ColorMatrix, ColorMatrixFilter } from '@pixi/filter-color-matrix';
 import { IEventDispatcher, IRoomCameraWidgetEffect, IRoomCameraWidgetManager, IRoomCameraWidgetSelectedEffect, NitroConfiguration } from '../../api';
-import { EventDispatcher } from '../../core';
+import { EventDispatcher } from '../../common';
 import { RoomCameraWidgetManagerEvent } from '../../events';
 import { NitroContainer, NitroSprite, TextureUtils } from '../../pixi-proxy';
 import { RoomCameraWidgetEffect } from './RoomCameraWidgetEffect';

src/nitro/communication/NitroCommunicationDemo.ts

@@ -1,5 +1,5 @@
 import { IConnection, INitroCommunicationDemo, INitroCommunicationManager, NitroConfiguration, NitroLogger } from '../../api';
-import { NitroManager } from '../../core';
+import { NitroManager } from '../../common';
 import { NitroCommunicationDemoEvent, SocketConnectionEvent } from '../../events';
 import { GetTickerTime } from '../../pixi-proxy';
 import { Nitro } from '../Nitro';

src/nitro/communication/NitroCommunicationManager.ts

@@ -1,23 +1,22 @@
-import { ICommunicationManager, IConnection, IConnectionStateListener, IMessageConfiguration, IMessageEvent, INitroCommunicationDemo, INitroCommunicationManager, INitroEvent, NitroConfiguration, NitroLogger } from '../../api';
-import { NitroManager } from '../../core';
+import { IConnection, IConnectionStateListener, IMessageConfiguration, IMessageEvent, INitroCommunicationDemo, INitroCommunicationManager, INitroEvent, NitroConfiguration, NitroLogger } from '../../api';
+import { NitroManager } from '../../common';
 import { NitroCommunicationDemoEvent, SocketConnectionEvent } from '../../events';
 import { Nitro } from '../Nitro';
 import { NitroCommunicationDemo } from './NitroCommunicationDemo';
 import { NitroMessages } from './NitroMessages';
+import { SocketConnection } from './SocketConnection';
 
 export class NitroCommunicationManager extends NitroManager implements INitroCommunicationManager, IConnectionStateListener
 {
-    private _communication: ICommunicationManager;
     private _connection: IConnection;
     private _messages: IMessageConfiguration;
 
     private _demo: INitroCommunicationDemo;
 
-    constructor(communication: ICommunicationManager)
+    constructor()
     {
         super();
 
-        this._communication = communication;
         this._connection = null;
         this._messages = new NitroMessages();
 
@@ -35,7 +34,7 @@ export class NitroCommunicationManager extends NitroManager implements INitroCom
 
         Nitro.instance.events.addEventListener(NitroCommunicationDemoEvent.CONNECTION_AUTHENTICATED, this.onConnectionAuthenticatedEvent);
 
-        this._connection = this._communication.createConnection(this);
+        this._connection = new SocketConnection(this);
 
         this._connection.registerMessages(this._messages);
 

src/nitro/communication/SocketConnection.ts

@@ -1,12 +1,11 @@
-import { ICodec, ICommunicationManager, IConnection, IConnectionStateListener, IMessageComposer, IMessageConfiguration, IMessageDataWrapper, IMessageEvent, NitroLogger, WebSocketEventEnum } from '../../api';
+import { ICodec, IConnection, IConnectionStateListener, IMessageComposer, IMessageConfiguration, IMessageDataWrapper, IMessageEvent, NitroLogger, WebSocketEventEnum } from '../../api';
+import { EventDispatcher } from '../../common';
 import { SocketConnectionEvent } from '../../events';
-import { EventDispatcher } from '../common';
 import { EvaWireFormat } from './codec';
 import { MessageClassManager } from './messages';
 
 export class SocketConnection extends EventDispatcher implements IConnection
 {
-    private _communicationManager: ICommunicationManager;
     private _stateListener: IConnectionStateListener;
     private _socket: WebSocket;
     private _messages: MessageClassManager;
@@ -19,11 +18,10 @@ export class SocketConnection extends EventDispatcher implements IConnection
 
     private _isAuthenticated: boolean;
 
-    constructor(communicationManager: ICommunicationManager, stateListener: IConnectionStateListener)
+    constructor(stateListener: IConnectionStateListener)
     {
         super();
 
-        this._communicationManager = communicationManager;
         this._stateListener = stateListener;
         this._socket = null;
         this._messages = new MessageClassManager();
@@ -58,7 +56,6 @@ export class SocketConnection extends EventDispatcher implements IConnection
 
         this.destroySocket();
 
-        this._communicationManager = null;
         this._stateListener = null;
         this._messages = null;
         this._codec = null;

src/nitro/communication/index.ts

@@ -1,4 +1,6 @@
-export * from './messages';
 export * from './NitroCommunicationDemo';
 export * from './NitroCommunicationManager';
 export * from './NitroMessages';
+export * from './SocketConnection';
+export * from './codec';
+export * from './messages';

src/nitro/communication/messages/index.ts

@@ -1,3 +1,4 @@
+export * from './MessageClassManager';
 export * from './incoming';
 export * from './outgoing';
 export * from './parser';

src/nitro/communication/messages/outgoing/handshake/ClientHelloMessageComposer.ts

@@ -1,5 +1,5 @@
 import { ClientDeviceCategoryEnum, ClientPlatformEnum, IMessageComposer } from '../../../../../api';
-import { NitroVersion } from '../../../../../core';
+import { NitroVersion } from '../../../../NitroVersion';
 
 export class ClientHelloMessageComposer implements IMessageComposer<ConstructorParameters<typeof ClientHelloMessageComposer>>
 {

src/nitro/configuration/ConfigurationManager.ts

@@ -1,6 +1,6 @@
 import { IConfigurationManager, NitroConfiguration } from '../../api';
-import { NitroManager } from '../common';
-import { ConfigurationEvent } from './ConfigurationEvent';
+import { NitroManager } from '../../common';
+import { ConfigurationEvent } from '../../events/core/ConfigurationEvent';
 
 export class ConfigurationManager extends NitroManager implements IConfigurationManager
 {

src/nitro/configuration/index.ts

@@ -1,2 +1 @@
-export * from './ConfigurationEvent';
 export * from './ConfigurationManager';

src/nitro/index.ts

@@ -1,11 +1,13 @@
+export * from './INitro';
+export * from './Nitro';
+export * from './NitroVersion';
 export * from './avatar';
 export * from './camera';
 export * from './communication';
+export * from './configuration';
 export * from './externalInterface';
 export * from './game';
-export * from './INitro';
 export * from './localization';
-export * from './Nitro';
 export * from './room';
 export * from './session';
 export * from './sound';

src/nitro/localization/NitroLocalizationManager.ts

@@ -1,5 +1,5 @@
 import { INitroCommunicationManager, INitroLocalizationManager, NitroConfiguration } from '../../api';
-import { NitroManager } from '../../core';
+import { NitroManager } from '../../common';
 import { NitroLocalizationEvent } from '../../events';
 import { BadgePointLimitsEvent } from '../communication';
 import { BadgeBaseAndLevel } from './BadgeBaseAndLevel';

src/nitro/room/RoomEngine.ts

@@ -2,7 +2,7 @@ import { RenderTexture, Resource, Texture } from '@pixi/core';
 import { Container, DisplayObject } from '@pixi/display';
 import { Matrix, Point, Rectangle } from '@pixi/math';
 import { IConnection, IDisposable, IFurnitureStackingHeightMap, IGetImageListener, IImageResult, ILegacyWallGeometry, IMessageComposer, INitroCommunicationManager, INitroEvent, IObjectData, IPetColorResult, IPetCustomPart, IRoomContentListener, IRoomContentLoader, IRoomCreator, IRoomEngine, IRoomEngineServices, IRoomGeometry, IRoomInstance, IRoomManager, IRoomManagerListener, IRoomObject, IRoomObjectController, IRoomObjectLogicFactory, IRoomObjectVisualizationFactory, IRoomRenderer, IRoomRendererFactory, IRoomRenderingCanvas, IRoomSessionManager, ISelectedRoomObjectData, ISessionDataManager, ITileObjectMap, IUpdateReceiver, IVector3D, LegacyDataType, MouseEventType, NitroConfiguration, NitroLogger, ObjectDataFactory, RoomControllerLevel, RoomObjectCategory, RoomObjectUserType, RoomObjectVariable, ToolbarIconEnum, Vector3d } from '../../api';
-import { NitroManager } from '../../core';
+import { NitroManager } from '../../common';
 import { BadgeImageReadyEvent, NitroToolbarAnimateIconEvent, RoomBackgroundColorEvent, RoomDragEvent, RoomEngineEvent, RoomEngineObjectEvent, RoomObjectEvent, RoomObjectFurnitureActionEvent, RoomObjectMouseEvent, RoomSessionEvent, RoomToObjectOwnAvatarMoveEvent } from '../../events';
 import { GetTicker, GetTickerTime, NitroSprite, TextureUtils } from '../../pixi-proxy';
 import { NumberBank, RoomEnterEffect, RoomGeometry, RoomInstance, RoomObjectUpdateMessage, RoomRendererFactory } from '../../room';

src/nitro/room/RoomMessageHandler.ts

@@ -1,5 +1,5 @@
 import { AvatarGuideStatus, IConnection, IRoomCreator, IVector3D, LegacyDataType, ObjectRolling, PetType, RoomObjectType, RoomObjectUserType, RoomObjectVariable, Vector3d } from '../../api';
-import { Disposable } from '../../core';
+import { Disposable } from '../../common';
 import { DiceValueMessageEvent, FloorHeightMapEvent, FurnitureAliasesComposer, FurnitureAliasesEvent, FurnitureDataEvent, FurnitureFloorAddEvent, FurnitureFloorDataParser, FurnitureFloorEvent, FurnitureFloorRemoveEvent, FurnitureFloorUpdateEvent, FurnitureWallAddEvent, FurnitureWallDataParser, FurnitureWallEvent, FurnitureWallRemoveEvent, FurnitureWallUpdateEvent, GetRoomEntryDataMessageComposer, GuideSessionEndedMessageEvent, GuideSessionErrorMessageEvent, GuideSessionStartedMessageEvent, IgnoreResultEvent, ItemDataUpdateMessageEvent, ObjectsDataUpdateEvent, ObjectsRollingEvent, OneWayDoorStatusMessageEvent, PetExperienceEvent, PetFigureUpdateEvent, RoomEntryTileMessageEvent, RoomEntryTileMessageParser, RoomHeightMapEvent, RoomHeightMapUpdateEvent, RoomPaintEvent, RoomReadyMessageEvent, RoomUnitChatEvent, RoomUnitChatShoutEvent, RoomUnitChatWhisperEvent, RoomUnitDanceEvent, RoomUnitEffectEvent, RoomUnitEvent, RoomUnitExpressionEvent, RoomUnitHandItemEvent, RoomUnitIdleEvent, RoomUnitInfoEvent, RoomUnitNumberEvent, RoomUnitRemoveEvent, RoomUnitStatusEvent, RoomUnitTypingEvent, RoomVisualizationSettingsEvent, UserInfoEvent, YouArePlayingGameEvent } from '../communication';
 import { RoomPlaneParser } from './object/RoomPlaneParser';
 import { RoomVariableEnum } from './RoomVariableEnum';

src/nitro/room/RoomObjectEventHandler.ts

@@ -1,5 +1,5 @@
 import { IFurnitureStackingHeightMap, ILegacyWallGeometry, IObjectData, IRoomCanvasMouseListener, IRoomEngineServices, IRoomGeometry, IRoomObject, IRoomObjectController, IRoomObjectEventManager, ISelectedRoomObjectData, IVector3D, MouseEventType, NitroConfiguration, NitroLogger, RoomObjectCategory, RoomObjectOperationType, RoomObjectPlacementSource, RoomObjectType, RoomObjectUserType, RoomObjectVariable, Vector3d } from '../../api';
-import { Disposable } from '../../core';
+import { Disposable } from '../../common';
 import { RoomEngineDimmerStateEvent, RoomEngineObjectEvent, RoomEngineObjectPlacedEvent, RoomEngineObjectPlacedOnUserEvent, RoomEngineObjectPlaySoundEvent, RoomEngineRoomAdEvent, RoomEngineSamplePlaybackEvent, RoomEngineTriggerWidgetEvent, RoomEngineUseProductEvent, RoomObjectBadgeAssetEvent, RoomObjectDataRequestEvent, RoomObjectDimmerStateUpdateEvent, RoomObjectEvent, RoomObjectFloorHoleEvent, RoomObjectFurnitureActionEvent, RoomObjectHSLColorEnabledEvent, RoomObjectHSLColorEnableEvent, RoomObjectMouseEvent, RoomObjectMoveEvent, RoomObjectPlaySoundIdEvent, RoomObjectRoomAdEvent, RoomObjectSamplePlaybackEvent, RoomObjectSoundMachineEvent, RoomObjectStateChangedEvent, RoomObjectTileMouseEvent, RoomObjectWallMouseEvent, RoomObjectWidgetRequestEvent, RoomSpriteMouseEvent } from '../../events';
 import { RoomEnterEffect, RoomId, RoomObjectUpdateMessage } from '../../room';
 import { BotPlaceComposer, FurnitureColorWheelComposer, FurnitureDiceActivateComposer, FurnitureDiceDeactivateComposer, FurnitureFloorUpdateComposer, FurnitureGroupInfoComposer, FurnitureMultiStateComposer, FurnitureOneWayDoorComposer, FurniturePickupComposer, FurniturePlaceComposer, FurniturePostItPlaceComposer, FurnitureRandomStateComposer, FurnitureWallMultiStateComposer, FurnitureWallUpdateComposer, GetItemDataComposer, GetResolutionAchievementsMessageComposer, PetMoveComposer, PetPlaceComposer, RemoveWallItemComposer, RoomUnitLookComposer, RoomUnitWalkComposer, SetItemDataMessageComposer, SetObjectDataMessageComposer } from '../communication';

src/nitro/room/RoomObjectLogicFactory.ts

@@ -1,5 +1,5 @@
 import { IEventDispatcher, IRoomObjectEventHandler, IRoomObjectLogicFactory, NitroLogger, RoomObjectLogicType } from '../../api';
-import { EventDispatcher } from '../../core';
+import { EventDispatcher } from '../../common';
 import { RoomObjectLogicBase } from '../../room';
 import { AvatarLogic, FurnitureAchievementResolutionLogic, FurnitureBadgeDisplayLogic, FurnitureChangeStateWhenStepOnLogic, FurnitureClothingChangeLogic, FurnitureCounterClockLogic, FurnitureCrackableLogic, FurnitureCraftingGizmoLogic, FurnitureCreditLogic, FurnitureCuckooClockLogic, FurnitureCustomStackHeightLogic, FurnitureDiceLogic, FurnitureEcotronBoxLogic, FurnitureEditableInternalLinkLogic, FurnitureEditableRoomLinkLogic, FurnitureEffectBoxLogic, FurnitureExternalImageLogic, FurnitureFireworksLogic, FurnitureFloorHoleLogic, FurnitureGroupForumTerminalLogic, FurnitureGuildCustomizedLogic, FurnitureHabboWheelLogic, FurnitureHighScoreLogic, FurnitureHockeyScoreLogic, FurnitureHweenLovelockLogic, FurnitureIceStormLogic, FurnitureInternalLinkLogic, FurnitureJukeboxLogic, FurnitureLogic, FurnitureLoveLockLogic, FurnitureMannequinLogic, FurnitureMonsterplantSeedLogic, FurnitureMultiHeightLogic, FurnitureMultiStateLogic, FurnitureMysteryBoxLogic, FurnitureMysteryTrophyLogic, FurnitureOneWayDoorLogic, FurniturePetCustomizationLogic, FurniturePlaceholderLogic, FurniturePlanetSystemLogic, FurniturePresentLogic, FurniturePurchaseableClothingLogic, FurniturePushableLogic, FurnitureRandomStateLogic, FurnitureRandomTeleportLogic, FurnitureRentableSpaceLogic, FurnitureRoomBackgroundColorLogic, FurnitureRoomBackgroundLogic, FurnitureRoomBillboardLogic, FurnitureRoomDimmerLogic, FurnitureScoreLogic, FurnitureSongDiskLogic, FurnitureSoundBlockLogic, FurnitureSoundMachineLogic, FurnitureStickieLogic, FurnitureTrophyLogic, FurnitureVoteCounterLogic, FurnitureVoteMajorityLogic, FurnitureWelcomeGiftLogic, FurnitureWindowLogic, FurnitureYoutubeLogic, PetLogic, RoomLogic, SelectionArrowLogic, TileCursorLogic } from './object';
 

src/nitro/room/object/visualization/avatar/AvatarVisualizationData.ts

@@ -1,6 +1,6 @@
 import { Resource, Texture } from '@pixi/core';
 import { AvatarScaleType, IAssetData, IAvatarEffectListener, IAvatarImage, IAvatarImageListener, IAvatarRenderManager, IObjectVisualizationData } from '../../../../../api';
-import { Disposable } from '../../../../../core';
+import { Disposable } from '../../../../../common';
 
 export class AvatarVisualizationData extends Disposable implements IObjectVisualizationData
 {

src/nitro/room/object/visualization/room/RoomVisualizationData.ts

@@ -1,5 +1,5 @@
 import { IAssetData, IGraphicAssetCollection, IObjectVisualizationData } from '../../../../../api';
-import { Disposable } from '../../../../../core';
+import { Disposable } from '../../../../../common';
 import { PlaneMaskManager } from './mask';
 import { FloorRasterizer, LandscapeRasterizer, WallRasterizer } from './rasterizer';
 

src/nitro/session/RoomSession.ts

@@ -1,5 +1,5 @@
 import { IConnection, IRoomSession, RoomControllerLevel, RoomTradingLevelEnum } from '../../api';
-import { Disposable } from '../../core';
+import { Disposable } from '../../common';
 import { RoomSessionEvent } from '../../events';
 import { BotRemoveComposer, ChangeQueueMessageComposer, CompostPlantMessageComposer, FurnitureMultiStateComposer, GetPetCommandsComposer, HarvestPetMessageComposer, MoodlightSettingsComposer, MoodlightSettingsSaveComposer, MoodlightTogggleStateComposer, NewUserExperienceScriptProceedComposer, OpenPetPackageMessageComposer, OpenPresentComposer, PeerUsersClassificationMessageComposer, PetMountComposer, PetRemoveComposer, PollAnswerComposer, PollRejectComposer, PollStartComposer, RemovePetSaddleComposer, RoomAmbassadorAlertComposer, RoomBanUserComposer, RoomDoorbellAccessComposer, RoomEnterComposer, RoomGiveRightsComposer, RoomKickUserComposer, RoomModerationSettings, RoomMuteUserComposer, RoomTakeRightsComposer, RoomUnitActionComposer, RoomUnitChatComposer, RoomUnitChatShoutComposer, RoomUnitChatWhisperComposer, RoomUnitDanceComposer, RoomUnitPostureComposer, RoomUnitSignComposer, RoomUnitTypingStartComposer, RoomUnitTypingStopComposer, RoomUsersClassificationMessageComposer, SetClothingChangeDataMessageComposer, TogglePetBreedingComposer, TogglePetRidingComposer, UsePetProductComposer, UserMottoComposer, VotePollCounterMessageComposer } from '../communication';
 import { UserDataManager } from './UserDataManager';

src/nitro/session/RoomSessionManager.ts

@@ -1,5 +1,5 @@
 import { INitroCommunicationManager, IRoomEngine, IRoomHandlerListener, IRoomSession, IRoomSessionManager } from '../../api';
-import { NitroManager } from '../../core';
+import { NitroManager } from '../../common';
 import { RoomEngineEvent, RoomSessionEvent } from '../../events';
 import { BaseHandler, GenericErrorHandler, PetPackageHandler, PollHandler, RoomChatHandler, RoomDataHandler, RoomDimmerPresetsHandler, RoomPermissionsHandler, RoomPresentHandler, RoomSessionHandler, RoomUsersHandler, WordQuizHandler } from './handler';
 import { RoomSession } from './RoomSession';

src/nitro/session/SessionDataManager.ts

@@ -1,14 +1,14 @@
 import { Resource, Texture } from '@pixi/core';
 import { GetAssetManager, IFurnitureData, IFurnitureDataListener, IGroupInformationManager, IMessageComposer, INitroCommunicationManager, INitroEvent, IProductData, IProductDataListener, ISessionDataManager, NitroConfiguration, NoobnessLevelEnum, SecurityLevel } from '../../api';
-import { NitroManager } from '../../core';
+import { NitroManager } from '../../common';
 import { MysteryBoxKeysUpdateEvent, NitroSettingsEvent, SessionDataPreferencesEvent, UserNameUpdateEvent } from '../../events';
-import { AccountSafetyLockStatusChangeMessageEvent, AccountSafetyLockStatusChangeParser, AvailabilityStatusMessageEvent, ChangeUserNameResultMessageEvent, EmailStatusResultEvent, FigureUpdateEvent, GetUserTagsComposer, InClientLinkEvent, MysteryBoxKeysEvent, NoobnessLevelMessageEvent, PetRespectComposer, PetScratchFailedMessageEvent, RoomReadyMessageEvent, RoomUnitChatComposer, UserInfoEvent, UserNameChangeMessageEvent, UserPermissionsEvent, UserRespectComposer, UserTagsMessageEvent } from '../communication';
 import { Nitro } from '../Nitro';
+import { AccountSafetyLockStatusChangeMessageEvent, AccountSafetyLockStatusChangeParser, AvailabilityStatusMessageEvent, ChangeUserNameResultMessageEvent, EmailStatusResultEvent, FigureUpdateEvent, GetUserTagsComposer, InClientLinkEvent, MysteryBoxKeysEvent, NoobnessLevelMessageEvent, PetRespectComposer, PetScratchFailedMessageEvent, RoomReadyMessageEvent, RoomUnitChatComposer, UserInfoEvent, UserNameChangeMessageEvent, UserPermissionsEvent, UserRespectComposer, UserTagsMessageEvent } from '../communication';
 import { HabboWebTools } from '../utils/HabboWebTools';
-import { BadgeImageManager } from './badge/BadgeImageManager';
-import { FurnitureDataLoader } from './furniture/FurnitureDataLoader';
 import { GroupInformationManager } from './GroupInformationManager';
 import { IgnoredUsersManager } from './IgnoredUsersManager';
+import { BadgeImageManager } from './badge/BadgeImageManager';
+import { FurnitureDataLoader } from './furniture/FurnitureDataLoader';
 import { ProductDataLoader } from './product/ProductDataLoader';
 
 export class SessionDataManager extends NitroManager implements ISessionDataManager

src/nitro/session/UserDataManager.ts

@@ -1,5 +1,5 @@
 import { IConnection, IRoomUserData } from '../../api';
-import { Disposable } from '../../core';
+import { Disposable } from '../../common';
 import { RequestPetInfoComposer, UserCurrentBadgesComposer } from '../communication';
 
 export class UserDataManager extends Disposable

src/nitro/session/furniture/FurnitureDataLoader.ts

@@ -1,5 +1,5 @@
 import { FurnitureType, IFurnitureData, INitroLocalizationManager, NitroLogger } from '../../../api';
-import { EventDispatcher } from '../../../core';
+import { EventDispatcher } from '../../../common';
 import { NitroEvent } from '../../../events';
 import { FurnitureData } from './FurnitureData';
 

src/nitro/session/handler/BaseHandler.ts

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

src/nitro/session/product/ProductDataLoader.ts

@@ -1,5 +1,5 @@
 import { IProductData } from '../../../api';
-import { EventDispatcher } from '../../../core';
+import { EventDispatcher } from '../../../common';
 import { NitroEvent } from '../../../events';
 import { ProductData } from './ProductData';
 

src/nitro/sound/SoundManager.ts

@@ -1,5 +1,5 @@
 import { AdvancedMap, IAdvancedMap, IMusicController, INitroEvent, ISoundManager, NitroConfiguration, NitroLogger } from '../../api';
-import { NitroManager } from '../../core';
+import { NitroManager } from '../../common';
 import { NitroSettingsEvent, NitroSoundEvent, RoomEngineEvent, RoomEngineObjectEvent, RoomEngineSamplePlaybackEvent } from '../../events';
 import { Nitro } from '../Nitro';
 import { MusicController } from './music/MusicController';

src/room/RoomInstance.ts

@@ -1,5 +1,5 @@
 import { IRoomInstance, IRoomInstanceContainer, IRoomObject, IRoomObjectController, IRoomObjectManager, IRoomObjectModel, IRoomRendererBase } from '../api';
-import { Disposable } from '../core';
+import { Disposable } from '../common';
 import { RoomObjectModel } from './object';
 
 export class RoomInstance extends Disposable implements IRoomInstance

src/room/RoomManager.ts

@@ -1,5 +1,5 @@
 import { IGraphicAssetCollection, IRoomContentLoader, IRoomInstance, IRoomInstanceContainer, IRoomManager, IRoomManagerListener, IRoomObject, IRoomObjectController, IRoomObjectLogicFactory, IRoomObjectManager, IRoomObjectVisualizationFactory, NitroLogger } from '../api';
-import { NitroManager } from '../core';
+import { NitroManager } from '../common';
 import { RoomContentLoadedEvent } from '../events';
 import { RoomContentLoader } from '../nitro/room/RoomContentLoader';
 import { RoomInstance } from './RoomInstance';

src/room/object/RoomObject.ts

@@ -1,5 +1,5 @@
 import { IRoomObjectController, IRoomObjectEventHandler, IRoomObjectModel, IRoomObjectMouseHandler, IRoomObjectUpdateMessage, IRoomObjectVisualization, IVector3D, Vector3d } from '../../api';
-import { Disposable } from '../../core';
+import { Disposable } from '../../common';
 import { RoomObjectModel } from './RoomObjectModel';
 
 export class RoomObject extends Disposable implements IRoomObjectController

src/room/object/logic/RoomObjectLogicBase.ts

@@ -1,5 +1,5 @@
 import { IEventDispatcher, IRoomGeometry, IRoomObjectController, IRoomObjectEventHandler, IRoomObjectUpdateMessage } from '../../../api';
-import { Disposable } from '../../../core';
+import { Disposable } from '../../../common';
 import { RoomSpriteMouseEvent } from '../../../events';
 
 export class RoomObjectLogicBase extends Disposable implements IRoomObjectEventHandler