Continue moving files

src/api/IAdvancedMap.ts

@@ -0,0 +1,22 @@
+import { IDisposable } from './common';
+
+export interface IAdvancedMap<T = any, U = any> extends IDisposable
+{
+    dispose(): void;
+    reset(): void;
+    unshift(key: T, value: U): boolean;
+    add(key: T, value: U): boolean;
+    remove(key: T): U;
+    getWithIndex(index: number): U;
+    getKey(index: number): T;
+    getKeys(): T[];
+    hasKey(key: T): boolean;
+    getValue(key: T): U;
+    getValues(): U[];
+    hasValue(value: U): boolean;
+    indexOf(value: U): number;
+    concatenate(newValues: IAdvancedMap<T, U>): void;
+    clone(): IAdvancedMap<T, U>;
+    readonly length: number;
+    readonly disposed: boolean
+}

src/api/index.ts

@@ -13,4 +13,12 @@ export * from './common';
 export * from './communication';
 export * from './communication/enums';
 export * from './configuration';
+export * from './IAdvancedMap';
 export * from './INitroCore';
+export * from './nitro';
+export * from './room';
+export * from './room/object';
+export * from './room/object/enum';
+export * from './room/object/logic';
+export * from './room/object/visualization';
+export * from './room/renderer';

src/api/nitro/IRoomContentLoader.ts

@@ -0,0 +1,13 @@
+import { IGraphicAssetCollection } from '../asset';
+import { IEventDispatcher } from '../common';
+import { IRoomObject } from '../room';
+
+export interface IRoomContentLoader
+{
+    dispose: () => void;
+    downloadAsset(type: string, events: IEventDispatcher): void;
+    isLoaderType(type: string): boolean;
+    getCollection(name: string): IGraphicAssetCollection;
+    getPlaceholderName(type: string): string;
+    setRoomObjectRoomId(object: IRoomObject, roomId: string): void;
+}

src/api/nitro/index.ts

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

src/api/room/IRoomInstance.ts

@@ -1,9 +1,8 @@
-import { IDisposable } from '../api';
+import { IDisposable } from '../../api';
 import { IRoomInstanceContainer } from './IRoomInstanceContainer';
 import { IRoomObjectManager } from './IRoomObjectManager';
