Move some events, fix fps again

src/events/room/RoomContentLoadedEvent.ts

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

src/events/room/RoomObjectBadgeAssetEvent.ts

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

src/events/room/RoomObjectDataRequestEvent.ts

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

src/events/room/RoomObjectDimmerStateUpdateEvent.ts

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

src/events/room/RoomObjectFloorHoleEvent.ts

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

src/events/room/RoomObjectFurnitureActionEvent.ts

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

src/events/room/RoomObjectHSLColorEnableEvent.ts

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

src/events/room/RoomObjectMoveEvent.ts

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

src/events/room/RoomObjectRoomAdEvent.ts

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

src/events/room/RoomObjectSamplePlaybackEvent.ts

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

src/events/room/RoomObjectStateChangedEvent.ts

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

src/events/room/RoomObjectTileMouseEvent.ts

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

src/events/room/RoomObjectWallMouseEvent.ts

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

src/events/room/RoomObjectWidgetRequestEvent.ts

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

src/events/room/RoomToObjectEvent.ts

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

src/events/room/RoomToObjectOwnAvatarMoveEvent.ts

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

src/events/room/index.ts

@@ -1,4 +1,5 @@
 export * from './RoomBackgroundColorEvent';
+export * from './RoomContentLoadedEvent';
 export * from './RoomDragEvent';
 export * from './RoomEngineDimmerStateEvent';
 export * from './RoomEngineEvent';
@@ -13,10 +14,12 @@ export * from './RoomEngineUseProductEvent';
 export * from './RoomObjectBadgeAssetEvent';
 export * from './RoomObjectDataRequestEvent';
 export * from './RoomObjectDimmerStateUpdateEvent';
+export * from './RoomObjectEvent';
 export * from './RoomObjectFloorHoleEvent';
 export * from './RoomObjectFurnitureActionEvent';
 export * from './RoomObjectHSLColorEnabledEvent';
 export * from './RoomObjectHSLColorEnableEvent';
+export * from './RoomObjectMouseEvent';
 export * from './RoomObjectMoveEvent';
 export * from './RoomObjectPlaySoundIdEvent';
 export * from './RoomObjectRoomAdEvent';
@@ -26,5 +29,7 @@ export * from './RoomObjectStateChangedEvent';
 export * from './RoomObjectTileMouseEvent';
 export * from './RoomObjectWallMouseEvent';
 export * from './RoomObjectWidgetRequestEvent';
+export * from './RoomSpriteMouseEvent';
+export * from './RoomToObjectEvent';
 export * from './RoomToObjectOwnAvatarMoveEvent';
 export * from './RoomZoomEvent';

src/nitro/room/RoomContentLoader.ts

@@ -3,7 +3,7 @@ import { Loader, LoaderResource } from '@pixi/loaders';
 import { Spritesheet } from '@pixi/spritesheet';
 import { FurnitureType, GetAssetManager, GraphicAssetCollection, GraphicAssetGifCollection, IAssetData, IEventDispatcher, IFurnitureData, IFurnitureDataListener, IGraphicAssetCollection, IGraphicAssetGifCollection, IPetColorResult, IRoomContentListener, IRoomContentLoader, IRoomObject, ISessionDataManager, NitroBundle, NitroConfiguration, NitroLogger, RoomObjectCategory, RoomObjectUserType, RoomObjectVariable, RoomObjectVisualizationType } from '../../api';
 import { NitroEvent } from '../../events';
-import { RoomContentLoadedEvent } from '../../room/events/RoomContentLoadedEvent';
+import { RoomContentLoadedEvent } from '../../events/room/RoomContentLoadedEvent';
 import { PetColorResult } from './PetColorResult';
 
 export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLoader

src/nitro/room/RoomEngine.ts

@@ -3,9 +3,9 @@ import { Container, DisplayObject } from '@pixi/display';
 import { Matrix, Point, Rectangle } from '@pixi/math';
 import { IConnection, IDisposable, IFurnitureStackingHeightMap, IGetImageListener, IImageResult, ILegacyWallGeometry, IMessageComposer, INitroCommunicationManager, INitroEvent, IObjectData, IPetColorResult, IPetCustomPart, IRoomContentListener, IRoomContentLoader, IRoomCreator, IRoomEngine, IRoomEngineServices, IRoomGeometry, IRoomInstance, IRoomManager, IRoomManagerListener, IRoomObject, IRoomObjectController, IRoomObjectLogicFactory, IRoomObjectVisualizationFactory, IRoomRenderer, IRoomRendererFactory, IRoomRenderingCanvas, IRoomSessionManager, ISelectedRoomObjectData, ISessionDataManager, ITileObjectMap, IUpdateReceiver, IVector3D, LegacyDataType, MouseEventType, NitroConfiguration, NitroLogger, ObjectDataFactory, RoomControllerLevel, RoomObjectCategory, RoomObjectUserType, RoomObjectVariable, ToolbarIconEnum, Vector3d } from '../../api';
 import { NitroManager } from '../../core';
