Move events

src/api/nitro/avatar/IAvatarAssetDownloadLibrary.ts

@@ -0,0 +1,8 @@
+import { IEventDispatcher } from '../../common';
+
+export interface IAvatarAssetDownloadLibrary extends IEventDispatcher
+{
+    downloadAsset(): void;
+    readonly libraryName: string;
+    readonly isLoaded: boolean;
+}

src/api/nitro/avatar/IEffectAssetDownloadLibrary.ts

@@ -0,0 +1,10 @@
+import { IAssetAnimation } from '../../asset';
+import { IEventDispatcher } from '../../common';
+
+export interface IEffectAssetDownloadLibrary extends IEventDispatcher
+{
+    downloadAsset(): void;
+    readonly libraryName: string;
+    readonly animation: { [index: string]: IAssetAnimation };
+    readonly isLoaded: boolean;
+}

src/api/nitro/avatar/index.ts

@@ -2,11 +2,13 @@ export * from './actions';
 export * from './animation';
 export * from './enum';
 export * from './figuredata';
+export * from './IAvatarAssetDownloadLibrary';
 export * from './IAvatarEffectListener';
 export * from './IAvatarFigureContainer';
 export * from './IAvatarImage';
 export * from './IAvatarImageListener';
 export * from './IAvatarRenderManager';
+export * from './IEffectAssetDownloadLibrary';
 export * from './IOutfit';
 export * from './pet';
 export * from './structure';

src/api/nitro/room/object/IPetFigureData.ts

@@ -0,0 +1,10 @@
+export interface IPetFigureData
+{
+    readonly typeId: number;
+    readonly paletteId: number;
+    readonly color: string;
+    readonly breedId: number;
+    readonly figuredata: string;
+    readonly customParts: number[];
+    readonly custompartCount: number;
+}

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

@@ -1,5 +1,6 @@
 export * from './data';
 export * from './data/type';
+export * from './IPetFigureData';
 export * from './IRoomMapData';
 export * from './RoomObjectCategory';
 export * from './RoomObjectLogicType';

src/api/nitro/session/IPollChoice.ts

@@ -0,0 +1,6 @@
+export interface IPollChoice
+{
+    value: string;
+    choiceText: string;
+    choiceType: number;
+}

src/api/nitro/session/IPollQuestion.ts

@@ -0,0 +1,14 @@
+import { IPollChoice } from './IPollChoice';
+
+export interface IPollQuestion
+{
+    questionId: number;
+    questionType: number;
+    sortOrder: number;
+    questionText: string;
+    questionCategory: number;
+    questionAnswerType: number;
+    questionAnswerCount: number;
+    children: IPollQuestion[];
+    questionChoices: IPollChoice[];
+}

src/api/nitro/session/IQuestion.ts

@@ -0,0 +1,12 @@
+export interface IQuestion
+{
+    id: number;
+    number: number;
+    type: number;
+    content: string;
+    selection_min?: number;
+    selections?: string[];
+    selection_values?: string[];
+    selection_count?: number;
+    selection_max?: number;
+}

src/api/nitro/session/IRoomPetData.ts

@@ -0,0 +1,30 @@
+export interface IRoomPetData
+{
+    id: number;
+    level: number;
+    maximumLevel: number;
+    experience: number;
+    levelExperienceGoal: number;
+    energy: number;
+    maximumEnergy: number;
+    happyness: number;
+    maximumHappyness: number;
+    ownerId: number;
+    ownerName: string;
+    respect: number;
+    age: number;
+    unknownRarity: number;
+    saddle: boolean;
+    rider: boolean;
+    skillTresholds: number[];
+    publiclyRideable: number;
+    breedable: boolean;
+    fullyGrown: boolean;
+    dead: boolean;
+    rarityLevel: number;
+    maximumTimeToLive: number;
+    remainingTimeToLive: number;
+    remainingGrowTime: number;
+    publiclyBreedable: boolean;
+    readonly adultLevel: number;
+}

src/api/nitro/session/index.ts

@@ -4,10 +4,14 @@ export * from './IFurnitureData';
 export * from './IFurnitureDataListener';
 export * from './IGroupInformationManager';
 export * from './IIgnoredUsersManager';
+export * from './IPollChoice';
+export * from './IPollQuestion';
 export * from './IProductData';
 export * from './IProductDataListener';
+export * from './IQuestion';
 export * from './IRoomHandlerListener';
 export * from './IRoomModerationSettings';
+export * from './IRoomPetData';
 export * from './IRoomSession';
 export * from './IRoomSessionManager';
 export * from './IRoomUserData';