-import { IRoomObject } from './object/IRoomObject';
-import { IRoomObjectModel } from './object/IRoomObjectModel';
-import { IRoomRendererBase } from './renderer/IRoomRendererBase';
+import { IRoomObject, IRoomObjectModel } from './object';
+import { IRoomRendererBase } from './renderer';
 
 export interface IRoomInstance extends IDisposable
 {

src/api/room/IRoomInstanceContainer.ts

@@ -1,5 +1,5 @@
 import { IRoomObjectManager } from './IRoomObjectManager';
-import { IRoomObject } from './object/IRoomObject';
+import { IRoomObject } from './object';
 
 export interface IRoomInstanceContainer
 {

src/api/room/IRoomManager.ts

@@ -1,7 +1,7 @@
-import { IEventDispatcher, INitroManager } from '../api';
-import { RoomContentLoader } from '../nitro/room/RoomContentLoader';
+import { IEventDispatcher, INitroManager } from '../common';
+import { IRoomContentLoader } from '../nitro';
 import { IRoomInstance } from './IRoomInstance';
-import { IRoomObject } from './object/IRoomObject';
+import { IRoomObject } from './object';
 
 export interface IRoomManager extends INitroManager
 {
@@ -11,7 +11,7 @@ export interface IRoomManager extends INitroManager
     addUpdateCategory(category: number): void;
     removeUpdateCategory(category: number): void;
     createRoomObjectAndInitalize(roomId: string, objectId: number, type: string, category: number): IRoomObject;
-    setContentLoader(loader: RoomContentLoader): void;
+    setContentLoader(loader: IRoomContentLoader): void;
     update(time: number, update?: boolean): void;
     rooms: Map<string, IRoomInstance>;
     events: IEventDispatcher;

src/api/room/IRoomObjectManager.ts

@@ -1,5 +1,5 @@
-import { AdvancedMap } from '../core';
-import { IRoomObjectController } from './object/IRoomObjectController';
+import { IAdvancedMap } from '../IAdvancedMap';
+import { IRoomObjectController } from './object';
 
 export interface IRoomObjectManager
 {
@@ -9,6 +9,6 @@ export interface IRoomObjectManager
     createObject(id: number, stateCount: number, type: string): IRoomObjectController;
     removeObject(id: number): void;
     removeAllObjects(): void;
-    objects: AdvancedMap<number, IRoomObjectController>;
+    objects: IAdvancedMap<number, IRoomObjectController>;
     totalObjects: number;
 }

src/api/room/IRoomObjectUpdateMessage.ts

@@ -0,0 +1,7 @@
+import { IVector3D } from './IVector3D';
+
+export interface IRoomObjectUpdateMessage
+{
+    readonly location: IVector3D;
+    readonly direction: IVector3D;
+}

src/api/room/IRoomSpriteMouseEvent.ts

@@ -0,0 +1,17 @@
+export interface IRoomSpriteMouseEvent
+{
+    readonly type: string;
+    readonly eventId: string;
+    readonly canvasId: string;
+    readonly spriteTag: string;
+    readonly screenX: number;
+    readonly screenY: number;
+    readonly localX: number;
+    readonly localY: number;
+    readonly ctrlKey: boolean;
+    readonly altKey: boolean;
+    readonly shiftKey: boolean;
+    readonly buttonDown: boolean;
+    spriteOffsetX: number;
+    spriteOffsetY: number;
+}

src/api/room/IVector3D.ts

@@ -0,0 +1,10 @@
+export interface IVector3D
+{
+    assign(vector: IVector3D): void;
+    add(vector: IVector3D): void;
+    subtract(vector: IVector3D): void;
+    x: number;
+    y: number;
+    z: number;
+    length: number;
+}

src/api/room/index.ts

@@ -0,0 +1,15 @@
+export * from './IRoomGeometry';
+export * from './IRoomInstance';
+export * from './IRoomInstanceContainer';
+export * from './IRoomManager';
+export * from './IRoomManagerListener';
+export * from './IRoomObjectManager';
+export * from './IRoomObjectUpdateMessage';
+export * from './IRoomSpriteMouseEvent';
+export * from './IVector3D';
+export * from './object';
+export * from './object/enum';
+export * from './object/logic';
+export * from './object/visualization';
+export * from './renderer';
+export * from './RoomObjectSpriteData';

src/api/room/object/IRoomObject.ts

@@ -1,8 +1,8 @@
-import { IDisposable } from '../../api';
-import { IVector3D } from '../utils/IVector3D';
+import { IDisposable } from '../../common';
+import { IVector3D } from '../IVector3D';
 import { IRoomObjectModel } from './IRoomObjectModel';
-import { IRoomObjectMouseHandler } from './logic/IRoomObjectMouseHandler';
-import { IRoomObjectVisualization } from './visualization/IRoomObjectVisualization';
+import { IRoomObjectMouseHandler } from './logic';
+import { IRoomObjectVisualization } from './visualization';
 
 export interface IRoomObject extends IDisposable
 {

src/api/room/object/IRoomObjectController.ts

@@ -1,8 +1,8 @@
-import { RoomObjectUpdateMessage } from '../messages/RoomObjectUpdateMessage';
-import { IVector3D } from '../utils/IVector3D';
+import { IRoomObjectUpdateMessage } from '../IRoomObjectUpdateMessage';
+import { IVector3D } from '../IVector3D';
 import { IRoomObject } from './IRoomObject';
-import { IRoomObjectEventHandler } from './logic/IRoomObjectEventHandler';
-import { IRoomObjectGraphicVisualization } from './visualization/IRoomObjectGraphicVisualization';
+import { IRoomObjectEventHandler } from './logic';
+import { IRoomObjectGraphicVisualization } from './visualization';
 
 export interface IRoomObjectController extends IRoomObject
 {
@@ -11,7 +11,7 @@ export interface IRoomObjectController extends IRoomObject
     setState(state: number, index?: number): boolean;
     setVisualization(visualization: IRoomObjectGraphicVisualization): void;
     setLogic(logic: IRoomObjectEventHandler): void;
-    processUpdateMessage(message: RoomObjectUpdateMessage): void;
+    processUpdateMessage(message: IRoomObjectUpdateMessage): void;
     tearDown(): void;
     isReady: boolean;
     logic: IRoomObjectEventHandler;

src/api/room/object/IRoomObjectModelController.ts

@@ -1,4 +1,4 @@
-import { AdvancedMap } from '../../core';
+import { IAdvancedMap } from '../../IAdvancedMap';
 import { IRoomObjectModel } from './IRoomObjectModel';
 
 export interface IRoomObjectModelController extends IRoomObjectModel
@@ -7,5 +7,5 @@ export interface IRoomObjectModelController extends IRoomObjectModel
     setString(_arg_1: string, _arg_2: string, _arg_3: boolean): void;
     setNumberArray(_arg_1: string, _arg_2: [], _arg_3: boolean): void;
     setStringArray(_arg_1: string, _arg_2: [], _arg_3: boolean): void;
-    setStringToStringMap(_arg_1: string, _arg_2: AdvancedMap<any, any>, _arg_3: boolean): void;
+    setStringToStringMap(_arg_1: string, _arg_2: IAdvancedMap<any, any>, _arg_3: boolean): void;
 }

src/api/room/object/index.ts

@@ -0,0 +1,7 @@
+export * from './enum';
+export * from './IRoomObject';
+export * from './IRoomObjectController';
+export * from './IRoomObjectModel';
+export * from './IRoomObjectModelController';
+export * from './logic';
+export * from './visualization';

src/api/room/object/logic/IRoomObjectEventHandler.ts

@@ -1,5 +1,5 @@
-import { IDisposable, IEventDispatcher } from '../../../api';
-import { RoomObjectUpdateMessage } from '../../messages/RoomObjectUpdateMessage';
+import { IDisposable, IEventDispatcher } from '../../../common';
+import { IRoomObjectUpdateMessage } from '../../IRoomObjectUpdateMessage';
 import { IRoomObjectController } from '../IRoomObjectController';
 import { IRoomObjectMouseHandler } from './IRoomObjectMouseHandler';
 
@@ -7,7 +7,7 @@ export interface IRoomObjectEventHandler extends IRoomObjectMouseHandler, IDispo
 {
     initialize(data: unknown): void;
     update(totalTimeRunning: number): void;
-    processUpdateMessage(message: RoomObjectUpdateMessage): void;
+    processUpdateMessage(message: IRoomObjectUpdateMessage): void;
     getEventTypes(): string[];
     useObject(): void;
     setObject(object: IRoomObjectController): void;

src/api/room/object/logic/IRoomObjectLogicFactory.ts

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

src/api/room/object/logic/IRoomObjectMouseHandler.ts

@@ -0,0 +1,7 @@
+import { IRoomGeometry } from '../../IRoomGeometry';
+import { IRoomSpriteMouseEvent } from '../../IRoomSpriteMouseEvent';
+
+export interface IRoomObjectMouseHandler
+{
+    mouseEvent(event: IRoomSpriteMouseEvent, geometry: IRoomGeometry): void;
+}

src/api/room/object/logic/index.ts

@@ -0,0 +1,3 @@
+export * from './IRoomObjectEventHandler';
+export * from './IRoomObjectLogicFactory';
+export * from './IRoomObjectMouseHandler';

src/api/room/object/visualization/IRoomObjectGraphicVisualization.ts

@@ -1,4 +1,4 @@
-import { IGraphicAssetCollection } from '../../../api';
+import { IGraphicAssetCollection } from '../../../asset';
 import { IRoomObjectVisualization } from './IRoomObjectVisualization';
 
 export interface IRoomObjectGraphicVisualization extends IRoomObjectVisualization

src/api/room/object/visualization/IRoomObjectSpriteVisualization.ts

@@ -1,4 +1,4 @@
-import { RoomObjectSpriteData } from '../../data/RoomObjectSpriteData';
+import { RoomObjectSpriteData } from '../../RoomObjectSpriteData';
 import { IRoomObjectGraphicVisualization } from './IRoomObjectGraphicVisualization';
 import { IRoomObjectSprite } from './IRoomObjectSprite';
 

src/api/room/object/visualization/IRoomObjectVisualization.ts

@@ -1,6 +1,6 @@
 import { RenderTexture } from '@pixi/core';
 import { Rectangle } from '@pixi/math';
-import { IRoomGeometry } from '../../utils/IRoomGeometry';
+import { IRoomGeometry } from '../../IRoomGeometry';
 import { IRoomObject } from '../IRoomObject';
 import { IObjectVisualizationData } from './IRoomObjectVisualizationData';
 

src/api/room/object/visualization/IRoomObjectVisualizationData.ts

@@ -1,4 +1,4 @@
-import { IAssetData } from '../../../api';
+import { IAssetData } from '../../../asset';
 
 export interface IObjectVisualizationData
 {

src/api/room/object/visualization/IRoomObjectVisualizationFactory.ts

@@ -1,4 +1,4 @@
-import { IAssetData } from '../../../api';
+import { IAssetData } from '../../../asset';
 import { IRoomObjectGraphicVisualization } from './IRoomObjectGraphicVisualization';
 import { IObjectVisualizationData } from './IRoomObjectVisualizationData';
 

src/api/room/object/visualization/IRoomPlane.ts

@@ -0,0 +1,13 @@
+import { IRoomGeometry } from '../../IRoomGeometry';
+import { IVector3D } from '../../IVector3D';
+import { IPlaneDrawingData } from './IPlaneDrawingData';
+
+export interface IRoomPlane
+{
+    uniqueId: number;
+    location: IVector3D;
+    leftSide: IVector3D;
+    rightSide: IVector3D;
+    color: number;
+    getDrawingDatas(_arg_1: IRoomGeometry): IPlaneDrawingData[];
+}

src/api/room/object/visualization/index.ts

@@ -0,0 +1,10 @@
+export * from './IPlaneDrawingData';
+export * from './IPlaneVisualization';
+export * from './IRoomObjectGraphicVisualization';
+export * from './IRoomObjectSprite';
+export * from './IRoomObjectSpriteVisualization';
+export * from './IRoomObjectVisualization';
+export * from './IRoomObjectVisualizationData';
+export * from './IRoomObjectVisualizationFactory';
+export * from './IRoomPlane';
+export * from './ISortableSprite';

src/api/room/renderer/IRoomCanvasMouseListener.ts

@@ -0,0 +1,8 @@
+import { IRoomGeometry } from '../IRoomGeometry';
+import { IRoomSpriteMouseEvent } from '../IRoomSpriteMouseEvent';
+import { IRoomObject } from '../object';
+
+export interface IRoomCanvasMouseListener
+{
+    processRoomCanvasMouseEvent(event: IRoomSpriteMouseEvent, object: IRoomObject, geometry: IRoomGeometry): void
+}

src/api/room/renderer/IRoomRendererBase.ts

@@ -1,4 +1,4 @@
-import { IRoomObject } from '../object/IRoomObject';
+import { IRoomObject } from '../object';
 
 export interface IRoomRendererBase
 {

src/api/room/renderer/IRoomRenderingCanvas.ts

@@ -1,10 +1,10 @@
 import { RenderTexture } from '@pixi/core';
 import { DisplayObject } from '@pixi/display';
 import { Point } from '@pixi/math';
-import { RoomObjectSpriteData } from '../data/RoomObjectSpriteData';
-import { IRoomGeometry } from '../utils/IRoomGeometry';
+import { IRoomGeometry } from '../IRoomGeometry';
+import { ISortableSprite } from '../object';
+import { RoomObjectSpriteData } from '../RoomObjectSpriteData';
 import { IRoomCanvasMouseListener } from './IRoomCanvasMouseListener';
-import { SortableSprite } from './utils/SortableSprite';
 
 export interface IRoomRenderingCanvas
 {
@@ -17,7 +17,7 @@ export interface IRoomRenderingCanvas
     setMouseListener(listener: IRoomCanvasMouseListener): void;
     skipSpriteVisibilityChecking(): void;
     resumeSpriteVisibilityChecking(): void;
-    getPlaneSortableSprites(): SortableSprite[];
+    getPlaneSortableSprites(): ISortableSprite[];
     handleMouseEvent(x: number, y: number, type: string, altKey: boolean, ctrlKey: boolean, shiftKey: boolean, buttonDown: boolean): boolean;
     getSortableSpriteList(): RoomObjectSpriteData[];
     getDisplayAsTexture(): RenderTexture;

src/api/room/renderer/IRoomSpriteCanvasContainer.ts

@@ -1,4 +1,4 @@
-import { IRoomObject } from '../object/IRoomObject';
+import { IRoomObject } from '../object';
 
 export interface IRoomSpriteCanvasContainer
 {

src/api/room/renderer/index.ts

@@ -0,0 +1,6 @@
+export * from './IRoomCanvasMouseListener';
+export * from './IRoomRenderer';
+export * from './IRoomRendererBase';
+export * from './IRoomRendererFactory';
+export * from './IRoomRenderingCanvas';
+export * from './IRoomSpriteCanvasContainer';

src/core/common/NitroEvent.ts

@@ -1,4 +1,6 @@
-export class NitroEvent
+import { INitroEvent } from '../../api';
+
+export class NitroEvent implements INitroEvent
 {
     private _type: string;
 

src/core/utils/AdvancedMap.ts

@@ -1,6 +1,6 @@
-import { IDisposable } from '../../api';
+import { IAdvancedMap } from '../../api';
 
-export class AdvancedMap<T, U> implements IDisposable
+export class AdvancedMap<T, U> implements IAdvancedMap<T, U>
 {
     private _length: number;
     private _dictionary: Map<T, U>;
@@ -148,7 +148,7 @@ export class AdvancedMap<T, U> implements IDisposable
         for (const k of newValues._keys) this.add(k, newValues.getValue(k));
     }
 
-    public clone(): AdvancedMap<T, U>
+    public clone(): IAdvancedMap<T, U>
     {
         const map = new AdvancedMap<T, U>();
 

src/nitro/INitro.ts

@@ -1,7 +1,6 @@
 import { Application } from '@pixi/app';
 import { Ticker } from '@pixi/ticker';
-import { IEventDispatcher, ILinkEventTracker, INitroCore, IWorkerEventTracker } from '../api';
-import { IRoomManager } from '../room/IRoomManager';
+import { IEventDispatcher, ILinkEventTracker, INitroCore, IRoomManager, IWorkerEventTracker } from '../api';
 import { IAvatarRenderManager } from './avatar/IAvatarRenderManager';
 import { IRoomCameraWidgetManager } from './camera/IRoomCameraWidgetManager';
 import { INitroCommunicationManager } from './communication/INitroCommunicationManager';

src/nitro/Nitro.ts

@@ -2,10 +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, INitroCore, IWorkerEventTracker } from '../api';
+import { IEventDispatcher, ILinkEventTracker, INitroCore, IRoomManager, 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';
 import { IAvatarRenderManager } from './avatar/IAvatarRenderManager';

src/nitro/avatar/cache/AvatarImageCache.ts

@@ -1,8 +1,7 @@
 import { Texture } from '@pixi/core';
 import { Matrix, Point, Rectangle } from '@pixi/math';
-import { NitroContainer, NitroSprite } from '../../../pixi-proxy';
-import { RoomObjectSpriteData } from '../../../room/data/RoomObjectSpriteData';
-import { Nitro } from '../../Nitro';
+import { RoomObjectSpriteData } from '../../../api/room/RoomObjectSpriteData';
+import { NitroContainer, NitroSprite, PixiApplicationProxy } from '../../../pixi-proxy';
 import { IActiveActionData } from '../actions/IActiveActionData';
 import { AssetAliasCollection } from '../alias/AssetAliasCollection';
 import { AvatarAnimationLayerData } from '../animation/AvatarAnimationLayerData';
@@ -87,7 +86,7 @@ export class AvatarImageCache
 
     public disposeInactiveActions(k: number = 60000): void
     {
-        const time = Nitro.instance.time;
+        const time = PixiApplicationProxy.instance.ticker.lastTime;
 
         if (this._cache)
         {

src/nitro/room/IRoomCreator.ts

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

src/nitro/room/IRoomEngine.ts

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

src/nitro/room/IRoomEngineServices.ts

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

src/nitro/room/RoomContentLoader.ts

@@ -1,10 +1,10 @@
 import { BaseTexture, Resource, Texture } from '@pixi/core';
 import { Loader, LoaderResource } from '@pixi/loaders';
 import { Spritesheet } from '@pixi/spritesheet';
-import { IAssetData, IEventDispatcher, IGraphicAssetCollection, INitroLogger } from '../../api';
+import { IAssetData, IEventDispatcher, IGraphicAssetCollection, INitroLogger, IRoomContentLoader } from '../../api';
+import { IRoomObject } from '../../api/room/object/IRoomObject';
 import { GraphicAssetCollection, GraphicAssetGifCollection, NitroBundle, NitroEvent, NitroLogger } from '../../core';
 import { RoomContentLoadedEvent } from '../../room/events/RoomContentLoadedEvent';
-import { IRoomObject } from '../../room/object/IRoomObject';
 import { Nitro } from '../Nitro';
 import { FurnitureType } from '../session/furniture/FurnitureType';
 import { IFurnitureData } from '../session/furniture/IFurnitureData';
@@ -17,7 +17,7 @@ import { RoomObjectVariable } from './object/RoomObjectVariable';
 import { RoomObjectVisualizationType } from './object/RoomObjectVisualizationType';
 import { PetColorResult } from './PetColorResult';
 
-export class RoomContentLoader implements IFurnitureDataListener
+export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLoader
 {
     private static PLACE_HOLDER: string = 'place_holder';
     private static PLACE_HOLDER_WALL: string = 'place_holder_wall';

src/nitro/room/RoomEngine.ts

@@ -1,30 +1,10 @@
 import { RenderTexture, Resource, Texture } from '@pixi/core';
 import { Container, DisplayObject } from '@pixi/display';
 import { Matrix, Point, Rectangle } from '@pixi/math';
-import { IConnection, IDisposable, IMessageComposer, IUpdateReceiver } from '../../api';
+import { IConnection, IDisposable, IMessageComposer, IRoomGeometry, IRoomInstance, IRoomManager, IRoomManagerListener, IRoomObject, IRoomObjectController, IRoomObjectLogicFactory, IRoomObjectVisualizationFactory, IRoomRenderer, IRoomRendererFactory, IRoomRenderingCanvas, IUpdateReceiver, IVector3D } from '../../api';
 import { NitroEvent, NitroManager } from '../../core';
 import { NitroSprite, TextureUtils } from '../../pixi-proxy';
-import { RoomObjectEvent } from '../../room/events/RoomObjectEvent';
-import { RoomObjectMouseEvent } from '../../room/events/RoomObjectMouseEvent';
-import { IRoomInstance } from '../../room/IRoomInstance';
-import { IRoomManager } from '../../room/IRoomManager';
-import { IRoomManagerListener } from '../../room/IRoomManagerListener';
-import { RoomObjectUpdateMessage } from '../../room/messages/RoomObjectUpdateMessage';
-import { IRoomObject } from '../../room/object/IRoomObject';
-import { IRoomObjectController } from '../../room/object/IRoomObjectController';
-import { IRoomObjectLogicFactory } from '../../room/object/logic/IRoomObjectLogicFactory';
-import { IRoomObjectVisualizationFactory } from '../../room/object/visualization/IRoomObjectVisualizationFactory';
-import { IRoomRenderer } from '../../room/renderer/IRoomRenderer';
-import { IRoomRendererFactory } from '../../room/renderer/IRoomRendererFactory';
-import { IRoomRenderingCanvas } from '../../room/renderer/IRoomRenderingCanvas';
-import { RoomRendererFactory } from '../../room/renderer/RoomRendererFactory';
-import { RoomInstance } from '../../room/RoomInstance';
-import { IRoomGeometry } from '../../room/utils/IRoomGeometry';
-import { IVector3D } from '../../room/utils/IVector3D';
-import { NumberBank } from '../../room/utils/NumberBank';
-import { RoomEnterEffect } from '../../room/utils/RoomEnterEffect';
-import { RoomGeometry } from '../../room/utils/RoomGeometry';
-import { Vector3d } from '../../room/utils/Vector3d';
+import { NumberBank, RoomEnterEffect, RoomGeometry, RoomInstance, RoomObjectEvent, RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomRendererFactory, Vector3d } from '../../room';
 import { PetCustomPart } from '../avatar/pets/PetCustomPart';
 import { PetFigureData } from '../avatar/pets/PetFigureData';
 import { RenderRoomMessageComposer, RenderRoomThumbnailMessageComposer } from '../communication';

src/nitro/room/RoomMessageHandler.ts

@@ -1,7 +1,6 @@
-import { IConnection } from '../../api';
+import { IConnection, IVector3D } from '../../api';
 import { Disposable } from '../../core';
-import { IVector3D } from '../../room/utils/IVector3D';
-import { Vector3d } from '../../room/utils/Vector3d';
+import { Vector3d } from '../../room';
 import { AvatarGuideStatus } from '../avatar/enum/AvatarGuideStatus';
 import { PetType } from '../avatar/pets/PetType';
 import { ObjectsDataUpdateEvent, PetExperienceEvent } from '../communication';

src/nitro/room/RoomObjectEventHandler.ts

@@ -1,16 +1,10 @@
+import { IRoomCanvasMouseListener, IRoomGeometry, IRoomObject, IRoomObjectController, IVector3D } from '../../api';
 import { Disposable, NitroLogger } from '../../core';
-import { RoomId } from '../../room';
+import { RoomEnterEffect, RoomId, Vector3d } from '../../room';
 import { RoomObjectEvent } from '../../room/events/RoomObjectEvent';
 import { RoomObjectMouseEvent } from '../../room/events/RoomObjectMouseEvent';
 import { RoomSpriteMouseEvent } from '../../room/events/RoomSpriteMouseEvent';
 import { RoomObjectUpdateMessage } from '../../room/messages/RoomObjectUpdateMessage';
-import { IRoomObject } from '../../room/object/IRoomObject';
-import { IRoomObjectController } from '../../room/object/IRoomObjectController';
-import { IRoomCanvasMouseListener } from '../../room/renderer/IRoomCanvasMouseListener';
-import { IRoomGeometry } from '../../room/utils/IRoomGeometry';
-import { IVector3D } from '../../room/utils/IVector3D';
-import { RoomEnterEffect } from '../../room/utils/RoomEnterEffect';
-import { Vector3d } from '../../room/utils/Vector3d';
 import { FurnitureGroupInfoComposer, SetObjectDataMessageComposer } from '../communication';
 import { GetResolutionAchievementsMessageComposer } from '../communication/messages/outgoing/game/GetResolutionAchievementsMessageComposer';
 import { BotPlaceComposer } from '../communication/messages/outgoing/room/engine/BotPlaceComposer';

src/nitro/room/RoomObjectLogicFactory.ts

@@ -1,7 +1,5 @@
-import { IEventDispatcher } from '../../api';
+import { IEventDispatcher, IRoomObjectEventHandler, IRoomObjectLogicFactory } from '../../api';
 import { EventDispatcher, NitroLogger } from '../../core';
-import { IRoomObjectEventHandler } from '../../room/object/logic/IRoomObjectEventHandler';
-import { IRoomObjectLogicFactory } from '../../room/object/logic/IRoomObjectLogicFactory';
 import { RoomObjectLogicBase } from '../../room/object/logic/RoomObjectLogicBase';
 import { FurnitureEcotronBoxLogic, FurnitureEffectBoxLogic, FurnitureGroupForumTerminalLogic, FurnitureHabboWheelLogic, FurnitureHweenLovelockLogic, FurnitureInternalLinkLogic, FurnitureJukeboxLogic, FurnitureLoveLockLogic, FurnitureMonsterplantSeedLogic, FurnitureMysteryBoxLogic, FurnitureMysteryTrophyLogic, FurniturePlaceholderLogic, FurniturePlanetSystemLogic, FurnitureRandomStateLogic, FurnitureRandomTeleportLogic, FurnitureRentableSpaceLogic, FurnitureSongDiskLogic, FurnitureSoundMachineLogic, FurnitureWelcomeGiftLogic } from './object';
 import { AvatarLogic } from './object/logic/avatar/AvatarLogic';

src/nitro/room/events/RoomObjectBadgeAssetEvent.ts

@@ -1,5 +1,5 @@
-import { RoomObjectEvent } from '../../../room/events/RoomObjectEvent';
-import { IRoomObject } from '../../../room/object/IRoomObject';
+import { IRoomObject } from '../../../api';
+import { RoomObjectEvent } from '../../../room';
 
 export class RoomObjectBadgeAssetEvent extends RoomObjectEvent
 {

src/nitro/room/events/RoomObjectDataRequestEvent.ts

@@ -1,5 +1,5 @@
-import { RoomObjectEvent } from '../../../room/events/RoomObjectEvent';
-import { IRoomObject } from '../../../room/object/IRoomObject';
+import { IRoomObject } from '../../../api';
+import { RoomObjectEvent } from '../../../room';
 
 export class RoomObjectDataRequestEvent extends RoomObjectEvent
 {

src/nitro/room/events/RoomObjectDimmerStateUpdateEvent.ts

@@ -1,5 +1,5 @@
-import { RoomObjectEvent } from '../../../room/events/RoomObjectEvent';
-import { IRoomObject } from '../../../room/object/IRoomObject';
+import { IRoomObject } from '../../../api';
+import { RoomObjectEvent } from '../../../room/events/RoomObjectEvent';
 
 export class RoomObjectDimmerStateUpdateEvent extends RoomObjectEvent
 {

src/nitro/room/events/RoomObjectFloorHoleEvent.ts

@@ -1,5 +1,5 @@
-import { RoomObjectEvent } from '../../../room/events/RoomObjectEvent';
-import { IRoomObject } from '../../../room/object/IRoomObject';
+import { IRoomObject } from '../../../api';
+import { RoomObjectEvent } from '../../../room';
 
 export class RoomObjectFloorHoleEvent extends RoomObjectEvent
 {

src/nitro/room/events/RoomObjectHSLColorEnableEvent.ts

@@ -1,5 +1,5 @@
-import { RoomObjectEvent } from '../../../room/events/RoomObjectEvent';
-import { IRoomObject } from '../../../room/object/IRoomObject';
+import { IRoomObject } from '../../../api';
+import { RoomObjectEvent } from '../../../room';
 
 export class RoomObjectHSLColorEnableEvent extends RoomObjectEvent
 {

src/nitro/room/events/RoomObjectMoveEvent.ts

@@ -1,5 +1,5 @@
-import { RoomObjectEvent } from '../../../room/events/RoomObjectEvent';
-import { IRoomObject } from '../../../room/object/IRoomObject';
+import { IRoomObject } from '../../../api';
+import { RoomObjectEvent } from '../../../room';
 
 export class RoomObjectMoveEvent extends RoomObjectEvent
 {

src/nitro/room/events/RoomObjectPlaySoundIdEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomObject } from '../../../room';
+import { IRoomObject } from '../../../api';
 import { RoomObjectFurnitureActionEvent } from './RoomObjectFurnitureActionEvent';
 
 export class RoomObjectPlaySoundIdEvent extends RoomObjectFurnitureActionEvent

src/nitro/room/events/RoomObjectRoomAdEvent.ts

@@ -1,4 +1,5 @@
-import { IRoomObject, RoomObjectEvent } from '../../../room';
+import { IRoomObject } from '../../../api';
+import { RoomObjectEvent } from '../../../room';
 
 export class RoomObjectRoomAdEvent extends RoomObjectEvent
 {

src/nitro/room/events/RoomObjectSamplePlaybackEvent.ts

@@ -1,5 +1,5 @@
-import { RoomObjectEvent } from '../../../room/events/RoomObjectEvent';
-import { IRoomObject } from '../../../room/object/IRoomObject';
+import { IRoomObject } from '../../../api';
+import { RoomObjectEvent } from '../../../room';
 
 export class RoomObjectSamplePlaybackEvent extends RoomObjectEvent
 {

src/nitro/room/events/RoomObjectStateChangedEvent.ts

@@ -1,5 +1,5 @@
-import { RoomObjectEvent } from '../../../room/events/RoomObjectEvent';
-import { IRoomObject } from '../../../room/object/IRoomObject';
+import { IRoomObject } from '../../../api';
+import { RoomObjectEvent } from '../../../room';
 
 export class RoomObjectStateChangedEvent extends RoomObjectEvent
 {

src/nitro/room/events/RoomObjectTileMouseEvent.ts

@@ -1,5 +1,5 @@
-import { RoomObjectMouseEvent } from '../../../room/events/RoomObjectMouseEvent';
-import { IRoomObject } from '../../../room/object/IRoomObject';
+import { IRoomObject } from '../../../api';
+import { RoomObjectMouseEvent } from '../../../room/events/RoomObjectMouseEvent';
 
 export class RoomObjectTileMouseEvent extends RoomObjectMouseEvent
 {

src/nitro/room/events/RoomObjectWallMouseEvent.ts

@@ -1,7 +1,5 @@
-import { RoomObjectMouseEvent } from '../../../room/events/RoomObjectMouseEvent';
-import { IRoomObject } from '../../../room/object/IRoomObject';
-import { IVector3D } from '../../../room/utils/IVector3D';
-import { Vector3d } from '../../../room/utils/Vector3d';
+import { IRoomObject, IVector3D } from '../../../api';
+import { RoomObjectMouseEvent, Vector3d } from '../../../room';
 
 export class RoomObjectWallMouseEvent extends RoomObjectMouseEvent
 {

src/nitro/room/events/RoomObjectWidgetRequestEvent.ts

@@ -1,5 +1,5 @@
-import { RoomObjectEvent } from '../../../room/events/RoomObjectEvent';
-import { IRoomObject } from '../../../room/object/IRoomObject';
+import { IRoomObject } from '../../../api';
+import { RoomObjectEvent } from '../../../room';
 
 export class RoomObjectWidgetRequestEvent extends RoomObjectEvent
 {

src/nitro/room/events/RoomToObjectOwnAvatarMoveEvent.ts

@@ -1,5 +1,5 @@
-import { RoomToObjectEvent } from '../../../room/events/RoomToObjectEvent';
-import { IVector3D } from '../../../room/utils/IVector3D';
+import { IVector3D } from '../../../api';
+import { RoomToObjectEvent } from '../../../room';
 
 export class RoomToObjectOwnAvatarMoveEvent extends RoomToObjectEvent
 {

src/nitro/room/messages/ObjectAvatarUpdateMessage.ts

@@ -1,4 +1,4 @@
-import { IVector3D } from '../../../room/utils/IVector3D';
+import { IVector3D } from '../../../api';
 import { ObjectMoveUpdateMessage } from './ObjectMoveUpdateMessage';
 
 export class ObjectAvatarUpdateMessage extends ObjectMoveUpdateMessage

src/nitro/room/messages/ObjectHeightUpdateMessage.ts

@@ -1,5 +1,5 @@
-import { RoomObjectUpdateMessage } from '../../../room/messages/RoomObjectUpdateMessage';
-import { IVector3D } from '../../../room/utils/IVector3D';
+import { IVector3D } from '../../../api';
+import { RoomObjectUpdateMessage } from '../../../room';
 
 export class ObjectHeightUpdateMessage extends RoomObjectUpdateMessage
 {

src/nitro/room/messages/ObjectMoveUpdateMessage.ts

@@ -1,5 +1,5 @@
-import { RoomObjectUpdateMessage } from '../../../room/messages/RoomObjectUpdateMessage';
-import { IVector3D } from '../../../room/utils/IVector3D';
+import { IVector3D } from '../../../api';
+import { RoomObjectUpdateMessage } from '../../../room';
 
 export class ObjectMoveUpdateMessage extends RoomObjectUpdateMessage
 {

src/nitro/room/messages/ObjectRoomMaskUpdateMessage.ts

@@ -1,6 +1,5 @@
-import { RoomObjectUpdateMessage } from '../../../room/messages/RoomObjectUpdateMessage';
-import { IVector3D } from '../../../room/utils/IVector3D';
-import { Vector3d } from '../../../room/utils/Vector3d';
+import { IVector3D } from '../../../api';
+import { RoomObjectUpdateMessage, Vector3d } from '../../../room';
 
 export class ObjectRoomMaskUpdateMessage extends RoomObjectUpdateMessage
 {

src/nitro/room/object/RoomMapMaskData.ts

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

src/nitro/room/object/RoomObjectVisualizationFactory.ts

@@ -1,9 +1,6 @@
-import { IAssetData } from '../../../api';
+import { IAssetData, IObjectVisualizationData, IRoomObjectGraphicVisualization, IRoomObjectVisualizationFactory } from '../../../api';
 import { NitroLogger } from '../../../core';
-import { IRoomObjectGraphicVisualization } from '../../../room/object/visualization/IRoomObjectGraphicVisualization';
-import { IObjectVisualizationData } from '../../../room/object/visualization/IRoomObjectVisualizationData';
-import { IRoomObjectVisualizationFactory } from '../../../room/object/visualization/IRoomObjectVisualizationFactory';
-import { RoomObjectSpriteVisualization } from '../../../room/object/visualization/RoomObjectSpriteVisualization';
+import { RoomObjectSpriteVisualization } from '../../../room';
 import { Nitro } from '../../Nitro';
 import { RoomObjectVisualizationType } from './RoomObjectVisualizationType';
 import { AvatarVisualization } from './visualization/avatar/AvatarVisualization';

src/nitro/room/object/RoomPlaneBitmapMaskData.ts

@@ -1,5 +1,5 @@
-import { IVector3D } from '../../../room/utils/IVector3D';
-import { Vector3d } from '../../../room/utils/Vector3d';
+import { IVector3D } from '../../../api';
+import { Vector3d } from '../../../room';
 
 export class RoomPlaneBitmapMaskData
 {

src/nitro/room/object/RoomPlaneBitmapMaskParser.ts

@@ -1,4 +1,4 @@
-import { IVector3D } from '../../../room/utils/IVector3D';
+import { IVector3D } from '../../../api';
 import { RoomMapMaskData } from './RoomMapMaskData';
 import { RoomPlaneBitmapMaskData } from './RoomPlaneBitmapMaskData';
 

src/nitro/room/object/RoomPlaneData.ts

@@ -1,5 +1,5 @@
-import { IVector3D } from '../../../room/utils/IVector3D';
-import { Vector3d } from '../../../room/utils/Vector3d';
+import { IVector3D } from '../../../api';
+import { Vector3d } from '../../../room';
 import { RoomPlaneMaskData } from './RoomPlaneMaskData';
 
 export class RoomPlaneData

src/nitro/room/object/RoomPlaneParser.ts

@@ -1,6 +1,6 @@
 import { Point } from '@pixi/math';
-import { IVector3D } from '../../../room/utils/IVector3D';
-import { Vector3d } from '../../../room/utils/Vector3d';
+import { IVector3D } from '../../../api';
+import { Vector3d } from '../../../room';
 import { RoomFloorHole } from './RoomFloorHole';
 import { RoomMapData } from './RoomMapData';
 import { RoomPlaneData } from './RoomPlaneData';

src/nitro/room/object/RoomWallData.ts

@@ -1,6 +1,6 @@
 import { Point } from '@pixi/math';
-import { IVector3D } from '../../../room/utils/IVector3D';
-import { Vector3d } from '../../../room/utils/Vector3d';
+import { IVector3D } from '../../../api';
+import { Vector3d } from '../../../room';
 
 export class RoomWallData
 {

src/nitro/room/object/data/IObjectData.ts

@@ -1,5 +1,4 @@
-import { IMessageDataWrapper } from '../../../../api';
-import { IRoomObjectModel } from '../../../../room/object/IRoomObjectModel';
+import { IMessageDataWrapper, IRoomObjectModel } from '../../../../api';
 
 export interface IObjectData
 {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/nitro/room/object/logic/MovingObjectLogic.ts

@@ -1,8 +1,5 @@
-import { RoomObjectUpdateMessage } from '../../../../room/messages/RoomObjectUpdateMessage';
-import { IRoomObjectController } from '../../../../room/object/IRoomObjectController';
-import { RoomObjectLogicBase } from '../../../../room/object/logic/RoomObjectLogicBase';
-import { IVector3D } from '../../../../room/utils/IVector3D';
-import { Vector3d } from '../../../../room/utils/Vector3d';
+import { IRoomObjectController, IRoomObjectUpdateMessage, IVector3D } from '../../../../api';
+import { RoomObjectLogicBase, Vector3d } from '../../../../room';
 import { ObjectMoveUpdateMessage } from '../../messages/ObjectMoveUpdateMessage';
 import { RoomObjectVariable } from '../RoomObjectVariable';
 
@@ -111,7 +108,7 @@ export class MovingObjectLogic extends RoomObjectLogicBase
         if (object) this._location.assign(object.getLocation());
     }
 
-    public processUpdateMessage(message: RoomObjectUpdateMessage): void
+    public processUpdateMessage(message: IRoomObjectUpdateMessage): void
     {
         if (!message) return;
 

src/nitro/room/object/logic/avatar/AvatarLogic.ts

@@ -1,10 +1,6 @@
 
-import { RoomObjectMouseEvent } from '../../../../../room/events/RoomObjectMouseEvent';
-import { RoomSpriteMouseEvent } from '../../../../../room/events/RoomSpriteMouseEvent';
-import { RoomObjectUpdateMessage } from '../../../../../room/messages/RoomObjectUpdateMessage';
-import { IRoomObjectModel } from '../../../../../room/object/IRoomObjectModel';
-import { IRoomGeometry } from '../../../../../room/utils/IRoomGeometry';
-import { Vector3d } from '../../../../../room/utils/Vector3d';
+import { IRoomGeometry, IRoomObjectModel } from '../../../../../api';
+import { RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomSpriteMouseEvent, Vector3d } from '../../../../../room';
 import { AvatarAction } from '../../../../avatar/enum/AvatarAction';
 import { Nitro } from '../../../../Nitro';
 import { MouseEventType } from '../../../../ui/MouseEventType';

src/nitro/room/object/logic/furniture/FurnitureAchievementResolutionLogic.ts

@@ -1,5 +1,4 @@
-import { RoomObjectEvent } from '../../../../../room/events/RoomObjectEvent';
-import { RoomObjectUpdateMessage } from '../../../../../room/messages/RoomObjectUpdateMessage';
+import { RoomObjectEvent, RoomObjectUpdateMessage } from '../../../../../room';
 import { RoomObjectBadgeAssetEvent } from '../../../events/RoomObjectBadgeAssetEvent';
 import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent';
 import { ObjectGroupBadgeUpdateMessage } from '../../../messages/ObjectGroupBadgeUpdateMessage';

src/nitro/room/object/logic/furniture/FurnitureBadgeDisplayLogic.ts

@@ -1,5 +1,5 @@
-import { RoomObjectUpdateMessage } from '../../../../../room/messages/RoomObjectUpdateMessage';
-import { Nitro } from '../../../../Nitro';
+import { PixiApplicationProxy } from '../../../../../pixi-proxy';
+import { RoomObjectUpdateMessage } from '../../../../../room';
 import { RoomObjectBadgeAssetEvent } from '../../../events/RoomObjectBadgeAssetEvent';
 import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent';
 import { ObjectDataUpdateMessage } from '../../../messages/ObjectDataUpdateMessage';
@@ -39,7 +39,7 @@ export class FurnitureBadgeDisplayLogic extends FurnitureLogic
                 this.object.model.setValue(RoomObjectVariable.FURNITURE_BADGE_ASSET_NAME, message.assetName);
                 this.object.model.setValue(RoomObjectVariable.FURNITURE_BADGE_IMAGE_STATUS, 1);
 
-                this.update(Nitro.instance.time);
+                this.update(PixiApplicationProxy.instance.ticker.lastTime);
             }
 
             return;

src/nitro/room/object/logic/furniture/FurnitureCounterClockLogic.ts

@@ -1,6 +1,5 @@
-import { RoomObjectEvent } from '../../../../../room/events/RoomObjectEvent';
-import { RoomSpriteMouseEvent } from '../../../../../room/events/RoomSpriteMouseEvent';
-import { IRoomGeometry } from '../../../../../room/utils/IRoomGeometry';
+import { IRoomGeometry } from '../../../../../api';
+import { RoomObjectEvent, RoomSpriteMouseEvent } from '../../../../../room';
 import { MouseEventType } from '../../../../ui/MouseEventType';
 import { RoomObjectStateChangedEvent } from '../../../events/RoomObjectStateChangedEvent';
 import { FurnitureLogic } from './FurnitureLogic';

src/nitro/room/object/logic/furniture/FurnitureCrackableLogic.ts

@@ -1,4 +1,4 @@
-import { RoomObjectUpdateMessage } from '../../../../../room/messages/RoomObjectUpdateMessage';
+import { RoomObjectUpdateMessage } from '../../../../../room';
 import { RoomWidgetEnumItemExtradataParameter } from '../../../../ui/widget/enums/RoomWidgetEnumItemExtradataParameter';
 import { RoomObjectVariable } from '../../RoomObjectVariable';
 import { FurnitureLogic } from './FurnitureLogic';

src/nitro/room/object/logic/furniture/FurnitureDiceLogic.ts

@@ -1,6 +1,5 @@
-import { RoomObjectEvent } from '../../../../../room/events/RoomObjectEvent';
-import { RoomSpriteMouseEvent } from '../../../../../room/events/RoomSpriteMouseEvent';
-import { IRoomGeometry } from '../../../../../room/utils/IRoomGeometry';
+import { IRoomGeometry } from '../../../../../api';
+import { RoomObjectEvent, RoomSpriteMouseEvent } from '../../../../../room';
 import { MouseEventType } from '../../../../ui/MouseEventType';
 import { RoomObjectFurnitureActionEvent } from '../../../events/RoomObjectFurnitureActionEvent';
 import { FurnitureLogic } from './FurnitureLogic';