Continue moving files

src/api/INitroCore.ts

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

src/api/common/IEventDispatcher.ts

@@ -1,5 +1,6 @@
-import { IDisposable, INitroLogger } from '../common';
+import { IDisposable } from './IDisposable';
 import { INitroEvent } from './INitroEvent';
+import { INitroLogger } from './INitroLogger';
 
 export interface IEventDispatcher extends IDisposable
 {

src/api/common/INitroManager.ts

@@ -1,5 +1,5 @@
-import { IEventDispatcher } from '../events';
 import { IDisposable } from './IDisposable';
+import { IEventDispatcher } from './IEventDispatcher';
 import { INitroLogger } from './INitroLogger';
 
 export interface INitroManager extends IDisposable

src/api/common/index.ts

@@ -1,4 +1,8 @@
 export * from './IDisposable';
+export * from './IEventDispatcher';
+export * from './ILinkEventTracker';
+export * from './INitroEvent';
 export * from './INitroLogger';
 export * from './INitroManager';
 export * from './IUpdateReceiver';
+export * from './IWorkerEventTracker';

src/api/communication/IConnection.ts

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

src/api/events/index.ts

@@ -1,4 +0,0 @@
-export * from './IEventDispatcher';
-export * from './ILinkEventTracker';
-export * from './INitroEvent';
-export * from './IWorkerEventTracker';

src/api/index.ts

@@ -13,4 +13,4 @@ export * from './common';
 export * from './communication';
 export * from './communication/enums';
 export * from './configuration';
-export * from './events';
+export * from './INitroCore';

src/core/INitroCore.ts

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

src/core/NitroCore.ts

@@ -1,10 +1,9 @@
-import { IAssetManager, ICommunicationManager, IConfigurationManager } from '../api';
-import { AssetManager } from './asset/AssetManager';
-import { Disposable } from './common/Disposable';
-import { CommunicationManager } from './communication/CommunicationManager';
-import { ConfigurationManager } from './configuration/ConfigurationManager';
-import { INitroCore } from './INitroCore';
-import { SayHello } from './utils/SayHello';
+import { IAssetManager, ICommunicationManager, IConfigurationManager, INitroCore } from '../api';
+import { AssetManager } from './asset';
+import { Disposable } from './common';
+import { CommunicationManager } from './communication';
+import { ConfigurationManager } from './configuration';
+import { SayHello } from './utils';
 
 export class NitroCore extends Disposable implements INitroCore
 {

src/core/asset/AssetManager.ts

@@ -2,10 +2,9 @@ import { BaseTexture, Resource, Texture } from '@pixi/core';
 import { Loader, LoaderResource } from '@pixi/loaders';
 import { Spritesheet } from '@pixi/spritesheet';
 import { IAssetData, IAssetManager, IGraphicAsset, IGraphicAssetCollection, INitroLogger } from '../../api';
-import { GraphicAssetCollection } from '../../room/object/visualization/utils/GraphicAssetCollection';
-import { Disposable } from '../common/Disposable';
-import { NitroLogger } from '../common/NitroLogger';
+import { Disposable, NitroLogger } from '../common';
 import { ArrayBufferToBase64 } from '../utils';
+import { GraphicAssetCollection } from './GraphicAssetCollection';
 import { NitroBundle } from './NitroBundle';
 
 export class AssetManager extends Disposable implements IAssetManager
@@ -23,11 +22,6 @@ export class AssetManager extends Disposable implements IAssetManager
         this._collections = new Map();
     }
 
-    public static removeFileExtension(name: string): string
-    {
-        return (name.substring(0, name.lastIndexOf('.')) || name);
-    }
-
     public getTexture(name: string): Texture<Resource>
     {
         if (!name) return null;

src/core/asset/GraphicAsset.ts

@@ -1,6 +1,6 @@
 import { Resource, Texture } from '@pixi/core';
 import { Rectangle } from '@pixi/math';
-import { IGraphicAsset } from '../../../../api';
+import { IGraphicAsset } from '../../api';
 
 export class GraphicAsset implements IGraphicAsset
 {

src/core/asset/GraphicAssetCollection.ts

@@ -1,9 +1,7 @@
 import { BaseTexture, Resource, Texture } from '@pixi/core';
 import { Spritesheet } from '@pixi/spritesheet';
 import { Dict } from '@pixi/utils';
-import { IAsset, IAssetData, IAssetPalette, IGraphicAsset, IGraphicAssetCollection } from '../../../../api';
-import { AssetManager } from '../../../../core/asset/AssetManager';
-import { Nitro } from '../../../../nitro/Nitro';
+import { IAsset, IAssetData, IAssetPalette, IGraphicAsset, IGraphicAssetCollection } from '../../api';
 import { GraphicAsset } from './GraphicAsset';
 import { GraphicAssetPalette } from './GraphicAssetPalette';
 
@@ -39,6 +37,11 @@ export class GraphicAssetCollection implements IGraphicAssetCollection
         this.define(data);
     }
 
+    public static removeFileExtension(name: string): string
+    {
+        return (name.substring(0, name.lastIndexOf('.')) || name);
+    }
+
     public dispose(): void
     {
         if (this._palettes)
@@ -66,7 +69,7 @@ export class GraphicAssetCollection implements IGraphicAssetCollection
     public addReference(): void
     {
         this._referenceCount++;
-        this._referenceTimestamp = Nitro.instance.time;
+        //this._referenceTimestamp = Nitro.instance.time;
     }
 
     public removeReference(): void
@@ -76,7 +79,7 @@ export class GraphicAssetCollection implements IGraphicAssetCollection
         if (this._referenceCount <= 0)
         {
             this._referenceCount = 0;
-            this._referenceTimestamp = Nitro.instance.time;
+            //this._referenceTimestamp = Nitro.instance.time;
 
             this.disposePaletteAssets(false);
         }
@@ -330,7 +333,7 @@ export class GraphicAssetCollection implements IGraphicAssetCollection
 
             if (!texture) continue;
 
-            this._textures.set(AssetManager.removeFileExtension(name), texture);
+            this._textures.set(GraphicAssetCollection.removeFileExtension(name), texture);
         }
     }
 

src/core/asset/GraphicAssetPalette.ts

@@ -1,6 +1,5 @@
 import { Resource, Texture } from '@pixi/core';
-import { NitroSprite } from '../../../../pixi-proxy';
-import { TextureUtils } from '../../../utils';
+import { NitroSprite, TextureUtils } from '../../pixi-proxy';
 
 export class GraphicAssetPalette
 {

src/core/asset/NitroBundle.ts

@@ -1,7 +1,6 @@
 import { BaseTexture } from '@pixi/core';
 import { Data, inflate } from 'pako';
-import { BinaryReader } from '../communication/codec/BinaryReader';
-import { ArrayBufferToBase64 } from '../utils';
+import { ArrayBufferToBase64, BinaryReader } from '../utils';
 
 export class NitroBundle
 {
@@ -23,14 +22,14 @@ export class NitroBundle
 
         let fileCount = binaryReader.readShort();
 
-        while(fileCount > 0)
+        while (fileCount > 0)
         {
             const fileNameLength = binaryReader.readShort();
             const fileName = binaryReader.readBytes(fileNameLength).toString();
             const fileLength = binaryReader.readInt();
             const buffer = binaryReader.readBytes(fileLength);
 
-            if(fileName.endsWith('.json'))
+            if (fileName.endsWith('.json'))
             {
                 const decompressed = inflate((buffer.toArrayBuffer() as Data));
 

src/core/asset/index.ts

@@ -1,2 +1,6 @@
 export * from './AssetManager';
+export * from './GraphicAsset';
+export * from './GraphicAssetCollection';
+export * from './GraphicAssetGifCollection';
+export * from './GraphicAssetPalette';
 export * from './NitroBundle';

src/core/common/EventDispatcher.ts

@@ -1,8 +1,7 @@
 import { IDisposable, IEventDispatcher, INitroLogger } from '../../api';
-import { Nitro } from '../../nitro/Nitro';
-import { Disposable } from '../common/Disposable';
-import { NitroLogger } from '../common/NitroLogger';
+import { Disposable } from './Disposable';
 import { NitroEvent } from './NitroEvent';
+import { NitroLogger } from './NitroLogger';
 
 export class EventDispatcher extends Disposable implements IEventDispatcher, IDisposable
 {
@@ -64,7 +63,7 @@ export class EventDispatcher extends Disposable implements IEventDispatcher, IDi
     {
         if (!event) return false;
 
-        if (Nitro.instance.getConfiguration<boolean>('system.dispatcher.log')) this._logger.log('Dispatched Event', event.type);
+        //if (Nitro.instance.getConfiguration<boolean>('system.dispatcher.log')) this._logger.log('Dispatched Event', event.type);
 
         this.processEvent(event);
 

src/core/common/NitroManager.ts

@@ -1,6 +1,6 @@
 import { IEventDispatcher, INitroLogger, INitroManager } from '../../api';
-import { EventDispatcher } from '../events/EventDispatcher';
 import { Disposable } from './Disposable';
+import { EventDispatcher } from './EventDispatcher';
 import { NitroLogger } from './NitroLogger';
 
 export class NitroManager extends Disposable implements INitroManager

src/core/common/index.ts

@@ -1,3 +1,5 @@
 export * from './Disposable';
+export * from './EventDispatcher';
+export * from './NitroEvent';
 export * from './NitroLogger';
 export * from './NitroManager';

src/core/communication/CommunicationManager.ts

@@ -1,6 +1,6 @@
 import { ICommunicationManager, IConnection, IConnectionStateListener, IUpdateReceiver } from '../../api';
-import { Disposable } from '../common/Disposable';
-import { SocketConnection } from './connections/SocketConnection';
+import { Disposable } from '../common';
+import { SocketConnection } from './SocketConnection';
 
 export class CommunicationManager extends Disposable implements ICommunicationManager, IUpdateReceiver
 {

src/core/communication/SocketConnection.ts

@@ -1,9 +1,8 @@
-import { ICodec, ICommunicationManager, IConnection, IConnectionStateListener, IMessageComposer, IMessageConfiguration, IMessageDataWrapper, IMessageEvent, WebSocketEventEnum } from '../../../api';
-import { Nitro } from '../../../nitro/Nitro';
-import { EventDispatcher } from '../../events/EventDispatcher';
-import { EvaWireFormat } from '../codec/evawire/EvaWireFormat';
-import { SocketConnectionEvent } from '../events/SocketConnectionEvent';
-import { MessageClassManager } from '../messages/MessageClassManager';
+import { ICodec, ICommunicationManager, IConnection, IConnectionStateListener, IMessageComposer, IMessageConfiguration, IMessageDataWrapper, IMessageEvent, WebSocketEventEnum } from '../../api';
+import { EventDispatcher } from '../common';
+import { EvaWireFormat } from './codec';
+import { MessageClassManager } from './messages';
+import { SocketConnectionEvent } from './SocketConnectionEvent';
 
 export class SocketConnection extends EventDispatcher implements IConnection
 {
@@ -175,7 +174,7 @@ export class SocketConnection extends EventDispatcher implements IConnection
 
             if (header === -1)
             {
-                if (Nitro.instance.getConfiguration<boolean>('system.packet.log')) this.logger.log(`Unknown Composer: ${composer.constructor.name}`);
+                //if (Nitro.instance.getConfiguration<boolean>('system.packet.log')) this.logger.log(`Unknown Composer: ${composer.constructor.name}`);
 
                 continue;
             }
@@ -185,12 +184,12 @@ export class SocketConnection extends EventDispatcher implements IConnection
 
             if (!encoded)
             {
-                if (Nitro.instance.getConfiguration<boolean>('system.packet.log')) this.logger.log('Encoding Failed', composer.constructor.name);
+                //if (Nitro.instance.getConfiguration<boolean>('system.packet.log')) this.logger.log('Encoding Failed', composer.constructor.name);
 
                 continue;
             }
 
-            if (Nitro.instance.getConfiguration<boolean>('system.packet.log')) this.logger.log('OutgoingComposer', header, composer.constructor.name, message);
+            //if (Nitro.instance.getConfiguration<boolean>('system.packet.log')) this.logger.log('OutgoingComposer', header, composer.constructor.name, message);
 
             this.write(encoded.getBuffer());
         }
@@ -248,7 +247,7 @@ export class SocketConnection extends EventDispatcher implements IConnection
 
             if (!messages || !messages.length) continue;
 
-            if (Nitro.instance.getConfiguration<boolean>('system.packet.log')) this.logger.log('IncomingMessage', wrapper.header, messages[0].constructor.name, messages[0].parser);
+            //if (Nitro.instance.getConfiguration<boolean>('system.packet.log')) this.logger.log('IncomingMessage', wrapper.header, messages[0].constructor.name, messages[0].parser);
 
             this.handleMessages(...messages);
         }
@@ -279,7 +278,7 @@ export class SocketConnection extends EventDispatcher implements IConnection
 
         if (!events || !events.length)
         {
-            if (Nitro.instance.getConfiguration<boolean>('system.packet.log')) this.logger.log('IncomingMessage', wrapper.header, 'UNREGISTERED', wrapper);
+            //if (Nitro.instance.getConfiguration<boolean>('system.packet.log')) this.logger.log('IncomingMessage', wrapper.header, 'UNREGISTERED', wrapper);
 
             return;
         }

src/core/communication/SocketConnectionEvent.ts

@@ -1,5 +1,5 @@
-import { IConnection } from '../../../api';
-import { NitroEvent } from '../../events/NitroEvent';
+import { IConnection } from '../../api';
+import { NitroEvent } from '../common';
 
 export class SocketConnectionEvent extends NitroEvent
 {

src/core/communication/codec/evawire/EvaWireFormat.ts

@@ -1,6 +1,5 @@
 import { IBinaryWriter, ICodec, IConnection, IMessageDataWrapper } from '../../../../api';
-import { BinaryReader } from '../BinaryReader';
-import { BinaryWriter } from '../BinaryWriter';
+import { BinaryReader, BinaryWriter } from '../../../utils';
 import { Byte } from '../Byte';
 import { Short } from '../Short';
 import { EvaWireDataWrapper } from './EvaWireDataWrapper';

src/core/communication/codec/index.ts

@@ -1,5 +1,3 @@
-export * from './BinaryReader';
-export * from './BinaryWriter';
 export * from './Byte';
 export * from './evawire';
 export * from './Short';

src/core/communication/connections/index.ts

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

src/core/communication/events/index.ts

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

src/core/communication/index.ts

@@ -1,5 +1,6 @@
 export * from './codec';
+export * from './codec/evawire';
 export * from './CommunicationManager';
-export * from './connections';
-export * from './events';
 export * from './messages';
+export * from './SocketConnection';
+export * from './SocketConnectionEvent';

src/core/configuration/ConfigurationEvent.ts

@@ -1,4 +1,4 @@
-import { NitroEvent } from '../events/NitroEvent';
+import { NitroEvent } from '../common';
 
 export class ConfigurationEvent extends NitroEvent
 {
@@ -9,4 +9,4 @@ export class ConfigurationEvent extends NitroEvent
     {
         super(type);
     }
-}
+}

src/core/configuration/ConfigurationManager.ts

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

src/core/events/index.ts

@@ -1,2 +0,0 @@
-export * from './EventDispatcher';
-export * from './NitroEvent';

src/core/index.ts

@@ -1,9 +1,10 @@
 export * from './asset';
 export * from './common';
 export * from './communication';
+export * from './communication/codec';
+export * from './communication/codec/evawire';
+export * from './communication/messages';
 export * from './configuration';
-export * from './events';
-export * from './INitroCore';
 export * from './NitroCore';
 export * from './NitroVersion';
 export * from './utils';

src/core/utils/BinaryReader.ts

@@ -1,4 +1,6 @@
-export class BinaryReader
+import { IBinaryReader } from '../../api';
+
+export class BinaryReader implements IBinaryReader
 {
     private _position: number;
     private _dataView: DataView;
@@ -9,7 +11,7 @@ export class BinaryReader
         this._dataView = new DataView(buffer);
     }
 
-    public readBytes(length: number): BinaryReader
+    public readBytes(length: number): IBinaryReader
     {
         const buffer = new BinaryReader(this._dataView.buffer.slice(this._position, this._position + length));
 

src/core/utils/BinaryWriter.ts

@@ -1,4 +1,6 @@
-export class BinaryWriter
+import { IBinaryWriter } from '../../api';
+
+export class BinaryWriter implements IBinaryWriter
 {
     private _buffer: Uint8Array;
     private _position: number;
@@ -9,7 +11,7 @@ export class BinaryWriter
         this._position = 0;
     }
 
-    public writeByte(byte: number): BinaryWriter
+    public writeByte(byte: number): IBinaryWriter
     {
         const array = new Uint8Array(1);
 
@@ -20,7 +22,7 @@ export class BinaryWriter
         return this;
     }
 
-    public writeBytes(bytes: ArrayBuffer | number[]): BinaryWriter
+    public writeBytes(bytes: ArrayBuffer | number[]): IBinaryWriter
     {
         const array = new Uint8Array(bytes);
 
@@ -29,7 +31,7 @@ export class BinaryWriter
         return this;
     }
 
-    public writeShort(short: number): BinaryWriter
+    public writeShort(short: number): IBinaryWriter
     {
         const array = new Uint8Array(2);
 
@@ -41,7 +43,7 @@ export class BinaryWriter
         return this;
     }
 
-    public writeInt(integer: number): BinaryWriter
+    public writeInt(integer: number): IBinaryWriter
     {
         const array = new Uint8Array(4);
 
@@ -55,11 +57,11 @@ export class BinaryWriter
         return this;
     }
 
-    public writeString(string: string, includeLength: boolean = true): BinaryWriter
+    public writeString(string: string, includeLength: boolean = true): IBinaryWriter
     {
         const array = new TextEncoder().encode(string);
 
-        if(includeLength)
+        if (includeLength)
         {
             this.writeShort(array.length);
             this.appendArray(array);
@@ -74,9 +76,9 @@ export class BinaryWriter
 
     private appendArray(array: Uint8Array): void
     {
-        if(!array) return;
+        if (!array) return;
 
-        const mergedArray = new Uint8Array( ((this.position + array.length) > this._buffer.length) ? (this.position + array.length) : this._buffer.length);
+        const mergedArray = new Uint8Array(((this.position + array.length) > this._buffer.length) ? (this.position + array.length) : this._buffer.length);
 
         mergedArray.set(this._buffer);
         mergedArray.set(array, this.position);

src/core/utils/NitroTimer.ts

@@ -1,43 +0,0 @@
-export class NitroTimer
-{
-    private _elapsedTime: number;
-    private _percision: number;
-    private _timer: any;
-
-    constructor(percision: number = 1)
-    {
-        this._elapsedTime = 0;
-        this._percision = percision;
-        this._timer = null;
-
-        this.start();
-    }
-
-    public start(): void
-    {
-        this._elapsedTime = 0;
-
-        if(!this._timer)
-        {
-            this._timer = setInterval(() => this.increase(), this._percision);
-        }
-    }
-
-    public stop(): void
-    {
-        if(this._timer)
-        {
-            clearTimeout(this._timer);
-        }
-    }
-
-    private increase(): void
-    {
-        this._elapsedTime += this._percision;
-    }
-
-    public getTimer(): number
-    {
-        return this._elapsedTime;
-    }
-}

src/core/utils/SayHello.ts

@@ -1,11 +1,11 @@
-import { NitroVersion } from '..';
+import { NitroVersion } from '../NitroVersion';
 
 export const SayHello = () =>
 {
-    if(navigator.userAgent.toLowerCase().indexOf('chrome') > -1)
+    if (navigator.userAgent.toLowerCase().indexOf('chrome') > -1)
     {
         const args = [
-            `\n %c %c %c Nitro ${ NitroVersion.UI_VERSION } - Renderer ${ NitroVersion.RENDERER_VERSION } %c %c %c https://discord.nitrodev.co %c %c \n\n`,
+            `\n %c %c %c Nitro ${NitroVersion.UI_VERSION} - Renderer ${NitroVersion.RENDERER_VERSION} %c %c %c https://discord.nitrodev.co %c %c \n\n`,
             'background: #ffffff; padding:5px 0;',
             'background: #ffffff; padding:5px 0;',
             'color: #ffffff; background: #000000; padding:5px 0;',
@@ -19,8 +19,8 @@ export const SayHello = () =>
         self.console.log(...args);
     }
 
-    else if(self.console)
+    else if (self.console)
     {
-        self.console.log(`Nitro ${ NitroVersion.UI_VERSION } - Renderer ${ NitroVersion.RENDERER_VERSION } `);
+        self.console.log(`Nitro ${NitroVersion.UI_VERSION} - Renderer ${NitroVersion.RENDERER_VERSION} `);
     }
 };

src/core/utils/index.ts

@@ -1,3 +1,5 @@
 export * from './AdvancedMap';
 export * from './ArrayBufferToBase64';
-export * from './NitroTimer';
+export * from './BinaryReader';
+export * from './BinaryWriter';
+export * from './SayHello';

src/nitro/INitro.ts

@@ -1,8 +1,6 @@
 import { Application } from '@pixi/app';
 import { Ticker } from '@pixi/ticker';
-import { IEventDispatcher, ILinkEventTracker, IWorkerEventTracker } from '../api';
-import { INitroCore } from '../core/INitroCore';
-import { NitroTimer } from '../core/utils/NitroTimer';
+import { IEventDispatcher, ILinkEventTracker, INitroCore, IWorkerEventTracker } from '../api';
 import { IRoomManager } from '../room/IRoomManager';
 import { IAvatarRenderManager } from './avatar/IAvatarRenderManager';
 import { IRoomCameraWidgetManager } from './camera/IRoomCameraWidgetManager';
@@ -13,7 +11,7 @@ import { IRoomSessionManager } from './session/IRoomSessionManager';
 import { ISessionDataManager } from './session/ISessionDataManager';
 import { ISoundManager } from './sound/ISoundManager';
 
-export interface INitro extends Application
+export interface INitro
 {
     init(): void;
     dispose(): void;
@@ -29,7 +27,7 @@ export interface INitro extends Application
     removeLinkEventTracker(tracker: ILinkEventTracker): void;
     createLinkEvent(link: string): void;
     setWorker(val: Worker): void;
-    nitroTimer: NitroTimer;
+    application: Application;
     core: INitroCore;
     events: IEventDispatcher;
     localization: INitroLocalizationManager;

src/nitro/Nitro.ts

@@ -2,13 +2,9 @@ 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, IWorkerEventTracker } from '../api';
-import { ConfigurationEvent } from '../core/configuration/ConfigurationEvent';
-import { EventDispatcher } from '../core/events/EventDispatcher';
-import { NitroEvent } from '../core/events/NitroEvent';
-import { INitroCore } from '../core/INitroCore';
-import { NitroCore } from '../core/NitroCore';
-import { NitroTimer } from '../core/utils/NitroTimer';
+import { IEventDispatcher, ILinkEventTracker, INitroCore, IWorkerEventTracker } from '../api';
+import { ConfigurationEvent, EventDispatcher, NitroCore, NitroEvent } from '../core';
+import { PixiApplicationProxy } from '../pixi-proxy';
 import { IRoomManager } from '../room/IRoomManager';
 import { RoomManager } from '../room/RoomManager';
 import { AvatarRenderManager } from './avatar/AvatarRenderManager';
@@ -39,7 +35,7 @@ LegacyExternalInterface.available;
 settings.SCALE_MODE = (!(window.devicePixelRatio % 1)) ? SCALE_MODES.NEAREST : SCALE_MODES.LINEAR;
 settings.ROUND_PIXELS = true;
 
-export class Nitro extends Application implements INitro
+export class Nitro implements INitro
 {
     public static WEBGL_CONTEXT_LOST: string = 'NE_WEBGL_CONTEXT_LOST';
     public static WEBGL_UNAVAILABLE: string = 'NE_WEBGL_UNAVAILABLE';
@@ -47,8 +43,8 @@ export class Nitro extends Application implements INitro
 
     private static INSTANCE: INitro = null;
 
-    private _nitroTimer: NitroTimer;
     private _worker: Worker;
+    private _application: Application;
     private _core: INitroCore;
     private _events: IEventDispatcher;
     private _communication: INitroCommunicationManager;
@@ -68,12 +64,10 @@ export class Nitro extends Application implements INitro
 
     constructor(core: INitroCore, options?: IApplicationOptions)
     {
-        super(options);
-
         if (!Nitro.INSTANCE) Nitro.INSTANCE = this;
 
-        this._nitroTimer = new NitroTimer();
         this._worker = null;
+        this._application = new PixiApplicationProxy(options);
         this._core = core;
         this._events = new EventDispatcher();
         this._communication = new NitroCommunicationManager(core.communication);
@@ -202,7 +196,12 @@ export class Nitro extends Application implements INitro
             this._communication = null;
         }
 
-        super.destroy();
+        if (this._application)
+        {
+            this._application.destroy();
+
+            this._application = null;
+        }
 
         this._isDisposed = true;
         this._isReady = false;
@@ -333,9 +332,9 @@ export class Nitro extends Application implements INitro
         this._worker.onmessage = this.createWorkerEvent.bind(this);
     }
 
-    public get nitroTimer(): NitroTimer
+    public get application(): Application
     {
-        return this._nitroTimer;
+        return this._application;
     }
 
     public get core(): INitroCore
@@ -395,12 +394,12 @@ export class Nitro extends Application implements INitro
 
     public get width(): number
     {
-        return this.renderer.width;
+        return this._application.renderer.width;
     }
 
     public get height(): number
     {
-        return this.renderer.height;
+        return this._application.renderer.height;
     }
 
     public get ticker(): Ticker

src/nitro/avatar/AvatarAssetDownloadLibrary.ts

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

src/nitro/avatar/AvatarAssetDownloadManager.ts

@@ -1,6 +1,5 @@
 import { IAssetManager } from '../../api';
-import { EventDispatcher } from '../../core/events/EventDispatcher';
-import { NitroEvent } from '../../core/events/NitroEvent';
+import { EventDispatcher, NitroEvent } from '../../core';
 import { Nitro } from '../Nitro';
 import { AvatarAssetDownloadLibrary } from './AvatarAssetDownloadLibrary';
 import { AvatarStructure } from './AvatarStructure';

src/nitro/avatar/AvatarImage.ts

@@ -4,10 +4,8 @@ import { ColorMatrixFilter } from '@pixi/filter-color-matrix';
 import { Rectangle } from '@pixi/math';
 import { Sprite } from '@pixi/sprite';
 import { IGraphicAsset } from '../../api';
-import { AdvancedMap } from '../../core/utils/AdvancedMap';
-import { PaletteMapFilter } from '../../core/utils/PaletteMapFilter';
-import { NitroContainer, NitroSprite } from '../../pixi-proxy';
-import { TextureUtils } from '../../room/utils/TextureUtils';
+import { AdvancedMap } from '../../core';
+import { NitroContainer, NitroSprite, PaletteMapFilter, PixiApplicationProxy, TextureUtils } from '../../pixi-proxy';
 import { Nitro } from '../Nitro';
 import { ActiveActionData } from './actions/ActiveActionData';
 import { IActionDefinition } from './actions/IActionDefinition';
@@ -413,7 +411,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener
 
         if (this._reusableTexture)
         {
-            Nitro.instance.renderer.render(container, {
+            PixiApplicationProxy.instance.renderer.render(container, {
                 renderTexture: this._reusableTexture,
                 clear: true
             });
@@ -484,7 +482,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener
 
         const newTexture = new Sprite(Texture.from(textureCanvas));
 
-        Nitro.instance.renderer.render(newTexture, {
+        PixiApplicationProxy.instance.renderer.render(newTexture, {
             renderTexture: texture,
             clear: true
         });

src/nitro/avatar/AvatarRenderManager.ts

@@ -1,6 +1,5 @@
 import { IAssetManager, IGraphicAsset } from '../../api';
-import { NitroManager } from '../../core/common/NitroManager';
-import { NitroEvent } from '../../core/events/NitroEvent';
+import { NitroEvent, NitroManager } from '../../core';
 import { Nitro } from '../Nitro';
 import { FigureDataContainer } from '../utils/FigureDataContainer';
 import { AssetAliasCollection } from './alias/AssetAliasCollection';

src/nitro/avatar/AvatarStructure.ts

@@ -1,6 +1,6 @@
 import { Point } from '@pixi/math';
 import { IAssetAnimation, IAssetManager } from '../../api';
-import { EventDispatcher } from '../../core/events/EventDispatcher';
+import { EventDispatcher } from '../../core';
 import { ActionDefinition } from './actions/ActionDefinition';
 import { AvatarActionManager } from './actions/AvatarActionManager';
 import { IActionDefinition } from './actions/IActionDefinition';

src/nitro/avatar/EffectAssetDownloadLibrary.ts

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

src/nitro/avatar/EffectAssetDownloadManager.ts

@@ -1,6 +1,5 @@
 import { IAssetManager } from '../../api';
-import { EventDispatcher } from '../../core/events/EventDispatcher';
-import { NitroEvent } from '../../core/events/NitroEvent';
+import { EventDispatcher, NitroEvent } from '../../core';
 import { Nitro } from '../Nitro';
 import { AvatarStructure } from './AvatarStructure';
 import { EffectAssetDownloadLibrary } from './EffectAssetDownloadLibrary';

src/nitro/avatar/events/AvatarRenderEffectLibraryEvent.ts

@@ -1,4 +1,4 @@
-import { NitroEvent } from '../../../core/events/NitroEvent';
+import { NitroEvent } from '../../../core';
 import { EffectAssetDownloadLibrary } from '../EffectAssetDownloadLibrary';
 
 export class AvatarRenderEffectLibraryEvent extends NitroEvent
@@ -18,4 +18,4 @@ export class AvatarRenderEffectLibraryEvent extends NitroEvent
     {
         return this._library;
     }
-}
+}

src/nitro/avatar/events/AvatarRenderLibraryEvent.ts

@@ -1,4 +1,4 @@
-import { NitroEvent } from '../../../core/events/NitroEvent';
+import { NitroEvent } from '../../../core';
 import { AvatarAssetDownloadLibrary } from '../AvatarAssetDownloadLibrary';
 
 export class AvatarRenderLibraryEvent extends NitroEvent
@@ -18,4 +18,4 @@ export class AvatarRenderLibraryEvent extends NitroEvent
     {
         return this._library;
     }
-}
+}

src/nitro/avatar/structure/AvatarStructureDownload.ts

@@ -1,5 +1,4 @@
-import { EventDispatcher } from '../../../core/events/EventDispatcher';
-import { NitroEvent } from '../../../core/events/NitroEvent';
+import { EventDispatcher, NitroEvent } from '../../../core';
 import { IFigureSetData } from './IFigureSetData';
 
 export class AvatarStructureDownload extends EventDispatcher
@@ -31,9 +30,9 @@ export class AvatarStructureDownload extends EventDispatcher
             {
                 const response = request.responseText;
 
-                if(!response || !response.length) throw new Error('invalid_figure_data');
+                if (!response || !response.length) throw new Error('invalid_figure_data');
 
-                if(this._dataReceiver) this._dataReceiver.appendJSON(JSON.parse(response));
+                if (this._dataReceiver) this._dataReceiver.appendJSON(JSON.parse(response));
 
                 this.dispatchEvent(new NitroEvent(AvatarStructureDownload.AVATAR_STRUCTURE_DONE));
             };

src/nitro/avatar/structure/figure/ISetType.ts

@@ -1,4 +1,4 @@
-import { AdvancedMap } from '../../../../core/utils/AdvancedMap';
+import { AdvancedMap } from '../../../../core';
 import { IFigurePartSet } from './IFigurePartSet';
 
 export interface ISetType

src/nitro/avatar/structure/figure/SetType.ts

@@ -1,4 +1,4 @@
-import { AdvancedMap } from '../../../../core/utils/AdvancedMap';
+import { AdvancedMap } from '../../../../core';
 import { IFigureDataSetType } from '../../interfaces';
 import { FigurePartSet } from './FigurePartSet';
 import { IFigurePartSet } from './IFigurePartSet';
@@ -13,13 +13,13 @@ export class SetType implements ISetType
 
     constructor(data: IFigureDataSetType)
     {
-        if(!data) throw new Error('invalid_data');
+        if (!data) throw new Error('invalid_data');
 
         this._type = data.type;
         this._paletteId = data.paletteId;
         this._isMandatory = {};
-        this._isMandatory['F'] = [ data.mandatory_f_0, data.mandatory_f_1 ];
-        this._isMandatory['M'] = [ data.mandatory_m_0, data.mandatory_m_1 ];
+        this._isMandatory['F'] = [data.mandatory_f_0, data.mandatory_f_1];
+        this._isMandatory['M'] = [data.mandatory_m_0, data.mandatory_m_1];
         this._partSets = new AdvancedMap();
 
         this.append(data);
@@ -27,7 +27,7 @@ export class SetType implements ISetType
 
     public dispose(): void
     {
-        for(const set of this._partSets.getValues())
+        for (const set of this._partSets.getValues())
         {
             const partSet = set as FigurePartSet;
 
@@ -39,12 +39,12 @@ export class SetType implements ISetType
 
     public cleanUp(data: IFigureDataSetType): void
     {
-        for(const set of data.sets)
+        for (const set of data.sets)
         {
             const setId = set.id.toString();
             const partSet = (this._partSets.getValue(setId) as FigurePartSet);
 
-            if(partSet)
+            if (partSet)
             {
                 partSet.dispose();
 
@@ -55,18 +55,18 @@ export class SetType implements ISetType
 
     public append(setType: IFigureDataSetType): void
     {
-        if(!setType || !setType.sets) return;
+        if (!setType || !setType.sets) return;
 
-        for(const set of setType.sets) this._partSets.add(set.id.toString(), new FigurePartSet(this._type, set));
+        for (const set of setType.sets) this._partSets.add(set.id.toString(), new FigurePartSet(this._type, set));
     }
 
     public getDefaultPartSet(gender: string): IFigurePartSet
     {
-        for(const set of this._partSets.getValues())
+        for (const set of this._partSets.getValues())
         {
-            if(!set) continue;
+            if (!set) continue;
 
-            if((set.clubLevel === 0) && ((set.gender === gender) || (set.gender === 'U'))) return set;
+            if ((set.clubLevel === 0) && ((set.gender === gender) || (set.gender === 'U'))) return set;
         }
 
         return null;

src/nitro/camera/RoomCameraWidgetManager.ts

@@ -2,8 +2,7 @@ import { Texture } from '@pixi/core';
 import { ColorMatrix, ColorMatrixFilter } from '@pixi/filter-color-matrix';
 import { IEventDispatcher } from '../../api';
 import { EventDispatcher } from '../../core';
-import { NitroContainer, NitroSprite } from '../../pixi-proxy';
-import { TextureUtils } from '../../room';
+import { NitroContainer, NitroSprite, TextureUtils } from '../../pixi-proxy';
 import { Nitro } from '../Nitro';
 import { RoomCameraWidgetManagerEvent } from './events/RoomCameraWidgetManagerEvent';
 import { IRoomCameraWidgetEffect } from './IRoomCameraWidgetEffect';

src/nitro/camera/events/RoomCameraWidgetManagerEvent.ts

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

src/nitro/communication/NitroCommunicationManager.ts

@@ -1,7 +1,5 @@
 import { ICommunicationManager, IConnection, IConnectionStateListener, IMessageConfiguration, IMessageEvent } from '../../api';
-import { NitroManager } from '../../core/common/NitroManager';
-import { SocketConnectionEvent } from '../../core/communication/events/SocketConnectionEvent';
-import { NitroEvent } from '../../core/events/NitroEvent';
+import { NitroEvent, NitroManager, SocketConnectionEvent } from '../../core';
 import { Nitro } from '../Nitro';
 import { NitroCommunicationDemo } from './demo/NitroCommunicationDemo';
 import { NitroCommunicationDemoEvent } from './demo/NitroCommunicationDemoEvent';

src/nitro/communication/demo/NitroCommunicationDemo.ts

@@ -1,6 +1,5 @@
 import { IConnection } from '../../../api';
-import { NitroManager } from '../../../core/common/NitroManager';
-import { SocketConnectionEvent } from '../../../core/communication/events/SocketConnectionEvent';
+import { NitroManager, SocketConnectionEvent } from '../../../core';
 import { Nitro } from '../../Nitro';
 import { INitroCommunicationManager } from '../INitroCommunicationManager';
 import { ClientPingEvent } from '../messages/incoming/client/ClientPingEvent';

src/nitro/communication/demo/NitroCommunicationDemoEvent.ts

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

src/nitro/communication/messages/incoming/advertisement/InterstitialMessageEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { InterstitialMessageParser } from '../../parser';
 
 export class InterstitialMessageEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/advertisement/RoomAdErrorEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { RoomAdErrorMessageParser } from '../../parser';
 
 export class RoomAdErrorEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/availability/AvailabilityStatusMessageEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { AvailabilityStatusMessageParser } from '../../parser/availability/AvailabilityStatusMessageParser';
 
 export class AvailabilityStatusMessageEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/availability/AvailabilityTimeMessageEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { AvailabilityTimeMessageParser } from '../../parser';
 
 export class AvailabilityTimeMessageEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/availability/HotelClosedAndOpensEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { HotelClosedAndOpensMessageParser } from '../../parser';
 
 export class HotelClosedAndOpensEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/availability/HotelClosesAndWillOpenAtEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { HotelClosesAndWillOpenAtMessageParser } from '../../parser';
 
 export class HotelClosesAndWillOpenAtEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/availability/HotelWillCloseInMinutesEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { HotelWillCloseInMinutesMessageParser } from '../../parser';
 
 export class HotelWillCloseInMinutesEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/availability/MaintenanceStatusMessageEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { MaintenanceStatusMessageParser } from '../../parser';
 
 export class MaintenanceStatusMessageEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/avatar/ChangeUserNameResultMessageEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { ChangeUserNameResultMessageParser } from '../../parser/avatar/ChangeUserNameResultMessageParser';
 
 export class ChangeUserNameResultMessageEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/avatar/CheckUserNameResultMessageEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { CheckUserNameResultMessageParser } from '../../parser/avatar/CheckUserNameResultMessageParser';
 
 export class CheckUserNameResultMessageEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/avatar/FigureUpdateEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { FigureUpdateParser } from '../../parser';
 
 export class FigureUpdateEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/avatar/WardrobeMessageEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { WardrobeMessageParser } from '../../parser';
 
 export class WardrobeMessageEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/bots/BotAddedToInventoryEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { BotAddedToInventoryParser } from '../../parser/bots/BotAddedToInventoryParser';
 
 export class BotAddedToInventoryEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/bots/BotInventoryMessageEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { BotInventoryMessageParser } from '../../parser/bots/BotInventoryMessageParser';
 
 export class BotInventoryMessageEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/bots/BotReceivedMessageEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { BotReceivedMessageParser } from '../../parser/bots/BotReceivedMessageParser';
 
 export class BotReceivedMessageEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/bots/BotRemovedFromInventoryEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { BotRemovedFromInventoryParser } from '../../parser/bots/BotRemovedFromInventoryParser';
 
 export class BotRemovedFromInventoryEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/callforhelp/CfhSanctionMessageEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { CfhSanctionMessageParser } from '../../parser/callforhelp/CfhSanctionMessageParser';
 
 export class CfhSanctionMessageEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/callforhelp/CfhTopicsInitEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { CfhTopicsInitMessageParser } from '../../parser/callforhelp/CfhTopicsInitMessageParser';
 
 export class CfhTopicsInitEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/callforhelp/SanctionStatusEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { SanctionStatusMessageParser } from '../../parser/callforhelp';
 
 export class SanctionStatusEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/camera/CameraPublishStatusMessageEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { CameraPublishStatusMessageParser } from '../../parser/camera/CameraPublishStatusMessageParser';
 
 export class CameraPublishStatusMessageEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/camera/CameraPurchaseOKMessageEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { CameraPurchaseOKMessageParser } from '../../parser/camera/CameraPurchaseOKMessageParser';
 
 export class CameraPurchaseOKMessageEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/camera/CameraStorageUrlMessageEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { CameraStorageUrlMessageParser } from '../../parser/camera/CameraStorageUrlMessageParser';
 
 export class CameraStorageUrlMessageEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/camera/CompetitionStatusMessageEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { CompetitionStatusMessageParser } from '../../parser/camera/CompetitionStatusMessageParser';
 
 export class CompetitionStatusMessageEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/camera/InitCameraMessageEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { InitCameraMessageParser } from '../../parser/camera/InitCameraMessageParser';
 
 export class InitCameraMessageEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/camera/ThumbnailStatusMessageEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { ThumbnailStatusMessageParser } from '../../parser/camera/ThumbnailStatusMessageParser';
 
 export class ThumbnailStatusMessageEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/campaign/CampaignCalendarDataMessageEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { CampaignCalendarDataMessageParser } from '../../parser/campaign';
 
 export class CampaignCalendarDataMessageEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/campaign/CampaignCalendarDoorOpenedMessageEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { CampaignCalendarDoorOpenedMessageParser } from '../../parser/campaign';
 
 export class CampaignCalendarDoorOpenedMessageEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/catalog/BonusRareInfoMessageEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { BonusRareInfoMessageParser } from '../../parser';
 
 export class BonusRareInfoMessageEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/catalog/BuildersClubFurniCountMessageEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { BuildersClubFurniCountMessageParser } from '../../parser';
 
 export class BuildersClubFurniCountMessageEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/catalog/BuildersClubSubscriptionStatusMessageEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { BuildersClubSubscriptionStatusMessageParser } from '../../parser';
 
 export class BuildersClubSubscriptionStatusMessageEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/catalog/BundleDiscountRulesetMessageEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { BundleDiscountRulesetMessageParser } from '../../parser';
 
 export class BundleDiscountRulesetMessageEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/catalog/CatalogPageExpirationEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { CatalogPageExpirationParser } from '../../parser';
 
 export class CatalogPageExpirationEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/catalog/CatalogPageMessageEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { CatalogPageMessageParser } from '../../parser/catalog/CatalogPageMessageParser';
 
 export class CatalogPageMessageEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/catalog/CatalogPageWithEarliestExpiryMessageEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { CatalogPageWithEarliestExpiryMessageParser } from '../../parser';
 
 export class CatalogPageWithEarliestExpiryMessageEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/catalog/CatalogPagesListEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { CatalogIndexMessageParser } from '../../parser';
 
 export class CatalogPagesListEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/catalog/CatalogPublishedMessageEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { CatalogPublishedMessageParser } from '../../parser/catalog/CatalogPublishedMessageParser';
 
 export class CatalogPublishedMessageEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/catalog/ClubGiftInfoEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { ClubGiftInfoParser } from '../../parser';
 
 export class ClubGiftInfoEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/catalog/ClubGiftSelectedEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { ClubGiftSelectedParser } from '../../parser';
 
 export class ClubGiftSelectedEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/catalog/DirectSMSClubBuyAvailableMessageEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { DirectSMSClubBuyAvailableMessageParser } from '../../parser';
 
 export class DirectSMSClubBuyAvailableMessageEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/catalog/GiftReceiverNotFoundEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { GiftReceiverNotFoundParser } from '../../parser';
 
 export class GiftReceiverNotFoundEvent extends MessageEvent implements IMessageEvent

src/nitro/communication/messages/incoming/catalog/GiftWrappingConfigurationEvent.ts

@@ -1,5 +1,5 @@
 import { IMessageEvent } from '../../../../../api';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { MessageEvent } from '../../../../../core';
 import { GiftWrappingConfigurationParser } from '../../parser';
 
 export class GiftWrappingConfigurationEvent extends MessageEvent implements IMessageEvent