More changes

src/api/nitro/index.ts

@@ -1,5 +1,9 @@
 export * from './camera';
 export * from './communication';
+export * from './enums';
 export * from './IRoomContentLoader';
+export * from './localization';
+export * from './room';
+export * from './room/enums';
 export * from './session';
 export * from './session/enum';

src/api/nitro/localization/INitroLocalizationManager.ts

@@ -1,4 +1,5 @@
-import { INitroManager } from '../../api';
+import { INitroManager } from '../../common';
+
 export interface INitroLocalizationManager extends INitroManager
 {
     getRomanNumeral(number: number): string;

src/api/nitro/localization/index.ts

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

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

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

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

@@ -0,0 +1,3 @@
+export * from './IObjectData';
+export * from './ObjectDataFlags';
+export * from './ObjectDataKey';

src/api/nitro/room/index.ts

@@ -0,0 +1,2 @@
+export * from './data';
+export * from './enums';

src/nitro/INitro.ts

@@ -1,8 +1,7 @@
 import { Application } from '@pixi/app';
 import { Ticker } from '@pixi/ticker';
-import { IEventDispatcher, ILinkEventTracker, INitroCommunicationManager, INitroCore, IRoomCameraWidgetManager, IRoomManager, IRoomSessionManager, ISessionDataManager, IWorkerEventTracker } from '../api';
+import { IEventDispatcher, ILinkEventTracker, INitroCommunicationManager, INitroCore, INitroLocalizationManager, IRoomCameraWidgetManager, IRoomManager, IRoomSessionManager, ISessionDataManager, IWorkerEventTracker } from '../api';
 import { IAvatarRenderManager } from './avatar/IAvatarRenderManager';
-import { INitroLocalizationManager } from './localization/INitroLocalizationManager';
 import { IRoomEngine } from './room/IRoomEngine';
 import { ISoundManager } from './sound/ISoundManager';
 

src/nitro/Nitro.ts

@@ -2,7 +2,7 @@ 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, INitroCommunicationManager, INitroCore, IRoomCameraWidgetManager, IRoomManager, IRoomSessionManager, ISessionDataManager, IWorkerEventTracker } from '../api';
+import { IEventDispatcher, ILinkEventTracker, INitroCommunicationManager, INitroCore, INitroLocalizationManager, IRoomCameraWidgetManager, IRoomManager, IRoomSessionManager, ISessionDataManager, IWorkerEventTracker } from '../api';
 import { ConfigurationEvent, EventDispatcher, NitroCore, NitroEvent } from '../core';
 import { PixiApplicationProxy } from '../pixi-proxy';
 import { RoomManager } from '../room/RoomManager';
@@ -13,7 +13,6 @@ import { NitroCommunicationManager } from './communication/NitroCommunicationMan
 import { LegacyExternalInterface } from './externalInterface/LegacyExternalInterface';
 import { GameMessageHandler } from './game/GameMessageHandler';
 import { INitro } from './INitro';
-import { INitroLocalizationManager } from './localization/INitroLocalizationManager';
 import { NitroLocalizationManager } from './localization/NitroLocalizationManager';
 import './Plugins';
 import { RoomEngineEvent } from './room/events/RoomEngineEvent';

src/nitro/communication/messages/incoming/inventory/furni/IFurnitureItemData.ts

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

src/nitro/communication/messages/incoming/inventory/trading/ItemDataStructure.ts

@@ -1,6 +1,5 @@
-import { IMessageDataWrapper } from '../../../../../../api';
+import { IMessageDataWrapper, IObjectData } from '../../../../../../api';
 import { Nitro } from '../../../../../Nitro';
-import { IObjectData } from '../../../../../room/object/data/IObjectData';
 import { FurnitureDataParser } from '../../../parser/room/furniture/FurnitureDataParser';
 import { IFurnitureItemData } from '../furni/IFurnitureItemData';
 

src/nitro/communication/messages/incoming/marketplace/MarketplaceOffer.ts