-import { BadgeImageReadyEvent, NitroToolbarAnimateIconEvent, RoomBackgroundColorEvent, RoomDragEvent, RoomEngineEvent, RoomEngineObjectEvent, RoomObjectFurnitureActionEvent, RoomSessionEvent, RoomToObjectOwnAvatarMoveEvent } from '../../events';
+import { BadgeImageReadyEvent, NitroToolbarAnimateIconEvent, RoomBackgroundColorEvent, RoomDragEvent, RoomEngineEvent, RoomEngineObjectEvent, RoomObjectEvent, RoomObjectFurnitureActionEvent, RoomObjectMouseEvent, RoomSessionEvent, RoomToObjectOwnAvatarMoveEvent } from '../../events';
 import { GetTicker, GetTickerTime, NitroSprite, TextureUtils } from '../../pixi-proxy';
-import { NumberBank, RoomEnterEffect, RoomGeometry, RoomInstance, RoomObjectEvent, RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomRendererFactory } from '../../room';
+import { NumberBank, RoomEnterEffect, RoomGeometry, RoomInstance, RoomObjectUpdateMessage, RoomRendererFactory } from '../../room';
 import { PetFigureData } from '../avatar';
 import { RenderRoomMessageComposer, RenderRoomThumbnailMessageComposer } from '../communication';
 import { FurniId } from '../utils';

src/nitro/room/RoomObjectEventHandler.ts

@@ -1,7 +1,7 @@
 import { IFurnitureStackingHeightMap, ILegacyWallGeometry, IObjectData, IRoomCanvasMouseListener, IRoomEngineServices, IRoomGeometry, IRoomObject, IRoomObjectController, IRoomObjectEventManager, ISelectedRoomObjectData, IVector3D, MouseEventType, NitroConfiguration, NitroLogger, RoomObjectCategory, RoomObjectOperationType, RoomObjectPlacementSource, RoomObjectType, RoomObjectUserType, RoomObjectVariable, Vector3d } from '../../api';
 import { Disposable } from '../../core';
