More changes

src/api/nitro/camera/IRoomCameraWidgetManager.ts

@@ -1,5 +1,5 @@
 import { Resource, Texture } from '@pixi/core';
-import { IEventDispatcher } from '../../api';
+import { IEventDispatcher } from '../../common';
 import { IRoomCameraWidgetEffect } from './IRoomCameraWidgetEffect';
 import { IRoomCameraWidgetSelectedEffect } from './IRoomCameraWidgetSelectedEffect';
 

src/api/nitro/camera/index.ts

@@ -0,0 +1,3 @@
+export * from './IRoomCameraWidgetEffect';
+export * from './IRoomCameraWidgetManager';
+export * from './IRoomCameraWidgetSelectedEffect';

src/api/nitro/index.ts

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

src/api/nitro/session/index.ts

@@ -1,3 +1,4 @@
+export * from './enum';
 export * from './FurnitureType';
 export * from './IFurnitureData';
 export * from './IFurnitureDataListener';

src/nitro/INitro.ts

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

src/nitro/Nitro.ts

@@ -2,14 +2,12 @@ import { Application, IApplicationOptions } from '@pixi/app';
 import { SCALE_MODES } from '@pixi/constants';
 import { settings } from '@pixi/settings';
 import { Ticker } from '@pixi/ticker';
-import { IEventDispatcher, ILinkEventTracker, INitroCore, IRoomManager, IRoomSessionManager, ISessionDataManager, IWorkerEventTracker } from '../api';
+import { IEventDispatcher, ILinkEventTracker, INitroCommunicationManager, INitroCore, IRoomCameraWidgetManager, IRoomManager, IRoomSessionManager, ISessionDataManager, IWorkerEventTracker } from '../api';
-import { INitroCommunicationManager } from '../api/nitro/communication/INitroCommunicationManager';
 import { ConfigurationEvent, EventDispatcher, NitroCore, NitroEvent } from '../core';
 import { PixiApplicationProxy } from '../pixi-proxy';
 import { RoomManager } from '../room/RoomManager';
 import { AvatarRenderManager } from './avatar/AvatarRenderManager';
 import { IAvatarRenderManager } from './avatar/IAvatarRenderManager';
-import { IRoomCameraWidgetManager } from './camera/IRoomCameraWidgetManager';
 import { RoomCameraWidgetManager } from './camera/RoomCameraWidgetManager';
 import { NitroCommunicationManager } from './communication/NitroCommunicationManager';
 import { LegacyExternalInterface } from './externalInterface/LegacyExternalInterface';

src/nitro/camera/RoomCameraWidgetEffect.ts

@@ -1,6 +1,6 @@
 import { Resource, Texture } from '@pixi/core';
 import { ColorMatrix } from '@pixi/filter-color-matrix';
