From 8e20920cab8e5775bed6dc2f99a02023ef6b4fae Mon Sep 17 00:00:00 2001 From: Bill Date: Wed, 2 Nov 2022 18:32:45 -0400 Subject: [PATCH] More changes --- .../nitro/room/object/RoomObjectLogicType.ts | 0 .../room/object/RoomObjectOperationType.ts | 0 .../object/RoomObjectVisualizationType.ts | 0 src/api/nitro/room/object/index.ts | 3 ++ src/nitro/Nitro.ts | 2 +- .../avatar/AvatarAssetDownloadLibrary.ts | 2 +- .../avatar/AvatarAssetDownloadManager.ts | 3 +- .../avatar/EffectAssetDownloadLibrary.ts | 2 +- .../avatar/EffectAssetDownloadManager.ts | 3 +- src/nitro/game/GameMessageHandler.ts | 2 +- src/nitro/room/RoomContentLoader.ts | 3 +- src/nitro/room/RoomEngine.ts | 29 +++------- src/nitro/room/RoomObjectEventHandler.ts | 34 ++---------- src/nitro/room/RoomObjectLogicFactory.ts | 53 ++----------------- .../object/RoomObjectVisualizationFactory.ts | 45 +--------------- src/nitro/room/object/index.ts | 18 +++++-- .../room/object/logic/avatar/AvatarLogic.ts | 7 ++- .../FurnitureAchievementResolutionLogic.ts | 3 +- .../furniture/FurnitureBadgeDisplayLogic.ts | 3 +- .../FurnitureChangeStateWhenStepOnLogic.ts | 2 +- .../furniture/FurnitureCounterClockLogic.ts | 4 +- .../furniture/FurnitureCrackableLogic.ts | 2 +- .../logic/furniture/FurnitureCreditLogic.ts | 2 +- .../FurnitureCustomStackHeightLogic.ts | 2 +- .../logic/furniture/FurnitureDiceLogic.ts | 4 +- .../furniture/FurnitureEcotronBoxLogic.ts | 4 +- .../FurnitureEditableInternalLinkLogic.ts | 4 +- .../FurnitureEditableRoomLinkLogic.ts | 2 +- .../furniture/FurnitureEffectBoxLogic.ts | 8 +-- .../furniture/FurnitureFireworksLogic.ts | 4 +- .../furniture/FurnitureFloorHoleLogic.ts | 2 +- .../furniture/FurnitureFriendFurniLogic.ts | 2 +- .../FurnitureGroupForumTerminalLogic.ts | 2 +- .../furniture/FurnitureHabboWheelLogic.ts | 6 +-- .../furniture/FurnitureHighScoreLogic.ts | 2 +- .../furniture/FurnitureHockeyScoreLogic.ts | 4 +- .../furniture/FurnitureInternalLinkLogic.ts | 4 +- .../logic/furniture/FurnitureJukeboxLogic.ts | 4 +- .../object/logic/furniture/FurnitureLogic.ts | 6 +-- .../furniture/FurnitureMannequinLogic.ts | 2 +- .../FurnitureMonsterplantSeedLogic.ts | 6 +-- .../furniture/FurnitureMultiStateLogic.ts | 4 +- .../furniture/FurnitureMysteryBoxLogic.ts | 6 +-- .../furniture/FurnitureMysteryTrophyLogic.ts | 6 +-- .../furniture/FurnitureOneWayDoorLogic.ts | 6 +-- .../furniture/FurniturePlaceholderLogic.ts | 4 +- .../logic/furniture/FurniturePresentLogic.ts | 5 +- .../FurniturePurchaseableClothingLogic.ts | 4 +- .../FurnitureRoomBackgroundColorLogic.ts | 5 +- .../furniture/FurnitureRoomBrandingLogic.ts | 3 +- .../furniture/FurnitureRoomDimmerLogic.ts | 3 +- .../furniture/FurnitureSoundBlockLogic.ts | 2 +- .../furniture/FurnitureSoundMachineLogic.ts | 2 +- .../logic/furniture/FurnitureStickieLogic.ts | 3 +- .../logic/furniture/FurnitureTrophyLogic.ts | 6 +-- .../logic/furniture/FurnitureYoutubeLogic.ts | 3 +- .../room/object/logic/furniture/index.ts | 2 + src/nitro/room/object/logic/pet/PetLogic.ts | 6 +-- src/nitro/room/object/logic/room/RoomLogic.ts | 5 +- .../avatar/AvatarVisualization.ts | 16 +----- .../avatar/AvatarVisualizationData.ts | 6 +-- .../avatar/additions/FloatingHeartAddition.ts | 2 +- .../avatar/additions/FloatingIdleZAddition.ts | 2 +- .../additions/GuideStatusBubbleAddition.ts | 3 +- .../avatar/additions/MutedBubbleAddition.ts | 2 +- .../avatar/additions/NumberBubbleAddition.ts | 2 +- .../avatar/additions/TypingBubbleAddition.ts | 2 +- .../object/visualization/data/SizeData.ts | 2 +- .../FurnitureAnimatedVisualization.ts | 7 +-- .../FurnitureAnimatedVisualizationData.ts | 30 +++++------ .../furniture/FurnitureCuboidVisualization.ts | 4 +- .../FurnitureMannequinVisualization.ts | 3 +- .../FurnitureMannequinVisualizationData.ts | 13 ++--- .../FurnitureParticleSystemEmitter.ts | 2 +- .../FurnitureParticleSystemParticle.ts | 2 +- .../FurnitureRoomBackgroundVisualization.ts | 12 ++--- .../furniture/FurnitureVisualization.ts | 6 +-- .../furniture/FurnitureVisualizationData.ts | 4 +- .../object/visualization/furniture/index.ts | 2 + .../visualization/pet/PetVisualization.ts | 11 ++-- .../visualization/pet/PetVisualizationData.ts | 6 +-- .../room/object/visualization/pet/index.ts | 1 + .../object/visualization/room/RoomPlane.ts | 8 ++- .../room/RoomVisualizationData.ts | 6 +-- .../room/TileCursorVisualization.ts | 2 +- .../room/object/visualization/room/index.ts | 2 + .../room/rasterizer/IPlaneRasterizer.ts | 4 +- .../rasterizer/animated/LandscapePlane.ts | 2 +- .../animated/LandscapeRasterizer.ts | 7 +-- .../room/rasterizer/basic/FloorRasterizer.ts | 2 +- .../basic/PlaneMaterialCellMatrix.ts | 2 +- .../room/rasterizer/basic/PlaneRasterizer.ts | 2 +- .../rasterizer/basic/PlaneVisualization.ts | 2 +- .../room/rasterizer/basic/WallRasterizer.ts | 2 +- src/nitro/room/preview/RoomPreviewer.ts | 3 +- src/nitro/room/utils/SpriteDataCollector.ts | 2 +- src/nitro/session/RoomSession.ts | 2 +- src/nitro/session/RoomSessionManager.ts | 16 ++---- src/nitro/session/SessionDataManager.ts | 6 +-- src/nitro/session/badge/BadgeImageManager.ts | 2 +- src/nitro/session/badge/GroupBadgePart.ts | 14 ++--- .../session/handler/GenericErrorHandler.ts | 2 +- src/nitro/session/handler/PollHandler.ts | 2 +- src/nitro/session/handler/RoomChatHandler.ts | 2 +- src/nitro/session/handler/RoomDataHandler.ts | 3 +- .../handler/RoomDimmerPresetsHandler.ts | 2 +- .../session/handler/RoomPresentHandler.ts | 2 +- .../session/handler/RoomSessionHandler.ts | 4 +- src/nitro/session/handler/RoomUsersHandler.ts | 10 +--- src/nitro/session/handler/WordQuizHandler.ts | 2 +- src/nitro/session/handler/index.ts | 2 + src/nitro/sound/SoundManager.ts | 3 +- src/nitro/sound/events/index.ts | 1 + src/nitro/sound/index.ts | 12 +++++ src/nitro/sound/music/MusicManager.ts | 4 +- src/room/RoomManager.ts | 2 +- 116 files changed, 236 insertions(+), 408 deletions(-) rename src/{ => api}/nitro/room/object/RoomObjectLogicType.ts (100%) rename src/{ => api}/nitro/room/object/RoomObjectOperationType.ts (100%) rename src/{ => api}/nitro/room/object/RoomObjectVisualizationType.ts (100%) create mode 100644 src/nitro/sound/events/index.ts create mode 100644 src/nitro/sound/index.ts diff --git a/src/nitro/room/object/RoomObjectLogicType.ts b/src/api/nitro/room/object/RoomObjectLogicType.ts similarity index 100% rename from src/nitro/room/object/RoomObjectLogicType.ts rename to src/api/nitro/room/object/RoomObjectLogicType.ts diff --git a/src/nitro/room/object/RoomObjectOperationType.ts b/src/api/nitro/room/object/RoomObjectOperationType.ts similarity index 100% rename from src/nitro/room/object/RoomObjectOperationType.ts rename to src/api/nitro/room/object/RoomObjectOperationType.ts diff --git a/src/nitro/room/object/RoomObjectVisualizationType.ts b/src/api/nitro/room/object/RoomObjectVisualizationType.ts similarity index 100% rename from src/nitro/room/object/RoomObjectVisualizationType.ts rename to src/api/nitro/room/object/RoomObjectVisualizationType.ts diff --git a/src/api/nitro/room/object/index.ts b/src/api/nitro/room/object/index.ts index 5a5ac5f1..a1c70596 100644 --- a/src/api/nitro/room/object/index.ts +++ b/src/api/nitro/room/object/index.ts @@ -2,6 +2,9 @@ export * from './data'; export * from './data/type'; export * from './IRoomMapData'; export * from './RoomObjectCategory'; +export * from './RoomObjectLogicType'; +export * from './RoomObjectOperationType'; export * from './RoomObjectType'; export * from './RoomObjectUserType'; export * from './RoomObjectVariable'; +export * from './RoomObjectVisualizationType'; diff --git a/src/nitro/Nitro.ts b/src/nitro/Nitro.ts index 16b1dbf1..de1ac1e1 100644 --- a/src/nitro/Nitro.ts +++ b/src/nitro/Nitro.ts @@ -15,7 +15,7 @@ import { GameMessageHandler } from './game/GameMessageHandler'; import { INitro } from './INitro'; import { NitroLocalizationManager } from './localization/NitroLocalizationManager'; import './Plugins'; -import { RoomEngineEvent } from './room/events/RoomEngineEvent'; +import { RoomEngineEvent } from './room'; import { RoomEngine } from './room/RoomEngine'; import { RoomSessionManager } from './session/RoomSessionManager'; import { SessionDataManager } from './session/SessionDataManager'; diff --git a/src/nitro/avatar/AvatarAssetDownloadLibrary.ts b/src/nitro/avatar/AvatarAssetDownloadLibrary.ts index 16903701..6c21ac94 100644 --- a/src/nitro/avatar/AvatarAssetDownloadLibrary.ts +++ b/src/nitro/avatar/AvatarAssetDownloadLibrary.ts @@ -1,6 +1,6 @@ import { IAssetManager } from '../../api'; import { EventDispatcher } from '../../core'; -import { AvatarRenderLibraryEvent } from './events/AvatarRenderLibraryEvent'; +import { AvatarRenderLibraryEvent } from './events'; export class AvatarAssetDownloadLibrary extends EventDispatcher { diff --git a/src/nitro/avatar/AvatarAssetDownloadManager.ts b/src/nitro/avatar/AvatarAssetDownloadManager.ts index e4e9d104..a6f783d0 100644 --- a/src/nitro/avatar/AvatarAssetDownloadManager.ts +++ b/src/nitro/avatar/AvatarAssetDownloadManager.ts @@ -3,8 +3,7 @@ import { EventDispatcher, NitroEvent } from '../../core'; import { Nitro } from '../Nitro'; import { AvatarAssetDownloadLibrary } from './AvatarAssetDownloadLibrary'; import { AvatarStructure } from './AvatarStructure'; -import { AvatarRenderEvent } from './events/AvatarRenderEvent'; -import { AvatarRenderLibraryEvent } from './events/AvatarRenderLibraryEvent'; +import { AvatarRenderEvent, AvatarRenderLibraryEvent } from './events'; import { IAvatarFigureContainer } from './IAvatarFigureContainer'; import { IAvatarImageListener } from './IAvatarImageListener'; diff --git a/src/nitro/avatar/EffectAssetDownloadLibrary.ts b/src/nitro/avatar/EffectAssetDownloadLibrary.ts index 5f53d242..efd54c09 100644 --- a/src/nitro/avatar/EffectAssetDownloadLibrary.ts +++ b/src/nitro/avatar/EffectAssetDownloadLibrary.ts @@ -1,6 +1,6 @@ import { IAssetAnimation, IAssetManager } from '../../api'; import { EventDispatcher } from '../../core'; -import { AvatarRenderEffectLibraryEvent } from './events/AvatarRenderEffectLibraryEvent'; +import { AvatarRenderEffectLibraryEvent } from './events'; export class EffectAssetDownloadLibrary extends EventDispatcher { diff --git a/src/nitro/avatar/EffectAssetDownloadManager.ts b/src/nitro/avatar/EffectAssetDownloadManager.ts index a4d35fef..cfd26cad 100644 --- a/src/nitro/avatar/EffectAssetDownloadManager.ts +++ b/src/nitro/avatar/EffectAssetDownloadManager.ts @@ -3,8 +3,7 @@ import { EventDispatcher, NitroEvent } from '../../core'; import { Nitro } from '../Nitro'; import { AvatarStructure } from './AvatarStructure'; import { EffectAssetDownloadLibrary } from './EffectAssetDownloadLibrary'; -import { AvatarRenderEffectLibraryEvent } from './events/AvatarRenderEffectLibraryEvent'; -import { AvatarRenderEvent } from './events/AvatarRenderEvent'; +import { AvatarRenderEffectLibraryEvent, AvatarRenderEvent } from './events'; import { IAvatarEffectListener } from './IAvatarEffectListener'; export class EffectAssetDownloadManager extends EventDispatcher diff --git a/src/nitro/game/GameMessageHandler.ts b/src/nitro/game/GameMessageHandler.ts index 42dacb96..e12dc1a1 100644 --- a/src/nitro/game/GameMessageHandler.ts +++ b/src/nitro/game/GameMessageHandler.ts @@ -1,6 +1,6 @@ import { IConnection } from '../../api'; import { LoadGameUrlEvent } from '../communication'; -import { LegacyExternalInterface } from '../externalInterface/LegacyExternalInterface'; +import { LegacyExternalInterface } from '../externalInterface'; export class GameMessageHandler { diff --git a/src/nitro/room/RoomContentLoader.ts b/src/nitro/room/RoomContentLoader.ts index 17094d5b..77700303 100644 --- a/src/nitro/room/RoomContentLoader.ts +++ b/src/nitro/room/RoomContentLoader.ts @@ -1,11 +1,10 @@ import { BaseTexture, Resource, Texture } from '@pixi/core'; import { Loader, LoaderResource } from '@pixi/loaders'; import { Spritesheet } from '@pixi/spritesheet'; -import { FurnitureType, IAssetData, IEventDispatcher, IFurnitureData, IFurnitureDataListener, IGraphicAssetCollection, IGraphicAssetGifCollection, INitroLogger, IPetColorResult, IRoomContentListener, IRoomContentLoader, IRoomObject, ISessionDataManager, RoomObjectCategory, RoomObjectUserType, RoomObjectVariable } from '../../api'; +import { FurnitureType, IAssetData, IEventDispatcher, IFurnitureData, IFurnitureDataListener, IGraphicAssetCollection, IGraphicAssetGifCollection, INitroLogger, IPetColorResult, IRoomContentListener, IRoomContentLoader, IRoomObject, ISessionDataManager, RoomObjectCategory, RoomObjectUserType, RoomObjectVariable, RoomObjectVisualizationType } from '../../api'; import { GraphicAssetCollection, GraphicAssetGifCollection, NitroBundle, NitroEvent, NitroLogger } from '../../core'; import { RoomContentLoadedEvent } from '../../room/events/RoomContentLoadedEvent'; import { Nitro } from '../Nitro'; -import { RoomObjectVisualizationType } from './object/RoomObjectVisualizationType'; import { PetColorResult } from './PetColorResult'; export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLoader diff --git a/src/nitro/room/RoomEngine.ts b/src/nitro/room/RoomEngine.ts index b3ded323..c07471ff 100644 --- a/src/nitro/room/RoomEngine.ts +++ b/src/nitro/room/RoomEngine.ts @@ -5,36 +5,23 @@ import { IConnection, IDisposable, IFurnitureStackingHeightMap, IGetImageListene import { NitroEvent, NitroManager } from '../../core'; import { NitroSprite, TextureUtils } from '../../pixi-proxy'; import { NumberBank, RoomEnterEffect, RoomGeometry, RoomInstance, RoomObjectEvent, RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomRendererFactory } from '../../room'; -import { PetFigureData } from '../avatar/pets/PetFigureData'; +import { PetFigureData } from '../avatar'; import { RenderRoomMessageComposer, RenderRoomThumbnailMessageComposer } from '../communication'; -import { NitroToolbarAnimateIconEvent } from '../events/NitroToolbarAnimateIconEvent'; +import { NitroToolbarAnimateIconEvent } from '../events'; import { Nitro } from '../Nitro'; -import { BadgeImageReadyEvent } from '../session/events/BadgeImageReadyEvent'; -import { RoomSessionEvent } from '../session/events/RoomSessionEvent'; -import { MouseEventType } from '../ui/MouseEventType'; -import { FurniId } from '../utils/FurniId'; -import { RoomDragEvent } from './events'; -import { RoomBackgroundColorEvent } from './events/RoomBackgroundColorEvent'; -import { RoomEngineEvent } from './events/RoomEngineEvent'; -import { RoomEngineObjectEvent } from './events/RoomEngineObjectEvent'; -import { RoomObjectFurnitureActionEvent } from './events/RoomObjectFurnitureActionEvent'; -import { RoomToObjectOwnAvatarMoveEvent } from './events/RoomToObjectOwnAvatarMoveEvent'; +import { BadgeImageReadyEvent, RoomSessionEvent } from '../session'; +import { MouseEventType } from '../ui'; +import { FurniId } from '../utils'; +import { RoomBackgroundColorEvent, RoomDragEvent, RoomEngineEvent, RoomEngineObjectEvent, RoomObjectFurnitureActionEvent, RoomToObjectOwnAvatarMoveEvent } from './events'; import { ImageResult } from './ImageResult'; import { ObjectAvatarCarryObjectUpdateMessage, ObjectAvatarChatUpdateMessage, ObjectAvatarDanceUpdateMessage, ObjectAvatarEffectUpdateMessage, ObjectAvatarExperienceUpdateMessage, ObjectAvatarExpressionUpdateMessage, ObjectAvatarFigureUpdateMessage, ObjectAvatarFlatControlUpdateMessage, ObjectAvatarGestureUpdateMessage, ObjectAvatarGuideStatusUpdateMessage, ObjectAvatarMutedUpdateMessage, ObjectAvatarOwnMessage, ObjectAvatarPetGestureUpdateMessage, ObjectAvatarPlayerValueUpdateMessage, ObjectAvatarPlayingGameUpdateMessage, ObjectAvatarPostureUpdateMessage, ObjectAvatarSignUpdateMessage, ObjectAvatarSleepUpdateMessage, ObjectAvatarTypingUpdateMessage, ObjectAvatarUpdateMessage, ObjectAvatarUseObjectUpdateMessage, ObjectDataUpdateMessage, ObjectGroupBadgeUpdateMessage, ObjectHeightUpdateMessage, ObjectItemDataUpdateMessage, ObjectModelDataUpdateMessage, ObjectMoveUpdateMessage, ObjectRoomColorUpdateMessage, ObjectRoomFloorHoleUpdateMessage, ObjectRoomMaskUpdateMessage, ObjectRoomPlanePropertyUpdateMessage, ObjectRoomPlaneVisibilityUpdateMessage, ObjectRoomUpdateMessage, ObjectStateUpdateMessage } from './messages'; -import { RoomLogic } from './object/logic/room/RoomLogic'; -import { RoomMapData } from './object/RoomMapData'; -import { RoomObjectVisualizationFactory } from './object/RoomObjectVisualizationFactory'; +import { RoomLogic, RoomMapData, RoomObjectVisualizationFactory } from './object'; import { RoomContentLoader } from './RoomContentLoader'; import { RoomMessageHandler } from './RoomMessageHandler'; import { RoomObjectEventHandler } from './RoomObjectEventHandler'; import { RoomObjectLogicFactory } from './RoomObjectLogicFactory'; import { RoomVariableEnum } from './RoomVariableEnum'; -import { RoomCamera } from './utils/RoomCamera'; -import { RoomData } from './utils/RoomData'; -import { RoomFurnitureData } from './utils/RoomFurnitureData'; -import { RoomInstanceData } from './utils/RoomInstanceData'; -import { RoomObjectBadgeImageAssetListener } from './utils/RoomObjectBadgeImageAssetListener'; -import { SpriteDataCollector } from './utils/SpriteDataCollector'; +import { RoomCamera, RoomData, RoomFurnitureData, RoomInstanceData, RoomObjectBadgeImageAssetListener, SpriteDataCollector } from './utils'; export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreator, IRoomEngineServices, IRoomManagerListener, IRoomContentListener, IUpdateReceiver, IDisposable { diff --git a/src/nitro/room/RoomObjectEventHandler.ts b/src/nitro/room/RoomObjectEventHandler.ts index bc295e9d..80d0ea54 100644 --- a/src/nitro/room/RoomObjectEventHandler.ts +++ b/src/nitro/room/RoomObjectEventHandler.ts @@ -1,36 +1,12 @@ -import { IFurnitureStackingHeightMap, ILegacyWallGeometry, IObjectData, IRoomCanvasMouseListener, IRoomEngineServices, IRoomGeometry, IRoomObject, IRoomObjectController, IRoomObjectEventManager, ISelectedRoomObjectData, IVector3D, RoomObjectCategory, RoomObjectPlacementSource, RoomObjectType, RoomObjectUserType, RoomObjectVariable, Vector3d } from '../../api'; +import { IFurnitureStackingHeightMap, ILegacyWallGeometry, IObjectData, IRoomCanvasMouseListener, IRoomEngineServices, IRoomGeometry, IRoomObject, IRoomObjectController, IRoomObjectEventManager, ISelectedRoomObjectData, IVector3D, RoomObjectCategory, RoomObjectOperationType, RoomObjectPlacementSource, RoomObjectType, RoomObjectUserType, RoomObjectVariable, Vector3d } from '../../api'; import { Disposable, NitroLogger } from '../../core'; -import { RoomEnterEffect, RoomId } 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'; +import { RoomEnterEffect, RoomId, RoomObjectEvent, RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../room'; import { BotPlaceComposer, FurnitureColorWheelComposer, FurnitureDiceActivateComposer, FurnitureDiceDeactivateComposer, FurnitureFloorUpdateComposer, FurnitureGroupInfoComposer, FurnitureMultiStateComposer, FurnitureOneWayDoorComposer, FurniturePickupComposer, FurniturePlaceComposer, FurniturePostItPlaceComposer, FurnitureRandomStateComposer, FurnitureWallMultiStateComposer, FurnitureWallUpdateComposer, GetItemDataComposer, GetResolutionAchievementsMessageComposer, PetMoveComposer, PetPlaceComposer, RemoveWallItemComposer, RoomUnitLookComposer, RoomUnitWalkComposer, SetItemDataMessageComposer, SetObjectDataMessageComposer } from '../communication'; import { Nitro } from '../Nitro'; -import { MouseEventType } from '../ui/MouseEventType'; -import { RoomEngineObjectPlaySoundEvent, RoomEngineRoomAdEvent, RoomEngineUseProductEvent, RoomObjectPlaySoundIdEvent, RoomObjectRoomAdEvent, RoomObjectSoundMachineEvent } from './events'; -import { RoomEngineDimmerStateEvent } from './events/RoomEngineDimmerStateEvent'; -import { RoomEngineObjectEvent } from './events/RoomEngineObjectEvent'; -import { RoomEngineObjectPlacedEvent } from './events/RoomEngineObjectPlacedEvent'; -import { RoomEngineObjectPlacedOnUserEvent } from './events/RoomEngineObjectPlacedOnUserEvent'; -import { RoomEngineSamplePlaybackEvent } from './events/RoomEngineSamplePlaybackEvent'; -import { RoomEngineTriggerWidgetEvent } from './events/RoomEngineTriggerWidgetEvent'; -import { RoomObjectBadgeAssetEvent } from './events/RoomObjectBadgeAssetEvent'; -import { RoomObjectDataRequestEvent } from './events/RoomObjectDataRequestEvent'; -import { RoomObjectDimmerStateUpdateEvent } from './events/RoomObjectDimmerStateUpdateEvent'; -import { RoomObjectFloorHoleEvent } from './events/RoomObjectFloorHoleEvent'; -import { RoomObjectFurnitureActionEvent } from './events/RoomObjectFurnitureActionEvent'; -import { RoomObjectHSLColorEnabledEvent } from './events/RoomObjectHSLColorEnabledEvent'; -import { RoomObjectHSLColorEnableEvent } from './events/RoomObjectHSLColorEnableEvent'; -import { RoomObjectMoveEvent } from './events/RoomObjectMoveEvent'; -import { RoomObjectSamplePlaybackEvent } from './events/RoomObjectSamplePlaybackEvent'; -import { RoomObjectStateChangedEvent } from './events/RoomObjectStateChangedEvent'; -import { RoomObjectTileMouseEvent } from './events/RoomObjectTileMouseEvent'; -import { RoomObjectWallMouseEvent } from './events/RoomObjectWallMouseEvent'; -import { RoomObjectWidgetRequestEvent } from './events/RoomObjectWidgetRequestEvent'; +import { MouseEventType } from '../ui'; +import { RoomEngineDimmerStateEvent, RoomEngineObjectEvent, RoomEngineObjectPlacedEvent, RoomEngineObjectPlacedOnUserEvent, RoomEngineObjectPlaySoundEvent, RoomEngineRoomAdEvent, RoomEngineSamplePlaybackEvent, RoomEngineTriggerWidgetEvent, RoomEngineUseProductEvent, RoomObjectBadgeAssetEvent, RoomObjectDataRequestEvent, RoomObjectDimmerStateUpdateEvent, RoomObjectFloorHoleEvent, RoomObjectFurnitureActionEvent, RoomObjectHSLColorEnabledEvent, RoomObjectHSLColorEnableEvent, RoomObjectMoveEvent, RoomObjectPlaySoundIdEvent, RoomObjectRoomAdEvent, RoomObjectSamplePlaybackEvent, RoomObjectSoundMachineEvent, RoomObjectStateChangedEvent, RoomObjectTileMouseEvent, RoomObjectWallMouseEvent, RoomObjectWidgetRequestEvent } from './events'; import { ObjectAvatarSelectedMessage, ObjectDataUpdateMessage, ObjectSelectedMessage, ObjectTileCursorUpdateMessage, ObjectVisibilityUpdateMessage } from './messages'; -import { RoomObjectOperationType } from './object/RoomObjectOperationType'; -import { SelectedRoomObjectData } from './utils/SelectedRoomObjectData'; +import { SelectedRoomObjectData } from './utils'; export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMouseListener, IRoomObjectEventManager { diff --git a/src/nitro/room/RoomObjectLogicFactory.ts b/src/nitro/room/RoomObjectLogicFactory.ts index 07f2cdb8..600e3985 100644 --- a/src/nitro/room/RoomObjectLogicFactory.ts +++ b/src/nitro/room/RoomObjectLogicFactory.ts @@ -1,54 +1,7 @@ -import { IEventDispatcher, IRoomObjectEventHandler, IRoomObjectLogicFactory } from '../../api'; +import { IEventDispatcher, IRoomObjectEventHandler, IRoomObjectLogicFactory, RoomObjectLogicType } from '../../api'; import { EventDispatcher, NitroLogger } from '../../core'; -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'; -import { FurnitureAchievementResolutionLogic } from './object/logic/furniture/FurnitureAchievementResolutionLogic'; -import { FurnitureBadgeDisplayLogic } from './object/logic/furniture/FurnitureBadgeDisplayLogic'; -import { FurnitureChangeStateWhenStepOnLogic } from './object/logic/furniture/FurnitureChangeStateWhenStepOnLogic'; -import { FurnitureClothingChangeLogic } from './object/logic/furniture/FurnitureClothingChangeLogic'; -import { FurnitureCounterClockLogic } from './object/logic/furniture/FurnitureCounterClockLogic'; -import { FurnitureCrackableLogic } from './object/logic/furniture/FurnitureCrackableLogic'; -import { FurnitureCraftingGizmoLogic } from './object/logic/furniture/FurnitureCraftingGizmoLogic'; -import { FurnitureCreditLogic } from './object/logic/furniture/FurnitureCreditLogic'; -import { FurnitureCuckooClockLogic } from './object/logic/furniture/FurnitureCuckooClockLogic'; -import { FurnitureCustomStackHeightLogic } from './object/logic/furniture/FurnitureCustomStackHeightLogic'; -import { FurnitureDiceLogic } from './object/logic/furniture/FurnitureDiceLogic'; -import { FurnitureEditableInternalLinkLogic } from './object/logic/furniture/FurnitureEditableInternalLinkLogic'; -import { FurnitureEditableRoomLinkLogic } from './object/logic/furniture/FurnitureEditableRoomLinkLogic'; -import { FurnitureExternalImageLogic } from './object/logic/furniture/FurnitureExternalImageLogic'; -import { FurnitureFireworksLogic } from './object/logic/furniture/FurnitureFireworksLogic'; -import { FurnitureFloorHoleLogic } from './object/logic/furniture/FurnitureFloorHoleLogic'; -import { FurnitureGuildCustomizedLogic } from './object/logic/furniture/FurnitureGuildCustomizedLogic'; -import { FurnitureHighScoreLogic } from './object/logic/furniture/FurnitureHighScoreLogic'; -import { FurnitureHockeyScoreLogic } from './object/logic/furniture/FurnitureHockeyScoreLogic'; -import { FurnitureIceStormLogic } from './object/logic/furniture/FurnitureIceStormLogic'; -import { FurnitureLogic } from './object/logic/furniture/FurnitureLogic'; -import { FurnitureMannequinLogic } from './object/logic/furniture/FurnitureMannequinLogic'; -import { FurnitureMultiHeightLogic } from './object/logic/furniture/FurnitureMultiHeightLogic'; -import { FurnitureMultiStateLogic } from './object/logic/furniture/FurnitureMultiStateLogic'; -import { FurnitureOneWayDoorLogic } from './object/logic/furniture/FurnitureOneWayDoorLogic'; -import { FurniturePetCustomizationLogic } from './object/logic/furniture/FurniturePetCustomizationLogic'; -import { FurniturePresentLogic } from './object/logic/furniture/FurniturePresentLogic'; -import { FurniturePurchaseableClothingLogic } from './object/logic/furniture/FurniturePurchaseableClothingLogic'; -import { FurniturePushableLogic } from './object/logic/furniture/FurniturePushableLogic'; -import { FurnitureRoomBackgroundColorLogic } from './object/logic/furniture/FurnitureRoomBackgroundColorLogic'; -import { FurnitureRoomBackgroundLogic } from './object/logic/furniture/FurnitureRoomBackgroundLogic'; -import { FurnitureRoomBillboardLogic } from './object/logic/furniture/FurnitureRoomBillboardLogic'; -import { FurnitureRoomDimmerLogic } from './object/logic/furniture/FurnitureRoomDimmerLogic'; -import { FurnitureScoreLogic } from './object/logic/furniture/FurnitureScoreLogic'; -import { FurnitureSoundBlockLogic } from './object/logic/furniture/FurnitureSoundBlockLogic'; -import { FurnitureStickieLogic } from './object/logic/furniture/FurnitureStickieLogic'; -import { FurnitureTrophyLogic } from './object/logic/furniture/FurnitureTrophyLogic'; -import { FurnitureVoteCounterLogic } from './object/logic/furniture/FurnitureVoteCounterLogic'; -import { FurnitureVoteMajorityLogic } from './object/logic/furniture/FurnitureVoteMajorityLogic'; -import { FurnitureWindowLogic } from './object/logic/furniture/FurnitureWindowLogic'; -import { FurnitureYoutubeLogic } from './object/logic/furniture/FurnitureYoutubeLogic'; -import { PetLogic } from './object/logic/pet/PetLogic'; -import { RoomLogic } from './object/logic/room/RoomLogic'; -import { SelectionArrowLogic } from './object/logic/room/SelectionArrowLogic'; -import { TileCursorLogic } from './object/logic/room/TileCursorLogic'; -import { RoomObjectLogicType } from './object/RoomObjectLogicType'; +import { RoomObjectLogicBase } from '../../room'; +import { AvatarLogic, FurnitureAchievementResolutionLogic, FurnitureBadgeDisplayLogic, FurnitureChangeStateWhenStepOnLogic, FurnitureClothingChangeLogic, FurnitureCounterClockLogic, FurnitureCrackableLogic, FurnitureCraftingGizmoLogic, FurnitureCreditLogic, FurnitureCuckooClockLogic, FurnitureCustomStackHeightLogic, FurnitureDiceLogic, FurnitureEcotronBoxLogic, FurnitureEditableInternalLinkLogic, FurnitureEditableRoomLinkLogic, FurnitureEffectBoxLogic, FurnitureExternalImageLogic, FurnitureFireworksLogic, FurnitureFloorHoleLogic, FurnitureGroupForumTerminalLogic, FurnitureGuildCustomizedLogic, FurnitureHabboWheelLogic, FurnitureHighScoreLogic, FurnitureHockeyScoreLogic, FurnitureHweenLovelockLogic, FurnitureIceStormLogic, FurnitureInternalLinkLogic, FurnitureJukeboxLogic, FurnitureLogic, FurnitureLoveLockLogic, FurnitureMannequinLogic, FurnitureMonsterplantSeedLogic, FurnitureMultiHeightLogic, FurnitureMultiStateLogic, FurnitureMysteryBoxLogic, FurnitureMysteryTrophyLogic, FurnitureOneWayDoorLogic, FurniturePetCustomizationLogic, FurniturePlaceholderLogic, FurniturePlanetSystemLogic, FurniturePresentLogic, FurniturePurchaseableClothingLogic, FurniturePushableLogic, FurnitureRandomStateLogic, FurnitureRandomTeleportLogic, FurnitureRentableSpaceLogic, FurnitureRoomBackgroundColorLogic, FurnitureRoomBackgroundLogic, FurnitureRoomBillboardLogic, FurnitureRoomDimmerLogic, FurnitureScoreLogic, FurnitureSongDiskLogic, FurnitureSoundBlockLogic, FurnitureSoundMachineLogic, FurnitureStickieLogic, FurnitureTrophyLogic, FurnitureVoteCounterLogic, FurnitureVoteMajorityLogic, FurnitureWelcomeGiftLogic, FurnitureWindowLogic, FurnitureYoutubeLogic, PetLogic, RoomLogic, SelectionArrowLogic, TileCursorLogic } from './object'; export class RoomObjectLogicFactory implements IRoomObjectLogicFactory { diff --git a/src/nitro/room/object/RoomObjectVisualizationFactory.ts b/src/nitro/room/object/RoomObjectVisualizationFactory.ts index 0ce4f580..e591c429 100644 --- a/src/nitro/room/object/RoomObjectVisualizationFactory.ts +++ b/src/nitro/room/object/RoomObjectVisualizationFactory.ts @@ -1,49 +1,8 @@ -import { IAssetData, IObjectVisualizationData, IRoomObjectGraphicVisualization, IRoomObjectVisualizationFactory } from '../../../api'; +import { IAssetData, IObjectVisualizationData, IRoomObjectGraphicVisualization, IRoomObjectVisualizationFactory, RoomObjectVisualizationType } from '../../../api'; import { NitroLogger } from '../../../core'; import { RoomObjectSpriteVisualization } from '../../../room'; import { Nitro } from '../../Nitro'; -import { RoomObjectVisualizationType } from './RoomObjectVisualizationType'; -import { AvatarVisualization } from './visualization/avatar/AvatarVisualization'; -import { AvatarVisualizationData } from './visualization/avatar/AvatarVisualizationData'; -import { FurnitureAnimatedVisualization } from './visualization/furniture/FurnitureAnimatedVisualization'; -import { FurnitureAnimatedVisualizationData } from './visualization/furniture/FurnitureAnimatedVisualizationData'; -import { FurnitureBadgeDisplayVisualization } from './visualization/furniture/FurnitureBadgeDisplayVisualization'; -import { FurnitureBBVisualization } from './visualization/furniture/FurnitureBBVisualization'; -import { FurnitureBottleVisualization } from './visualization/furniture/FurnitureBottleVisualization'; -import { FurnitureBuilderPlaceholderVisualization } from './visualization/furniture/FurnitureBuilderPlaceholderVisualization'; -import { FurnitureCounterClockVisualization } from './visualization/furniture/FurnitureCounterClockVisualization'; -import { FurnitureCuboidVisualization } from './visualization/furniture/FurnitureCuboidVisualization'; -import { FurnitureExternalImageVisualization } from './visualization/furniture/FurnitureExternalImageVisualization'; -import { FurnitureFireworksVisualization } from './visualization/furniture/FurnitureFireworksVisualization'; -import { FurnitureGiftWrappedFireworksVisualization } from './visualization/furniture/FurnitureGiftWrappedFireworksVisualization'; -import { FurnitureGiftWrappedVisualization } from './visualization/furniture/FurnitureGiftWrappedVisualization'; -import { FurnitureGuildCustomizedVisualization } from './visualization/furniture/FurnitureGuildCustomizedVisualization'; -import { FurnitureGuildIsometricBadgeVisualization } from './visualization/furniture/FurnitureGuildIsometricBadgeVisualization'; -import { FurnitureHabboWheelVisualization } from './visualization/furniture/FurnitureHabboWheelVisualization'; -import { FurnitureIsometricBBVisualization } from './visualization/furniture/FurnitureIsometricBBVisualization'; -import { FurnitureMannequinVisualization } from './visualization/furniture/FurnitureMannequinVisualization'; -import { FurnitureMannequinVisualizationData } from './visualization/furniture/FurnitureMannequinVisualizationData'; -import { FurniturePartyBeamerVisualization } from './visualization/furniture/FurniturePartyBeamerVisualization'; -import { FurniturePlanetSystemVisualization } from './visualization/furniture/FurniturePlanetSystemVisualization'; -import { FurniturePosterVisualization } from './visualization/furniture/FurniturePosterVisualization'; -import { FurnitureQueueTileVisualization } from './visualization/furniture/FurnitureQueueTileVisualization'; -import { FurnitureResettingAnimatedVisualization } from './visualization/furniture/FurnitureResettingAnimatedVisualization'; -import { FurnitureRoomBackgroundVisualization } from './visualization/furniture/FurnitureRoomBackgroundVisualization'; -import { FurnitureScoreBoardVisualization } from './visualization/furniture/FurnitureScoreBoardVisualization'; -import { FurnitureSoundBlockVisualization } from './visualization/furniture/FurnitureSoundBlockVisualization'; -import { FurnitureStickieVisualization } from './visualization/furniture/FurnitureStickieVisualization'; -import { FurnitureValRandomizerVisualization } from './visualization/furniture/FurnitureValRandomizerVisualization'; -import { FurnitureVisualization } from './visualization/furniture/FurnitureVisualization'; -import { FurnitureVisualizationData } from './visualization/furniture/FurnitureVisualizationData'; -import { FurnitureVoteCounterVisualization } from './visualization/furniture/FurnitureVoteCounterVisualization'; -import { FurnitureVoteMajorityVisualization } from './visualization/furniture/FurnitureVoteMajorityVisualization'; -import { FurnitureWaterAreaVisualization } from './visualization/furniture/FurnitureWaterAreaVisualization'; -import { FurnitureYoutubeVisualization } from './visualization/furniture/FurnitureYoutubeVisualization'; -import { PetVisualization } from './visualization/pet/PetVisualization'; -import { PetVisualizationData } from './visualization/pet/PetVisualizationData'; -import { RoomVisualization } from './visualization/room/RoomVisualization'; -import { RoomVisualizationData } from './visualization/room/RoomVisualizationData'; -import { TileCursorVisualization } from './visualization/room/TileCursorVisualization'; +import { AvatarVisualization, AvatarVisualizationData, FurnitureAnimatedVisualization, FurnitureAnimatedVisualizationData, FurnitureBadgeDisplayVisualization, FurnitureBBVisualization, FurnitureBottleVisualization, FurnitureBuilderPlaceholderVisualization, FurnitureCounterClockVisualization, FurnitureCuboidVisualization, FurnitureExternalImageVisualization, FurnitureFireworksVisualization, FurnitureGiftWrappedFireworksVisualization, FurnitureGiftWrappedVisualization, FurnitureGuildCustomizedVisualization, FurnitureGuildIsometricBadgeVisualization, FurnitureHabboWheelVisualization, FurnitureIsometricBBVisualization, FurnitureMannequinVisualization, FurnitureMannequinVisualizationData, FurniturePartyBeamerVisualization, FurniturePlanetSystemVisualization, FurniturePosterVisualization, FurnitureQueueTileVisualization, FurnitureResettingAnimatedVisualization, FurnitureRoomBackgroundVisualization, FurnitureScoreBoardVisualization, FurnitureSoundBlockVisualization, FurnitureStickieVisualization, FurnitureValRandomizerVisualization, FurnitureVisualization, FurnitureVisualizationData, FurnitureVoteCounterVisualization, FurnitureVoteMajorityVisualization, FurnitureWaterAreaVisualization, FurnitureYoutubeVisualization, PetVisualization, PetVisualizationData, RoomVisualization, RoomVisualizationData, TileCursorVisualization } from './visualization'; export class RoomObjectVisualizationFactory implements IRoomObjectVisualizationFactory { diff --git a/src/nitro/room/object/index.ts b/src/nitro/room/object/index.ts index eaa84951..8d30eb31 100644 --- a/src/nitro/room/object/index.ts +++ b/src/nitro/room/object/index.ts @@ -1,11 +1,12 @@ export * from './logic'; +export * from './logic/avatar'; +export * from './logic/furniture'; +export * from './logic/pet'; +export * from './logic/room'; export * from './RoomFloorHole'; export * from './RoomMapData'; export * from './RoomMapMaskData'; -export * from './RoomObjectLogicType'; -export * from './RoomObjectOperationType'; export * from './RoomObjectVisualizationFactory'; -export * from './RoomObjectVisualizationType'; export * from './RoomPlaneBitmapMaskData'; export * from './RoomPlaneBitmapMaskParser'; export * from './RoomPlaneData'; @@ -13,3 +14,14 @@ export * from './RoomPlaneMaskData'; export * from './RoomPlaneParser'; export * from './RoomWallData'; export * from './visualization'; +export * from './visualization/avatar'; +export * from './visualization/avatar/additions'; +export * from './visualization/data'; +export * from './visualization/furniture'; +export * from './visualization/pet'; +export * from './visualization/room'; +export * from './visualization/room/mask'; +export * from './visualization/room/rasterizer'; +export * from './visualization/room/rasterizer/animated'; +export * from './visualization/room/rasterizer/basic'; +export * from './visualization/room/utils'; diff --git a/src/nitro/room/object/logic/avatar/AvatarLogic.ts b/src/nitro/room/object/logic/avatar/AvatarLogic.ts index 63480630..10dda102 100644 --- a/src/nitro/room/object/logic/avatar/AvatarLogic.ts +++ b/src/nitro/room/object/logic/avatar/AvatarLogic.ts @@ -1,11 +1,10 @@ import { IRoomGeometry, IRoomObjectModel, RoomObjectVariable, Vector3d } from '../../../../../api'; import { RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room'; -import { AvatarAction } from '../../../../avatar/enum/AvatarAction'; +import { AvatarAction } from '../../../../avatar'; import { Nitro } from '../../../../Nitro'; -import { MouseEventType } from '../../../../ui/MouseEventType'; -import { RoomObjectFurnitureActionEvent } from '../../../events/RoomObjectFurnitureActionEvent'; -import { RoomObjectMoveEvent } from '../../../events/RoomObjectMoveEvent'; +import { MouseEventType } from '../../../../ui'; +import { RoomObjectFurnitureActionEvent, RoomObjectMoveEvent } from '../../../events'; import { ObjectAvatarCarryObjectUpdateMessage, ObjectAvatarChatUpdateMessage, ObjectAvatarDanceUpdateMessage, ObjectAvatarEffectUpdateMessage, ObjectAvatarExpressionUpdateMessage, ObjectAvatarFigureUpdateMessage, ObjectAvatarFlatControlUpdateMessage, ObjectAvatarGestureUpdateMessage, ObjectAvatarMutedUpdateMessage, ObjectAvatarOwnMessage, ObjectAvatarPlayerValueUpdateMessage, ObjectAvatarPlayingGameUpdateMessage, ObjectAvatarPostureUpdateMessage, ObjectAvatarSelectedMessage, ObjectAvatarSignUpdateMessage, ObjectAvatarSleepUpdateMessage, ObjectAvatarTypingUpdateMessage, ObjectAvatarUpdateMessage, ObjectAvatarUseObjectUpdateMessage } from '../../../messages'; import { MovingObjectLogic } from '../MovingObjectLogic'; diff --git a/src/nitro/room/object/logic/furniture/FurnitureAchievementResolutionLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureAchievementResolutionLogic.ts index d17ec097..8ba49599 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureAchievementResolutionLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureAchievementResolutionLogic.ts @@ -1,7 +1,6 @@ import { RoomObjectVariable } from '../../../../../api'; import { RoomObjectEvent, RoomObjectUpdateMessage } from '../../../../../room'; -import { RoomObjectBadgeAssetEvent } from '../../../events/RoomObjectBadgeAssetEvent'; -import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; +import { RoomObjectBadgeAssetEvent, RoomObjectWidgetRequestEvent } from '../../../events'; import { ObjectGroupBadgeUpdateMessage, ObjectSelectedMessage } from '../../../messages'; import { FurnitureBadgeDisplayLogic } from './FurnitureBadgeDisplayLogic'; diff --git a/src/nitro/room/object/logic/furniture/FurnitureBadgeDisplayLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureBadgeDisplayLogic.ts index 9b38d9f8..d79759b8 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureBadgeDisplayLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureBadgeDisplayLogic.ts @@ -1,8 +1,7 @@ import { RoomObjectVariable, StringDataType } from '../../../../../api'; import { PixiApplicationProxy } from '../../../../../pixi-proxy'; import { RoomObjectUpdateMessage } from '../../../../../room'; -import { RoomObjectBadgeAssetEvent } from '../../../events/RoomObjectBadgeAssetEvent'; -import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; +import { RoomObjectBadgeAssetEvent, RoomObjectWidgetRequestEvent } from '../../../events'; import { ObjectDataUpdateMessage, ObjectGroupBadgeUpdateMessage } from '../../../messages'; import { FurnitureLogic } from './FurnitureLogic'; diff --git a/src/nitro/room/object/logic/furniture/FurnitureChangeStateWhenStepOnLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureChangeStateWhenStepOnLogic.ts index b2fa6aa3..49333b89 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureChangeStateWhenStepOnLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureChangeStateWhenStepOnLogic.ts @@ -1,5 +1,5 @@ import { IAssetData, RoomObjectVariable } from '../../../../../api'; -import { RoomToObjectOwnAvatarMoveEvent } from '../../../events/RoomToObjectOwnAvatarMoveEvent'; +import { RoomToObjectOwnAvatarMoveEvent } from '../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureChangeStateWhenStepOnLogic extends FurnitureLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureCounterClockLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureCounterClockLogic.ts index 7179bdfb..21968f25 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureCounterClockLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureCounterClockLogic.ts @@ -1,7 +1,7 @@ import { IRoomGeometry } from '../../../../../api'; import { RoomObjectEvent, RoomSpriteMouseEvent } from '../../../../../room'; -import { MouseEventType } from '../../../../ui/MouseEventType'; -import { RoomObjectStateChangedEvent } from '../../../events/RoomObjectStateChangedEvent'; +import { MouseEventType } from '../../../../ui'; +import { RoomObjectStateChangedEvent } from '../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureCounterClockLogic extends FurnitureLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureCrackableLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureCrackableLogic.ts index a9a8ac82..28ed661f 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureCrackableLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureCrackableLogic.ts @@ -1,6 +1,6 @@ import { RoomObjectVariable } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room'; -import { RoomWidgetEnumItemExtradataParameter } from '../../../../ui/widget/enums/RoomWidgetEnumItemExtradataParameter'; +import { RoomWidgetEnumItemExtradataParameter } from '../../../../ui'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureCrackableLogic extends FurnitureLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureCreditLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureCreditLogic.ts index 4d6b1f36..4d19800c 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureCreditLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureCreditLogic.ts @@ -1,5 +1,5 @@ import { IAssetData, RoomObjectVariable } from '../../../../../api'; -import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; +import { RoomObjectWidgetRequestEvent } from '../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureCreditLogic extends FurnitureLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureCustomStackHeightLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureCustomStackHeightLogic.ts index c0ccc4e0..bcc5ab17 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureCustomStackHeightLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureCustomStackHeightLogic.ts @@ -1,5 +1,5 @@ import { IAssetData, RoomObjectVariable } from '../../../../../api'; -import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; +import { RoomObjectWidgetRequestEvent } from '../../../events'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; export class FurnitureCustomStackHeightLogic extends FurnitureMultiStateLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureDiceLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureDiceLogic.ts index 0ea2d3ab..e06b2487 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureDiceLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureDiceLogic.ts @@ -1,7 +1,7 @@ import { IRoomGeometry } from '../../../../../api'; import { RoomObjectEvent, RoomSpriteMouseEvent } from '../../../../../room'; -import { MouseEventType } from '../../../../ui/MouseEventType'; -import { RoomObjectFurnitureActionEvent } from '../../../events/RoomObjectFurnitureActionEvent'; +import { MouseEventType } from '../../../../ui'; +import { RoomObjectFurnitureActionEvent } from '../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureDiceLogic extends FurnitureLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureEcotronBoxLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureEcotronBoxLogic.ts index adc40952..260023b7 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureEcotronBoxLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureEcotronBoxLogic.ts @@ -1,4 +1,4 @@ -import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; +import { RoomObjectWidgetRequestEvent } from '../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureEcotronBoxLogic extends FurnitureLogic @@ -14,7 +14,7 @@ export class FurnitureEcotronBoxLogic extends FurnitureLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.ECOTRONBOX, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureEditableInternalLinkLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureEditableInternalLinkLogic.ts index 9b4d3cef..4f89826e 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureEditableInternalLinkLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureEditableInternalLinkLogic.ts @@ -1,7 +1,7 @@ import { IAssetData, IRoomGeometry, RoomObjectVariable } from '../../../../../api'; import { RoomSpriteMouseEvent } from '../../../../../room'; -import { MouseEventType } from '../../../../ui/MouseEventType'; -import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; +import { MouseEventType } from '../../../../ui'; +import { RoomObjectWidgetRequestEvent } from '../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureEditableInternalLinkLogic extends FurnitureLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureEditableRoomLinkLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureEditableRoomLinkLogic.ts index 3f9206b8..e6dba70d 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureEditableRoomLinkLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureEditableRoomLinkLogic.ts @@ -1,5 +1,5 @@ import { IAssetData, RoomObjectVariable } from '../../../../../api'; -import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; +import { RoomObjectWidgetRequestEvent } from '../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureEditableRoomLinkLogic extends FurnitureLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureEffectBoxLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureEffectBoxLogic.ts index a7b70ef6..6ef8fd14 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureEffectBoxLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureEffectBoxLogic.ts @@ -1,5 +1,5 @@ -import { ContextMenuEnum } from '../../../../ui/widget/enums/ContextMenuEnum'; -import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; +import { ContextMenuEnum } from '../../../../ui'; +import { RoomObjectWidgetRequestEvent } from '../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureEffectBoxLogic extends FurnitureLogic @@ -8,14 +8,14 @@ export class FurnitureEffectBoxLogic extends FurnitureLogic public getEventTypes(): string[] { - const types = [ RoomObjectWidgetRequestEvent.EFFECTBOX_OPEN_DIALOG ]; + const types = [RoomObjectWidgetRequestEvent.EFFECTBOX_OPEN_DIALOG]; return this.mergeTypes(super.getEventTypes(), types); } public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.EFFECTBOX_OPEN_DIALOG, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureFireworksLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureFireworksLogic.ts index 3fedbb3d..b3e7ce4c 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureFireworksLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureFireworksLogic.ts @@ -1,7 +1,7 @@ import { IAssetData, IParticleSystem, IRoomGeometry, RoomObjectVariable } from '../../../../../api'; import { RoomObjectEvent, RoomSpriteMouseEvent } from '../../../../../room'; -import { MouseEventType } from '../../../../ui/MouseEventType'; -import { RoomObjectStateChangedEvent } from '../../../events/RoomObjectStateChangedEvent'; +import { MouseEventType } from '../../../../ui'; +import { RoomObjectStateChangedEvent } from '../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureFireworksLogic extends FurnitureLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureFloorHoleLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureFloorHoleLogic.ts index 6a4bf8b4..4a356753 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureFloorHoleLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureFloorHoleLogic.ts @@ -1,6 +1,6 @@ import { RoomObjectVariable, Vector3d } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room'; -import { RoomObjectFloorHoleEvent } from '../../../events/RoomObjectFloorHoleEvent'; +import { RoomObjectFloorHoleEvent } from '../../../events'; import { ObjectDataUpdateMessage } from '../../../messages'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; diff --git a/src/nitro/room/object/logic/furniture/FurnitureFriendFurniLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureFriendFurniLogic.ts index 77f22b2c..2ad1bcaf 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureFriendFurniLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureFriendFurniLogic.ts @@ -1,7 +1,7 @@ import { IAssetData, RoomObjectVariable, StringDataType } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room'; import { ContextMenuEnum } from '../../../../ui'; -import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; +import { RoomObjectWidgetRequestEvent } from '../../../events'; import { ObjectDataUpdateMessage } from '../../../messages'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; diff --git a/src/nitro/room/object/logic/furniture/FurnitureGroupForumTerminalLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureGroupForumTerminalLogic.ts index 1d3ea01e..d98af8ab 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureGroupForumTerminalLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureGroupForumTerminalLogic.ts @@ -1,5 +1,5 @@ import { RoomObjectVariable } from '../../../../../api'; -import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; +import { RoomObjectWidgetRequestEvent } from '../../../events'; import { FurnitureGuildCustomizedLogic } from './FurnitureGuildCustomizedLogic'; export class FurnitureGroupForumTerminalLogic extends FurnitureGuildCustomizedLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureHabboWheelLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureHabboWheelLogic.ts index 9b0be170..6cfd9d9b 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureHabboWheelLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureHabboWheelLogic.ts @@ -1,18 +1,18 @@ -import { RoomObjectFurnitureActionEvent } from '../../../events/RoomObjectFurnitureActionEvent'; +import { RoomObjectFurnitureActionEvent } from '../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureHabboWheelLogic extends FurnitureLogic { public getEventTypes(): string[] { - const types = [ RoomObjectFurnitureActionEvent.USE_HABBOWHEEL ]; + const types = [RoomObjectFurnitureActionEvent.USE_HABBOWHEEL]; return this.mergeTypes(super.getEventTypes(), types); } public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.USE_HABBOWHEEL, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureHighScoreLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureHighScoreLogic.ts index 9c8b578e..c3176ce1 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureHighScoreLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureHighScoreLogic.ts @@ -1,6 +1,6 @@ import { RoomObjectVariable } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room'; -import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; +import { RoomObjectWidgetRequestEvent } from '../../../events'; import { ObjectDataUpdateMessage } from '../../../messages'; import { FurnitureLogic } from './FurnitureLogic'; diff --git a/src/nitro/room/object/logic/furniture/FurnitureHockeyScoreLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureHockeyScoreLogic.ts index 0aa49e1b..e48d8b59 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureHockeyScoreLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureHockeyScoreLogic.ts @@ -1,7 +1,7 @@ import { IRoomGeometry } from '../../../../../api'; import { RoomObjectEvent, RoomSpriteMouseEvent } from '../../../../../room'; -import { MouseEventType } from '../../../../ui/MouseEventType'; -import { RoomObjectStateChangedEvent } from '../../../events/RoomObjectStateChangedEvent'; +import { MouseEventType } from '../../../../ui'; +import { RoomObjectStateChangedEvent } from '../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureHockeyScoreLogic extends FurnitureLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureInternalLinkLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureInternalLinkLogic.ts index 590b91e0..e8f03b02 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureInternalLinkLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureInternalLinkLogic.ts @@ -1,7 +1,7 @@ import { IAssetData, IRoomGeometry, RoomObjectVariable } from '../../../../../api'; import { RoomSpriteMouseEvent } from '../../../../../room'; -import { MouseEventType } from '../../../../ui/MouseEventType'; -import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; +import { MouseEventType } from '../../../../ui'; +import { RoomObjectWidgetRequestEvent } from '../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureInternalLinkLogic extends FurnitureLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureJukeboxLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureJukeboxLogic.ts index c80aec22..c1239596 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureJukeboxLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureJukeboxLogic.ts @@ -1,9 +1,7 @@ import { RoomObjectVariable } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room'; import { RoomWidgetEnumItemExtradataParameter } from '../../../../ui'; -import { RoomObjectStateChangedEvent } from '../../../events'; -import { RoomObjectFurnitureActionEvent } from '../../../events/RoomObjectFurnitureActionEvent'; -import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; +import { RoomObjectFurnitureActionEvent, RoomObjectStateChangedEvent, RoomObjectWidgetRequestEvent } from '../../../events'; import { ObjectDataUpdateMessage } from '../../../messages'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; diff --git a/src/nitro/room/object/logic/furniture/FurnitureLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureLogic.ts index ffc748dc..647bcd21 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureLogic.ts @@ -1,10 +1,8 @@ import { IAssetData, IRoomGeometry, IRoomObjectController, IRoomObjectModel, IVector3D, RoomObjectVariable, Vector3d } from '../../../../../api'; import { RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room'; import { Nitro } from '../../../../Nitro'; -import { MouseEventType } from '../../../../ui/MouseEventType'; -import { RoomObjectRoomAdEvent } from '../../../events'; -import { RoomObjectStateChangedEvent } from '../../../events/RoomObjectStateChangedEvent'; -import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; +import { MouseEventType } from '../../../../ui'; +import { RoomObjectRoomAdEvent, RoomObjectStateChangedEvent, RoomObjectWidgetRequestEvent } from '../../../events'; import { ObjectDataUpdateMessage, ObjectHeightUpdateMessage, ObjectItemDataUpdateMessage, ObjectMoveUpdateMessage, ObjectSelectedMessage } from '../../../messages'; import { MovingObjectLogic } from '../MovingObjectLogic'; diff --git a/src/nitro/room/object/logic/furniture/FurnitureMannequinLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureMannequinLogic.ts index 98c5a047..a82c8b9f 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureMannequinLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureMannequinLogic.ts @@ -1,6 +1,6 @@ import { MapDataType, RoomObjectVariable } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room'; -import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; +import { RoomObjectWidgetRequestEvent } from '../../../events'; import { ObjectDataUpdateMessage } from '../../../messages'; import { FurnitureLogic } from './FurnitureLogic'; diff --git a/src/nitro/room/object/logic/furniture/FurnitureMonsterplantSeedLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureMonsterplantSeedLogic.ts index bbc90afa..fc1ae20b 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureMonsterplantSeedLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureMonsterplantSeedLogic.ts @@ -1,19 +1,19 @@ import { ContextMenuEnum } from '../../../../ui'; -import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; +import { RoomObjectWidgetRequestEvent } from '../../../events'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; export class FurnitureMonsterplantSeedLogic extends FurnitureMultiStateLogic { public getEventTypes(): string[] { - const types = [ RoomObjectWidgetRequestEvent.MONSTERPLANT_SEED_PLANT_CONFIRMATION_DIALOG ]; + const types = [RoomObjectWidgetRequestEvent.MONSTERPLANT_SEED_PLANT_CONFIRMATION_DIALOG]; return this.mergeTypes(super.getEventTypes(), types); } public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.MONSTERPLANT_SEED_PLANT_CONFIRMATION_DIALOG, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureMultiStateLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureMultiStateLogic.ts index f32f1afa..8af26064 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureMultiStateLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureMultiStateLogic.ts @@ -1,7 +1,7 @@ import { IRoomGeometry } from '../../../../../api'; import { RoomSpriteMouseEvent } from '../../../../../room'; -import { MouseEventType } from '../../../../ui/MouseEventType'; -import { RoomObjectFurnitureActionEvent } from '../../../events/RoomObjectFurnitureActionEvent'; +import { MouseEventType } from '../../../../ui'; +import { RoomObjectFurnitureActionEvent } from '../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureMultiStateLogic extends FurnitureLogic diff --git a/src/nitro/room/object/logic/furniture/FurnitureMysteryBoxLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureMysteryBoxLogic.ts index 20754c25..9b9a8f39 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureMysteryBoxLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureMysteryBoxLogic.ts @@ -1,19 +1,19 @@ import { ContextMenuEnum } from '../../../../ui'; -import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; +import { RoomObjectWidgetRequestEvent } from '../../../events'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; export class FurnitureMysteryBoxLogic extends FurnitureMultiStateLogic { public getEventTypes(): string[] { - const types = [ RoomObjectWidgetRequestEvent.MYSTERYBOX_OPEN_DIALOG ]; + const types = [RoomObjectWidgetRequestEvent.MYSTERYBOX_OPEN_DIALOG]; return this.mergeTypes(super.getEventTypes(), types); } public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.MYSTERYBOX_OPEN_DIALOG, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureMysteryTrophyLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureMysteryTrophyLogic.ts index 45869c88..7e81c06d 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureMysteryTrophyLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureMysteryTrophyLogic.ts @@ -1,19 +1,19 @@ import { ContextMenuEnum } from '../../../../ui'; -import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; +import { RoomObjectWidgetRequestEvent } from '../../../events'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; export class FurnitureMysteryTrophyLogic extends FurnitureMultiStateLogic { public getEventTypes(): string[] { - const types = [ RoomObjectWidgetRequestEvent.MYSTERYTROPHY_OPEN_DIALOG ]; + const types = [RoomObjectWidgetRequestEvent.MYSTERYTROPHY_OPEN_DIALOG]; return this.mergeTypes(super.getEventTypes(), types); } public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.MYSTERYTROPHY_OPEN_DIALOG, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureOneWayDoorLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureOneWayDoorLogic.ts index 64fe0257..37aa8bbe 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureOneWayDoorLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureOneWayDoorLogic.ts @@ -1,18 +1,18 @@ -import { RoomObjectFurnitureActionEvent } from '../../../events/RoomObjectFurnitureActionEvent'; +import { RoomObjectFurnitureActionEvent } from '../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureOneWayDoorLogic extends FurnitureLogic { public getEventTypes(): string[] { - const types = [ RoomObjectFurnitureActionEvent.ENTER_ONEWAYDOOR ]; + const types = [RoomObjectFurnitureActionEvent.ENTER_ONEWAYDOOR]; return this.mergeTypes(super.getEventTypes(), types); } public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.ENTER_ONEWAYDOOR, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurniturePlaceholderLogic.ts b/src/nitro/room/object/logic/furniture/FurniturePlaceholderLogic.ts index e227a243..2370b189 100644 --- a/src/nitro/room/object/logic/furniture/FurniturePlaceholderLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurniturePlaceholderLogic.ts @@ -1,4 +1,4 @@ -import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; +import { RoomObjectWidgetRequestEvent } from '../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurniturePlaceholderLogic extends FurnitureLogic @@ -14,7 +14,7 @@ export class FurniturePlaceholderLogic extends FurnitureLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.PLACEHOLDER, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurniturePresentLogic.ts b/src/nitro/room/object/logic/furniture/FurniturePresentLogic.ts index 4ee473a3..b15b834f 100644 --- a/src/nitro/room/object/logic/furniture/FurniturePresentLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurniturePresentLogic.ts @@ -1,8 +1,7 @@ import { IAssetData, IParticleSystem, IRoomGeometry, MapDataType, RoomObjectVariable } from '../../../../../api'; import { RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room'; -import { MouseEventType } from '../../../../ui/MouseEventType'; -import { RoomObjectFurnitureActionEvent } from '../../../events/RoomObjectFurnitureActionEvent'; -import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; +import { MouseEventType } from '../../../../ui'; +import { RoomObjectFurnitureActionEvent, RoomObjectWidgetRequestEvent } from '../../../events'; import { ObjectDataUpdateMessage, ObjectModelDataUpdateMessage } from '../../../messages'; import { FurnitureLogic } from './FurnitureLogic'; diff --git a/src/nitro/room/object/logic/furniture/FurniturePurchaseableClothingLogic.ts b/src/nitro/room/object/logic/furniture/FurniturePurchaseableClothingLogic.ts index 76e0974c..0715bb1d 100644 --- a/src/nitro/room/object/logic/furniture/FurniturePurchaseableClothingLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurniturePurchaseableClothingLogic.ts @@ -1,5 +1,5 @@ import { ContextMenuEnum } from '../../../../ui'; -import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; +import { RoomObjectWidgetRequestEvent } from '../../../events'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; export class FurniturePurchaseableClothingLogic extends FurnitureMultiStateLogic @@ -16,7 +16,7 @@ export class FurniturePurchaseableClothingLogic extends FurnitureMultiStateLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.PURCHASABLE_CLOTHING_CONFIRMATION_DIALOG, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureRoomBackgroundColorLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureRoomBackgroundColorLogic.ts index bd1f268c..10f144a4 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureRoomBackgroundColorLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureRoomBackgroundColorLogic.ts @@ -1,8 +1,7 @@ import { IRoomGeometry, NumberDataType, RoomObjectVariable } from '../../../../../api'; import { RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room'; -import { MouseEventType } from '../../../../ui/MouseEventType'; -import { RoomObjectHSLColorEnableEvent } from '../../../events/RoomObjectHSLColorEnableEvent'; -import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; +import { MouseEventType } from '../../../../ui'; +import { RoomObjectHSLColorEnableEvent, RoomObjectWidgetRequestEvent } from '../../../events'; import { ObjectDataUpdateMessage } from '../../../messages'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; diff --git a/src/nitro/room/object/logic/furniture/FurnitureRoomBrandingLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureRoomBrandingLogic.ts index 33a40965..c8438b0e 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureRoomBrandingLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureRoomBrandingLogic.ts @@ -3,8 +3,7 @@ import { decompressFrames, parseGIF } from 'gifuct-js'; import { IAssetData, IRoomGeometry, MapDataType, RoomObjectVariable } from '../../../../../api'; import { RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room'; import { Nitro } from '../../../../Nitro'; -import { MouseEventType } from '../../../../ui'; -import { RoomWidgetEnumItemExtradataParameter } from '../../../../ui/widget/enums/RoomWidgetEnumItemExtradataParameter'; +import { MouseEventType, RoomWidgetEnumItemExtradataParameter } from '../../../../ui'; import { RoomObjectRoomAdEvent } from '../../../events'; import { ObjectAdUpdateMessage, ObjectDataUpdateMessage } from '../../../messages'; import { FurnitureLogic } from './FurnitureLogic'; diff --git a/src/nitro/room/object/logic/furniture/FurnitureRoomDimmerLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureRoomDimmerLogic.ts index 518a9bad..80ad0517 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureRoomDimmerLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureRoomDimmerLogic.ts @@ -1,7 +1,6 @@ import { RoomObjectVariable } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room'; -import { RoomObjectDimmerStateUpdateEvent } from '../../../events/RoomObjectDimmerStateUpdateEvent'; -import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; +import { RoomObjectDimmerStateUpdateEvent, RoomObjectWidgetRequestEvent } from '../../../events'; import { ObjectDataUpdateMessage } from '../../../messages'; import { FurnitureLogic } from './FurnitureLogic'; diff --git a/src/nitro/room/object/logic/furniture/FurnitureSoundBlockLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureSoundBlockLogic.ts index 79781249..25cb1a35 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureSoundBlockLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureSoundBlockLogic.ts @@ -1,6 +1,6 @@ import { IAssetData, RoomObjectVariable } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room'; -import { RoomObjectSamplePlaybackEvent } from '../../../events/RoomObjectSamplePlaybackEvent'; +import { RoomObjectSamplePlaybackEvent } from '../../../events'; import { ObjectDataUpdateMessage } from '../../../messages'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; diff --git a/src/nitro/room/object/logic/furniture/FurnitureSoundMachineLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureSoundMachineLogic.ts index d63580e3..e35601e4 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureSoundMachineLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureSoundMachineLogic.ts @@ -1,7 +1,7 @@ import { RoomObjectVariable } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room'; import { RoomWidgetEnumItemExtradataParameter } from '../../../../ui'; -import { RoomObjectFurnitureActionEvent } from '../../../events/RoomObjectFurnitureActionEvent'; +import { RoomObjectFurnitureActionEvent } from '../../../events'; import { ObjectDataUpdateMessage } from '../../../messages'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; diff --git a/src/nitro/room/object/logic/furniture/FurnitureStickieLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureStickieLogic.ts index 4e394f19..40591605 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureStickieLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureStickieLogic.ts @@ -1,7 +1,6 @@ import { IAssetData, RoomObjectVariable } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room'; -import { RoomObjectFurnitureActionEvent } from '../../../events/RoomObjectFurnitureActionEvent'; -import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; +import { RoomObjectFurnitureActionEvent, RoomObjectWidgetRequestEvent } from '../../../events'; import { ObjectItemDataUpdateMessage } from '../../../messages'; import { FurnitureLogic } from './FurnitureLogic'; diff --git a/src/nitro/room/object/logic/furniture/FurnitureTrophyLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureTrophyLogic.ts index 0ed0c8c5..0e2125b9 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureTrophyLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureTrophyLogic.ts @@ -1,18 +1,18 @@ -import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; +import { RoomObjectWidgetRequestEvent } from '../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureTrophyLogic extends FurnitureLogic { public getEventTypes(): string[] { - const types = [ RoomObjectWidgetRequestEvent.TROPHY ]; + const types = [RoomObjectWidgetRequestEvent.TROPHY]; return this.mergeTypes(super.getEventTypes(), types); } public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.TROPHY, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureYoutubeLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureYoutubeLogic.ts index be9e99ca..5d8efaa5 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureYoutubeLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureYoutubeLogic.ts @@ -1,6 +1,5 @@ import { RoomObjectVariable } from '../../../../../api'; -import { RoomObjectWidgetRequestEvent } from '../../../events'; -import { RoomObjectDataRequestEvent } from '../../../events/RoomObjectDataRequestEvent'; +import { RoomObjectDataRequestEvent, RoomObjectWidgetRequestEvent } from '../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureYoutubeLogic extends FurnitureLogic diff --git a/src/nitro/room/object/logic/furniture/index.ts b/src/nitro/room/object/logic/furniture/index.ts index 2a8f87d1..d548e949 100644 --- a/src/nitro/room/object/logic/furniture/index.ts +++ b/src/nitro/room/object/logic/furniture/index.ts @@ -1,10 +1,12 @@ export * from './FurnitureAchievementResolutionLogic'; export * from './FurnitureBadgeDisplayLogic'; export * from './FurnitureChangeStateWhenStepOnLogic'; +export * from './FurnitureClothingChangeLogic'; export * from './FurnitureCounterClockLogic'; export * from './FurnitureCrackableLogic'; export * from './FurnitureCraftingGizmoLogic'; export * from './FurnitureCreditLogic'; +export * from './FurnitureCuckooClockLogic'; export * from './FurnitureCustomStackHeightLogic'; export * from './FurnitureDiceLogic'; export * from './FurnitureEcotronBoxLogic'; diff --git a/src/nitro/room/object/logic/pet/PetLogic.ts b/src/nitro/room/object/logic/pet/PetLogic.ts index b559571c..7fb3623a 100644 --- a/src/nitro/room/object/logic/pet/PetLogic.ts +++ b/src/nitro/room/object/logic/pet/PetLogic.ts @@ -1,8 +1,8 @@ import { IAssetData, IRoomGeometry, IRoomObjectModel, PetType, RoomObjectVariable, Vector3d } from '../../../../../api'; import { RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room'; -import { PetFigureData } from '../../../../avatar/pets/PetFigureData'; -import { MouseEventType } from '../../../../ui/MouseEventType'; -import { RoomObjectMoveEvent } from '../../../events/RoomObjectMoveEvent'; +import { PetFigureData } from '../../../../avatar'; +import { MouseEventType } from '../../../../ui'; +import { RoomObjectMoveEvent } from '../../../events'; import { ObjectAvatarChatUpdateMessage, ObjectAvatarExperienceUpdateMessage, ObjectAvatarFigureUpdateMessage, ObjectAvatarPetGestureUpdateMessage, ObjectAvatarPostureUpdateMessage, ObjectAvatarSelectedMessage, ObjectAvatarSleepUpdateMessage, ObjectAvatarUpdateMessage } from '../../../messages'; import { MovingObjectLogic } from '../MovingObjectLogic'; diff --git a/src/nitro/room/object/logic/room/RoomLogic.ts b/src/nitro/room/object/logic/room/RoomLogic.ts index 4b113ac6..c823f231 100644 --- a/src/nitro/room/object/logic/room/RoomLogic.ts +++ b/src/nitro/room/object/logic/room/RoomLogic.ts @@ -2,9 +2,8 @@ import { Point } from '@pixi/math'; import { IRoomGeometry, IRoomObjectModel, RoomObjectVariable, Vector3d } from '../../../../../api'; import { ColorConverter, RoomObjectEvent, RoomObjectLogicBase, RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room'; import { Nitro } from '../../../../Nitro'; -import { MouseEventType } from '../../../../ui/MouseEventType'; -import { RoomObjectTileMouseEvent } from '../../../events/RoomObjectTileMouseEvent'; -import { RoomObjectWallMouseEvent } from '../../../events/RoomObjectWallMouseEvent'; +import { MouseEventType } from '../../../../ui'; +import { RoomObjectTileMouseEvent, RoomObjectWallMouseEvent } from '../../../events'; import { ObjectRoomColorUpdateMessage, ObjectRoomFloorHoleUpdateMessage, ObjectRoomMapUpdateMessage, ObjectRoomMaskUpdateMessage, ObjectRoomPlanePropertyUpdateMessage, ObjectRoomPlaneVisibilityUpdateMessage, ObjectRoomUpdateMessage } from '../../../messages'; import { RoomMapData } from '../../RoomMapData'; import { RoomPlaneBitmapMaskData } from '../../RoomPlaneBitmapMaskData'; diff --git a/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts b/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts index ee84984d..dfe6c2d6 100644 --- a/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts +++ b/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts @@ -3,20 +3,8 @@ import { Resource, Texture } from '@pixi/core'; import { AlphaTolerance, IGraphicAsset, IObjectVisualizationData, IRoomGeometry, IRoomObject, IRoomObjectModel, RoomObjectSpriteType, RoomObjectVariable } from '../../../../../api'; import { AdvancedMap } from '../../../../../core'; import { RoomObjectSpriteVisualization } from '../../../../../room'; -import { AvatarAction } from '../../../../avatar/enum/AvatarAction'; -import { AvatarGuideStatus } from '../../../../avatar/enum/AvatarGuideStatus'; -import { AvatarSetType } from '../../../../avatar/enum/AvatarSetType'; -import { IAvatarEffectListener } from '../../../../avatar/IAvatarEffectListener'; -import { IAvatarImage } from '../../../../avatar/IAvatarImage'; -import { IAvatarImageListener } from '../../../../avatar/IAvatarImageListener'; -import { ExpressionAdditionFactory } from './additions/ExpressionAdditionFactory'; -import { FloatingIdleZAddition } from './additions/FloatingIdleZAddition'; -import { GameClickTargetAddition } from './additions/GameClickTargetAddition'; -import { GuideStatusBubbleAddition } from './additions/GuideStatusBubbleAddition'; -import { IAvatarAddition } from './additions/IAvatarAddition'; -import { MutedBubbleAddition } from './additions/MutedBubbleAddition'; -import { NumberBubbleAddition } from './additions/NumberBubbleAddition'; -import { TypingBubbleAddition } from './additions/TypingBubbleAddition'; +import { AvatarAction, AvatarGuideStatus, AvatarSetType, IAvatarEffectListener, IAvatarImage, IAvatarImageListener } from '../../../../avatar'; +import { ExpressionAdditionFactory, FloatingIdleZAddition, GameClickTargetAddition, GuideStatusBubbleAddition, IAvatarAddition, MutedBubbleAddition, NumberBubbleAddition, TypingBubbleAddition } from './additions'; import { AvatarVisualizationData } from './AvatarVisualizationData'; export class AvatarVisualization extends RoomObjectSpriteVisualization implements IAvatarImageListener, IAvatarEffectListener diff --git a/src/nitro/room/object/visualization/avatar/AvatarVisualizationData.ts b/src/nitro/room/object/visualization/avatar/AvatarVisualizationData.ts index 16092095..a3f7c5f9 100644 --- a/src/nitro/room/object/visualization/avatar/AvatarVisualizationData.ts +++ b/src/nitro/room/object/visualization/avatar/AvatarVisualizationData.ts @@ -1,11 +1,7 @@ import { Resource, Texture } from '@pixi/core'; import { IAssetData, IObjectVisualizationData } from '../../../../../api'; import { Disposable } from '../../../../../core'; -import { AvatarScaleType } from '../../../../avatar/enum/AvatarScaleType'; -import { IAvatarEffectListener } from '../../../../avatar/IAvatarEffectListener'; -import { IAvatarImage } from '../../../../avatar/IAvatarImage'; -import { IAvatarImageListener } from '../../../../avatar/IAvatarImageListener'; -import { IAvatarRenderManager } from '../../../../avatar/IAvatarRenderManager'; +import { AvatarScaleType, IAvatarEffectListener, IAvatarImage, IAvatarImageListener, IAvatarRenderManager } from '../../../../avatar'; export class AvatarVisualizationData extends Disposable implements IObjectVisualizationData { diff --git a/src/nitro/room/object/visualization/avatar/additions/FloatingHeartAddition.ts b/src/nitro/room/object/visualization/avatar/additions/FloatingHeartAddition.ts index 3bccbfa7..b6daef10 100644 --- a/src/nitro/room/object/visualization/avatar/additions/FloatingHeartAddition.ts +++ b/src/nitro/room/object/visualization/avatar/additions/FloatingHeartAddition.ts @@ -1,6 +1,6 @@ import { Resource, Texture } from '@pixi/core'; import { IRoomObjectSprite } from '../../../../../../api'; -import { AvatarAction } from '../../../../../avatar/enum/AvatarAction'; +import { AvatarAction } from '../../../../../avatar'; import { Nitro } from '../../../../../Nitro'; import { AvatarVisualization } from '../AvatarVisualization'; import { ExpressionAddition } from './ExpressionAddition'; diff --git a/src/nitro/room/object/visualization/avatar/additions/FloatingIdleZAddition.ts b/src/nitro/room/object/visualization/avatar/additions/FloatingIdleZAddition.ts index d8dfaf89..a19feb1e 100644 --- a/src/nitro/room/object/visualization/avatar/additions/FloatingIdleZAddition.ts +++ b/src/nitro/room/object/visualization/avatar/additions/FloatingIdleZAddition.ts @@ -1,6 +1,6 @@ import { Resource, Texture } from '@pixi/core'; import { IRoomObjectSprite } from '../../../../../../api'; -import { AvatarAction } from '../../../../../avatar/enum/AvatarAction'; +import { AvatarAction } from '../../../../../avatar'; import { Nitro } from '../../../../../Nitro'; import { AvatarVisualization } from '../AvatarVisualization'; import { IAvatarAddition } from './IAvatarAddition'; diff --git a/src/nitro/room/object/visualization/avatar/additions/GuideStatusBubbleAddition.ts b/src/nitro/room/object/visualization/avatar/additions/GuideStatusBubbleAddition.ts index 70d8d5a9..763e8e60 100644 --- a/src/nitro/room/object/visualization/avatar/additions/GuideStatusBubbleAddition.ts +++ b/src/nitro/room/object/visualization/avatar/additions/GuideStatusBubbleAddition.ts @@ -1,7 +1,6 @@ import { Resource, Texture } from '@pixi/core'; import { IRoomObjectSprite } from '../../../../../../api'; -import { AvatarAction } from '../../../../../avatar/enum/AvatarAction'; -import { AvatarGuideStatus } from '../../../../../avatar/enum/AvatarGuideStatus'; +import { AvatarAction, AvatarGuideStatus } from '../../../../../avatar'; import { AvatarVisualization } from '../AvatarVisualization'; import { IAvatarAddition } from './IAvatarAddition'; diff --git a/src/nitro/room/object/visualization/avatar/additions/MutedBubbleAddition.ts b/src/nitro/room/object/visualization/avatar/additions/MutedBubbleAddition.ts index 20160624..159966b9 100644 --- a/src/nitro/room/object/visualization/avatar/additions/MutedBubbleAddition.ts +++ b/src/nitro/room/object/visualization/avatar/additions/MutedBubbleAddition.ts @@ -1,6 +1,6 @@ import { Resource, Texture } from '@pixi/core'; import { IRoomObjectSprite } from '../../../../../../api'; -import { AvatarAction } from '../../../../../avatar/enum/AvatarAction'; +import { AvatarAction } from '../../../../../avatar'; import { AvatarVisualization } from '../AvatarVisualization'; import { IAvatarAddition } from './IAvatarAddition'; diff --git a/src/nitro/room/object/visualization/avatar/additions/NumberBubbleAddition.ts b/src/nitro/room/object/visualization/avatar/additions/NumberBubbleAddition.ts index 0d04ef2e..ca72fb2c 100644 --- a/src/nitro/room/object/visualization/avatar/additions/NumberBubbleAddition.ts +++ b/src/nitro/room/object/visualization/avatar/additions/NumberBubbleAddition.ts @@ -1,6 +1,6 @@ import { Resource, Texture } from '@pixi/core'; import { IRoomObjectSprite } from '../../../../../../api'; -import { AvatarAction } from '../../../../../avatar/enum/AvatarAction'; +import { AvatarAction } from '../../../../../avatar'; import { AvatarVisualization } from '../AvatarVisualization'; import { IAvatarAddition } from './IAvatarAddition'; diff --git a/src/nitro/room/object/visualization/avatar/additions/TypingBubbleAddition.ts b/src/nitro/room/object/visualization/avatar/additions/TypingBubbleAddition.ts index b8ae4390..3f5909ae 100644 --- a/src/nitro/room/object/visualization/avatar/additions/TypingBubbleAddition.ts +++ b/src/nitro/room/object/visualization/avatar/additions/TypingBubbleAddition.ts @@ -1,6 +1,6 @@ import { Resource, Texture } from '@pixi/core'; import { IRoomObjectSprite } from '../../../../../../api'; -import { AvatarAction } from '../../../../../avatar/enum/AvatarAction'; +import { AvatarAction } from '../../../../../avatar'; import { AvatarVisualization } from '../AvatarVisualization'; import { IAvatarAddition } from './IAvatarAddition'; diff --git a/src/nitro/room/object/visualization/data/SizeData.ts b/src/nitro/room/object/visualization/data/SizeData.ts index 4317fe0f..7420b390 100644 --- a/src/nitro/room/object/visualization/data/SizeData.ts +++ b/src/nitro/room/object/visualization/data/SizeData.ts @@ -1,5 +1,5 @@ import { IAssetColor, IAssetVisualizationDirection, IAssetVisualizationLayer } from '../../../../../api'; -import { SpriteUtilities } from '../../../../../room/utils/SpriteUtilities'; +import { SpriteUtilities } from '../../../../../room'; import { ColorData } from './ColorData'; import { DirectionData } from './DirectionData'; import { LayerData } from './LayerData'; diff --git a/src/nitro/room/object/visualization/furniture/FurnitureAnimatedVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureAnimatedVisualization.ts index 70fc3084..7691e29d 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureAnimatedVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureAnimatedVisualization.ts @@ -1,8 +1,5 @@ -import { IObjectVisualizationData, RoomObjectVariable } from '../../../../../api'; -import { RoomObjectVisualizationType } from '../../RoomObjectVisualizationType'; -import { AnimationData } from '../data/AnimationData'; -import { AnimationFrame } from '../data/AnimationFrame'; -import { AnimationStateData } from '../data/AnimationStateData'; +import { IObjectVisualizationData, RoomObjectVariable, RoomObjectVisualizationType } from '../../../../../api'; +import { AnimationData, AnimationFrame, AnimationStateData } from '../data'; import { FurnitureAnimatedVisualizationData } from './FurnitureAnimatedVisualizationData'; import { FurnitureVisualization } from './FurnitureVisualization'; diff --git a/src/nitro/room/object/visualization/furniture/FurnitureAnimatedVisualizationData.ts b/src/nitro/room/object/visualization/furniture/FurnitureAnimatedVisualizationData.ts index 293338fd..f3e33c3d 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureAnimatedVisualizationData.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureAnimatedVisualizationData.ts @@ -1,6 +1,4 @@ -import { AnimationFrame } from '../data/AnimationFrame'; -import { AnimationSizeData } from '../data/AnimationSizeData'; -import { SizeData } from '../data/SizeData'; +import { AnimationFrame, AnimationSizeData, SizeData } from '../data'; import { FurnitureVisualizationData } from './FurnitureVisualizationData'; export class FurnitureAnimatedVisualizationData extends FurnitureVisualizationData @@ -12,15 +10,15 @@ export class FurnitureAnimatedVisualizationData extends FurnitureVisualizationDa protected processVisualElement(sizeData: SizeData, key: string, data: any): boolean { - if(!sizeData || !key || !data) return false; + if (!sizeData || !key || !data) return false; - switch(key) + switch (key) { case 'animations': - if(!(sizeData instanceof AnimationSizeData) || !sizeData.defineAnimations(data)) return false; + if (!(sizeData instanceof AnimationSizeData) || !sizeData.defineAnimations(data)) return false; break; default: - if(!super.processVisualElement(sizeData, key, data)) return false; + if (!super.processVisualElement(sizeData, key, data)) return false; break; } @@ -31,7 +29,7 @@ export class FurnitureAnimatedVisualizationData extends FurnitureVisualizationDa { const size = this.getSizeData(scale) as AnimationSizeData; - if(!size) return null; + if (!size) return null; return size.hasAnimation(animationId); } @@ -40,7 +38,7 @@ export class FurnitureAnimatedVisualizationData extends FurnitureVisualizationDa { const size = this.getSizeData(scale) as AnimationSizeData; - if(!size) return null; + if (!size) return null; return size.getAnimationCount(); } @@ -49,7 +47,7 @@ export class FurnitureAnimatedVisualizationData extends FurnitureVisualizationDa { const size = this.getSizeData(scale) as AnimationSizeData; - if(!size) return null; + if (!size) return null; return size.getAnimationId(animationId); } @@ -58,7 +56,7 @@ export class FurnitureAnimatedVisualizationData extends FurnitureVisualizationDa { const size = this.getSizeData(scale) as AnimationSizeData; - if(!size) return null; + if (!size) return null; return size.isImmediateChange(animationId, _arg_3); } @@ -67,7 +65,7 @@ export class FurnitureAnimatedVisualizationData extends FurnitureVisualizationDa { const size = this.getSizeData(scale) as AnimationSizeData; - if(!size) return null; + if (!size) return null; return size.getStartFrame(animationId, direction); } @@ -76,17 +74,17 @@ export class FurnitureAnimatedVisualizationData extends FurnitureVisualizationDa { const size = this.getSizeData(scale) as AnimationSizeData; - if(!size) return null; + if (!size) return null; return size.getFrame(animationId, direction, layerId, frameCount); } - public getFrameFromSequence(scale: number, animationId: number, direction: number, layerId: number, sequenceId: number, offset: number, frameCount: number):AnimationFrame + public getFrameFromSequence(scale: number, animationId: number, direction: number, layerId: number, sequenceId: number, offset: number, frameCount: number): AnimationFrame { const size = this.getSizeData(scale) as AnimationSizeData; - if(!size) return null; + if (!size) return null; return size.getFrameFromSequence(animationId, direction, layerId, sequenceId, offset, frameCount); } -} \ No newline at end of file +} diff --git a/src/nitro/room/object/visualization/furniture/FurnitureCuboidVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureCuboidVisualization.ts index 2d1b54ff..41f0e777 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureCuboidVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureCuboidVisualization.ts @@ -1,6 +1,6 @@ -import { RoomObjectSpriteVisualization } from '../../../../../room/object/visualization/RoomObjectSpriteVisualization'; +import { RoomObjectSpriteVisualization } from '../../../../../room'; export class FurnitureCuboidVisualization extends RoomObjectSpriteVisualization { -} \ No newline at end of file +} diff --git a/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualization.ts index 8b90fd6a..a92c1494 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualization.ts @@ -1,6 +1,5 @@ import { IObjectVisualizationData, RoomObjectVariable } from '../../../../../api'; -import { AvatarSetType } from '../../../../avatar/enum/AvatarSetType'; -import { IAvatarImageListener } from '../../../../avatar/IAvatarImageListener'; +import { AvatarSetType, IAvatarImageListener } from '../../../../avatar'; import { FurnitureMannequinVisualizationData } from './FurnitureMannequinVisualizationData'; import { FurnitureVisualization } from './FurnitureVisualization'; diff --git a/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualizationData.ts b/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualizationData.ts index 499e7987..b5f33199 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualizationData.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualizationData.ts @@ -1,8 +1,5 @@ -import { IAvatarEffectListener } from '../../../../avatar/IAvatarEffectListener'; -import { IAvatarImage } from '../../../../avatar/IAvatarImage'; -import { IAvatarImageListener } from '../../../../avatar/IAvatarImageListener'; -import { IAvatarRenderManager } from '../../../../avatar/IAvatarRenderManager'; -import { AvatarVisualizationData } from '../avatar/AvatarVisualizationData'; +import { IAvatarEffectListener, IAvatarImage, IAvatarImageListener, IAvatarRenderManager } from '../../../../avatar'; +import { AvatarVisualizationData } from '../avatar'; import { FurnitureVisualizationData } from './FurnitureVisualizationData'; export class FurnitureMannequinVisualizationData extends FurnitureVisualizationData @@ -20,7 +17,7 @@ export class FurnitureMannequinVisualizationData extends FurnitureVisualizationD { super.dispose(); - if(this._avatarData) + if (this._avatarData) { this._avatarData.dispose(); @@ -30,11 +27,11 @@ export class FurnitureMannequinVisualizationData extends FurnitureVisualizationD public createAvatarImage(figure: string, size: number, gender: string = null, avatarListener: IAvatarImageListener = null, effectListener: IAvatarEffectListener = null): IAvatarImage { - return this._avatarData.createAvatarImage(figure,size, gender, avatarListener, effectListener); + return this._avatarData.createAvatarImage(figure, size, gender, avatarListener, effectListener); } public set avatarManager(renderer: IAvatarRenderManager) { this._avatarData.avatarManager = renderer; } -} \ No newline at end of file +} diff --git a/src/nitro/room/object/visualization/furniture/FurnitureParticleSystemEmitter.ts b/src/nitro/room/object/visualization/furniture/FurnitureParticleSystemEmitter.ts index 3538f487..ab721a7c 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureParticleSystemEmitter.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureParticleSystemEmitter.ts @@ -1,5 +1,5 @@ import { IGraphicAsset } from '../../../../../api'; -import { Vector3D } from '../../../../avatar/geometry/Vector3D'; +import { Vector3D } from '../../../../avatar'; import { ParticleSystemParticle } from '../data'; import { FurnitureParticleSystemParticle } from './FurnitureParticleSystemParticle'; diff --git a/src/nitro/room/object/visualization/furniture/FurnitureParticleSystemParticle.ts b/src/nitro/room/object/visualization/furniture/FurnitureParticleSystemParticle.ts index f92859be..f8006ba4 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureParticleSystemParticle.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureParticleSystemParticle.ts @@ -1,5 +1,5 @@ import { IGraphicAsset } from '../../../../../api'; -import { Vector3D } from '../../../../avatar/geometry/Vector3D'; +import { Vector3D } from '../../../../avatar'; export class FurnitureParticleSystemParticle { diff --git a/src/nitro/room/object/visualization/furniture/FurnitureRoomBackgroundVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureRoomBackgroundVisualization.ts index 35669c8a..59010ceb 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureRoomBackgroundVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureRoomBackgroundVisualization.ts @@ -1,5 +1,5 @@ import { Resource, Texture } from '@pixi/core'; -import { DirectionalOffsetData } from '../data/DirectionalOffsetData'; +import { DirectionalOffsetData } from '../data'; import { FurnitureBrandedImageVisualization } from './FurnitureBrandedImageVisualization'; export class FurnitureRoomBackgroundVisualization extends FurnitureBrandedImageVisualization @@ -10,7 +10,7 @@ export class FurnitureRoomBackgroundVisualization extends FurnitureBrandedImageV { super.imageReady(texture, imageUrl); - if(!texture) return; + if (!texture) return; this.setImageOffset(texture.width, texture.height); } @@ -30,11 +30,11 @@ export class FurnitureRoomBackgroundVisualization extends FurnitureBrandedImageV protected getLayerXOffset(scale: number, direction: number, layerId: number): number { - if(this._imageOffset) + if (this._imageOffset) { const offset = this._imageOffset.getXOffset(direction, 0); - if(offset !== undefined) return offset + this._offsetX; + if (offset !== undefined) return offset + this._offsetX; } return super.getLayerXOffset(scale, direction, layerId) + this._offsetX; @@ -42,11 +42,11 @@ export class FurnitureRoomBackgroundVisualization extends FurnitureBrandedImageV protected getLayerYOffset(scale: number, direction: number, layerId: number): number { - if(this._imageOffset) + if (this._imageOffset) { const offset = this._imageOffset.getYOffset(direction, 0); - if(offset !== undefined) return offset + this._offsetY; + if (offset !== undefined) return offset + this._offsetY; } return super.getLayerYOffset(scale, direction, layerId) + this._offsetY; diff --git a/src/nitro/room/object/visualization/furniture/FurnitureVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureVisualization.ts index 0be29b11..6d943cda 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureVisualization.ts @@ -1,8 +1,6 @@ -import { AlphaTolerance, IGraphicAsset, IObjectVisualizationData, IRoomGeometry, IRoomObjectSprite, RoomObjectVariable } from '../../../../../api'; +import { AlphaTolerance, IGraphicAsset, IObjectVisualizationData, IRoomGeometry, IRoomObjectSprite, RoomObjectVariable, RoomObjectVisualizationType } from '../../../../../api'; import { RoomObjectSpriteVisualization } from '../../../../../room'; -import { RoomObjectVisualizationType } from '../../RoomObjectVisualizationType'; -import { ColorData } from '../data/ColorData'; -import { LayerData } from '../data/LayerData'; +import { ColorData, LayerData } from '../data'; import { FurnitureVisualizationData } from './FurnitureVisualizationData'; export class FurnitureVisualization extends RoomObjectSpriteVisualization diff --git a/src/nitro/room/object/visualization/furniture/FurnitureVisualizationData.ts b/src/nitro/room/object/visualization/furniture/FurnitureVisualizationData.ts index 37a1e811..0c0c57e6 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureVisualizationData.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureVisualizationData.ts @@ -1,7 +1,5 @@ import { IAssetData, IAssetVisualizationData, IObjectVisualizationData } from '../../../../../api'; -import { ColorData } from '../data/ColorData'; -import { LayerData } from '../data/LayerData'; -import { SizeData } from '../data/SizeData'; +import { ColorData, LayerData, SizeData } from '../data'; export class FurnitureVisualizationData implements IObjectVisualizationData { diff --git a/src/nitro/room/object/visualization/furniture/index.ts b/src/nitro/room/object/visualization/furniture/index.ts index 996f2972..01ef20b8 100644 --- a/src/nitro/room/object/visualization/furniture/index.ts +++ b/src/nitro/room/object/visualization/furniture/index.ts @@ -15,6 +15,7 @@ export * from './FurnitureGiftWrappedVisualization'; export * from './FurnitureGuildCustomizedVisualization'; export * from './FurnitureGuildIsometricBadgeVisualization'; export * from './FurnitureHabboWheelVisualization'; +export * from './FurnitureIsometricBBVisualization'; export * from './FurnitureMannequinVisualization'; export * from './FurnitureMannequinVisualizationData'; export * from './FurnitureParticleSystem'; @@ -22,6 +23,7 @@ export * from './FurnitureParticleSystemEmitter'; export * from './FurnitureParticleSystemParticle'; export * from './FurniturePartyBeamerVisualization'; export * from './FurniturePlanetSystemVisualization'; +export * from './FurniturePlanetSystemVisualizationPlanetObject'; export * from './FurniturePosterVisualization'; export * from './FurnitureQueueTileVisualization'; export * from './FurnitureResettingAnimatedVisualization'; diff --git a/src/nitro/room/object/visualization/pet/PetVisualization.ts b/src/nitro/room/object/visualization/pet/PetVisualization.ts index e3fe3ca2..8dbfd100 100644 --- a/src/nitro/room/object/visualization/pet/PetVisualization.ts +++ b/src/nitro/room/object/visualization/pet/PetVisualization.ts @@ -1,13 +1,8 @@ import { Resource, Texture } from '@pixi/core'; -import { IGraphicAsset, IObjectVisualizationData, IRoomGeometry, RoomObjectVariable } from '../../../../../api'; +import { IGraphicAsset, IObjectVisualizationData, IRoomGeometry, RoomObjectVariable, RoomObjectVisualizationType } from '../../../../../api'; import { Nitro } from '../../../../Nitro'; -import { RoomObjectVisualizationType } from '../../RoomObjectVisualizationType'; -import { AnimationData } from '../data/AnimationData'; -import { AnimationStateData } from '../data/AnimationStateData'; -import { DirectionData } from '../data/DirectionData'; -import { LayerData } from '../data/LayerData'; -import { FurnitureAnimatedVisualization } from '../furniture/FurnitureAnimatedVisualization'; -import { FurnitureVisualizationData } from '../furniture/FurnitureVisualizationData'; +import { AnimationData, AnimationStateData, DirectionData, LayerData } from '../data'; +import { FurnitureAnimatedVisualization, FurnitureVisualizationData } from '../furniture'; import { ExperienceData } from './ExperienceData'; import { PetVisualizationData } from './PetVisualizationData'; diff --git a/src/nitro/room/object/visualization/pet/PetVisualizationData.ts b/src/nitro/room/object/visualization/pet/PetVisualizationData.ts index 19df484e..a5b5352e 100644 --- a/src/nitro/room/object/visualization/pet/PetVisualizationData.ts +++ b/src/nitro/room/object/visualization/pet/PetVisualizationData.ts @@ -1,8 +1,6 @@ import { IAssetVisualizationData } from '../../../../../api'; -import { AnimationSizeData } from '../data/AnimationSizeData'; -import { PetSizeData } from '../data/PetSizeData'; -import { SizeData } from '../data/SizeData'; -import { FurnitureAnimatedVisualizationData } from '../furniture/FurnitureAnimatedVisualizationData'; +import { AnimationSizeData, PetSizeData, SizeData } from '../data'; +import { FurnitureAnimatedVisualizationData } from '../furniture'; export class PetVisualizationData extends FurnitureAnimatedVisualizationData { diff --git a/src/nitro/room/object/visualization/pet/index.ts b/src/nitro/room/object/visualization/pet/index.ts index 14c0dea8..02a6ab30 100644 --- a/src/nitro/room/object/visualization/pet/index.ts +++ b/src/nitro/room/object/visualization/pet/index.ts @@ -1,2 +1,3 @@ +export * from './ExperienceData'; export * from './PetVisualization'; export * from './PetVisualizationData'; diff --git a/src/nitro/room/object/visualization/room/RoomPlane.ts b/src/nitro/room/object/visualization/room/RoomPlane.ts index 7e2318fb..1aad4bad 100644 --- a/src/nitro/room/object/visualization/room/RoomPlane.ts +++ b/src/nitro/room/object/visualization/room/RoomPlane.ts @@ -3,15 +3,13 @@ import { Graphics } from '@pixi/graphics'; import { Matrix, Point, Rectangle } from '@pixi/math'; import { IRoomGeometry, IRoomPlane, IVector3D, Vector3d } from '../../../../../api'; import { NitroRenderTexture, TextureUtils } from '../../../../../pixi-proxy'; -import { PlaneMaskManager } from './mask/PlaneMaskManager'; +import { PlaneMaskManager } from './mask'; import { PlaneDrawingData } from './PlaneDrawingData'; -import { PlaneVisualizationLayer } from './rasterizer/basic/PlaneVisualizationLayer'; -import { IPlaneRasterizer } from './rasterizer/IPlaneRasterizer'; +import { IPlaneRasterizer, PlaneVisualizationLayer } from './rasterizer'; import { RoomPlaneBitmapMask } from './RoomPlaneBitmapMask'; import { RoomPlaneRectangleMask } from './RoomPlaneRectangleMask'; import { RoomVisualization } from './RoomVisualization'; -import { PlaneBitmapData } from './utils/PlaneBitmapData'; -import { Randomizer } from './utils/Randomizer'; +import { PlaneBitmapData, Randomizer } from './utils'; export class RoomPlane implements IRoomPlane { diff --git a/src/nitro/room/object/visualization/room/RoomVisualizationData.ts b/src/nitro/room/object/visualization/room/RoomVisualizationData.ts index f9bdec54..1dd28e8b 100644 --- a/src/nitro/room/object/visualization/room/RoomVisualizationData.ts +++ b/src/nitro/room/object/visualization/room/RoomVisualizationData.ts @@ -1,9 +1,7 @@ import { IAssetData, IGraphicAssetCollection, IObjectVisualizationData } from '../../../../../api'; import { Disposable } from '../../../../../core'; -import { PlaneMaskManager } from './mask/PlaneMaskManager'; -import { LandscapeRasterizer } from './rasterizer/animated/LandscapeRasterizer'; -import { FloorRasterizer } from './rasterizer/basic/FloorRasterizer'; -import { WallRasterizer } from './rasterizer/basic/WallRasterizer'; +import { PlaneMaskManager } from './mask'; +import { FloorRasterizer, LandscapeRasterizer, WallRasterizer } from './rasterizer'; export class RoomVisualizationData extends Disposable implements IObjectVisualizationData { diff --git a/src/nitro/room/object/visualization/room/TileCursorVisualization.ts b/src/nitro/room/object/visualization/room/TileCursorVisualization.ts index 122ade26..b732980d 100644 --- a/src/nitro/room/object/visualization/room/TileCursorVisualization.ts +++ b/src/nitro/room/object/visualization/room/TileCursorVisualization.ts @@ -1,5 +1,5 @@ import { RoomObjectVariable } from '../../../../../api'; -import { FurnitureAnimatedVisualization } from '../furniture/FurnitureAnimatedVisualization'; +import { FurnitureAnimatedVisualization } from '../furniture'; export class TileCursorVisualization extends FurnitureAnimatedVisualization { diff --git a/src/nitro/room/object/visualization/room/index.ts b/src/nitro/room/object/visualization/room/index.ts index 907fc0d4..79471716 100644 --- a/src/nitro/room/object/visualization/room/index.ts +++ b/src/nitro/room/object/visualization/room/index.ts @@ -1,6 +1,8 @@ export * from './mask'; export * from './PlaneDrawingData'; export * from './rasterizer'; +export * from './rasterizer/animated'; +export * from './rasterizer/basic'; export * from './RoomPlane'; export * from './RoomPlaneBitmapMask'; export * from './RoomPlaneRectangleMask'; diff --git a/src/nitro/room/object/visualization/room/rasterizer/IPlaneRasterizer.ts b/src/nitro/room/object/visualization/room/rasterizer/IPlaneRasterizer.ts index 8e25951f..1d49aa97 100644 --- a/src/nitro/room/object/visualization/room/rasterizer/IPlaneRasterizer.ts +++ b/src/nitro/room/object/visualization/room/rasterizer/IPlaneRasterizer.ts @@ -1,7 +1,7 @@ import { Graphics } from '@pixi/graphics'; import { IVector3D } from '../../../../../../api'; -import { PlaneBitmapData } from '../utils/PlaneBitmapData'; -import { PlaneVisualizationLayer } from './basic/PlaneVisualizationLayer'; +import { PlaneBitmapData } from '../utils'; +import { PlaneVisualizationLayer } from './basic'; export interface IPlaneRasterizer { diff --git a/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapePlane.ts b/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapePlane.ts index 338d992e..e255650f 100644 --- a/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapePlane.ts +++ b/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapePlane.ts @@ -1,6 +1,6 @@ import { Graphics } from '@pixi/graphics'; import { IVector3D, Vector3d } from '../../../../../../../api'; -import { Plane } from '../basic/Plane'; +import { Plane } from '../basic'; export class LandscapePlane extends Plane { diff --git a/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapeRasterizer.ts b/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapeRasterizer.ts index 533c72af..f46b3b87 100644 --- a/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapeRasterizer.ts +++ b/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapeRasterizer.ts @@ -1,11 +1,8 @@ import { Graphics } from '@pixi/graphics'; import { IVector3D } from '../../../../../../../api'; import { Nitro } from '../../../../../../Nitro'; -import { PlaneBitmapData } from '../../utils/PlaneBitmapData'; -import { Randomizer } from '../../utils/Randomizer'; -import { PlaneMaterial } from '../basic/PlaneMaterial'; -import { PlaneRasterizer } from '../basic/PlaneRasterizer'; -import { PlaneVisualizationLayer } from '../basic/PlaneVisualizationLayer'; +import { PlaneBitmapData, Randomizer } from '../../utils'; +import { PlaneMaterial, PlaneRasterizer, PlaneVisualizationLayer } from '../basic'; import { LandscapePlane } from './LandscapePlane'; export class LandscapeRasterizer extends PlaneRasterizer diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/FloorRasterizer.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/FloorRasterizer.ts index 0635610e..bc0f520d 100644 --- a/src/nitro/room/object/visualization/room/rasterizer/basic/FloorRasterizer.ts +++ b/src/nitro/room/object/visualization/room/rasterizer/basic/FloorRasterizer.ts @@ -1,6 +1,6 @@ import { Graphics } from '@pixi/graphics'; import { IVector3D } from '../../../../../../../api'; -import { PlaneBitmapData } from '../../utils/PlaneBitmapData'; +import { PlaneBitmapData } from '../../utils'; import { FloorPlane } from './FloorPlane'; import { PlaneRasterizer } from './PlaneRasterizer'; diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCellMatrix.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCellMatrix.ts index 3147965f..6b9930f7 100644 --- a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCellMatrix.ts +++ b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCellMatrix.ts @@ -3,7 +3,7 @@ import { Point, Rectangle } from '@pixi/math'; import { IVector3D, Vector3d } from '../../../../../../../api'; import { TextureUtils } from '../../../../../../../pixi-proxy'; import { RoomVisualization } from '../../RoomVisualization'; -import { Randomizer } from '../../utils/Randomizer'; +import { Randomizer } from '../../utils'; import { PlaneMaterialCell } from './PlaneMaterialCell'; import { PlaneMaterialCellColumn } from './PlaneMaterialCellColumn'; diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneRasterizer.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneRasterizer.ts index 787696d8..66053adf 100644 --- a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneRasterizer.ts +++ b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneRasterizer.ts @@ -3,7 +3,7 @@ import { Graphics } from '@pixi/graphics'; import { Point } from '@pixi/math'; import { IGraphicAsset, IGraphicAssetCollection, IRoomGeometry, IVector3D, Vector3d } from '../../../../../../../api'; import { Rasterizer, RoomGeometry } from '../../../../../../../room'; -import { PlaneBitmapData } from '../../utils/PlaneBitmapData'; +import { PlaneBitmapData } from '../../utils'; import { IPlaneRasterizer } from '../IPlaneRasterizer'; import { FloorPlane } from './FloorPlane'; import { Plane } from './Plane'; diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneVisualization.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneVisualization.ts index fea1866f..1267fef2 100644 --- a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneVisualization.ts +++ b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneVisualization.ts @@ -1,6 +1,6 @@ import { Graphics } from '@pixi/graphics'; import { IDisposable, IGraphicAssetCollection, IRoomGeometry, IVector3D, Vector3d } from '../../../../../../../api'; -import { PlaneVisualizationAnimationLayer } from '../animated/PlaneVisualizationAnimationLayer'; +import { PlaneVisualizationAnimationLayer } from '../animated'; import { PlaneMaterial } from './PlaneMaterial'; import { PlaneVisualizationLayer } from './PlaneVisualizationLayer'; diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/WallRasterizer.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/WallRasterizer.ts index c28045dc..d1c7b807 100644 --- a/src/nitro/room/object/visualization/room/rasterizer/basic/WallRasterizer.ts +++ b/src/nitro/room/object/visualization/room/rasterizer/basic/WallRasterizer.ts @@ -1,6 +1,6 @@ import { Graphics } from '@pixi/graphics'; import { IVector3D } from '../../../../../../../api'; -import { PlaneBitmapData } from '../../utils/PlaneBitmapData'; +import { PlaneBitmapData } from '../../utils'; import { PlaneRasterizer } from './PlaneRasterizer'; import { WallPlane } from './WallPlane'; diff --git a/src/nitro/room/preview/RoomPreviewer.ts b/src/nitro/room/preview/RoomPreviewer.ts index f2ed1bf1..04127656 100644 --- a/src/nitro/room/preview/RoomPreviewer.ts +++ b/src/nitro/room/preview/RoomPreviewer.ts @@ -7,8 +7,7 @@ import { NitroSprite } from '../../../pixi-proxy'; import { RoomId } from '../../../room'; import { FloorHeightMapMessageParser, RoomEntryTileMessageParser } from '../../communication'; import { Nitro } from '../../Nitro'; -import { RoomEngineEvent } from '../events/RoomEngineEvent'; -import { RoomEngineObjectEvent } from '../events/RoomEngineObjectEvent'; +import { RoomEngineEvent, RoomEngineObjectEvent } from '../events'; import { ObjectRoomMapUpdateMessage } from '../messages'; import { RoomPlaneParser } from '../object/RoomPlaneParser'; import { RoomEngine } from '../RoomEngine'; diff --git a/src/nitro/room/utils/SpriteDataCollector.ts b/src/nitro/room/utils/SpriteDataCollector.ts index deac7d38..1c668649 100644 --- a/src/nitro/room/utils/SpriteDataCollector.ts +++ b/src/nitro/room/utils/SpriteDataCollector.ts @@ -1,7 +1,7 @@ import { Point, Rectangle } from '@pixi/math'; import { IPlaneDrawingData, IPlaneVisualization, IRoomObjectSpriteVisualization, IRoomPlane, IRoomRenderingCanvas, RoomObjectCategory, RoomObjectSpriteData, Vector3d } from '../../../api'; import { PixiApplicationProxy } from '../../../pixi-proxy'; -import { PlaneDrawingData } from '../object/visualization/room/PlaneDrawingData'; +import { PlaneDrawingData } from '../object'; import { RoomEngine } from '../RoomEngine'; export class SpriteDataCollector diff --git a/src/nitro/session/RoomSession.ts b/src/nitro/session/RoomSession.ts index 9bd0bb65..2bbf44c0 100644 --- a/src/nitro/session/RoomSession.ts +++ b/src/nitro/session/RoomSession.ts @@ -1,7 +1,7 @@ import { IConnection, IRoomSession, RoomControllerLevel, RoomTradingLevelEnum } from '../../api'; import { Disposable } from '../../core'; import { BotRemoveComposer, CompostPlantMessageComposer, FurnitureMultiStateComposer, HarvestPetMessageComposer, MoodlightSettingsComposer, MoodlightSettingsSaveComposer, MoodlightTogggleStateComposer, OpenPresentComposer, PetMountComposer, PetRemoveComposer, PollAnswerComposer, PollRejectComposer, PollStartComposer, RemovePetSaddleComposer, RoomAmbassadorAlertComposer, RoomBanUserComposer, RoomDoorbellAccessComposer, RoomEnterComposer, RoomGiveRightsComposer, RoomKickUserComposer, RoomModerationSettings, RoomMuteUserComposer, RoomTakeRightsComposer, RoomUnitActionComposer, RoomUnitChatComposer, RoomUnitChatShoutComposer, RoomUnitChatWhisperComposer, RoomUnitDanceComposer, RoomUnitPostureComposer, RoomUnitSignComposer, RoomUnitTypingStartComposer, RoomUnitTypingStopComposer, TogglePetBreedingComposer, TogglePetRidingComposer, UsePetProductComposer, UserMottoComposer } from '../communication'; -import { RoomSessionEvent } from './events/RoomSessionEvent'; +import { RoomSessionEvent } from './events'; import { UserDataManager } from './UserDataManager'; export class RoomSession extends Disposable implements IRoomSession diff --git a/src/nitro/session/RoomSessionManager.ts b/src/nitro/session/RoomSessionManager.ts index 27156ce3..473d7b1c 100644 --- a/src/nitro/session/RoomSessionManager.ts +++ b/src/nitro/session/RoomSessionManager.ts @@ -1,18 +1,8 @@ import { INitroCommunicationManager, IRoomEngine, IRoomHandlerListener, IRoomSession, IRoomSessionManager } from '../../api'; import { NitroManager } from '../../core'; -import { RoomEngineEvent } from '../room/events/RoomEngineEvent'; -import { RoomSessionEvent } from './events/RoomSessionEvent'; -import { BaseHandler } from './handler/BaseHandler'; -import { GenericErrorHandler } from './handler/GenericErrorHandler'; -import { PollHandler } from './handler/PollHandler'; -import { RoomChatHandler } from './handler/RoomChatHandler'; -import { RoomDataHandler } from './handler/RoomDataHandler'; -import { RoomDimmerPresetsHandler } from './handler/RoomDimmerPresetsHandler'; -import { RoomPermissionsHandler } from './handler/RoomPermissionsHandler'; -import { RoomPresentHandler } from './handler/RoomPresentHandler'; -import { RoomSessionHandler } from './handler/RoomSessionHandler'; -import { RoomUsersHandler } from './handler/RoomUsersHandler'; -import { WordQuizHandler } from './handler/WordQuizHandler'; +import { RoomEngineEvent } from '../room'; +import { RoomSessionEvent } from './events'; +import { BaseHandler, GenericErrorHandler, PollHandler, RoomChatHandler, RoomDataHandler, RoomDimmerPresetsHandler, RoomPermissionsHandler, RoomPresentHandler, RoomSessionHandler, RoomUsersHandler, WordQuizHandler } from './handler'; import { RoomSession } from './RoomSession'; export class RoomSessionManager extends NitroManager implements IRoomSessionManager, IRoomHandlerListener diff --git a/src/nitro/session/SessionDataManager.ts b/src/nitro/session/SessionDataManager.ts index 876e7a8d..bc252bdb 100644 --- a/src/nitro/session/SessionDataManager.ts +++ b/src/nitro/session/SessionDataManager.ts @@ -2,13 +2,11 @@ import { Resource, Texture } from '@pixi/core'; import { IFurnitureData, IFurnitureDataListener, IGroupInformationManager, IMessageComposer, INitroCommunicationManager, IProductData, IProductDataListener, ISessionDataManager, NoobnessLevelEnum, SecurityLevel } from '../../api'; import { NitroEvent, NitroManager } from '../../core'; import { AvailabilityStatusMessageEvent, ChangeUserNameResultMessageEvent, FigureUpdateEvent, InClientLinkEvent, MysteryBoxKeysEvent, NoobnessLevelMessageEvent, PetRespectComposer, RoomReadyMessageEvent, RoomUnitChatComposer, UserInfoEvent, UserNameChangeMessageEvent, UserPermissionsEvent, UserRespectComposer } from '../communication'; -import { NitroSettingsEvent } from '../events/NitroSettingsEvent'; +import { NitroSettingsEvent } from '../events'; import { Nitro } from '../Nitro'; import { HabboWebTools } from '../utils/HabboWebTools'; import { BadgeImageManager } from './badge/BadgeImageManager'; -import { MysteryBoxKeysUpdateEvent } from './events'; -import { SessionDataPreferencesEvent } from './events/SessionDataPreferencesEvent'; -import { UserNameUpdateEvent } from './events/UserNameUpdateEvent'; +import { MysteryBoxKeysUpdateEvent, SessionDataPreferencesEvent, UserNameUpdateEvent } from './events'; import { FurnitureDataLoader } from './furniture/FurnitureDataLoader'; import { GroupInformationManager } from './GroupInformationManager'; import { IgnoredUsersManager } from './IgnoredUsersManager'; diff --git a/src/nitro/session/badge/BadgeImageManager.ts b/src/nitro/session/badge/BadgeImageManager.ts index ef3da20e..1da27a3f 100644 --- a/src/nitro/session/badge/BadgeImageManager.ts +++ b/src/nitro/session/badge/BadgeImageManager.ts @@ -3,7 +3,7 @@ import { IAssetManager, IDisposable, IMessageEvent } from '../../../api'; import { NitroContainer, NitroSprite, NitroTexture, TextureUtils } from '../../../pixi-proxy'; import { GroupBadgePartsEvent } from '../../communication'; import { Nitro } from '../../Nitro'; -import { BadgeImageReadyEvent } from '../events/BadgeImageReadyEvent'; +import { BadgeImageReadyEvent } from '../events'; import { SessionDataManager } from './../SessionDataManager'; import { BadgeInfo } from './BadgeInfo'; import { GroupBadge } from './GroupBadge'; diff --git a/src/nitro/session/badge/GroupBadgePart.ts b/src/nitro/session/badge/GroupBadgePart.ts index 08b1c343..0bf12af7 100644 --- a/src/nitro/session/badge/GroupBadgePart.ts +++ b/src/nitro/session/badge/GroupBadgePart.ts @@ -1,4 +1,4 @@ -import { NitroPoint, NitroTexture } from '../../..'; +import { NitroPoint, NitroTexture } from '../../../pixi-proxy'; export class GroupBadgePart { @@ -27,7 +27,7 @@ export class GroupBadgePart public get code(): string { - if(this.key === 0) return null; + if (this.key === 0) return null; return GroupBadgePart.getCode(this.type, this.key, this.color, this.position); } @@ -37,20 +37,20 @@ export class GroupBadgePart return (type === GroupBadgePart.BASE ? type : key >= 100 ? GroupBadgePart.SYMBOL_ALT : GroupBadgePart.SYMBOL) + (key < 10 ? '0' : '') + (type === GroupBadgePart.BASE ? key : key >= 100 ? key - 100 : key) + (color < 10 ? '0' : '') + color + position; } - public calculatePosition(asset: NitroTexture) : NitroPoint + public calculatePosition(asset: NitroTexture): NitroPoint { const gridPos = this.calculateGridPos(this.position); let x: number = (((GroupBadgePart.CELL_WIDTH * gridPos.x) + (GroupBadgePart.CELL_WIDTH / 2)) - (asset.width / 2)); let y: number = (((GroupBadgePart.CELL_HEIGHT * gridPos.y) + (GroupBadgePart.CELL_HEIGHT / 2)) - (asset.height / 2)); - if(x < 0) x = 0; + if (x < 0) x = 0; - if((x + asset.width) > GroupBadgePart.IMAGE_WIDTH) x = (GroupBadgePart.IMAGE_WIDTH - asset.width); + if ((x + asset.width) > GroupBadgePart.IMAGE_WIDTH) x = (GroupBadgePart.IMAGE_WIDTH - asset.width); - if(y < 0) y = 0; + if (y < 0) y = 0; - if((y + asset.height) > GroupBadgePart.IMAGE_HEIGHT) y = (GroupBadgePart.IMAGE_HEIGHT - asset.height); + if ((y + asset.height) > GroupBadgePart.IMAGE_HEIGHT) y = (GroupBadgePart.IMAGE_HEIGHT - asset.height); return new NitroPoint(Math.floor(x), Math.floor(y)); } diff --git a/src/nitro/session/handler/GenericErrorHandler.ts b/src/nitro/session/handler/GenericErrorHandler.ts index da1288a7..aa4c6d83 100644 --- a/src/nitro/session/handler/GenericErrorHandler.ts +++ b/src/nitro/session/handler/GenericErrorHandler.ts @@ -1,6 +1,6 @@ import { GenericErrorEnum, IConnection, IRoomHandlerListener } from '../../../api'; import { GenericErrorEvent } from '../../communication'; -import { RoomSessionErrorMessageEvent } from '../events/RoomSessionErrorMessageEvent'; +import { RoomSessionErrorMessageEvent } from '../events'; import { BaseHandler } from './BaseHandler'; export class GenericErrorHandler extends BaseHandler diff --git a/src/nitro/session/handler/PollHandler.ts b/src/nitro/session/handler/PollHandler.ts index 5fa1022d..8ecff7f7 100644 --- a/src/nitro/session/handler/PollHandler.ts +++ b/src/nitro/session/handler/PollHandler.ts @@ -1,6 +1,6 @@ import { IConnection, IRoomHandlerListener } from '../../../api'; import { PollContentsEvent, PollErrorEvent, PollOfferEvent } from '../../communication'; -import { RoomSessionPollEvent } from '../events/RoomSessionPollEvent'; +import { RoomSessionPollEvent } from '../events'; import { BaseHandler } from './BaseHandler'; export class PollHandler extends BaseHandler diff --git a/src/nitro/session/handler/RoomChatHandler.ts b/src/nitro/session/handler/RoomChatHandler.ts index fbe2dc2a..0cca74b0 100644 --- a/src/nitro/session/handler/RoomChatHandler.ts +++ b/src/nitro/session/handler/RoomChatHandler.ts @@ -1,7 +1,7 @@ import { IConnection, IRoomHandlerListener } from '../../../api'; import { FloodControlEvent, PetRespectNoficationEvent, PetSupplementedNotificationEvent, PetSupplementTypeEnum, RemainingMuteEvent, RespectReceivedEvent, RoomUnitChatEvent, RoomUnitChatShoutEvent, RoomUnitChatWhisperEvent, RoomUnitHandItemReceivedEvent } from '../../communication'; import { SystemChatStyleEnum } from '../../ui/widget/enums/SystemChatStyleEnum'; -import { RoomSessionChatEvent } from '../events/RoomSessionChatEvent'; +import { RoomSessionChatEvent } from '../events'; import { BaseHandler } from './BaseHandler'; export class RoomChatHandler extends BaseHandler diff --git a/src/nitro/session/handler/RoomDataHandler.ts b/src/nitro/session/handler/RoomDataHandler.ts index a8478ae8..34d4a4c2 100644 --- a/src/nitro/session/handler/RoomDataHandler.ts +++ b/src/nitro/session/handler/RoomDataHandler.ts @@ -1,7 +1,6 @@ import { IConnection, IRoomHandlerListener } from '../../../api'; import { GetGuestRoomResultEvent } from '../../communication'; -import { RoomSessionEvent } from '../events/RoomSessionEvent'; -import { RoomSessionPropertyUpdateEvent } from '../events/RoomSessionPropertyUpdateEvent'; +import { RoomSessionEvent, RoomSessionPropertyUpdateEvent } from '../events'; import { BaseHandler } from './BaseHandler'; export class RoomDataHandler extends BaseHandler diff --git a/src/nitro/session/handler/RoomDimmerPresetsHandler.ts b/src/nitro/session/handler/RoomDimmerPresetsHandler.ts index 9e9fbb90..4a9c28b7 100644 --- a/src/nitro/session/handler/RoomDimmerPresetsHandler.ts +++ b/src/nitro/session/handler/RoomDimmerPresetsHandler.ts @@ -1,6 +1,6 @@ import { IConnection, IRoomHandlerListener } from '../../../api'; import { RoomDimmerPresetsEvent } from '../../communication'; -import { RoomSessionDimmerPresetsEvent } from '../events/RoomSessionDimmerPresetsEvent'; +import { RoomSessionDimmerPresetsEvent } from '../events'; import { BaseHandler } from './BaseHandler'; export class RoomDimmerPresetsHandler extends BaseHandler diff --git a/src/nitro/session/handler/RoomPresentHandler.ts b/src/nitro/session/handler/RoomPresentHandler.ts index 568ca7e5..5762dbce 100644 --- a/src/nitro/session/handler/RoomPresentHandler.ts +++ b/src/nitro/session/handler/RoomPresentHandler.ts @@ -1,6 +1,6 @@ import { IConnection, IRoomHandlerListener } from '../../../api'; import { PresentOpenedMessageEvent } from '../../communication'; -import { RoomSessionPresentEvent } from '../events/RoomSessionPresentEvent'; +import { RoomSessionPresentEvent } from '../events'; import { BaseHandler } from './BaseHandler'; export class RoomPresentHandler extends BaseHandler diff --git a/src/nitro/session/handler/RoomSessionHandler.ts b/src/nitro/session/handler/RoomSessionHandler.ts index 67202f84..f7874f14 100644 --- a/src/nitro/session/handler/RoomSessionHandler.ts +++ b/src/nitro/session/handler/RoomSessionHandler.ts @@ -1,7 +1,7 @@ import { IConnection, IRoomHandlerListener } from '../../../api'; import { DesktopViewEvent, FlatAccessDeniedMessageEvent, GoToFlatMessageComposer, RoomDoorbellAcceptedEvent, RoomEnterEvent, RoomReadyMessageEvent, YouAreSpectatorMessageEvent } from '../../communication'; -import { RoomSessionDoorbellEvent } from '../events/RoomSessionDoorbellEvent'; -import { RoomSessionSpectatorModeEvent } from './../events/RoomSessionSpectatorModeEvent'; +import { RoomSessionDoorbellEvent } from '../events'; +import { RoomSessionSpectatorModeEvent } from './../events'; import { BaseHandler } from './BaseHandler'; export class RoomSessionHandler extends BaseHandler diff --git a/src/nitro/session/handler/RoomUsersHandler.ts b/src/nitro/session/handler/RoomUsersHandler.ts index fd673046..6b54e19b 100644 --- a/src/nitro/session/handler/RoomUsersHandler.ts +++ b/src/nitro/session/handler/RoomUsersHandler.ts @@ -1,14 +1,6 @@ import { IConnection, IRoomHandlerListener, IRoomUserData } from '../../../api'; import { BotErrorEvent, DoorbellMessageEvent, FavoriteMembershipUpdateMessageEvent, NewFriendRequestEvent, PetFigureUpdateEvent, PetInfoEvent, PetPlacingErrorEvent, PetStatusUpdateEvent, RoomUnitDanceEvent, RoomUnitEvent, RoomUnitInfoEvent, RoomUnitRemoveEvent, UserCurrentBadgesEvent, UserNameChangeMessageEvent } from '../../communication'; -import { RoomSessionPetFigureUpdateEvent, RoomSessionPetStatusUpdateEvent, RoomSessionUserFigureUpdateEvent } from '../events'; -import { RoomSessionDanceEvent } from '../events/RoomSessionDanceEvent'; -import { RoomSessionDoorbellEvent } from '../events/RoomSessionDoorbellEvent'; -import { RoomSessionErrorMessageEvent } from '../events/RoomSessionErrorMessageEvent'; -import { RoomSessionFavoriteGroupUpdateEvent } from '../events/RoomSessionFavoriteGroupUpdateEvent'; -import { RoomSessionFriendRequestEvent } from '../events/RoomSessionFriendRequestEvent'; -import { RoomSessionPetInfoUpdateEvent } from '../events/RoomSessionPetInfoUpdateEvent'; -import { RoomSessionUserBadgesEvent } from '../events/RoomSessionUserBadgesEvent'; -import { RoomSessionUserDataUpdateEvent } from '../events/RoomSessionUserDataUpdateEvent'; +import { RoomSessionDanceEvent, RoomSessionDoorbellEvent, RoomSessionErrorMessageEvent, RoomSessionFavoriteGroupUpdateEvent, RoomSessionFriendRequestEvent, RoomSessionPetFigureUpdateEvent, RoomSessionPetInfoUpdateEvent, RoomSessionPetStatusUpdateEvent, RoomSessionUserBadgesEvent, RoomSessionUserDataUpdateEvent, RoomSessionUserFigureUpdateEvent } from '../events'; import { RoomPetData } from '../RoomPetData'; import { RoomUserData } from '../RoomUserData'; import { BaseHandler } from './BaseHandler'; diff --git a/src/nitro/session/handler/WordQuizHandler.ts b/src/nitro/session/handler/WordQuizHandler.ts index f032c080..b66dac7d 100644 --- a/src/nitro/session/handler/WordQuizHandler.ts +++ b/src/nitro/session/handler/WordQuizHandler.ts @@ -1,6 +1,6 @@ import { IConnection, IRoomHandlerListener } from '../../../api'; import { QuestionAnsweredEvent, QuestionEvent, QuestionFinishedEvent } from '../../communication'; -import { RoomSessionWordQuizEvent } from '../events/RoomSessionWordQuizEvent'; +import { RoomSessionWordQuizEvent } from '../events'; import { BaseHandler } from './BaseHandler'; export class WordQuizHandler extends BaseHandler diff --git a/src/nitro/session/handler/index.ts b/src/nitro/session/handler/index.ts index 32a2f45a..d7f53252 100644 --- a/src/nitro/session/handler/index.ts +++ b/src/nitro/session/handler/index.ts @@ -1,5 +1,6 @@ export * from './BaseHandler'; export * from './GenericErrorHandler'; +export * from './PollHandler'; export * from './RoomChatHandler'; export * from './RoomDataHandler'; export * from './RoomDimmerPresetsHandler'; @@ -7,3 +8,4 @@ export * from './RoomPermissionsHandler'; export * from './RoomPresentHandler'; export * from './RoomSessionHandler'; export * from './RoomUsersHandler'; +export * from './WordQuizHandler'; diff --git a/src/nitro/sound/SoundManager.ts b/src/nitro/sound/SoundManager.ts index e9bb80e1..51902ec3 100644 --- a/src/nitro/sound/SoundManager.ts +++ b/src/nitro/sound/SoundManager.ts @@ -1,6 +1,5 @@ import { AdvancedMap, NitroEvent, NitroManager } from '../../core'; -import { NitroSettingsEvent } from '../events'; -import { NitroSoundEvent } from '../events/NitroSoundEvent'; +import { NitroSettingsEvent, NitroSoundEvent } from '../events'; import { Nitro } from '../Nitro'; import { RoomEngineEvent, RoomEngineObjectEvent, RoomEngineSamplePlaybackEvent } from '../room'; import { ISoundManager } from './ISoundManager'; diff --git a/src/nitro/sound/events/index.ts b/src/nitro/sound/events/index.ts new file mode 100644 index 00000000..a1ffd069 --- /dev/null +++ b/src/nitro/sound/events/index.ts @@ -0,0 +1 @@ +export * from './SoundManagerEvent'; diff --git a/src/nitro/sound/index.ts b/src/nitro/sound/index.ts new file mode 100644 index 00000000..fb75f4a2 --- /dev/null +++ b/src/nitro/sound/index.ts @@ -0,0 +1,12 @@ +export * from './common/SongStartRequestData'; +export * from './common/TraxChannel'; +export * from './common/TraxChannelItem'; +export * from './common/TraxData'; +export * from './common/TraxSample'; +export * from './common/TraxSequencer'; +export * from './events'; +export * from './ISoundManager'; +export * from './music/IMusicManager'; +export * from './music/MusicManager'; +export * from './music/MusicPriorities'; +export * from './SoundManager'; diff --git a/src/nitro/sound/music/MusicManager.ts b/src/nitro/sound/music/MusicManager.ts index ca04a760..ecbf48c0 100644 --- a/src/nitro/sound/music/MusicManager.ts +++ b/src/nitro/sound/music/MusicManager.ts @@ -1,9 +1,9 @@ import { NitroEvent, NitroManager } from '../../../core'; import { GetSongInfoMessageComposer, JukeboxPlayListFullMessageEvent, JukeboxSongDisksMessageEvent, NowPlayingMessageEvent, SongInfoEntry, TraxSongInfoMessageEvent, UserSongDisksInventoryMessageEvent } from '../../communication'; import { Nitro } from '../../Nitro'; -import { RoomObjectSoundMachineEvent } from '../../room/events/RoomObjectSoundMachineEvent'; +import { RoomObjectSoundMachineEvent } from '../../room/events'; import { SongStartRequestData } from '../common/SongStartRequestData'; -import { SoundManagerEvent } from '../events/SoundManagerEvent'; +import { SoundManagerEvent } from '../events'; import { IMusicManager } from './IMusicManager'; import { MusicPriorities } from './MusicPriorities'; diff --git a/src/room/RoomManager.ts b/src/room/RoomManager.ts index 35687514..870e20d8 100644 --- a/src/room/RoomManager.ts +++ b/src/room/RoomManager.ts @@ -1,7 +1,7 @@ import { IGraphicAssetCollection, IRoomContentLoader, IRoomInstance, IRoomInstanceContainer, IRoomManager, IRoomManagerListener, IRoomObject, IRoomObjectController, IRoomObjectLogicFactory, IRoomObjectManager, IRoomObjectVisualizationFactory } from '../api'; import { NitroManager } from '../core'; import { RoomContentLoader } from '../nitro/room/RoomContentLoader'; -import { RoomContentLoadedEvent } from './events/RoomContentLoadedEvent'; +import { RoomContentLoadedEvent } from './events'; import { RoomInstance } from './RoomInstance'; import { RoomObjectManager } from './RoomObjectManager';