-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 { RoomEngineDimmerStateEvent, RoomEngineObjectEvent, RoomEngineObjectPlacedEvent, RoomEngineObjectPlacedOnUserEvent, RoomEngineObjectPlaySoundEvent, RoomEngineRoomAdEvent, RoomEngineSamplePlaybackEvent, RoomEngineTriggerWidgetEvent, RoomEngineUseProductEvent, RoomObjectBadgeAssetEvent, RoomObjectDataRequestEvent, RoomObjectDimmerStateUpdateEvent, RoomObjectEvent, RoomObjectFloorHoleEvent, RoomObjectFurnitureActionEvent, RoomObjectHSLColorEnabledEvent, RoomObjectHSLColorEnableEvent, RoomObjectMouseEvent, RoomObjectMoveEvent, RoomObjectPlaySoundIdEvent, RoomObjectRoomAdEvent, RoomObjectSamplePlaybackEvent, RoomObjectSoundMachineEvent, RoomObjectStateChangedEvent, RoomObjectTileMouseEvent, RoomObjectWallMouseEvent, RoomObjectWidgetRequestEvent, RoomSpriteMouseEvent } from '../../events';
-import { RoomEnterEffect, RoomId, RoomObjectEvent, RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../room';
+import { RoomEnterEffect, RoomId, RoomObjectUpdateMessage } 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 { ObjectAvatarSelectedMessage, ObjectDataUpdateMessage, ObjectSelectedMessage, ObjectTileCursorUpdateMessage, ObjectVisibilityUpdateMessage } from './messages';

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

@@ -1,8 +1,8 @@
 
 import { AvatarAction, IRoomGeometry, IRoomObjectModel, MouseEventType, RoomObjectVariable, Vector3d } from '../../../../../api';
-import { RoomObjectFurnitureActionEvent, RoomObjectMoveEvent } from '../../../../../events';
+import { RoomObjectFurnitureActionEvent, RoomObjectMouseEvent, RoomObjectMoveEvent, RoomSpriteMouseEvent } from '../../../../../events';
 import { GetTickerTime } from '../../../../../pixi-proxy';
-import { RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room';
+import { RoomObjectUpdateMessage } from '../../../../../room';
 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';
 

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

@@ -1,6 +1,6 @@
 import { RoomObjectVariable } from '../../../../../api';
-import { RoomObjectBadgeAssetEvent, RoomObjectWidgetRequestEvent } from '../../../../../events';
+import { RoomObjectBadgeAssetEvent, RoomObjectEvent, RoomObjectWidgetRequestEvent } from '../../../../../events';
-import { RoomObjectEvent, RoomObjectUpdateMessage } from '../../../../../room';
+import { RoomObjectUpdateMessage } from '../../../../../room';
 import { ObjectGroupBadgeUpdateMessage, ObjectSelectedMessage } from '../../../messages';
 import { FurnitureBadgeDisplayLogic } from './FurnitureBadgeDisplayLogic';
 

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

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

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

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

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

@@ -1,6 +1,5 @@
 import { IAssetData, IRoomGeometry, MouseEventType, RoomObjectVariable } from '../../../../../api';
-import { RoomObjectWidgetRequestEvent } from '../../../../../events';
+import { RoomObjectWidgetRequestEvent, RoomSpriteMouseEvent } from '../../../../../events';
-import { RoomSpriteMouseEvent } from '../../../../../room';
 import { FurnitureLogic } from './FurnitureLogic';
 
 export class FurnitureEditableInternalLinkLogic extends FurnitureLogic

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

@@ -1,6 +1,5 @@
 import { IAssetData, IParticleSystem, IRoomGeometry, MouseEventType, RoomObjectVariable } from '../../../../../api';
-import { RoomObjectStateChangedEvent } from '../../../../../events';
+import { RoomObjectEvent, RoomObjectStateChangedEvent, RoomSpriteMouseEvent } from '../../../../../events';
-import { RoomObjectEvent, RoomSpriteMouseEvent } from '../../../../../room';
 import { FurnitureLogic } from './FurnitureLogic';
 
 export class FurnitureFireworksLogic extends FurnitureLogic

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

@@ -1,7 +1,7 @@
 import { IRoomGeometry, MouseEventType, RoomObjectVariable, StringDataType } from '../../../../../api';
-import { RoomObjectBadgeAssetEvent, RoomObjectWidgetRequestEvent } from '../../../../../events';
+import { RoomObjectBadgeAssetEvent, RoomObjectWidgetRequestEvent, RoomSpriteMouseEvent } from '../../../../../events';
 import { GetTickerTime } from '../../../../../pixi-proxy';
-import { RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room';
+import { RoomObjectUpdateMessage } from '../../../../../room';
 import { ObjectDataUpdateMessage, ObjectGroupBadgeUpdateMessage, ObjectSelectedMessage } from '../../../messages';
 import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic';
 

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

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

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

@@ -1,6 +1,5 @@
 import { IAssetData, IRoomGeometry, MouseEventType, RoomObjectVariable } from '../../../../../api';
-import { RoomObjectWidgetRequestEvent } from '../../../../../events';
+import { RoomObjectWidgetRequestEvent, RoomSpriteMouseEvent } from '../../../../../events';
-import { RoomSpriteMouseEvent } from '../../../../../room';
 import { FurnitureLogic } from './FurnitureLogic';
 
 export class FurnitureInternalLinkLogic extends FurnitureLogic

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

@@ -1,6 +1,6 @@
 import { IAssetData, IRoomGeometry, IRoomObjectController, IRoomObjectModel, IVector3D, MouseEventType, NitroConfiguration, RoomObjectVariable, Vector3d } from '../../../../../api';
-import { RoomObjectRoomAdEvent, RoomObjectStateChangedEvent, RoomObjectWidgetRequestEvent } from '../../../../../events';
+import { RoomObjectMouseEvent, RoomObjectRoomAdEvent, RoomObjectStateChangedEvent, RoomObjectWidgetRequestEvent, RoomSpriteMouseEvent } from '../../../../../events';
-import { RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room';
+import { RoomObjectUpdateMessage } from '../../../../../room';
 import { ObjectDataUpdateMessage, ObjectHeightUpdateMessage, ObjectItemDataUpdateMessage, ObjectMoveUpdateMessage, ObjectSelectedMessage } from '../../../messages';
 import { MovingObjectLogic } from '../MovingObjectLogic';
 

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

@@ -1,6 +1,5 @@
 import { IRoomGeometry, MouseEventType } from '../../../../../api';
-import { RoomObjectFurnitureActionEvent } from '../../../../../events';
+import { RoomObjectFurnitureActionEvent, RoomSpriteMouseEvent } from '../../../../../events';
-import { RoomSpriteMouseEvent } from '../../../../../room';
 import { FurnitureLogic } from './FurnitureLogic';
 
 export class FurnitureMultiStateLogic extends FurnitureLogic

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

@@ -1,6 +1,6 @@
 import { IAssetData, IParticleSystem, IRoomGeometry, MapDataType, MouseEventType, RoomObjectVariable } from '../../../../../api';
-import { RoomObjectFurnitureActionEvent, RoomObjectWidgetRequestEvent } from '../../../../../events';
+import { RoomObjectFurnitureActionEvent, RoomObjectWidgetRequestEvent, RoomSpriteMouseEvent } from '../../../../../events';
-import { RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room';
+import { RoomObjectUpdateMessage } from '../../../../../room';
 import { ObjectDataUpdateMessage, ObjectModelDataUpdateMessage } from '../../../messages';
 import { FurnitureLogic } from './FurnitureLogic';
 

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

@@ -1,6 +1,6 @@
 import { IRoomGeometry, MouseEventType, NumberDataType, RoomObjectVariable } from '../../../../../api';
-import { RoomObjectHSLColorEnableEvent, RoomObjectWidgetRequestEvent } from '../../../../../events';
+import { RoomObjectHSLColorEnableEvent, RoomObjectWidgetRequestEvent, RoomSpriteMouseEvent } from '../../../../../events';
-import { RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room';
+import { RoomObjectUpdateMessage } from '../../../../../room';
 import { ObjectDataUpdateMessage } from '../../../messages';
 import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic';
 

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

@@ -1,8 +1,8 @@
 import { BaseTexture, Texture } from '@pixi/core';
 import { decompressFrames, parseGIF } from 'gifuct-js';
 import { GetAssetManager, IAssetData, IRoomGeometry, MapDataType, MouseEventType, RoomObjectVariable, RoomWidgetEnumItemExtradataParameter } from '../../../../../api';
-import { RoomObjectRoomAdEvent } from '../../../../../events';
+import { RoomObjectRoomAdEvent, RoomSpriteMouseEvent } from '../../../../../events';
-import { RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room';
+import { RoomObjectUpdateMessage } from '../../../../../room';
 import { Nitro } from '../../../../Nitro';
 import { ObjectAdUpdateMessage, ObjectDataUpdateMessage } from '../../../messages';
 import { FurnitureLogic } from './FurnitureLogic';

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

@@ -1,6 +1,5 @@
 import { IRoomGeometry, MouseEventType } from '../../../../../api';
-import { RoomObjectStateChangedEvent } from '../../../../../events';
+import { RoomObjectStateChangedEvent, RoomSpriteMouseEvent } from '../../../../../events';
-import { RoomSpriteMouseEvent } from '../../../../../room';
 import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic';
 
 export class FurnitureWelcomeGiftLogic extends FurnitureMultiStateLogic

src/nitro/room/object/logic/pet/PetLogic.ts

@@ -1,6 +1,6 @@
 import { IAssetData, IRoomGeometry, IRoomObjectModel, MouseEventType, PetType, RoomObjectVariable, Vector3d } from '../../../../../api';
-import { RoomObjectMoveEvent } from '../../../../../events';
+import { RoomObjectMouseEvent, RoomObjectMoveEvent, RoomSpriteMouseEvent } from '../../../../../events';
-import { RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room';
+import { RoomObjectUpdateMessage } from '../../../../../room';
 import { PetFigureData } from '../../../../avatar';
 import { ObjectAvatarChatUpdateMessage, ObjectAvatarExperienceUpdateMessage, ObjectAvatarFigureUpdateMessage, ObjectAvatarPetGestureUpdateMessage, ObjectAvatarPostureUpdateMessage, ObjectAvatarSelectedMessage, ObjectAvatarSleepUpdateMessage, ObjectAvatarUpdateMessage } from '../../../messages';
 import { MovingObjectLogic } from '../MovingObjectLogic';

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

@@ -1,7 +1,7 @@
 import { Point } from '@pixi/math';
 import { IRoomGeometry, IRoomObjectModel, MouseEventType, NitroConfiguration, RoomObjectVariable, Vector3d } from '../../../../../api';
-import { RoomObjectTileMouseEvent, RoomObjectWallMouseEvent } from '../../../../../events';
+import { RoomObjectEvent, RoomObjectMouseEvent, RoomObjectTileMouseEvent, RoomObjectWallMouseEvent, RoomSpriteMouseEvent } from '../../../../../events';
-import { ColorConverter, RoomObjectEvent, RoomObjectLogicBase, RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room';
+import { ColorConverter, RoomObjectLogicBase, RoomObjectUpdateMessage } from '../../../../../room';
 import { ObjectRoomColorUpdateMessage, ObjectRoomFloorHoleUpdateMessage, ObjectRoomMapUpdateMessage, ObjectRoomMaskUpdateMessage, ObjectRoomPlanePropertyUpdateMessage, ObjectRoomPlaneVisibilityUpdateMessage, ObjectRoomUpdateMessage } from '../../../messages';
 import { RoomMapData } from '../../RoomMapData';
 import { RoomPlaneBitmapMaskData } from '../../RoomPlaneBitmapMaskData';

src/room/RoomManager.ts

@@ -1,7 +1,7 @@
 import { IGraphicAssetCollection, IRoomContentLoader, IRoomInstance, IRoomInstanceContainer, IRoomManager, IRoomManagerListener, IRoomObject, IRoomObjectController, IRoomObjectLogicFactory, IRoomObjectManager, IRoomObjectVisualizationFactory, NitroLogger } from '../api';
 import { NitroManager } from '../core';
+import { RoomContentLoadedEvent } from '../events';
 import { RoomContentLoader } from '../nitro/room/RoomContentLoader';
-import { RoomContentLoadedEvent } from './events';
 import { RoomInstance } from './RoomInstance';
 import { RoomObjectManager } from './RoomObjectManager';
 

src/room/events/index.ts

@@ -1,5 +0,0 @@
-export * from './RoomContentLoadedEvent';
-export * from './RoomObjectEvent';
-export * from './RoomObjectMouseEvent';
-export * from './RoomSpriteMouseEvent';
-export * from './RoomToObjectEvent';

src/room/index.ts

@@ -1,4 +1,3 @@
-export * from './events';
 export * from './messages';
 export * from './object';
 export * from './object/logic';

src/room/object/logic/RoomObjectLogicBase.ts

@@ -1,6 +1,6 @@
 import { IEventDispatcher, IRoomGeometry, IRoomObjectController, IRoomObjectEventHandler, IRoomObjectUpdateMessage } from '../../../api';
 import { Disposable } from '../../../core';
-import { RoomSpriteMouseEvent } from '../../events';
+import { RoomSpriteMouseEvent } from '../../../events';
 
 export class RoomObjectLogicBase extends Disposable implements IRoomObjectEventHandler
 {

src/room/renderer/RoomSpriteCanvas.ts

@@ -4,9 +4,9 @@ import { Graphics } from '@pixi/graphics';
 import { Matrix, Point, Rectangle } from '@pixi/math';
 import { Sprite } from '@pixi/sprite';
 import { IRoomCanvasMouseListener, IRoomGeometry, IRoomObject, IRoomObjectSprite, IRoomObjectSpriteVisualization, IRoomRenderingCanvas, IRoomSpriteCanvasContainer, IRoomSpriteMouseEvent, MouseEventType, RoomObjectSpriteData, RoomObjectSpriteType, Vector3d } from '../../api';
+import { RoomSpriteMouseEvent } from '../../events';
 import { Nitro } from '../../nitro/Nitro';
-import { GetTickerTime, NitroContainer, NitroSprite, PixiApplicationProxy } from '../../pixi-proxy';
+import { GetTicker, NitroContainer, NitroSprite, PixiApplicationProxy } from '../../pixi-proxy';
-import { RoomSpriteMouseEvent } from '../events';
 import { RoomEnterEffect, RoomGeometry, RoomRotatingEffect, RoomShakingEffect } from '../utils';
 import { RoomObjectCache, RoomObjectCacheItem } from './cache';
 import { ExtendedSprite, ObjectMouseData, SortableSprite } from './utils';
@@ -322,7 +322,7 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas
     {
         this._canvasUpdated = false;
 
-        this._totalTimeRunning = GetTickerTime();
+        this._totalTimeRunning += GetTicker().deltaTime;
 
         if (this._totalTimeRunning === this._renderTimestamp) return;