src/api/room/IPetBreedingResultData.ts

@@ -0,0 +1,10 @@
+export interface IPetBreedingResultData
+{
+    readonly stuffId: number;
+    readonly classId: number;
+    readonly productCode: string;
+    readonly userId: number;
+    readonly userName: string;
+    readonly rarityLevel: number;
+    readonly hasMutation: boolean;
+}

src/api/room/index.ts

@@ -1,3 +1,4 @@
+export * from './IPetBreedingResultData';
 export * from './IRoomGeometry';
 export * from './IRoomInstance';
 export * from './IRoomInstanceContainer';

src/core/common/EventDispatcher.ts

@@ -1,6 +1,5 @@
-import { IDisposable, IEventDispatcher, INitroLogger } from '../../api';
+import { IDisposable, IEventDispatcher, INitroEvent, INitroLogger } from '../../api';
 import { Disposable } from './Disposable';
-import { NitroEvent } from './NitroEvent';
 import { NitroLogger } from './NitroLogger';
 
 export class EventDispatcher extends Disposable implements IEventDispatcher, IDisposable
@@ -25,11 +24,11 @@ export class EventDispatcher extends Disposable implements IEventDispatcher, IDi
 
     public addEventListener(type: string, callback: Function): void
     {
-        if(!type || !callback) return;
+        if (!type || !callback) return;
 
         const existing = this._listeners.get(type);
 
-        if(!existing)
+        if (!existing)
         {
             this._listeners.set(type, [callback]);
 
@@ -41,27 +40,27 @@ export class EventDispatcher extends Disposable implements IEventDispatcher, IDi
 
     public removeEventListener(type: string, callback: any): void
     {
-        if(!type || !callback) return;
+        if (!type || !callback) return;
 
         const existing = this._listeners.get(type);
 
-        if(!existing || !existing.length) return;
+        if (!existing || !existing.length) return;
 
-        for(const [i, cb] of existing.entries())
+        for (const [i, cb] of existing.entries())
         {
-            if(!cb || (cb !== callback)) continue;
+            if (!cb || (cb !== callback)) continue;
 
             existing.splice(i, 1);
 
-            if(!existing.length) this._listeners.delete(type);
+            if (!existing.length) this._listeners.delete(type);
 
             return;
         }
     }
 
-    public dispatchEvent(event: NitroEvent): boolean
+    public dispatchEvent(event: INitroEvent): boolean
     {
-        if(!event) return false;
+        if (!event) return false;
 
         //if (Nitro.instance.getConfiguration<boolean>('system.dispatcher.log')) this._logger.log('Dispatched Event', event.type);
 
@@ -70,22 +69,22 @@ export class EventDispatcher extends Disposable implements IEventDispatcher, IDi
         return true;
     }
 
-    private processEvent(event: NitroEvent): void
+    private processEvent(event: INitroEvent): void
     {
         const existing = this._listeners.get(event.type);
 
-        if(!existing || !existing.length) return;
+        if (!existing || !existing.length) return;
 
         const callbacks = [];
 
-        for(const callback of existing)
+        for (const callback of existing)
         {
-            if(!callback) continue;
+            if (!callback) continue;
 
             callbacks.push(callback);
         }
 
-        while(callbacks.length)
+        while (callbacks.length)
         {
             const callback = callbacks.shift();
 

src/core/common/index.ts

@@ -1,5 +1,4 @@
 export * from './Disposable';
 export * from './EventDispatcher';
-export * from './NitroEvent';
 export * from './NitroLogger';
 export * from './NitroManager';

src/core/communication/SocketConnection.ts

@@ -1,8 +1,8 @@
 import { ICodec, ICommunicationManager, IConnection, IConnectionStateListener, IMessageComposer, IMessageConfiguration, IMessageDataWrapper, IMessageEvent, WebSocketEventEnum } from '../../api';
+import { SocketConnectionEvent } from '../../events';
 import { EventDispatcher } from '../common';
 import { EvaWireFormat } from './codec';
 import { MessageClassManager } from './messages';
-import { SocketConnectionEvent } from './SocketConnectionEvent';
 
 export class SocketConnection extends EventDispatcher implements IConnection
 {
@@ -44,7 +44,7 @@ export class SocketConnection extends EventDispatcher implements IConnection
 
     public init(socketUrl: string): void
     {
-        if(this._stateListener)
+        if (this._stateListener)
         {
             this._stateListener.connectionInit(socketUrl);
         }
@@ -67,13 +67,13 @@ export class SocketConnection extends EventDispatcher implements IConnection
 
     public onReady(): void
     {
-        if(this._isReady) return;
+        if (this._isReady) return;
 
         this._isReady = true;
 
-        if(this._pendingServerMessages && this._pendingServerMessages.length) this.processWrappers(...this._pendingServerMessages);
+        if (this._pendingServerMessages && this._pendingServerMessages.length) this.processWrappers(...this._pendingServerMessages);
 
-        if(this._pendingClientMessages && this._pendingClientMessages.length) this.send(...this._pendingClientMessages);
+        if (this._pendingClientMessages && this._pendingClientMessages.length) this.send(...this._pendingClientMessages);
 
         this._pendingServerMessages = [];
         this._pendingClientMessages = [];
@@ -81,7 +81,7 @@ export class SocketConnection extends EventDispatcher implements IConnection
 
     private createSocket(socketUrl: string): void
     {
-        if(!socketUrl) return;
+        if (!socketUrl) return;
 
         this.destroySocket();
 
@@ -96,14 +96,14 @@ export class SocketConnection extends EventDispatcher implements IConnection
 
     private destroySocket(): void
     {
-        if(!this._socket) return;
+        if (!this._socket) return;
 
         this._socket.removeEventListener(WebSocketEventEnum.CONNECTION_OPENED, this.onOpen);
         this._socket.removeEventListener(WebSocketEventEnum.CONNECTION_CLOSED, this.onClose);
         this._socket.removeEventListener(WebSocketEventEnum.CONNECTION_ERROR, this.onError);
         this._socket.removeEventListener(WebSocketEventEnum.CONNECTION_MESSAGE, this.onMessage);
 
-        if(this._socket.readyState === WebSocket.OPEN) this._socket.close();
+        if (this._socket.readyState === WebSocket.OPEN) this._socket.close();
 
         this._socket = null;
     }
@@ -125,7 +125,7 @@ export class SocketConnection extends EventDispatcher implements IConnection
 
     private onMessage(event: MessageEvent): void
     {
-        if(!event) return;
+        if (!event) return;
 
         //this.dispatchConnectionEvent(SocketConnectionEvent.CONNECTION_MESSAGE, event);
 
@@ -153,26 +153,26 @@ export class SocketConnection extends EventDispatcher implements IConnection
 
     public send(...composers: IMessageComposer<unknown[]>[]): boolean
     {
-        if(this.disposed || !composers) return false;
+        if (this.disposed || !composers) return false;
 
         composers = [...composers];
 
-        if(this._isAuthenticated && !this._isReady)
+        if (this._isAuthenticated && !this._isReady)
         {
-            if(!this._pendingClientMessages) this._pendingClientMessages = [];
+            if (!this._pendingClientMessages) this._pendingClientMessages = [];
 
             this._pendingClientMessages.push(...composers);
 
             return false;
         }
 
-        for(const composer of composers)
+        for (const composer of composers)
         {
-            if(!composer) continue;
+            if (!composer) continue;
 
             const header = this._messages.getComposerId(composer);
 
-            if(header === -1)
+            if (header === -1)
             {
                 //if (Nitro.instance.getConfiguration<boolean>('system.packet.log')) this.logger.log(`Unknown Composer: ${composer.constructor.name}`);
 
@@ -182,7 +182,7 @@ export class SocketConnection extends EventDispatcher implements IConnection
             const message = composer.getMessageArray();
             const encoded = this._codec.encode(header, message);
 
-            if(!encoded)
+            if (!encoded)
             {
                 //if (Nitro.instance.getConfiguration<boolean>('system.packet.log')) this.logger.log('Encoding Failed', composer.constructor.name);
 
@@ -199,7 +199,7 @@ export class SocketConnection extends EventDispatcher implements IConnection
 
     private write(buffer: ArrayBuffer): void
     {
-        if(this._socket.readyState !== WebSocket.OPEN) return;
+        if (this._socket.readyState !== WebSocket.OPEN) return;
 
         this._socket.send(buffer);
     }
@@ -221,11 +221,11 @@ export class SocketConnection extends EventDispatcher implements IConnection
     {
         const wrappers = this.splitReceivedMessages();
 
-        if(!wrappers || !wrappers.length) return;
+        if (!wrappers || !wrappers.length) return;
 
-        if(this._isAuthenticated && !this._isReady)
+        if (this._isAuthenticated && !this._isReady)
         {
-            if(!this._pendingServerMessages) this._pendingServerMessages = [];
+            if (!this._pendingServerMessages) this._pendingServerMessages = [];
 
             this._pendingServerMessages.push(...wrappers);
 
@@ -237,15 +237,15 @@ export class SocketConnection extends EventDispatcher implements IConnection
 
     private processWrappers(...wrappers: IMessageDataWrapper[]): void
     {
-        if(!wrappers || !wrappers.length) return;
+        if (!wrappers || !wrappers.length) return;
 
-        for(const wrapper of wrappers)
+        for (const wrapper of wrappers)
         {
-            if(!wrapper) continue;
+            if (!wrapper) continue;
 
             const messages = this.getMessagesForWrapper(wrapper);
 
-            if(!messages || !messages.length) continue;
+            if (!messages || !messages.length) continue;
 
             //if (Nitro.instance.getConfiguration<boolean>('system.packet.log')) this.logger.log('IncomingMessage', wrapper.header, messages[0].constructor.name, messages[0].parser);
 
@@ -255,7 +255,7 @@ export class SocketConnection extends EventDispatcher implements IConnection
 
     private splitReceivedMessages(): IMessageDataWrapper[]
     {
-        if(!this._dataBuffer || !this._dataBuffer.byteLength) return null;
+        if (!this._dataBuffer || !this._dataBuffer.byteLength) return null;
 
         return this._codec.decode(this);
     }
@@ -272,11 +272,11 @@ export class SocketConnection extends EventDispatcher implements IConnection
 
     private getMessagesForWrapper(wrapper: IMessageDataWrapper): IMessageEvent[]
     {
-        if(!wrapper) return null;
+        if (!wrapper) return null;
 
         const events = this._messages.getEvents(wrapper.header);
 
-        if(!events || !events.length)
+        if (!events || !events.length)
         {
             //if (Nitro.instance.getConfiguration<boolean>('system.packet.log')) this.logger.log('IncomingMessage', wrapper.header, 'UNREGISTERED', wrapper);
 
@@ -288,9 +288,9 @@ export class SocketConnection extends EventDispatcher implements IConnection
             //@ts-ignore
             const parser = new events[0].parserClass();
 
-            if(!parser || !parser.flush() || !parser.parse(wrapper)) return null;
+            if (!parser || !parser.flush() || !parser.parse(wrapper)) return null;
 
-            for(const event of events) (event.parser = parser);
+            for (const event of events) (event.parser = parser);
         }
 
         catch (e)
@@ -307,33 +307,33 @@ export class SocketConnection extends EventDispatcher implements IConnection
     {
         messages = [...messages];
 
-        for(const message of messages)
+        for (const message of messages)
         {
-            if(!message) continue;
+            if (!message) continue;
 
             message.connection = this;
 
-            if(message.callBack) message.callBack(message);
+            if (message.callBack) message.callBack(message);
         }
     }
 
     public registerMessages(configuration: IMessageConfiguration): void
     {
-        if(!configuration) return;
+        if (!configuration) return;
 
         this._messages.registerMessages(configuration);
     }
 
     public addMessageEvent(event: IMessageEvent): void
     {
-        if(!event || !this._messages) return;
+        if (!event || !this._messages) return;
 
         this._messages.registerMessageEvent(event);
     }
 
     public removeMessageEvent(event: IMessageEvent): void
     {
-        if(!event || !this._messages) return;
+        if (!event || !this._messages) return;
 
         this._messages.removeMessageEvent(event);
     }

src/core/communication/index.ts

@@ -3,4 +3,3 @@ export * from './codec/evawire';
 export * from './CommunicationManager';
 export * from './messages';
 export * from './SocketConnection';
-export * from './SocketConnectionEvent';

src/core/communication/messages/MessageClassManager.ts

@@ -1,5 +1,5 @@
 import { IMessageComposer, IMessageConfiguration, IMessageEvent } from '../../../api';
-import { MessageEvent } from './MessageEvent';
+import { MessageEvent } from '../../../events';
 
 export class MessageClassManager
 {
@@ -23,36 +23,36 @@ export class MessageClassManager
 
     public registerMessages(configuration: IMessageConfiguration): void
     {
-        for(const [header, handler] of configuration.events) this.registerMessageEventClass(header, handler);
+        for (const [header, handler] of configuration.events) this.registerMessageEventClass(header, handler);
 
-        for(const [header, handler] of configuration.composers) this.registerMessageComposerClass(header, handler);
+        for (const [header, handler] of configuration.composers) this.registerMessageComposerClass(header, handler);
     }
 
     private registerMessageEventClass(header: number, handler: Function): void
     {
-        if(!header || !handler) return;
+        if (!header || !handler) return;
 
         this._messageIdByEvent.set(handler, header);
     }
 
     private registerMessageComposerClass(header: number, handler: Function): void
     {
-        if(!header || !handler) return;
+        if (!header || !handler) return;
 
         this._messageIdByComposer.set(handler, header);
     }
 
     public registerMessageEvent(event: IMessageEvent): void
     {
-        if(!event) return;
+        if (!event) return;
 
         const header = this.getEventId(event);
 
-        if(!header) return;
+        if (!header) return;
 
         let existing = this._messageInstancesById.get(header);
 
-        if(!existing || !existing.length)
+        if (!existing || !existing.length)
         {
             existing = [];
 
@@ -64,25 +64,25 @@ export class MessageClassManager
 
     public removeMessageEvent(event: IMessageEvent): void
     {
-        if(!event) return;
+        if (!event) return;
 
         const header = this.getEventId(event);
 
-        if(!header) return;
+        if (!header) return;
 
         const existing = this._messageInstancesById.get(header);
 
-        if(!existing) return;
+        if (!existing) return;
 
-        for(const [index, message] of existing.entries())
+        for (const [index, message] of existing.entries())
         {
-            if(!message) continue;
+            if (!message) continue;
 
-            if(message !== event) continue;
+            if (message !== event) continue;
 
             existing.splice(index, 1);
 
-            if(existing.length === 0) this._messageInstancesById.delete(header);
+            if (existing.length === 0) this._messageInstancesById.delete(header);
 
             message.dispose();
 
@@ -92,36 +92,36 @@ export class MessageClassManager
 
     public getEvents(header: number): IMessageEvent[]
     {
-        if(!header) return;
+        if (!header) return;
 
         const existing = this._messageInstancesById.get(header);
 
-        if(!existing) return;
+        if (!existing) return;
 
         return existing;
     }
 
     public getEventId(event: IMessageEvent): number
     {
-        if(!event) return -1;
+        if (!event) return -1;
 
         //@ts-ignore
         const name = (event instanceof MessageEvent ? event.constructor : event) as Function;
 
         const existing = this._messageIdByEvent.get(name);
 
-        if(!existing) return -1;
+        if (!existing) return -1;
 
         return existing;
     }
 
     public getComposerId(composer: IMessageComposer<unknown[]>): number
     {
-        if(!composer) return -1;
+        if (!composer) return -1;
 
         const existing = this._messageIdByComposer.get(composer.constructor);
 
-        if(!existing) return -1;
+        if (!existing) return -1;
 
         return existing;
     }

src/core/communication/messages/index.ts

@@ -1,2 +1 @@
 export * from './MessageClassManager';
-export * from './MessageEvent';

src/core/configuration/ConfigurationEvent.ts

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

src/events/NitroSettingsEvent.ts

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

src/events/NitroSoundEvent.ts

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

src/events/NitroToolbarEvent.ts

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

src/events/avatar/AvatarRenderEffectLibraryEvent.ts

@@ -0,0 +1,21 @@
+import { IEffectAssetDownloadLibrary } from '../../api';
+import { NitroEvent } from '../core';
+
+export class AvatarRenderEffectLibraryEvent extends NitroEvent
+{
+    public static DOWNLOAD_COMPLETE: string = 'ARELE_DOWNLOAD_COMPLETE';
+
+    private _library: IEffectAssetDownloadLibrary;
+
+    constructor(type: string, library: IEffectAssetDownloadLibrary)
+    {
+        super(type);
+
+        this._library = library;
+    }
+
+    public get library(): IEffectAssetDownloadLibrary
+    {
+        return this._library;
+    }
+}

src/events/avatar/AvatarRenderLibraryEvent.ts

@@ -0,0 +1,21 @@
+import { IAvatarAssetDownloadLibrary } from '../../api';
+import { NitroEvent } from '../core';
+
+export class AvatarRenderLibraryEvent extends NitroEvent
+{
+    public static DOWNLOAD_COMPLETE: string = 'ARLE_DOWNLOAD_COMPLETE';
+
+    private _library: IAvatarAssetDownloadLibrary;
+
+    constructor(type: string, library: IAvatarAssetDownloadLibrary)
+    {
+        super(type);
+
+        this._library = library;
+    }
+
+    public get library(): IAvatarAssetDownloadLibrary
+    {
+        return this._library;
+    }
+}

src/events/camera/RoomCameraWidgetManagerEvent.ts

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

src/events/camera/index.ts

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

src/events/communication/NitroCommunicationDemoEvent.ts

@@ -1,5 +1,5 @@
-import { IConnection } from '../../../api';
-import { NitroEvent } from '../../../core';
+import { IConnection } from '../../api';
+import { NitroEvent } from '../core';
 
 export class NitroCommunicationDemoEvent extends NitroEvent
 {

src/events/communication/index.ts

@@ -1,2 +1 @@
-export * from './NitroCommunicationDemo';
 export * from './NitroCommunicationDemoEvent';

src/events/core/MessageEvent.ts

@@ -1,4 +1,4 @@
-import { IConnection, IMessageEvent, IMessageParser } from '../../../api';
+import { IConnection, IMessageEvent, IMessageParser } from '../../api';
 
 export class MessageEvent implements IMessageEvent
 {

src/events/core/SocketConnectionEvent.ts

@@ -1,5 +1,5 @@
 import { IConnection } from '../../api';
-import { NitroEvent } from '../common';
+import { NitroEvent } from './NitroEvent';
 
 export class SocketConnectionEvent extends NitroEvent
 {

src/events/core/index.ts

@@ -0,0 +1,3 @@
+export * from './MessageEvent';
+export * from './NitroEvent';
+export * from './SocketConnectionEvent';

src/events/index.ts

@@ -0,0 +1,11 @@
+export * from './avatar';
+export * from './camera';
+export * from './communication';
+export * from './core';
+export * from './localization';
+export * from './NitroSettingsEvent';
+export * from './NitroSoundEvent';
+export * from './NitroToolbarAnimateIconEvent';
+export * from './NitroToolbarEvent';
+export * from './room';
+export * from './session';

src/events/localization/NitroLocalizationEvent.ts

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

src/events/localization/index.ts

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

src/events/room/RoomEngineEvent.ts

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

src/events/room/RoomObjectBadgeAssetEvent.ts

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

src/events/room/RoomObjectDataRequestEvent.ts

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

src/events/room/RoomObjectDimmerStateUpdateEvent.ts

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

src/events/room/RoomObjectFloorHoleEvent.ts

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

src/events/room/RoomObjectFurnitureActionEvent.ts

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

src/events/room/RoomObjectHSLColorEnableEvent.ts

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

src/events/room/RoomObjectMoveEvent.ts

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

src/events/room/RoomObjectPlaySoundIdEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomObject } from '../../../api';
+import { IRoomObject } from '../../api';
 import { RoomObjectFurnitureActionEvent } from './RoomObjectFurnitureActionEvent';
 
 export class RoomObjectPlaySoundIdEvent extends RoomObjectFurnitureActionEvent

src/events/room/RoomObjectRoomAdEvent.ts

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

src/events/room/RoomObjectSamplePlaybackEvent.ts

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

src/events/room/RoomObjectStateChangedEvent.ts

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

src/events/room/RoomObjectTileMouseEvent.ts

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

src/events/room/RoomObjectWallMouseEvent.ts

@@ -1,11 +1,11 @@
-import { IRoomObject, IVector3D, Vector3d } from '../../../api';
-import { RoomObjectMouseEvent } from '../../../room';
+import { IRoomObject, IVector3D, Vector3d } from '../../api';
+import { RoomObjectMouseEvent } from '../../room';
 
 export class RoomObjectWallMouseEvent extends RoomObjectMouseEvent
 {
-    private _wallLocation: Vector3d;
-    private _wallWd: Vector3d;
-    private _wallHt: Vector3d;
+    private _wallLocation: IVector3D;
+    private _wallWd: IVector3D;
+    private _wallHt: IVector3D;
     private _x: number;
     private _y: number;
     private _direction: number;

src/events/room/RoomObjectWidgetRequestEvent.ts

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

src/events/room/RoomToObjectOwnAvatarMoveEvent.ts

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

src/events/session/BadgeImageReadyEvent.ts

@@ -1,5 +1,5 @@
 import { Resource, Texture } from '@pixi/core';
-import { NitroEvent } from '../../../core';
+import { NitroEvent } from '../core';
 
 export class BadgeImageReadyEvent extends NitroEvent
 {

src/events/session/MysteryBoxKeysUpdateEvent.ts

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

src/events/session/PerksUpdatedEvent.ts

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

src/events/session/RoomSessionChatEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../../../api';
+import { IRoomSession } from '../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionChatEvent extends RoomSessionEvent

src/events/session/RoomSessionConfirmPetBreedingEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../../../api';
+import { IRoomSession } from '../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionConfirmPetBreedingEvent extends RoomSessionEvent

src/events/session/RoomSessionConfirmPetBreedingResultEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../../../api';
+import { IRoomSession } from '../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionConfirmPetBreedingResultEvent extends RoomSessionEvent

src/events/session/RoomSessionDanceEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../../../api';
+import { IRoomSession } from '../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionDanceEvent extends RoomSessionEvent

src/events/session/RoomSessionDimmerPresetsEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../../../api';
+import { IRoomSession } from '../../api';
 import { RoomSessionDimmerPresetsEventPresetItem } from './RoomSessionDimmerPresetsEventPresetItem';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
@@ -23,7 +23,7 @@ export class RoomSessionDimmerPresetsEvent extends RoomSessionEvent
 
     public getPreset(id: number): RoomSessionDimmerPresetsEventPresetItem
     {
-        if((id < 0) || (id >= this._presets.length)) return null;
+        if ((id < 0) || (id >= this._presets.length)) return null;
 
         return this._presets[id];
     }

src/events/session/RoomSessionDoorbellEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../../../api';
+import { IRoomSession } from '../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionDoorbellEvent extends RoomSessionEvent

src/events/session/RoomSessionErrorMessageEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../../../api';
+import { IRoomSession } from '../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionErrorMessageEvent extends RoomSessionEvent

src/events/session/RoomSessionEvent.ts

@@ -1,5 +1,5 @@
-import { IRoomSession } from '../../../api';
-import { NitroEvent } from '../../../core';
+import { IRoomSession } from '../../api';
+import { NitroEvent } from '../core';
 
 export class RoomSessionEvent extends NitroEvent
 {

src/events/session/RoomSessionFavoriteGroupUpdateEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../../../api';
+import { IRoomSession } from '../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionFavoriteGroupUpdateEvent extends RoomSessionEvent

src/events/session/RoomSessionFriendRequestEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../../../api';
+import { IRoomSession } from '../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionFriendRequestEvent extends RoomSessionEvent

src/events/session/RoomSessionNestBreedingSuccessEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../../../api';
+import { IRoomSession } from '../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionNestBreedingSuccessEvent extends RoomSessionEvent

src/events/session/RoomSessionPetBreedingEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../../../api';
+import { IRoomSession } from '../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionPetBreedingEvent extends RoomSessionEvent

src/events/session/RoomSessionPetBreedingResultEvent.ts

@@ -1,15 +1,14 @@
-import { IRoomSession } from '../../../api';
-import { PetBreedingResultData } from '../../communication';
+import { IPetBreedingResultData, IRoomSession } from '../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionPetBreedingResultEvent extends RoomSessionEvent
 {
     public static PET_BREEDING_RESULT: string = 'RSPFUE_PET_BREEDING_RESULT';
 
-    private _resultData: PetBreedingResultData;
-    private _otherResultData: PetBreedingResultData;
+    private _resultData: IPetBreedingResultData;
+    private _otherResultData: IPetBreedingResultData;
 
-    constructor(k: IRoomSession, _arg_2: PetBreedingResultData, _arg_3: PetBreedingResultData)
+    constructor(k: IRoomSession, _arg_2: IPetBreedingResultData, _arg_3: IPetBreedingResultData)
     {
         super(RoomSessionPetBreedingResultEvent.PET_BREEDING_RESULT, k);
 
@@ -17,12 +16,12 @@ export class RoomSessionPetBreedingResultEvent extends RoomSessionEvent
         this._otherResultData = _arg_3;
     }
 
-    public get resultData(): PetBreedingResultData
+    public get resultData(): IPetBreedingResultData
     {
         return this._resultData;
     }
 
-    public get otherResultData(): PetBreedingResultData
+    public get otherResultData(): IPetBreedingResultData
     {
         return this._otherResultData;
     }

src/events/session/RoomSessionPetCommandsUpdateEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../../../api';
+import { IRoomSession } from '../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionPetCommandsUpdateEvent extends RoomSessionEvent

src/events/session/RoomSessionPetFigureUpdateEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../../../api';
+import { IRoomSession } from '../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionPetFigureUpdateEvent extends RoomSessionEvent

src/events/session/RoomSessionPetInfoUpdateEvent.ts

@@ -1,21 +1,20 @@
-import { IRoomSession } from '../../../api';
-import { RoomPetData } from '../RoomPetData';
+import { IRoomPetData, IRoomSession } from '../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionPetInfoUpdateEvent extends RoomSessionEvent
 {
     public static PET_INFO: string = 'RSPIUE_PET_INFO';
 
-    private _petInfo: RoomPetData;
+    private _petInfo: IRoomPetData;
 
-    constructor(k: IRoomSession, _arg_2: RoomPetData)
+    constructor(k: IRoomSession, _arg_2: IRoomPetData)
     {
         super(RoomSessionPetInfoUpdateEvent.PET_INFO, k);
 
         this._petInfo = _arg_2;
     }
 
-    public get petInfo(): RoomPetData
+    public get petInfo(): IRoomPetData
     {
         return this._petInfo;
     }

src/events/session/RoomSessionPetLevelUpdateEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../../../api';
+import { IRoomSession } from '../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionPetLevelUpdateEvent extends RoomSessionEvent

src/events/session/RoomSessionPetPackageEvent.ts

@@ -1,5 +1,4 @@
-import { IRoomSession } from '../../../api';
-import { PetFigureDataParser } from '../../communication';
+import { IPetFigureData, IRoomSession } from '../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionPetPackageEvent extends RoomSessionEvent
@@ -8,11 +7,11 @@ export class RoomSessionPetPackageEvent extends RoomSessionEvent
     public static RSOPPE_OPEN_PET_PACKAGE_RESULT: string = 'RSOPPE_OPEN_PET_PACKAGE_RESULT';
 
     private _objectId: number = -1;
-    private _figureData: PetFigureDataParser;
+    private _figureData: IPetFigureData;
     private _nameValidationStatus: number = 0;
     private _nameValidationInfo: string = null;
 
-    constructor(k: string, _arg_2: IRoomSession, _arg_3: number, _arg_4: PetFigureDataParser, _arg_5: number, _arg_6: string)
+    constructor(k: string, _arg_2: IRoomSession, _arg_3: number, _arg_4: IPetFigureData, _arg_5: number, _arg_6: string)
     {
         super(k, _arg_2);
         this._objectId = _arg_3;
@@ -26,7 +25,7 @@ export class RoomSessionPetPackageEvent extends RoomSessionEvent
         return this._objectId;
     }
 
-    public get figureData(): PetFigureDataParser
+    public get figureData(): IPetFigureData
     {
         return this._figureData;
     }

src/events/session/RoomSessionPetStatusUpdateEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../../../api';
+import { IRoomSession } from '../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionPetStatusUpdateEvent extends RoomSessionEvent

src/events/session/RoomSessionPollEvent.ts

@@ -1,8 +1,6 @@
-import { IRoomSession } from '../../../api';
-import { PollQuestion } from '../../communication';
+import { IPollQuestion, IRoomSession } from '../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
-
 export class RoomSessionPollEvent extends RoomSessionEvent
 {
     public static OFFER: string = 'RSPE_POLL_OFFER';
@@ -15,7 +13,7 @@ export class RoomSessionPollEvent extends RoomSessionEvent
     private _numQuestions: number = 0;
     private _startMessage: string = '';
     private _endMessage: string = '';
-    private _questionArray: PollQuestion[] = null;
+    private _questionArray: IPollQuestion[] = null;
     private _npsPoll: boolean = false;
 
     constructor(k: string, _arg_2: IRoomSession, _arg_3: number)
@@ -80,12 +78,12 @@ export class RoomSessionPollEvent extends RoomSessionEvent
         this._endMessage = k;
     }
 
-    public get questionArray(): PollQuestion[]
+    public get questionArray(): IPollQuestion[]
     {
         return this._questionArray;
     }
 
-    public set questionArray(k: PollQuestion[])
+    public set questionArray(k: IPollQuestion[])
     {
         this._questionArray = k;
     }

src/events/session/RoomSessionPresentEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../../../api';
+import { IRoomSession } from '../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionPresentEvent extends RoomSessionEvent

src/events/session/RoomSessionPropertyUpdateEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../../../api';
+import { IRoomSession } from '../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionPropertyUpdateEvent extends RoomSessionEvent

src/events/session/RoomSessionQueueEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../../../api';
+import { IRoomSession } from '../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionQueueEvent extends RoomSessionEvent

src/events/session/RoomSessionSpectatorModeEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../../../api';
+import { IRoomSession } from '../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionSpectatorModeEvent extends RoomSessionEvent

src/events/session/RoomSessionUserBadgesEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../../../api';
+import { IRoomSession } from '../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionUserBadgesEvent extends RoomSessionEvent

src/events/session/RoomSessionUserDataUpdateEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession, IRoomUserData } from '../../../api';
+import { IRoomSession, IRoomUserData } from '../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionUserDataUpdateEvent extends RoomSessionEvent

src/events/session/RoomSessionUserFigureUpdateEvent.ts

@@ -1,4 +1,4 @@
-import { IRoomSession } from '../../../api';
+import { IRoomSession } from '../../api';
 import { RoomSessionEvent } from './RoomSessionEvent';
 
 export class RoomSessionUserFigureUpdateEvent extends RoomSessionEvent