@@ -1,4 +1,4 @@
-import { IObjectData } from '../../../../room/object/data/IObjectData';
+import { IObjectData } from '../../../../../api';
 
 export class MarketplaceOffer
 {
@@ -6,14 +6,14 @@ export class MarketplaceOffer
     private readonly _furniId: number;
     private readonly _furniType: number;
     private readonly _extraData: string;
-    private readonly _stuffData:IObjectData;
+    private readonly _stuffData: IObjectData;
     private readonly _price: number;
     private readonly _status: number;
     private readonly _timeLeftMinutes: number = -1;
     private readonly _averagePrice: number;
     private readonly _offerCount: number;
 
-    constructor(offerId: number, furniId: number, furniType: number, extraData: string, stuffData:IObjectData, price: number, status: number, timeLeftMinutes: number, averagePrice: number, offerCount: number=-1)
+    constructor(offerId: number, furniId: number, furniType: number, extraData: string, stuffData: IObjectData, price: number, status: number, timeLeftMinutes: number, averagePrice: number, offerCount: number = -1)
     {
         this._offerId = offerId;
         this._furniId = furniId;
@@ -47,7 +47,7 @@ export class MarketplaceOffer
         return this._extraData;
     }
 
-    public get stuffData():IObjectData
+    public get stuffData(): IObjectData
     {
         return this._stuffData;
     }

src/nitro/communication/messages/incoming/room/engine/ObjectData.ts

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

src/nitro/communication/messages/parser/inventory/furniture/utils/FurnitureListItemParser.ts

@@ -1,6 +1,5 @@
-import { IMessageDataWrapper } from '../../../../../../../api';
+import { IMessageDataWrapper, IObjectData } from '../../../../../../../api';
 import { Nitro } from '../../../../../../Nitro';
-import { IObjectData } from '../../../../../../room/object/data/IObjectData';
 import { IFurnitureItemData } from '../../../../incoming/inventory/furni/IFurnitureItemData';
 import { FurnitureDataParser } from '../../../room/furniture/FurnitureDataParser';
 

src/nitro/communication/messages/parser/marketplace/MarketplaceOfferData.ts

@@ -1,4 +1,4 @@
-import { IObjectData } from '../../../../room/object/data/IObjectData';
+import { IObjectData } from '../../../../../api';
 
 export class MarketplaceOfferData
 {

src/nitro/communication/messages/parser/marketplace/MarketplaceOffersParser.ts

@@ -1,5 +1,4 @@
-import { IMessageDataWrapper, IMessageParser } from '../../../../../api';
+import { IMessageDataWrapper, IMessageParser, IObjectData } from '../../../../../api';
-import { IObjectData } from '../../../../room/object/data/IObjectData';
 import { ObjectDataFactory } from '../../../../room/object/data/ObjectDataFactory';
 import { LegacyDataType } from '../../../../room/object/data/type/LegacyDataType';
 import { MarketplaceOffer } from '../../incoming/marketplace/MarketplaceOffer';

src/nitro/communication/messages/parser/marketplace/MarketplaceOwnOffersParser.ts

@@ -1,5 +1,4 @@
-import { IMessageDataWrapper, IMessageParser } from '../../../../../api';
+import { IMessageDataWrapper, IMessageParser, IObjectData } from '../../../../../api';
-import { IObjectData } from '../../../../room/object/data/IObjectData';
 import { ObjectDataFactory } from '../../../../room/object/data/ObjectDataFactory';
 import { LegacyDataType } from '../../../../room/object/data/type/LegacyDataType';
 import { MarketplaceOffer } from '../../incoming/marketplace/MarketplaceOffer';

src/nitro/communication/messages/parser/room/furniture/FurnitureDataParser.ts

@@ -1,5 +1,4 @@
-import { IMessageDataWrapper, IMessageParser } from '../../../../../../api';
+import { IMessageDataWrapper, IMessageParser, IObjectData } from '../../../../../../api';
-import { IObjectData } from '../../../../../room/object/data/IObjectData';
 import { ObjectDataFactory } from '../../../../../room/object/data/ObjectDataFactory';
 
 export class FurnitureDataParser implements IMessageParser

src/nitro/communication/messages/parser/room/furniture/floor/FurnitureFloorDataParser.ts

@@ -1,5 +1,4 @@
-import { IMessageDataWrapper } from '../../../../../../../api';
+import { IMessageDataWrapper, IObjectData } from '../../../../../../../api';
-import { IObjectData } from '../../../../../../room/object/data/IObjectData';
 import { FurnitureDataParser } from '../FurnitureDataParser';
 
 export class FurnitureFloorDataParser

src/nitro/communication/messages/parser/user/data/RelationshipStatusInfo.ts

@@ -1,5 +1,4 @@
-import { IMessageDataWrapper } from '../../../../../../api';
+import { IMessageDataWrapper, RelationshipStatusEnum } from '../../../../../../api';
-import { RelationshipStatusEnum } from '../../../../../enums/RelationshipStatusEnum';
 
 export class RelationshipStatusInfo
 {

src/nitro/index.ts

@@ -1,7 +1,6 @@
 export * from './avatar';
 export * from './camera';
 export * from './communication';
-export * from './enums';
 export * from './events';
 export * from './externalInterface';
 export * from './game';

src/nitro/localization/NitroLocalizationManager.ts

@@ -1,9 +1,8 @@
-import { INitroCommunicationManager } from '../../api/nitro/communication/INitroCommunicationManager';
+import { INitroCommunicationManager, INitroLocalizationManager } from '../../api';
 import { NitroManager } from '../../core';
 import { BadgePointLimitsEvent } from '../communication/messages/incoming/inventory/badges/BadgePointLimitsEvent';
 import { Nitro } from '../Nitro';
 import { BadgeBaseAndLevel } from './BadgeBaseAndLevel';
-import { INitroLocalizationManager } from './INitroLocalizationManager';
 import { NitroLocalizationEvent } from './NitroLocalizationEvent';
 
 export class NitroLocalizationManager extends NitroManager implements INitroLocalizationManager

src/nitro/localization/index.ts

@@ -1,4 +1,3 @@
 export * from './BadgeBaseAndLevel';
-export * from './INitroLocalizationManager';
 export * from './NitroLocalizationEvent';
 export * from './NitroLocalizationManager';

src/nitro/room/IRoomCreator.ts

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

src/nitro/room/IRoomEngine.ts

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

src/nitro/room/IRoomEngineServices.ts

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

src/nitro/room/ISelectedRoomObjectData.ts

@@ -1,4 +1,4 @@
-import { IObjectData } from './object/data/IObjectData';
+import { IObjectData } from '../../api';
 
 export interface ISelectedRoomObjectData
 {

src/nitro/room/RoomEngine.ts

@@ -1,15 +1,13 @@
 import { RenderTexture, Resource, Texture } from '@pixi/core';
 import { Container, DisplayObject } from '@pixi/display';
 import { Matrix, Point, Rectangle } from '@pixi/math';
-import { IConnection, IDisposable, IMessageComposer, INitroCommunicationManager, IRoomGeometry, IRoomInstance, IRoomManager, IRoomManagerListener, IRoomObject, IRoomObjectController, IRoomObjectLogicFactory, IRoomObjectVisualizationFactory, IRoomRenderer, IRoomRendererFactory, IRoomRenderingCanvas, IRoomSessionManager, ISessionDataManager, IUpdateReceiver, IVector3D } from '../../api';
+import { IConnection, IDisposable, IMessageComposer, INitroCommunicationManager, IObjectData, IRoomGeometry, IRoomInstance, IRoomManager, IRoomManagerListener, IRoomObject, IRoomObjectController, IRoomObjectLogicFactory, IRoomObjectVisualizationFactory, IRoomRenderer, IRoomRendererFactory, IRoomRenderingCanvas, IRoomSessionManager, ISessionDataManager, IUpdateReceiver, IVector3D, RoomControllerLevel, ToolbarIconEnum } from '../../api';
-import { RoomControllerLevel } from '../../api/nitro/session/enum/RoomControllerLevel';
 import { NitroEvent, NitroManager } from '../../core';
 import { NitroSprite, TextureUtils } from '../../pixi-proxy';
 import { NumberBank, RoomEnterEffect, RoomGeometry, RoomInstance, RoomObjectEvent, RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomRendererFactory, Vector3d } from '../../room';
 import { PetCustomPart } from '../avatar/pets/PetCustomPart';
 import { PetFigureData } from '../avatar/pets/PetFigureData';
 import { RenderRoomMessageComposer, RenderRoomThumbnailMessageComposer } from '../communication';
-import { ToolbarIconEnum } from '../enums/ToolbarIconEnum';
 import { NitroToolbarAnimateIconEvent } from '../events/NitroToolbarAnimateIconEvent';
 import { Nitro } from '../Nitro';
 import { BadgeImageReadyEvent } from '../session/events/BadgeImageReadyEvent';
@@ -62,7 +60,6 @@ import { ObjectRoomPlanePropertyUpdateMessage } from './messages/ObjectRoomPlane
 import { ObjectRoomPlaneVisibilityUpdateMessage } from './messages/ObjectRoomPlaneVisibilityUpdateMessage';
 import { ObjectRoomUpdateMessage } from './messages/ObjectRoomUpdateMessage';
 import { ObjectStateUpdateMessage } from './messages/ObjectStateUpdateMessage';
-import { IObjectData } from './object/data/IObjectData';
 import { ObjectDataFactory } from './object/data/ObjectDataFactory';
 import { LegacyDataType } from './object/data/type/LegacyDataType';
 import { RoomLogic } from './object/logic/room/RoomLogic';

src/nitro/room/RoomObjectEventHandler.ts

@@ -1,4 +1,4 @@
-import { IRoomCanvasMouseListener, IRoomGeometry, IRoomObject, IRoomObjectController, IVector3D } from '../../api';
+import { IObjectData, IRoomCanvasMouseListener, IRoomGeometry, IRoomObject, IRoomObjectController, IVector3D, RoomObjectPlacementSource } from '../../api';
 import { Disposable, NitroLogger } from '../../core';
 import { RoomEnterEffect, RoomId, Vector3d } from '../../room';
 import { RoomObjectEvent } from '../../room/events/RoomObjectEvent';
@@ -29,7 +29,6 @@ import { RoomUnitLookComposer } from '../communication/messages/outgoing/room/un
 import { RoomUnitWalkComposer } from '../communication/messages/outgoing/room/unit/RoomUnitWalkComposer';
 import { Nitro } from '../Nitro';
 import { MouseEventType } from '../ui/MouseEventType';
-import { RoomObjectPlacementSource } from './enums/RoomObjectPlacementSource';
 import { RoomEngineObjectPlaySoundEvent, RoomEngineRoomAdEvent, RoomEngineUseProductEvent, RoomObjectPlaySoundIdEvent, RoomObjectRoomAdEvent, RoomObjectSoundMachineEvent } from './events';
 import { RoomEngineDimmerStateEvent } from './events/RoomEngineDimmerStateEvent';
 import { RoomEngineObjectEvent } from './events/RoomEngineObjectEvent';
@@ -56,7 +55,6 @@ import { ObjectDataUpdateMessage } from './messages/ObjectDataUpdateMessage';
 import { ObjectSelectedMessage } from './messages/ObjectSelectedMessage';
 import { ObjectTileCursorUpdateMessage } from './messages/ObjectTileCursorUpdateMessage';
 import { ObjectVisibilityUpdateMessage } from './messages/ObjectVisibilityUpdateMessage';
-import { IObjectData } from './object/data/IObjectData';
 import { RoomObjectCategory } from './object/RoomObjectCategory';
 import { RoomObjectOperationType } from './object/RoomObjectOperationType';
 import { RoomObjectType } from './object/RoomObjectType';

src/nitro/room/index.ts

@@ -1,4 +1,3 @@
-export * from './enums';
 export * from './events';
 export * from './IGetImageListener';
 export * from './ImageResult';

src/nitro/room/messages/ObjectDataUpdateMessage.ts

@@ -1,5 +1,5 @@
+import { IObjectData } from '../../../api';
 import { RoomObjectUpdateMessage } from '../../../room/messages/RoomObjectUpdateMessage';
-import { IObjectData } from '../object/data/IObjectData';
 
 export class ObjectDataUpdateMessage extends RoomObjectUpdateMessage
 {

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

@@ -1,7 +1,5 @@
-import { IMessageDataWrapper, IRoomObjectModel } from '../../../../api';
+import { IMessageDataWrapper, IObjectData, IRoomObjectModel, ObjectDataFlags } from '../../../../api';
 import { RoomObjectVariable } from '../RoomObjectVariable';
-import { IObjectData } from './IObjectData';
-import { ObjectDataFlags } from './ObjectDataFlags';
 
 export class ObjectDataBase implements IObjectData
 {

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

@@ -1,12 +1,5 @@
-import { IObjectData } from './IObjectData';
+import { IObjectData } from '../../../../api';
-import { CrackableDataType } from './type/CrackableDataType';
+import { CrackableDataType, EmptyDataType, HighScoreDataType, LegacyDataType, MapDataType, NumberDataType, StringDataType, VoteDataType } from './type';
-import { EmptyDataType } from './type/EmptyDataType';
-import { HighScoreDataType } from './type/HighScoreDataType';
-import { LegacyDataType } from './type/LegacyDataType';
-import { MapDataType } from './type/MapDataType';
-import { NumberDataType } from './type/NumberDataType';
-import { StringDataType } from './type/StringDataType';
-import { VoteDataType } from './type/VoteDataType';
 
 export class ObjectDataFactory
 {
@@ -14,7 +7,7 @@ export class ObjectDataFactory
     {
         let objectData: IObjectData = null;
 
-        switch(flags & 0xFF)
+        switch (flags & 0xFF)
         {
             case CrackableDataType.FORMAT_KEY:
                 objectData = new CrackableDataType();
@@ -42,10 +35,10 @@ export class ObjectDataFactory
                 break;
         }
 
-        if(!objectData) return null;
+        if (!objectData) return null;
 
         objectData.flags = (flags & 0xFF00);
 
         return objectData;
     }
-}
+}

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

@@ -1,6 +1,3 @@
-export * from './IObjectData';
 export * from './ObjectDataBase';
 export * from './ObjectDataFactory';
-export * from './ObjectDataFlags';
-export * from './ObjectDataKey';
 export * from './type';

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

@@ -1,8 +1,6 @@
-import { IMessageDataWrapper, IRoomObjectModel } from '../../../../../api';
+import { IMessageDataWrapper, IObjectData, IRoomObjectModel, ObjectDataKey } from '../../../../../api';
 import { RoomObjectVariable } from '../../RoomObjectVariable';
-import { IObjectData } from '../IObjectData';
 import { ObjectDataBase } from '../ObjectDataBase';
-import { ObjectDataKey } from '../ObjectDataKey';
 
 export class CrackableDataType extends ObjectDataBase implements IObjectData
 {

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

@@ -1,8 +1,6 @@
-import { IMessageDataWrapper, IRoomObjectModel } from '../../../../../api';
+import { IMessageDataWrapper, IObjectData, IRoomObjectModel, ObjectDataKey } from '../../../../../api';
 import { RoomObjectVariable } from '../../RoomObjectVariable';
-import { IObjectData } from '../IObjectData';
 import { ObjectDataBase } from '../ObjectDataBase';
-import { ObjectDataKey } from '../ObjectDataKey';
 
 export class EmptyDataType extends ObjectDataBase implements IObjectData
 {

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

@@ -1,8 +1,6 @@
-import { IMessageDataWrapper, IRoomObjectModel } from '../../../../../api';
+import { IMessageDataWrapper, IObjectData, IRoomObjectModel, ObjectDataKey } from '../../../../../api';
 import { RoomObjectVariable } from '../../RoomObjectVariable';
-import { IObjectData } from '../IObjectData';
 import { ObjectDataBase } from '../ObjectDataBase';
-import { ObjectDataKey } from '../ObjectDataKey';
 import { HighScoreData } from './HighScoreData';
 
 export class HighScoreDataType extends ObjectDataBase implements IObjectData

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

@@ -1,8 +1,6 @@
-import { IMessageDataWrapper, IRoomObjectModel } from '../../../../../api';
+import { IMessageDataWrapper, IObjectData, IRoomObjectModel, ObjectDataKey } from '../../../../../api';
 import { RoomObjectVariable } from '../../RoomObjectVariable';
-import { IObjectData } from '../IObjectData';
 import { ObjectDataBase } from '../ObjectDataBase';
-import { ObjectDataKey } from '../ObjectDataKey';
 
 export class LegacyDataType extends ObjectDataBase implements IObjectData
 {

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

@@ -1,8 +1,6 @@
-import { IMessageDataWrapper, IRoomObjectModel } from '../../../../../api';
+import { IMessageDataWrapper, IObjectData, IRoomObjectModel, ObjectDataKey } from '../../../../../api';
 import { RoomObjectVariable } from '../../RoomObjectVariable';
-import { IObjectData } from '../IObjectData';
 import { ObjectDataBase } from '../ObjectDataBase';
-import { ObjectDataKey } from '../ObjectDataKey';
 
 export class MapDataType extends ObjectDataBase
 {

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

@@ -1,8 +1,6 @@
-import { IMessageDataWrapper, IRoomObjectModel } from '../../../../../api';
+import { IMessageDataWrapper, IObjectData, IRoomObjectModel, ObjectDataKey } from '../../../../../api';
 import { RoomObjectVariable } from '../../RoomObjectVariable';
-import { IObjectData } from '../IObjectData';
 import { ObjectDataBase } from '../ObjectDataBase';
-import { ObjectDataKey } from '../ObjectDataKey';
 
 export class NumberDataType extends ObjectDataBase
 {

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

@@ -1,8 +1,6 @@
-import { IMessageDataWrapper, IRoomObjectModel } from '../../../../../api';
+import { IMessageDataWrapper, IObjectData, IRoomObjectModel, ObjectDataKey } from '../../../../../api';
 import { RoomObjectVariable } from '../../RoomObjectVariable';
-import { IObjectData } from '../IObjectData';
 import { ObjectDataBase } from '../ObjectDataBase';
-import { ObjectDataKey } from '../ObjectDataKey';
 
 export class StringDataType extends ObjectDataBase
 {

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

@@ -1,8 +1,6 @@
-import { IMessageDataWrapper, IRoomObjectModel } from '../../../../../api';
+import { IMessageDataWrapper, IObjectData, IRoomObjectModel, ObjectDataKey } from '../../../../../api';
 import { RoomObjectVariable } from '../../RoomObjectVariable';
-import { IObjectData } from '../IObjectData';
 import { ObjectDataBase } from '../ObjectDataBase';
-import { ObjectDataKey } from '../ObjectDataKey';
 
 export class VoteDataType extends ObjectDataBase
 {

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

@@ -1,4 +1,4 @@
-import { FriendFurniEngravingWidgetType } from '../../../enums';
+import { FriendFurniEngravingWidgetType } from '../../../../../api';
 import { FurnitureFriendFurniLogic } from './FurnitureFriendFurniLogic';
 
 export class FurnitureHweenLovelockLogic extends FurnitureFriendFurniLogic

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

@@ -1,4 +1,4 @@
-import { FriendFurniEngravingWidgetType } from '../../../enums';
+import { FriendFurniEngravingWidgetType } from '../../../../../api';
 import { FurnitureFriendFurniLogic } from './FurnitureFriendFurniLogic';
 
 export class FurnitureLoveLockLogic extends FurnitureFriendFurniLogic

src/nitro/room/preview/RoomPreviewer.ts

@@ -2,7 +2,7 @@ import { RenderTexture, Texture } from '@pixi/core';
 import { Container, DisplayObject } from '@pixi/display';
 import { Point, Rectangle } from '@pixi/math';
 import { Sprite } from '@pixi/sprite';
-import { IRoomObjectController, IRoomRenderingCanvas, IVector3D } from '../../../api';
+import { IObjectData, IRoomObjectController, IRoomRenderingCanvas, IVector3D } from '../../../api';
 import { NitroSprite } from '../../../pixi-proxy';
 import { RoomId, Vector3d } from '../../../room';
 import { FloorHeightMapMessageParser } from '../../communication/messages/parser/room/mapping/FloorHeightMapMessageParser';
@@ -15,7 +15,6 @@ import { ImageResult } from '../ImageResult';
 import { IRoomCreator } from '../IRoomCreator';
 import { IRoomEngine } from '../IRoomEngine';
 import { ObjectRoomMapUpdateMessage } from '../messages/ObjectRoomMapUpdateMessage';
-import { IObjectData } from '../object/data/IObjectData';
 import { LegacyDataType } from '../object/data/type/LegacyDataType';
 import { RoomObjectCategory } from '../object/RoomObjectCategory';
 import { RoomObjectUserType } from '../object/RoomObjectUserType';

src/nitro/room/utils/RoomFurnitureData.ts

@@ -1,6 +1,5 @@
-import { IVector3D } from '../../../api';
+import { IObjectData, IVector3D } from '../../../api';
 import { Vector3d } from '../../../room';
-import { IObjectData } from '../object';
 
 export class RoomFurnitureData
 {

src/nitro/room/utils/SelectedRoomObjectData.ts

@@ -1,7 +1,6 @@
-import { IVector3D } from '../../../api';
+import { IObjectData, IVector3D } from '../../../api';
 import { Vector3d } from '../../../room';
 import { ISelectedRoomObjectData } from '../ISelectedRoomObjectData';
-import { IObjectData } from '../object';
 
 export class SelectedRoomObjectData implements ISelectedRoomObjectData
 {

src/nitro/session/furniture/FurnitureDataLoader.ts

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