diff --git a/src/nitro/camera/IRoomCameraWidgetEffect.ts b/src/api/nitro/camera/IRoomCameraWidgetEffect.ts similarity index 100% rename from src/nitro/camera/IRoomCameraWidgetEffect.ts rename to src/api/nitro/camera/IRoomCameraWidgetEffect.ts diff --git a/src/nitro/camera/IRoomCameraWidgetManager.ts b/src/api/nitro/camera/IRoomCameraWidgetManager.ts similarity index 91% rename from src/nitro/camera/IRoomCameraWidgetManager.ts rename to src/api/nitro/camera/IRoomCameraWidgetManager.ts index 712563ff..d8847e9f 100644 --- a/src/nitro/camera/IRoomCameraWidgetManager.ts +++ b/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'; diff --git a/src/nitro/camera/IRoomCameraWidgetSelectedEffect.ts b/src/api/nitro/camera/IRoomCameraWidgetSelectedEffect.ts similarity index 100% rename from src/nitro/camera/IRoomCameraWidgetSelectedEffect.ts rename to src/api/nitro/camera/IRoomCameraWidgetSelectedEffect.ts diff --git a/src/api/nitro/camera/index.ts b/src/api/nitro/camera/index.ts new file mode 100644 index 00000000..7c7db031 --- /dev/null +++ b/src/api/nitro/camera/index.ts @@ -0,0 +1,3 @@ +export * from './IRoomCameraWidgetEffect'; +export * from './IRoomCameraWidgetManager'; +export * from './IRoomCameraWidgetSelectedEffect'; diff --git a/src/api/nitro/index.ts b/src/api/nitro/index.ts index 9c28bf6e..675f9b43 100644 --- a/src/api/nitro/index.ts +++ b/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'; diff --git a/src/nitro/session/enum/GenericErrorEnum.ts b/src/api/nitro/session/enum/GenericErrorEnum.ts similarity index 100% rename from src/nitro/session/enum/GenericErrorEnum.ts rename to src/api/nitro/session/enum/GenericErrorEnum.ts diff --git a/src/nitro/session/enum/NoobnessLevelEnum.ts b/src/api/nitro/session/enum/NoobnessLevelEnum.ts similarity index 100% rename from src/nitro/session/enum/NoobnessLevelEnum.ts rename to src/api/nitro/session/enum/NoobnessLevelEnum.ts diff --git a/src/nitro/session/enum/RoomControllerLevel.ts b/src/api/nitro/session/enum/RoomControllerLevel.ts similarity index 100% rename from src/nitro/session/enum/RoomControllerLevel.ts rename to src/api/nitro/session/enum/RoomControllerLevel.ts diff --git a/src/nitro/session/enum/RoomTradingLevelEnum.ts b/src/api/nitro/session/enum/RoomTradingLevelEnum.ts similarity index 100% rename from src/nitro/session/enum/RoomTradingLevelEnum.ts rename to src/api/nitro/session/enum/RoomTradingLevelEnum.ts diff --git a/src/nitro/session/enum/SecurityLevel.ts b/src/api/nitro/session/enum/SecurityLevel.ts similarity index 100% rename from src/nitro/session/enum/SecurityLevel.ts rename to src/api/nitro/session/enum/SecurityLevel.ts diff --git a/src/nitro/session/enum/index.ts b/src/api/nitro/session/enum/index.ts similarity index 100% rename from src/nitro/session/enum/index.ts rename to src/api/nitro/session/enum/index.ts diff --git a/src/api/nitro/session/index.ts b/src/api/nitro/session/index.ts index 60425f1b..4101bfe5 100644 --- a/src/api/nitro/session/index.ts +++ b/src/api/nitro/session/index.ts @@ -1,3 +1,4 @@ +export * from './enum'; export * from './FurnitureType'; export * from './IFurnitureData'; export * from './IFurnitureDataListener'; diff --git a/src/nitro/INitro.ts b/src/nitro/INitro.ts index 670f4b78..f148fb6f 100644 --- a/src/nitro/INitro.ts +++ b/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'; diff --git a/src/nitro/Nitro.ts b/src/nitro/Nitro.ts index 1f78b329..1bfcf468 100644 --- a/src/nitro/Nitro.ts +++ b/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 { INitroCommunicationManager } from '../api/nitro/communication/INitroCommunicationManager'; +import { IEventDispatcher, ILinkEventTracker, INitroCommunicationManager, INitroCore, IRoomCameraWidgetManager, IRoomManager, IRoomSessionManager, ISessionDataManager, IWorkerEventTracker } from '../api'; 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'; diff --git a/src/nitro/camera/RoomCameraWidgetEffect.ts b/src/nitro/camera/RoomCameraWidgetEffect.ts index 3fa664bb..2b3375cc 100644 --- a/src/nitro/camera/RoomCameraWidgetEffect.ts +++ b/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 { diff --git a/src/nitro/camera/RoomCameraWidgetManager.ts b/src/nitro/camera/RoomCameraWidgetManager.ts index 7993dc53..e6731736 100644 --- a/src/nitro/camera/RoomCameraWidgetManager.ts +++ b/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 { diff --git a/src/nitro/camera/events/RoomCameraWidgetManagerEvent.ts b/src/nitro/camera/RoomCameraWidgetManagerEvent.ts similarity index 81% rename from src/nitro/camera/events/RoomCameraWidgetManagerEvent.ts rename to src/nitro/camera/RoomCameraWidgetManagerEvent.ts index 8fb56e52..882f7ec1 100644 --- a/src/nitro/camera/events/RoomCameraWidgetManagerEvent.ts +++ b/src/nitro/camera/RoomCameraWidgetManagerEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../../core'; +import { NitroEvent } from '../../core'; export class RoomCameraWidgetManagerEvent extends NitroEvent { diff --git a/src/nitro/camera/RoomCameraWidgetSelectedEffect.ts b/src/nitro/camera/RoomCameraWidgetSelectedEffect.ts index b944ef7f..c0d95287 100644 --- a/src/nitro/camera/RoomCameraWidgetSelectedEffect.ts +++ b/src/nitro/camera/RoomCameraWidgetSelectedEffect.ts @@ -1,4 +1,4 @@ -import { IRoomCameraWidgetEffect } from './IRoomCameraWidgetEffect'; +import { IRoomCameraWidgetEffect } from '../../api'; export class RoomCameraWidgetSelectedEffect { diff --git a/src/nitro/camera/events/index.ts b/src/nitro/camera/events/index.ts deleted file mode 100644 index b6e32e26..00000000 --- a/src/nitro/camera/events/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './RoomCameraWidgetManagerEvent'; diff --git a/src/nitro/camera/index.ts b/src/nitro/camera/index.ts index 9a16a454..5d0ba1a8 100644 --- a/src/nitro/camera/index.ts +++ b/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'; diff --git a/src/nitro/communication/messages/parser/room/access/rights/RoomRightsParser.ts b/src/nitro/communication/messages/parser/room/access/rights/RoomRightsParser.ts index f44f8564..79300629 100644 --- a/src/nitro/communication/messages/parser/room/access/rights/RoomRightsParser.ts +++ b/src/nitro/communication/messages/parser/room/access/rights/RoomRightsParser.ts @@ -1,5 +1,4 @@ -import { IMessageDataWrapper, IMessageParser } from '../../../../../../../api'; -import { RoomControllerLevel } from '../../../../../../session/enum/RoomControllerLevel'; +import { IMessageDataWrapper, IMessageParser, RoomControllerLevel } from '../../../../../../../api'; export class RoomRightsParser implements IMessageParser { diff --git a/src/nitro/room/RoomEngine.ts b/src/nitro/room/RoomEngine.ts index edfd7a16..630c714f 100644 --- a/src/nitro/room/RoomEngine.ts +++ b/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'; diff --git a/src/nitro/session/RoomSession.ts b/src/nitro/session/RoomSession.ts index 6122d7d1..76c929ca 100644 --- a/src/nitro/session/RoomSession.ts +++ b/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'; diff --git a/src/nitro/session/SessionDataManager.ts b/src/nitro/session/SessionDataManager.ts index c3a6ccf2..095d2b50 100644 --- a/src/nitro/session/SessionDataManager.ts +++ b/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'; diff --git a/src/nitro/session/handler/GenericErrorHandler.ts b/src/nitro/session/handler/GenericErrorHandler.ts index e7531427..6508bc8d 100644 --- a/src/nitro/session/handler/GenericErrorHandler.ts +++ b/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'; diff --git a/src/nitro/session/handler/RoomPermissionsHandler.ts b/src/nitro/session/handler/RoomPermissionsHandler.ts index 3694e472..ae92ad7d 100644 --- a/src/nitro/session/handler/RoomPermissionsHandler.ts +++ b/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 diff --git a/src/nitro/session/index.ts b/src/nitro/session/index.ts index f61fd931..6e4e20da 100644 --- a/src/nitro/session/index.ts +++ b/src/nitro/session/index.ts @@ -1,5 +1,4 @@ export * from './badge'; -export * from './enum'; export * from './events'; export * from './furniture'; export * from './HabboClubLevelEnum';