-import { IRoomCameraWidgetEffect } from './IRoomCameraWidgetEffect';
+import { IRoomCameraWidgetEffect } from '../../api';
 
 export class RoomCameraWidgetEffect implements IRoomCameraWidgetEffect
 {

src/nitro/camera/RoomCameraWidgetManager.ts

@@ -1,14 +1,11 @@
 import { Texture } from '@pixi/core';
 import { ColorMatrix, ColorMatrixFilter } from '@pixi/filter-color-matrix';
-import { IEventDispatcher } from '../../api';
+import { IEventDispatcher, IRoomCameraWidgetEffect, IRoomCameraWidgetManager, IRoomCameraWidgetSelectedEffect } from '../../api';
 import { EventDispatcher } from '../../core';
 import { NitroContainer, NitroSprite, TextureUtils } from '../../pixi-proxy';
 import { Nitro } from '../Nitro';
-import { RoomCameraWidgetManagerEvent } from './events/RoomCameraWidgetManagerEvent';
-import { IRoomCameraWidgetEffect } from './IRoomCameraWidgetEffect';
-import { IRoomCameraWidgetManager } from './IRoomCameraWidgetManager';
-import { IRoomCameraWidgetSelectedEffect } from './IRoomCameraWidgetSelectedEffect';
 import { RoomCameraWidgetEffect } from './RoomCameraWidgetEffect';
+import { RoomCameraWidgetManagerEvent } from './RoomCameraWidgetManagerEvent';
 
 export class RoomCameraWidgetManager implements IRoomCameraWidgetManager
 {

src/nitro/camera/RoomCameraWidgetManagerEvent.ts

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

src/nitro/camera/RoomCameraWidgetSelectedEffect.ts

@@ -1,4 +1,4 @@
-import { IRoomCameraWidgetEffect } from './IRoomCameraWidgetEffect';
+import { IRoomCameraWidgetEffect } from '../../api';
 
 export class RoomCameraWidgetSelectedEffect
 {

src/nitro/camera/events/index.ts

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

src/nitro/camera/index.ts

@@ -1,7 +1,4 @@
-export * from './events';
-export * from './IRoomCameraWidgetEffect';
-export * from './IRoomCameraWidgetManager';
-export * from './IRoomCameraWidgetSelectedEffect';
 export * from './RoomCameraWidgetEffect';
 export * from './RoomCameraWidgetManager';
+export * from './RoomCameraWidgetManagerEvent';
 export * from './RoomCameraWidgetSelectedEffect';

src/nitro/communication/messages/parser/room/access/rights/RoomRightsParser.ts

@@ -1,5 +1,4 @@
-import { IMessageDataWrapper, IMessageParser } from '../../../../../../../api';
+import { IMessageDataWrapper, IMessageParser, RoomControllerLevel } from '../../../../../../../api';
-import { RoomControllerLevel } from '../../../../../../session/enum/RoomControllerLevel';
 
 export class RoomRightsParser implements IMessageParser
 {

src/nitro/room/RoomEngine.ts

@@ -2,6 +2,7 @@ import { RenderTexture, Resource, Texture } from '@pixi/core';
 import { Container, DisplayObject } from '@pixi/display';
 import { Matrix, Point, Rectangle } from '@pixi/math';
 import { IConnection, IDisposable, IMessageComposer, INitroCommunicationManager, IRoomGeometry, IRoomInstance, IRoomManager, IRoomManagerListener, IRoomObject, IRoomObjectController, IRoomObjectLogicFactory, IRoomObjectVisualizationFactory, IRoomRenderer, IRoomRendererFactory, IRoomRenderingCanvas, IRoomSessionManager, ISessionDataManager, IUpdateReceiver, IVector3D } 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';
@@ -11,7 +12,6 @@ import { RenderRoomMessageComposer, RenderRoomThumbnailMessageComposer } from '.
 import { ToolbarIconEnum } from '../enums/ToolbarIconEnum';
 import { NitroToolbarAnimateIconEvent } from '../events/NitroToolbarAnimateIconEvent';
 import { Nitro } from '../Nitro';
-import { RoomControllerLevel } from '../session/enum/RoomControllerLevel';
 import { BadgeImageReadyEvent } from '../session/events/BadgeImageReadyEvent';
 import { RoomSessionEvent } from '../session/events/RoomSessionEvent';
 import { MouseEventType } from '../ui/MouseEventType';

src/nitro/session/RoomSession.ts

@@ -1,4 +1,4 @@
-import { IConnection, IRoomSession } from '../../api';
+import { IConnection, IRoomSession, RoomControllerLevel, RoomTradingLevelEnum } from '../../api';
 import { Disposable } from '../../core';
 import { CompostPlantMessageComposer, FurnitureMultiStateComposer, HarvestPetMessageComposer, PetMountComposer, PollAnswerComposer, PollRejectComposer, PollStartComposer, RemovePetSaddleComposer, TogglePetBreedingComposer, TogglePetRidingComposer, UsePetProductComposer } from '../communication';
 import { RoomModerationSettings } from '../communication/messages/incoming/roomsettings/RoomModerationSettings';
@@ -26,8 +26,6 @@ import { RoomUnitDanceComposer } from '../communication/messages/outgoing/room/u
 import { RoomUnitPostureComposer } from '../communication/messages/outgoing/room/unit/RoomUnitPostureComposer';
 import { RoomUnitSignComposer } from '../communication/messages/outgoing/room/unit/RoomUnitSignComposer';
 import { UserMottoComposer } from '../communication/messages/outgoing/user/data/UserMottoComposer';
-import { RoomControllerLevel } from './enum/RoomControllerLevel';
-import { RoomTradingLevelEnum } from './enum/RoomTradingLevelEnum';
 import { RoomSessionEvent } from './events/RoomSessionEvent';
 import { UserDataManager } from './UserDataManager';
 

src/nitro/session/SessionDataManager.ts

@@ -1,5 +1,5 @@
 import { Resource, Texture } from '@pixi/core';
-import { IFurnitureData, IFurnitureDataListener, IGroupInformationManager, IMessageComposer, INitroCommunicationManager, IProductData, IProductDataListener, ISessionDataManager } from '../../api';
+import { IFurnitureData, IFurnitureDataListener, IGroupInformationManager, IMessageComposer, INitroCommunicationManager, IProductData, IProductDataListener, ISessionDataManager, NoobnessLevelEnum, SecurityLevel } from '../../api';
 import { NitroEvent, NitroManager } from '../../core';
 import { FigureUpdateEvent, MysteryBoxKeysEvent } from '../communication';
 import { AvailabilityStatusMessageEvent } from '../communication/messages/incoming/availability/AvailabilityStatusMessageEvent';
@@ -17,8 +17,6 @@ import { NitroSettingsEvent } from '../events/NitroSettingsEvent';
 import { Nitro } from '../Nitro';
 import { HabboWebTools } from '../utils/HabboWebTools';
 import { BadgeImageManager } from './badge/BadgeImageManager';
-import { NoobnessLevelEnum } from './enum/NoobnessLevelEnum';
-import { SecurityLevel } from './enum/SecurityLevel';
 import { MysteryBoxKeysUpdateEvent } from './events';
 import { SessionDataPreferencesEvent } from './events/SessionDataPreferencesEvent';
 import { UserNameUpdateEvent } from './events/UserNameUpdateEvent';

src/nitro/session/handler/GenericErrorHandler.ts

@@ -1,6 +1,5 @@
-import { IConnection, IRoomHandlerListener } from '../../../api';
+import { GenericErrorEnum, IConnection, IRoomHandlerListener } from '../../../api';
 import { GenericErrorEvent } from '../../communication/messages/incoming/generic/GenericErrorEvent';
-import { GenericErrorEnum } from '../enum/GenericErrorEnum';
 import { RoomSessionErrorMessageEvent } from '../events/RoomSessionErrorMessageEvent';
 import { BaseHandler } from './BaseHandler';
 

src/nitro/session/handler/RoomPermissionsHandler.ts

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

src/nitro/session/index.ts

@@ -1,5 +1,4 @@
 export * from './badge';
-export * from './enum';
 export * from './events';
 export * from './furniture';
 export * from './HabboClubLevelEnum';