diff --git a/src/api/INitroCore.ts b/src/api/INitroCore.ts new file mode 100644 index 00000000..646074c9 --- /dev/null +++ b/src/api/INitroCore.ts @@ -0,0 +1,11 @@ +import { IAssetManager } from './asset'; +import { IDisposable } from './common'; +import { ICommunicationManager } from './communication'; +import { IConfigurationManager } from './configuration'; + +export interface INitroCore extends IDisposable +{ + configuration: IConfigurationManager; + asset: IAssetManager; + communication: ICommunicationManager; +} diff --git a/src/api/events/IEventDispatcher.ts b/src/api/common/IEventDispatcher.ts similarity index 78% rename from src/api/events/IEventDispatcher.ts rename to src/api/common/IEventDispatcher.ts index 6b7e119b..1456adff 100644 --- a/src/api/events/IEventDispatcher.ts +++ b/src/api/common/IEventDispatcher.ts @@ -1,5 +1,6 @@ -import { IDisposable, INitroLogger } from '../common'; +import { IDisposable } from './IDisposable'; import { INitroEvent } from './INitroEvent'; +import { INitroLogger } from './INitroLogger'; export interface IEventDispatcher extends IDisposable { diff --git a/src/api/events/ILinkEventTracker.ts b/src/api/common/ILinkEventTracker.ts similarity index 100% rename from src/api/events/ILinkEventTracker.ts rename to src/api/common/ILinkEventTracker.ts diff --git a/src/api/events/INitroEvent.ts b/src/api/common/INitroEvent.ts similarity index 100% rename from src/api/events/INitroEvent.ts rename to src/api/common/INitroEvent.ts diff --git a/src/api/common/INitroManager.ts b/src/api/common/INitroManager.ts index 6ee5574e..2840ac2c 100644 --- a/src/api/common/INitroManager.ts +++ b/src/api/common/INitroManager.ts @@ -1,5 +1,5 @@ -import { IEventDispatcher } from '../events'; import { IDisposable } from './IDisposable'; +import { IEventDispatcher } from './IEventDispatcher'; import { INitroLogger } from './INitroLogger'; export interface INitroManager extends IDisposable diff --git a/src/api/events/IWorkerEventTracker.ts b/src/api/common/IWorkerEventTracker.ts similarity index 100% rename from src/api/events/IWorkerEventTracker.ts rename to src/api/common/IWorkerEventTracker.ts diff --git a/src/api/common/index.ts b/src/api/common/index.ts index a5e04021..08327ef4 100644 --- a/src/api/common/index.ts +++ b/src/api/common/index.ts @@ -1,4 +1,8 @@ export * from './IDisposable'; +export * from './IEventDispatcher'; +export * from './ILinkEventTracker'; +export * from './INitroEvent'; export * from './INitroLogger'; export * from './INitroManager'; export * from './IUpdateReceiver'; +export * from './IWorkerEventTracker'; diff --git a/src/api/communication/IConnection.ts b/src/api/communication/IConnection.ts index 158f6ec6..3aa30ab1 100644 --- a/src/api/communication/IConnection.ts +++ b/src/api/communication/IConnection.ts @@ -1,4 +1,4 @@ -import { IEventDispatcher } from '../events'; +import { IEventDispatcher } from '../common'; import { IMessageComposer } from './IMessageComposer'; import { IMessageConfiguration } from './IMessageConfiguration'; import { IMessageEvent } from './IMessageEvent'; diff --git a/src/api/events/index.ts b/src/api/events/index.ts deleted file mode 100644 index c4495c04..00000000 --- a/src/api/events/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export * from './IEventDispatcher'; -export * from './ILinkEventTracker'; -export * from './INitroEvent'; -export * from './IWorkerEventTracker'; diff --git a/src/api/index.ts b/src/api/index.ts index 6432ddb1..34916288 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -13,4 +13,4 @@ export * from './common'; export * from './communication'; export * from './communication/enums'; export * from './configuration'; -export * from './events'; +export * from './INitroCore'; diff --git a/src/core/INitroCore.ts b/src/core/INitroCore.ts deleted file mode 100644 index a10387e6..00000000 --- a/src/core/INitroCore.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { IAssetManager, ICommunicationManager, IConfigurationManager, IDisposable } from '../api'; - -export interface INitroCore extends IDisposable -{ - configuration: IConfigurationManager; - asset: IAssetManager; - communication: ICommunicationManager; -} diff --git a/src/core/NitroCore.ts b/src/core/NitroCore.ts index 633036a2..d7113946 100644 --- a/src/core/NitroCore.ts +++ b/src/core/NitroCore.ts @@ -1,10 +1,9 @@ -import { IAssetManager, ICommunicationManager, IConfigurationManager } from '../api'; -import { AssetManager } from './asset/AssetManager'; -import { Disposable } from './common/Disposable'; -import { CommunicationManager } from './communication/CommunicationManager'; -import { ConfigurationManager } from './configuration/ConfigurationManager'; -import { INitroCore } from './INitroCore'; -import { SayHello } from './utils/SayHello'; +import { IAssetManager, ICommunicationManager, IConfigurationManager, INitroCore } from '../api'; +import { AssetManager } from './asset'; +import { Disposable } from './common'; +import { CommunicationManager } from './communication'; +import { ConfigurationManager } from './configuration'; +import { SayHello } from './utils'; export class NitroCore extends Disposable implements INitroCore { diff --git a/src/core/asset/AssetManager.ts b/src/core/asset/AssetManager.ts index d8936c2e..c090304b 100644 --- a/src/core/asset/AssetManager.ts +++ b/src/core/asset/AssetManager.ts @@ -2,10 +2,9 @@ import { BaseTexture, Resource, Texture } from '@pixi/core'; import { Loader, LoaderResource } from '@pixi/loaders'; import { Spritesheet } from '@pixi/spritesheet'; import { IAssetData, IAssetManager, IGraphicAsset, IGraphicAssetCollection, INitroLogger } from '../../api'; -import { GraphicAssetCollection } from '../../room/object/visualization/utils/GraphicAssetCollection'; -import { Disposable } from '../common/Disposable'; -import { NitroLogger } from '../common/NitroLogger'; +import { Disposable, NitroLogger } from '../common'; import { ArrayBufferToBase64 } from '../utils'; +import { GraphicAssetCollection } from './GraphicAssetCollection'; import { NitroBundle } from './NitroBundle'; export class AssetManager extends Disposable implements IAssetManager @@ -23,11 +22,6 @@ export class AssetManager extends Disposable implements IAssetManager this._collections = new Map(); } - public static removeFileExtension(name: string): string - { - return (name.substring(0, name.lastIndexOf('.')) || name); - } - public getTexture(name: string): Texture { if (!name) return null; diff --git a/src/room/object/visualization/utils/GraphicAsset.ts b/src/core/asset/GraphicAsset.ts similarity index 98% rename from src/room/object/visualization/utils/GraphicAsset.ts rename to src/core/asset/GraphicAsset.ts index f4251a06..a29e57b6 100644 --- a/src/room/object/visualization/utils/GraphicAsset.ts +++ b/src/core/asset/GraphicAsset.ts @@ -1,6 +1,6 @@ import { Resource, Texture } from '@pixi/core'; import { Rectangle } from '@pixi/math'; -import { IGraphicAsset } from '../../../../api'; +import { IGraphicAsset } from '../../api'; export class GraphicAsset implements IGraphicAsset { diff --git a/src/room/object/visualization/utils/GraphicAssetCollection.ts b/src/core/asset/GraphicAssetCollection.ts similarity index 96% rename from src/room/object/visualization/utils/GraphicAssetCollection.ts rename to src/core/asset/GraphicAssetCollection.ts index e36c220c..eea72b97 100644 --- a/src/room/object/visualization/utils/GraphicAssetCollection.ts +++ b/src/core/asset/GraphicAssetCollection.ts @@ -1,9 +1,7 @@ import { BaseTexture, Resource, Texture } from '@pixi/core'; import { Spritesheet } from '@pixi/spritesheet'; import { Dict } from '@pixi/utils'; -import { IAsset, IAssetData, IAssetPalette, IGraphicAsset, IGraphicAssetCollection } from '../../../../api'; -import { AssetManager } from '../../../../core/asset/AssetManager'; -import { Nitro } from '../../../../nitro/Nitro'; +import { IAsset, IAssetData, IAssetPalette, IGraphicAsset, IGraphicAssetCollection } from '../../api'; import { GraphicAsset } from './GraphicAsset'; import { GraphicAssetPalette } from './GraphicAssetPalette'; @@ -39,6 +37,11 @@ export class GraphicAssetCollection implements IGraphicAssetCollection this.define(data); } + public static removeFileExtension(name: string): string + { + return (name.substring(0, name.lastIndexOf('.')) || name); + } + public dispose(): void { if (this._palettes) @@ -66,7 +69,7 @@ export class GraphicAssetCollection implements IGraphicAssetCollection public addReference(): void { this._referenceCount++; - this._referenceTimestamp = Nitro.instance.time; + //this._referenceTimestamp = Nitro.instance.time; } public removeReference(): void @@ -76,7 +79,7 @@ export class GraphicAssetCollection implements IGraphicAssetCollection if (this._referenceCount <= 0) { this._referenceCount = 0; - this._referenceTimestamp = Nitro.instance.time; + //this._referenceTimestamp = Nitro.instance.time; this.disposePaletteAssets(false); } @@ -330,7 +333,7 @@ export class GraphicAssetCollection implements IGraphicAssetCollection if (!texture) continue; - this._textures.set(AssetManager.removeFileExtension(name), texture); + this._textures.set(GraphicAssetCollection.removeFileExtension(name), texture); } } diff --git a/src/room/object/visualization/utils/GraphicAssetGifCollection.ts b/src/core/asset/GraphicAssetGifCollection.ts similarity index 100% rename from src/room/object/visualization/utils/GraphicAssetGifCollection.ts rename to src/core/asset/GraphicAssetGifCollection.ts diff --git a/src/room/object/visualization/utils/GraphicAssetPalette.ts b/src/core/asset/GraphicAssetPalette.ts similarity index 93% rename from src/room/object/visualization/utils/GraphicAssetPalette.ts rename to src/core/asset/GraphicAssetPalette.ts index 3de75405..c5bf8cae 100644 --- a/src/room/object/visualization/utils/GraphicAssetPalette.ts +++ b/src/core/asset/GraphicAssetPalette.ts @@ -1,6 +1,5 @@ import { Resource, Texture } from '@pixi/core'; -import { NitroSprite } from '../../../../pixi-proxy'; -import { TextureUtils } from '../../../utils'; +import { NitroSprite, TextureUtils } from '../../pixi-proxy'; export class GraphicAssetPalette { diff --git a/src/core/asset/NitroBundle.ts b/src/core/asset/NitroBundle.ts index 4c31075e..56f3b279 100644 --- a/src/core/asset/NitroBundle.ts +++ b/src/core/asset/NitroBundle.ts @@ -1,7 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Data, inflate } from 'pako'; -import { BinaryReader } from '../communication/codec/BinaryReader'; -import { ArrayBufferToBase64 } from '../utils'; +import { ArrayBufferToBase64, BinaryReader } from '../utils'; export class NitroBundle { @@ -23,14 +22,14 @@ export class NitroBundle let fileCount = binaryReader.readShort(); - while(fileCount > 0) + while (fileCount > 0) { const fileNameLength = binaryReader.readShort(); const fileName = binaryReader.readBytes(fileNameLength).toString(); const fileLength = binaryReader.readInt(); const buffer = binaryReader.readBytes(fileLength); - if(fileName.endsWith('.json')) + if (fileName.endsWith('.json')) { const decompressed = inflate((buffer.toArrayBuffer() as Data)); diff --git a/src/core/asset/index.ts b/src/core/asset/index.ts index 5dca55f3..b318a445 100644 --- a/src/core/asset/index.ts +++ b/src/core/asset/index.ts @@ -1,2 +1,6 @@ export * from './AssetManager'; +export * from './GraphicAsset'; +export * from './GraphicAssetCollection'; +export * from './GraphicAssetGifCollection'; +export * from './GraphicAssetPalette'; export * from './NitroBundle'; diff --git a/src/core/events/EventDispatcher.ts b/src/core/common/EventDispatcher.ts similarity index 89% rename from src/core/events/EventDispatcher.ts rename to src/core/common/EventDispatcher.ts index 0a781e32..3be83da2 100644 --- a/src/core/events/EventDispatcher.ts +++ b/src/core/common/EventDispatcher.ts @@ -1,8 +1,7 @@ import { IDisposable, IEventDispatcher, INitroLogger } from '../../api'; -import { Nitro } from '../../nitro/Nitro'; -import { Disposable } from '../common/Disposable'; -import { NitroLogger } from '../common/NitroLogger'; +import { Disposable } from './Disposable'; import { NitroEvent } from './NitroEvent'; +import { NitroLogger } from './NitroLogger'; export class EventDispatcher extends Disposable implements IEventDispatcher, IDisposable { @@ -64,7 +63,7 @@ export class EventDispatcher extends Disposable implements IEventDispatcher, IDi { if (!event) return false; - if (Nitro.instance.getConfiguration('system.dispatcher.log')) this._logger.log('Dispatched Event', event.type); + //if (Nitro.instance.getConfiguration('system.dispatcher.log')) this._logger.log('Dispatched Event', event.type); this.processEvent(event); diff --git a/src/core/events/NitroEvent.ts b/src/core/common/NitroEvent.ts similarity index 100% rename from src/core/events/NitroEvent.ts rename to src/core/common/NitroEvent.ts diff --git a/src/core/common/NitroManager.ts b/src/core/common/NitroManager.ts index 026ffe95..65a582b5 100644 --- a/src/core/common/NitroManager.ts +++ b/src/core/common/NitroManager.ts @@ -1,6 +1,6 @@ import { IEventDispatcher, INitroLogger, INitroManager } from '../../api'; -import { EventDispatcher } from '../events/EventDispatcher'; import { Disposable } from './Disposable'; +import { EventDispatcher } from './EventDispatcher'; import { NitroLogger } from './NitroLogger'; export class NitroManager extends Disposable implements INitroManager diff --git a/src/core/common/index.ts b/src/core/common/index.ts index 59124d14..ed685f50 100644 --- a/src/core/common/index.ts +++ b/src/core/common/index.ts @@ -1,3 +1,5 @@ export * from './Disposable'; +export * from './EventDispatcher'; +export * from './NitroEvent'; export * from './NitroLogger'; export * from './NitroManager'; diff --git a/src/core/communication/CommunicationManager.ts b/src/core/communication/CommunicationManager.ts index 3c081cb3..365d112c 100644 --- a/src/core/communication/CommunicationManager.ts +++ b/src/core/communication/CommunicationManager.ts @@ -1,6 +1,6 @@ import { ICommunicationManager, IConnection, IConnectionStateListener, IUpdateReceiver } from '../../api'; -import { Disposable } from '../common/Disposable'; -import { SocketConnection } from './connections/SocketConnection'; +import { Disposable } from '../common'; +import { SocketConnection } from './SocketConnection'; export class CommunicationManager extends Disposable implements ICommunicationManager, IUpdateReceiver { diff --git a/src/core/communication/connections/SocketConnection.ts b/src/core/communication/SocketConnection.ts similarity index 88% rename from src/core/communication/connections/SocketConnection.ts rename to src/core/communication/SocketConnection.ts index bab5d33a..ff25a882 100644 --- a/src/core/communication/connections/SocketConnection.ts +++ b/src/core/communication/SocketConnection.ts @@ -1,9 +1,8 @@ -import { ICodec, ICommunicationManager, IConnection, IConnectionStateListener, IMessageComposer, IMessageConfiguration, IMessageDataWrapper, IMessageEvent, WebSocketEventEnum } from '../../../api'; -import { Nitro } from '../../../nitro/Nitro'; -import { EventDispatcher } from '../../events/EventDispatcher'; -import { EvaWireFormat } from '../codec/evawire/EvaWireFormat'; -import { SocketConnectionEvent } from '../events/SocketConnectionEvent'; -import { MessageClassManager } from '../messages/MessageClassManager'; +import { ICodec, ICommunicationManager, IConnection, IConnectionStateListener, IMessageComposer, IMessageConfiguration, IMessageDataWrapper, IMessageEvent, WebSocketEventEnum } from '../../api'; +import { EventDispatcher } from '../common'; +import { EvaWireFormat } from './codec'; +import { MessageClassManager } from './messages'; +import { SocketConnectionEvent } from './SocketConnectionEvent'; export class SocketConnection extends EventDispatcher implements IConnection { @@ -175,7 +174,7 @@ export class SocketConnection extends EventDispatcher implements IConnection if (header === -1) { - if (Nitro.instance.getConfiguration('system.packet.log')) this.logger.log(`Unknown Composer: ${composer.constructor.name}`); + //if (Nitro.instance.getConfiguration('system.packet.log')) this.logger.log(`Unknown Composer: ${composer.constructor.name}`); continue; } @@ -185,12 +184,12 @@ export class SocketConnection extends EventDispatcher implements IConnection if (!encoded) { - if (Nitro.instance.getConfiguration('system.packet.log')) this.logger.log('Encoding Failed', composer.constructor.name); + //if (Nitro.instance.getConfiguration('system.packet.log')) this.logger.log('Encoding Failed', composer.constructor.name); continue; } - if (Nitro.instance.getConfiguration('system.packet.log')) this.logger.log('OutgoingComposer', header, composer.constructor.name, message); + //if (Nitro.instance.getConfiguration('system.packet.log')) this.logger.log('OutgoingComposer', header, composer.constructor.name, message); this.write(encoded.getBuffer()); } @@ -248,7 +247,7 @@ export class SocketConnection extends EventDispatcher implements IConnection if (!messages || !messages.length) continue; - if (Nitro.instance.getConfiguration('system.packet.log')) this.logger.log('IncomingMessage', wrapper.header, messages[0].constructor.name, messages[0].parser); + //if (Nitro.instance.getConfiguration('system.packet.log')) this.logger.log('IncomingMessage', wrapper.header, messages[0].constructor.name, messages[0].parser); this.handleMessages(...messages); } @@ -279,7 +278,7 @@ export class SocketConnection extends EventDispatcher implements IConnection if (!events || !events.length) { - if (Nitro.instance.getConfiguration('system.packet.log')) this.logger.log('IncomingMessage', wrapper.header, 'UNREGISTERED', wrapper); + //if (Nitro.instance.getConfiguration('system.packet.log')) this.logger.log('IncomingMessage', wrapper.header, 'UNREGISTERED', wrapper); return; } diff --git a/src/core/communication/events/SocketConnectionEvent.ts b/src/core/communication/SocketConnectionEvent.ts similarity index 87% rename from src/core/communication/events/SocketConnectionEvent.ts rename to src/core/communication/SocketConnectionEvent.ts index b2dcd055..ec697a0a 100644 --- a/src/core/communication/events/SocketConnectionEvent.ts +++ b/src/core/communication/SocketConnectionEvent.ts @@ -1,5 +1,5 @@ -import { IConnection } from '../../../api'; -import { NitroEvent } from '../../events/NitroEvent'; +import { IConnection } from '../../api'; +import { NitroEvent } from '../common'; export class SocketConnectionEvent extends NitroEvent { diff --git a/src/core/communication/codec/evawire/EvaWireFormat.ts b/src/core/communication/codec/evawire/EvaWireFormat.ts index 13a6c3f5..9e555862 100644 --- a/src/core/communication/codec/evawire/EvaWireFormat.ts +++ b/src/core/communication/codec/evawire/EvaWireFormat.ts @@ -1,6 +1,5 @@ import { IBinaryWriter, ICodec, IConnection, IMessageDataWrapper } from '../../../../api'; -import { BinaryReader } from '../BinaryReader'; -import { BinaryWriter } from '../BinaryWriter'; +import { BinaryReader, BinaryWriter } from '../../../utils'; import { Byte } from '../Byte'; import { Short } from '../Short'; import { EvaWireDataWrapper } from './EvaWireDataWrapper'; diff --git a/src/core/communication/codec/index.ts b/src/core/communication/codec/index.ts index 565b726a..cb49e180 100644 --- a/src/core/communication/codec/index.ts +++ b/src/core/communication/codec/index.ts @@ -1,5 +1,3 @@ -export * from './BinaryReader'; -export * from './BinaryWriter'; export * from './Byte'; export * from './evawire'; export * from './Short'; diff --git a/src/core/communication/connections/index.ts b/src/core/communication/connections/index.ts deleted file mode 100644 index 4f36c51e..00000000 --- a/src/core/communication/connections/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './SocketConnection'; diff --git a/src/core/communication/events/index.ts b/src/core/communication/events/index.ts deleted file mode 100644 index 1093b131..00000000 --- a/src/core/communication/events/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './SocketConnectionEvent'; diff --git a/src/core/communication/index.ts b/src/core/communication/index.ts index 803caee8..af71066a 100644 --- a/src/core/communication/index.ts +++ b/src/core/communication/index.ts @@ -1,5 +1,6 @@ export * from './codec'; +export * from './codec/evawire'; export * from './CommunicationManager'; -export * from './connections'; -export * from './events'; export * from './messages'; +export * from './SocketConnection'; +export * from './SocketConnectionEvent'; diff --git a/src/core/configuration/ConfigurationEvent.ts b/src/core/configuration/ConfigurationEvent.ts index 92fd59ae..ea72dfef 100644 --- a/src/core/configuration/ConfigurationEvent.ts +++ b/src/core/configuration/ConfigurationEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../events/NitroEvent'; +import { NitroEvent } from '../common'; export class ConfigurationEvent extends NitroEvent { @@ -9,4 +9,4 @@ export class ConfigurationEvent extends NitroEvent { super(type); } -} \ No newline at end of file +} diff --git a/src/core/configuration/ConfigurationManager.ts b/src/core/configuration/ConfigurationManager.ts index ff4b2684..1a210de9 100644 --- a/src/core/configuration/ConfigurationManager.ts +++ b/src/core/configuration/ConfigurationManager.ts @@ -1,5 +1,5 @@ import { IConfigurationManager } from '../../api'; -import { NitroManager } from '../common/NitroManager'; +import { NitroManager } from '../common'; import { ConfigurationEvent } from './ConfigurationEvent'; export class ConfigurationManager extends NitroManager implements IConfigurationManager diff --git a/src/core/events/index.ts b/src/core/events/index.ts deleted file mode 100644 index 6b39ee44..00000000 --- a/src/core/events/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './EventDispatcher'; -export * from './NitroEvent'; diff --git a/src/core/index.ts b/src/core/index.ts index 75b6fdae..58f92bbf 100644 --- a/src/core/index.ts +++ b/src/core/index.ts @@ -1,9 +1,10 @@ export * from './asset'; export * from './common'; export * from './communication'; +export * from './communication/codec'; +export * from './communication/codec/evawire'; +export * from './communication/messages'; export * from './configuration'; -export * from './events'; -export * from './INitroCore'; export * from './NitroCore'; export * from './NitroVersion'; export * from './utils'; diff --git a/src/core/communication/codec/BinaryReader.ts b/src/core/utils/BinaryReader.ts similarity index 91% rename from src/core/communication/codec/BinaryReader.ts rename to src/core/utils/BinaryReader.ts index 4ff2b469..51e12f3e 100644 --- a/src/core/communication/codec/BinaryReader.ts +++ b/src/core/utils/BinaryReader.ts @@ -1,4 +1,6 @@ -export class BinaryReader +import { IBinaryReader } from '../../api'; + +export class BinaryReader implements IBinaryReader { private _position: number; private _dataView: DataView; @@ -9,7 +11,7 @@ export class BinaryReader this._dataView = new DataView(buffer); } - public readBytes(length: number): BinaryReader + public readBytes(length: number): IBinaryReader { const buffer = new BinaryReader(this._dataView.buffer.slice(this._position, this._position + length)); diff --git a/src/core/communication/codec/BinaryWriter.ts b/src/core/utils/BinaryWriter.ts similarity index 76% rename from src/core/communication/codec/BinaryWriter.ts rename to src/core/utils/BinaryWriter.ts index 4f5c6b31..6d63e21e 100644 --- a/src/core/communication/codec/BinaryWriter.ts +++ b/src/core/utils/BinaryWriter.ts @@ -1,4 +1,6 @@ -export class BinaryWriter +import { IBinaryWriter } from '../../api'; + +export class BinaryWriter implements IBinaryWriter { private _buffer: Uint8Array; private _position: number; @@ -9,7 +11,7 @@ export class BinaryWriter this._position = 0; } - public writeByte(byte: number): BinaryWriter + public writeByte(byte: number): IBinaryWriter { const array = new Uint8Array(1); @@ -20,7 +22,7 @@ export class BinaryWriter return this; } - public writeBytes(bytes: ArrayBuffer | number[]): BinaryWriter + public writeBytes(bytes: ArrayBuffer | number[]): IBinaryWriter { const array = new Uint8Array(bytes); @@ -29,7 +31,7 @@ export class BinaryWriter return this; } - public writeShort(short: number): BinaryWriter + public writeShort(short: number): IBinaryWriter { const array = new Uint8Array(2); @@ -41,7 +43,7 @@ export class BinaryWriter return this; } - public writeInt(integer: number): BinaryWriter + public writeInt(integer: number): IBinaryWriter { const array = new Uint8Array(4); @@ -55,11 +57,11 @@ export class BinaryWriter return this; } - public writeString(string: string, includeLength: boolean = true): BinaryWriter + public writeString(string: string, includeLength: boolean = true): IBinaryWriter { const array = new TextEncoder().encode(string); - if(includeLength) + if (includeLength) { this.writeShort(array.length); this.appendArray(array); @@ -74,9 +76,9 @@ export class BinaryWriter private appendArray(array: Uint8Array): void { - if(!array) return; + if (!array) return; - const mergedArray = new Uint8Array( ((this.position + array.length) > this._buffer.length) ? (this.position + array.length) : this._buffer.length); + const mergedArray = new Uint8Array(((this.position + array.length) > this._buffer.length) ? (this.position + array.length) : this._buffer.length); mergedArray.set(this._buffer); mergedArray.set(array, this.position); diff --git a/src/core/utils/NitroTimer.ts b/src/core/utils/NitroTimer.ts deleted file mode 100644 index 1dca0434..00000000 --- a/src/core/utils/NitroTimer.ts +++ /dev/null @@ -1,43 +0,0 @@ -export class NitroTimer -{ - private _elapsedTime: number; - private _percision: number; - private _timer: any; - - constructor(percision: number = 1) - { - this._elapsedTime = 0; - this._percision = percision; - this._timer = null; - - this.start(); - } - - public start(): void - { - this._elapsedTime = 0; - - if(!this._timer) - { - this._timer = setInterval(() => this.increase(), this._percision); - } - } - - public stop(): void - { - if(this._timer) - { - clearTimeout(this._timer); - } - } - - private increase(): void - { - this._elapsedTime += this._percision; - } - - public getTimer(): number - { - return this._elapsedTime; - } -} \ No newline at end of file diff --git a/src/core/utils/SayHello.ts b/src/core/utils/SayHello.ts index 61de7897..2681e617 100644 --- a/src/core/utils/SayHello.ts +++ b/src/core/utils/SayHello.ts @@ -1,11 +1,11 @@ -import { NitroVersion } from '..'; +import { NitroVersion } from '../NitroVersion'; export const SayHello = () => { - if(navigator.userAgent.toLowerCase().indexOf('chrome') > -1) + if (navigator.userAgent.toLowerCase().indexOf('chrome') > -1) { const args = [ - `\n %c %c %c Nitro ${ NitroVersion.UI_VERSION } - Renderer ${ NitroVersion.RENDERER_VERSION } %c %c %c https://discord.nitrodev.co %c %c \n\n`, + `\n %c %c %c Nitro ${NitroVersion.UI_VERSION} - Renderer ${NitroVersion.RENDERER_VERSION} %c %c %c https://discord.nitrodev.co %c %c \n\n`, 'background: #ffffff; padding:5px 0;', 'background: #ffffff; padding:5px 0;', 'color: #ffffff; background: #000000; padding:5px 0;', @@ -19,8 +19,8 @@ export const SayHello = () => self.console.log(...args); } - else if(self.console) + else if (self.console) { - self.console.log(`Nitro ${ NitroVersion.UI_VERSION } - Renderer ${ NitroVersion.RENDERER_VERSION } `); + self.console.log(`Nitro ${NitroVersion.UI_VERSION} - Renderer ${NitroVersion.RENDERER_VERSION} `); } }; diff --git a/src/core/utils/index.ts b/src/core/utils/index.ts index accbd1e1..57269512 100644 --- a/src/core/utils/index.ts +++ b/src/core/utils/index.ts @@ -1,3 +1,5 @@ export * from './AdvancedMap'; export * from './ArrayBufferToBase64'; -export * from './NitroTimer'; +export * from './BinaryReader'; +export * from './BinaryWriter'; +export * from './SayHello'; diff --git a/src/nitro/INitro.ts b/src/nitro/INitro.ts index 87309b67..6a603af2 100644 --- a/src/nitro/INitro.ts +++ b/src/nitro/INitro.ts @@ -1,8 +1,6 @@ import { Application } from '@pixi/app'; import { Ticker } from '@pixi/ticker'; -import { IEventDispatcher, ILinkEventTracker, IWorkerEventTracker } from '../api'; -import { INitroCore } from '../core/INitroCore'; -import { NitroTimer } from '../core/utils/NitroTimer'; +import { IEventDispatcher, ILinkEventTracker, INitroCore, IWorkerEventTracker } from '../api'; import { IRoomManager } from '../room/IRoomManager'; import { IAvatarRenderManager } from './avatar/IAvatarRenderManager'; import { IRoomCameraWidgetManager } from './camera/IRoomCameraWidgetManager'; @@ -13,7 +11,7 @@ import { IRoomSessionManager } from './session/IRoomSessionManager'; import { ISessionDataManager } from './session/ISessionDataManager'; import { ISoundManager } from './sound/ISoundManager'; -export interface INitro extends Application +export interface INitro { init(): void; dispose(): void; @@ -29,7 +27,7 @@ export interface INitro extends Application removeLinkEventTracker(tracker: ILinkEventTracker): void; createLinkEvent(link: string): void; setWorker(val: Worker): void; - nitroTimer: NitroTimer; + application: Application; core: INitroCore; events: IEventDispatcher; localization: INitroLocalizationManager; diff --git a/src/nitro/Nitro.ts b/src/nitro/Nitro.ts index f4a61e88..4f0c7ec6 100644 --- a/src/nitro/Nitro.ts +++ b/src/nitro/Nitro.ts @@ -2,13 +2,9 @@ import { Application, IApplicationOptions } from '@pixi/app'; import { SCALE_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Ticker } from '@pixi/ticker'; -import { IEventDispatcher, ILinkEventTracker, IWorkerEventTracker } from '../api'; -import { ConfigurationEvent } from '../core/configuration/ConfigurationEvent'; -import { EventDispatcher } from '../core/events/EventDispatcher'; -import { NitroEvent } from '../core/events/NitroEvent'; -import { INitroCore } from '../core/INitroCore'; -import { NitroCore } from '../core/NitroCore'; -import { NitroTimer } from '../core/utils/NitroTimer'; +import { IEventDispatcher, ILinkEventTracker, INitroCore, IWorkerEventTracker } from '../api'; +import { ConfigurationEvent, EventDispatcher, NitroCore, NitroEvent } from '../core'; +import { PixiApplicationProxy } from '../pixi-proxy'; import { IRoomManager } from '../room/IRoomManager'; import { RoomManager } from '../room/RoomManager'; import { AvatarRenderManager } from './avatar/AvatarRenderManager'; @@ -39,7 +35,7 @@ LegacyExternalInterface.available; settings.SCALE_MODE = (!(window.devicePixelRatio % 1)) ? SCALE_MODES.NEAREST : SCALE_MODES.LINEAR; settings.ROUND_PIXELS = true; -export class Nitro extends Application implements INitro +export class Nitro implements INitro { public static WEBGL_CONTEXT_LOST: string = 'NE_WEBGL_CONTEXT_LOST'; public static WEBGL_UNAVAILABLE: string = 'NE_WEBGL_UNAVAILABLE'; @@ -47,8 +43,8 @@ export class Nitro extends Application implements INitro private static INSTANCE: INitro = null; - private _nitroTimer: NitroTimer; private _worker: Worker; + private _application: Application; private _core: INitroCore; private _events: IEventDispatcher; private _communication: INitroCommunicationManager; @@ -68,12 +64,10 @@ export class Nitro extends Application implements INitro constructor(core: INitroCore, options?: IApplicationOptions) { - super(options); - if (!Nitro.INSTANCE) Nitro.INSTANCE = this; - this._nitroTimer = new NitroTimer(); this._worker = null; + this._application = new PixiApplicationProxy(options); this._core = core; this._events = new EventDispatcher(); this._communication = new NitroCommunicationManager(core.communication); @@ -202,7 +196,12 @@ export class Nitro extends Application implements INitro this._communication = null; } - super.destroy(); + if (this._application) + { + this._application.destroy(); + + this._application = null; + } this._isDisposed = true; this._isReady = false; @@ -333,9 +332,9 @@ export class Nitro extends Application implements INitro this._worker.onmessage = this.createWorkerEvent.bind(this); } - public get nitroTimer(): NitroTimer + public get application(): Application { - return this._nitroTimer; + return this._application; } public get core(): INitroCore @@ -395,12 +394,12 @@ export class Nitro extends Application implements INitro public get width(): number { - return this.renderer.width; + return this._application.renderer.width; } public get height(): number { - return this.renderer.height; + return this._application.renderer.height; } public get ticker(): Ticker diff --git a/src/nitro/avatar/AvatarAssetDownloadLibrary.ts b/src/nitro/avatar/AvatarAssetDownloadLibrary.ts index d02f0482..16903701 100644 --- a/src/nitro/avatar/AvatarAssetDownloadLibrary.ts +++ b/src/nitro/avatar/AvatarAssetDownloadLibrary.ts @@ -1,5 +1,5 @@ import { IAssetManager } from '../../api'; -import { EventDispatcher } from '../../core/events/EventDispatcher'; +import { EventDispatcher } from '../../core'; import { AvatarRenderLibraryEvent } from './events/AvatarRenderLibraryEvent'; export class AvatarAssetDownloadLibrary extends EventDispatcher diff --git a/src/nitro/avatar/AvatarAssetDownloadManager.ts b/src/nitro/avatar/AvatarAssetDownloadManager.ts index 50434c3a..e4e9d104 100644 --- a/src/nitro/avatar/AvatarAssetDownloadManager.ts +++ b/src/nitro/avatar/AvatarAssetDownloadManager.ts @@ -1,6 +1,5 @@ import { IAssetManager } from '../../api'; -import { EventDispatcher } from '../../core/events/EventDispatcher'; -import { NitroEvent } from '../../core/events/NitroEvent'; +import { EventDispatcher, NitroEvent } from '../../core'; import { Nitro } from '../Nitro'; import { AvatarAssetDownloadLibrary } from './AvatarAssetDownloadLibrary'; import { AvatarStructure } from './AvatarStructure'; diff --git a/src/nitro/avatar/AvatarImage.ts b/src/nitro/avatar/AvatarImage.ts index 74bb7a32..03fbc981 100644 --- a/src/nitro/avatar/AvatarImage.ts +++ b/src/nitro/avatar/AvatarImage.ts @@ -4,10 +4,8 @@ import { ColorMatrixFilter } from '@pixi/filter-color-matrix'; import { Rectangle } from '@pixi/math'; import { Sprite } from '@pixi/sprite'; import { IGraphicAsset } from '../../api'; -import { AdvancedMap } from '../../core/utils/AdvancedMap'; -import { PaletteMapFilter } from '../../core/utils/PaletteMapFilter'; -import { NitroContainer, NitroSprite } from '../../pixi-proxy'; -import { TextureUtils } from '../../room/utils/TextureUtils'; +import { AdvancedMap } from '../../core'; +import { NitroContainer, NitroSprite, PaletteMapFilter, PixiApplicationProxy, TextureUtils } from '../../pixi-proxy'; import { Nitro } from '../Nitro'; import { ActiveActionData } from './actions/ActiveActionData'; import { IActionDefinition } from './actions/IActionDefinition'; @@ -413,7 +411,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener if (this._reusableTexture) { - Nitro.instance.renderer.render(container, { + PixiApplicationProxy.instance.renderer.render(container, { renderTexture: this._reusableTexture, clear: true }); @@ -484,7 +482,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener const newTexture = new Sprite(Texture.from(textureCanvas)); - Nitro.instance.renderer.render(newTexture, { + PixiApplicationProxy.instance.renderer.render(newTexture, { renderTexture: texture, clear: true }); diff --git a/src/nitro/avatar/AvatarRenderManager.ts b/src/nitro/avatar/AvatarRenderManager.ts index 1913b98b..b2259e3d 100644 --- a/src/nitro/avatar/AvatarRenderManager.ts +++ b/src/nitro/avatar/AvatarRenderManager.ts @@ -1,6 +1,5 @@ import { IAssetManager, IGraphicAsset } from '../../api'; -import { NitroManager } from '../../core/common/NitroManager'; -import { NitroEvent } from '../../core/events/NitroEvent'; +import { NitroEvent, NitroManager } from '../../core'; import { Nitro } from '../Nitro'; import { FigureDataContainer } from '../utils/FigureDataContainer'; import { AssetAliasCollection } from './alias/AssetAliasCollection'; diff --git a/src/nitro/avatar/AvatarStructure.ts b/src/nitro/avatar/AvatarStructure.ts index e222f5bc..f9e3c480 100644 --- a/src/nitro/avatar/AvatarStructure.ts +++ b/src/nitro/avatar/AvatarStructure.ts @@ -1,6 +1,6 @@ import { Point } from '@pixi/math'; import { IAssetAnimation, IAssetManager } from '../../api'; -import { EventDispatcher } from '../../core/events/EventDispatcher'; +import { EventDispatcher } from '../../core'; import { ActionDefinition } from './actions/ActionDefinition'; import { AvatarActionManager } from './actions/AvatarActionManager'; import { IActionDefinition } from './actions/IActionDefinition'; diff --git a/src/nitro/avatar/EffectAssetDownloadLibrary.ts b/src/nitro/avatar/EffectAssetDownloadLibrary.ts index ce35a98f..5f53d242 100644 --- a/src/nitro/avatar/EffectAssetDownloadLibrary.ts +++ b/src/nitro/avatar/EffectAssetDownloadLibrary.ts @@ -1,5 +1,5 @@ import { IAssetAnimation, IAssetManager } from '../../api'; -import { EventDispatcher } from '../../core/events/EventDispatcher'; +import { EventDispatcher } from '../../core'; import { AvatarRenderEffectLibraryEvent } from './events/AvatarRenderEffectLibraryEvent'; export class EffectAssetDownloadLibrary extends EventDispatcher diff --git a/src/nitro/avatar/EffectAssetDownloadManager.ts b/src/nitro/avatar/EffectAssetDownloadManager.ts index f3ee9f09..a4d35fef 100644 --- a/src/nitro/avatar/EffectAssetDownloadManager.ts +++ b/src/nitro/avatar/EffectAssetDownloadManager.ts @@ -1,6 +1,5 @@ import { IAssetManager } from '../../api'; -import { EventDispatcher } from '../../core/events/EventDispatcher'; -import { NitroEvent } from '../../core/events/NitroEvent'; +import { EventDispatcher, NitroEvent } from '../../core'; import { Nitro } from '../Nitro'; import { AvatarStructure } from './AvatarStructure'; import { EffectAssetDownloadLibrary } from './EffectAssetDownloadLibrary'; diff --git a/src/nitro/avatar/events/AvatarRenderEffectLibraryEvent.ts b/src/nitro/avatar/events/AvatarRenderEffectLibraryEvent.ts index 68041bd9..c636fe6c 100644 --- a/src/nitro/avatar/events/AvatarRenderEffectLibraryEvent.ts +++ b/src/nitro/avatar/events/AvatarRenderEffectLibraryEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../../core/events/NitroEvent'; +import { NitroEvent } from '../../../core'; import { EffectAssetDownloadLibrary } from '../EffectAssetDownloadLibrary'; export class AvatarRenderEffectLibraryEvent extends NitroEvent @@ -18,4 +18,4 @@ export class AvatarRenderEffectLibraryEvent extends NitroEvent { return this._library; } -} \ No newline at end of file +} diff --git a/src/nitro/avatar/events/AvatarRenderLibraryEvent.ts b/src/nitro/avatar/events/AvatarRenderLibraryEvent.ts index caa80d5c..98df7207 100644 --- a/src/nitro/avatar/events/AvatarRenderLibraryEvent.ts +++ b/src/nitro/avatar/events/AvatarRenderLibraryEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../../core/events/NitroEvent'; +import { NitroEvent } from '../../../core'; import { AvatarAssetDownloadLibrary } from '../AvatarAssetDownloadLibrary'; export class AvatarRenderLibraryEvent extends NitroEvent @@ -18,4 +18,4 @@ export class AvatarRenderLibraryEvent extends NitroEvent { return this._library; } -} \ No newline at end of file +} diff --git a/src/nitro/avatar/structure/AvatarStructureDownload.ts b/src/nitro/avatar/structure/AvatarStructureDownload.ts index 0103c961..9738bb72 100644 --- a/src/nitro/avatar/structure/AvatarStructureDownload.ts +++ b/src/nitro/avatar/structure/AvatarStructureDownload.ts @@ -1,5 +1,4 @@ -import { EventDispatcher } from '../../../core/events/EventDispatcher'; -import { NitroEvent } from '../../../core/events/NitroEvent'; +import { EventDispatcher, NitroEvent } from '../../../core'; import { IFigureSetData } from './IFigureSetData'; export class AvatarStructureDownload extends EventDispatcher @@ -31,9 +30,9 @@ export class AvatarStructureDownload extends EventDispatcher { const response = request.responseText; - if(!response || !response.length) throw new Error('invalid_figure_data'); + if (!response || !response.length) throw new Error('invalid_figure_data'); - if(this._dataReceiver) this._dataReceiver.appendJSON(JSON.parse(response)); + if (this._dataReceiver) this._dataReceiver.appendJSON(JSON.parse(response)); this.dispatchEvent(new NitroEvent(AvatarStructureDownload.AVATAR_STRUCTURE_DONE)); }; diff --git a/src/nitro/avatar/structure/figure/ISetType.ts b/src/nitro/avatar/structure/figure/ISetType.ts index 23a1f659..0df7f939 100644 --- a/src/nitro/avatar/structure/figure/ISetType.ts +++ b/src/nitro/avatar/structure/figure/ISetType.ts @@ -1,4 +1,4 @@ -import { AdvancedMap } from '../../../../core/utils/AdvancedMap'; +import { AdvancedMap } from '../../../../core'; import { IFigurePartSet } from './IFigurePartSet'; export interface ISetType diff --git a/src/nitro/avatar/structure/figure/SetType.ts b/src/nitro/avatar/structure/figure/SetType.ts index d5e0f3eb..b665ad8a 100644 --- a/src/nitro/avatar/structure/figure/SetType.ts +++ b/src/nitro/avatar/structure/figure/SetType.ts @@ -1,4 +1,4 @@ -import { AdvancedMap } from '../../../../core/utils/AdvancedMap'; +import { AdvancedMap } from '../../../../core'; import { IFigureDataSetType } from '../../interfaces'; import { FigurePartSet } from './FigurePartSet'; import { IFigurePartSet } from './IFigurePartSet'; @@ -13,13 +13,13 @@ export class SetType implements ISetType constructor(data: IFigureDataSetType) { - if(!data) throw new Error('invalid_data'); + if (!data) throw new Error('invalid_data'); this._type = data.type; this._paletteId = data.paletteId; this._isMandatory = {}; - this._isMandatory['F'] = [ data.mandatory_f_0, data.mandatory_f_1 ]; - this._isMandatory['M'] = [ data.mandatory_m_0, data.mandatory_m_1 ]; + this._isMandatory['F'] = [data.mandatory_f_0, data.mandatory_f_1]; + this._isMandatory['M'] = [data.mandatory_m_0, data.mandatory_m_1]; this._partSets = new AdvancedMap(); this.append(data); @@ -27,7 +27,7 @@ export class SetType implements ISetType public dispose(): void { - for(const set of this._partSets.getValues()) + for (const set of this._partSets.getValues()) { const partSet = set as FigurePartSet; @@ -39,12 +39,12 @@ export class SetType implements ISetType public cleanUp(data: IFigureDataSetType): void { - for(const set of data.sets) + for (const set of data.sets) { const setId = set.id.toString(); const partSet = (this._partSets.getValue(setId) as FigurePartSet); - if(partSet) + if (partSet) { partSet.dispose(); @@ -55,18 +55,18 @@ export class SetType implements ISetType public append(setType: IFigureDataSetType): void { - if(!setType || !setType.sets) return; + if (!setType || !setType.sets) return; - for(const set of setType.sets) this._partSets.add(set.id.toString(), new FigurePartSet(this._type, set)); + for (const set of setType.sets) this._partSets.add(set.id.toString(), new FigurePartSet(this._type, set)); } public getDefaultPartSet(gender: string): IFigurePartSet { - for(const set of this._partSets.getValues()) + for (const set of this._partSets.getValues()) { - if(!set) continue; + if (!set) continue; - if((set.clubLevel === 0) && ((set.gender === gender) || (set.gender === 'U'))) return set; + if ((set.clubLevel === 0) && ((set.gender === gender) || (set.gender === 'U'))) return set; } return null; diff --git a/src/nitro/camera/RoomCameraWidgetManager.ts b/src/nitro/camera/RoomCameraWidgetManager.ts index 87a12f68..7993dc53 100644 --- a/src/nitro/camera/RoomCameraWidgetManager.ts +++ b/src/nitro/camera/RoomCameraWidgetManager.ts @@ -2,8 +2,7 @@ import { Texture } from '@pixi/core'; import { ColorMatrix, ColorMatrixFilter } from '@pixi/filter-color-matrix'; import { IEventDispatcher } from '../../api'; import { EventDispatcher } from '../../core'; -import { NitroContainer, NitroSprite } from '../../pixi-proxy'; -import { TextureUtils } from '../../room'; +import { NitroContainer, NitroSprite, TextureUtils } from '../../pixi-proxy'; import { Nitro } from '../Nitro'; import { RoomCameraWidgetManagerEvent } from './events/RoomCameraWidgetManagerEvent'; import { IRoomCameraWidgetEffect } from './IRoomCameraWidgetEffect'; diff --git a/src/nitro/camera/events/RoomCameraWidgetManagerEvent.ts b/src/nitro/camera/events/RoomCameraWidgetManagerEvent.ts index fb5abd8b..8fb56e52 100644 --- a/src/nitro/camera/events/RoomCameraWidgetManagerEvent.ts +++ b/src/nitro/camera/events/RoomCameraWidgetManagerEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../../core/events/NitroEvent'; +import { NitroEvent } from '../../../core'; export class RoomCameraWidgetManagerEvent extends NitroEvent { diff --git a/src/nitro/communication/NitroCommunicationManager.ts b/src/nitro/communication/NitroCommunicationManager.ts index 0a5731fa..d2c4a825 100644 --- a/src/nitro/communication/NitroCommunicationManager.ts +++ b/src/nitro/communication/NitroCommunicationManager.ts @@ -1,7 +1,5 @@ import { ICommunicationManager, IConnection, IConnectionStateListener, IMessageConfiguration, IMessageEvent } from '../../api'; -import { NitroManager } from '../../core/common/NitroManager'; -import { SocketConnectionEvent } from '../../core/communication/events/SocketConnectionEvent'; -import { NitroEvent } from '../../core/events/NitroEvent'; +import { NitroEvent, NitroManager, SocketConnectionEvent } from '../../core'; import { Nitro } from '../Nitro'; import { NitroCommunicationDemo } from './demo/NitroCommunicationDemo'; import { NitroCommunicationDemoEvent } from './demo/NitroCommunicationDemoEvent'; diff --git a/src/nitro/communication/demo/NitroCommunicationDemo.ts b/src/nitro/communication/demo/NitroCommunicationDemo.ts index 2fe5243e..25b18c44 100644 --- a/src/nitro/communication/demo/NitroCommunicationDemo.ts +++ b/src/nitro/communication/demo/NitroCommunicationDemo.ts @@ -1,6 +1,5 @@ import { IConnection } from '../../../api'; -import { NitroManager } from '../../../core/common/NitroManager'; -import { SocketConnectionEvent } from '../../../core/communication/events/SocketConnectionEvent'; +import { NitroManager, SocketConnectionEvent } from '../../../core'; import { Nitro } from '../../Nitro'; import { INitroCommunicationManager } from '../INitroCommunicationManager'; import { ClientPingEvent } from '../messages/incoming/client/ClientPingEvent'; diff --git a/src/nitro/communication/demo/NitroCommunicationDemoEvent.ts b/src/nitro/communication/demo/NitroCommunicationDemoEvent.ts index f1778da8..721bf876 100644 --- a/src/nitro/communication/demo/NitroCommunicationDemoEvent.ts +++ b/src/nitro/communication/demo/NitroCommunicationDemoEvent.ts @@ -1,5 +1,5 @@ import { IConnection } from '../../../api'; -import { NitroEvent } from '../../../core/events/NitroEvent'; +import { NitroEvent } from '../../../core'; export class NitroCommunicationDemoEvent extends NitroEvent { diff --git a/src/nitro/communication/messages/incoming/advertisement/InterstitialMessageEvent.ts b/src/nitro/communication/messages/incoming/advertisement/InterstitialMessageEvent.ts index 07ee3f98..2e297e75 100644 --- a/src/nitro/communication/messages/incoming/advertisement/InterstitialMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/advertisement/InterstitialMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { InterstitialMessageParser } from '../../parser'; export class InterstitialMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/advertisement/RoomAdErrorEvent.ts b/src/nitro/communication/messages/incoming/advertisement/RoomAdErrorEvent.ts index 77d7cf3e..162c2320 100644 --- a/src/nitro/communication/messages/incoming/advertisement/RoomAdErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/advertisement/RoomAdErrorEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { RoomAdErrorMessageParser } from '../../parser'; export class RoomAdErrorEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/availability/AvailabilityStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/availability/AvailabilityStatusMessageEvent.ts index a492a043..9779f778 100644 --- a/src/nitro/communication/messages/incoming/availability/AvailabilityStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/availability/AvailabilityStatusMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { AvailabilityStatusMessageParser } from '../../parser/availability/AvailabilityStatusMessageParser'; export class AvailabilityStatusMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/availability/AvailabilityTimeMessageEvent.ts b/src/nitro/communication/messages/incoming/availability/AvailabilityTimeMessageEvent.ts index 1ba18aab..3db21149 100644 --- a/src/nitro/communication/messages/incoming/availability/AvailabilityTimeMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/availability/AvailabilityTimeMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { AvailabilityTimeMessageParser } from '../../parser'; export class AvailabilityTimeMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/availability/HotelClosedAndOpensEvent.ts b/src/nitro/communication/messages/incoming/availability/HotelClosedAndOpensEvent.ts index 0c1759e7..be7b77ad 100644 --- a/src/nitro/communication/messages/incoming/availability/HotelClosedAndOpensEvent.ts +++ b/src/nitro/communication/messages/incoming/availability/HotelClosedAndOpensEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { HotelClosedAndOpensMessageParser } from '../../parser'; export class HotelClosedAndOpensEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/availability/HotelClosesAndWillOpenAtEvent.ts b/src/nitro/communication/messages/incoming/availability/HotelClosesAndWillOpenAtEvent.ts index ad4ee56f..32a4adba 100644 --- a/src/nitro/communication/messages/incoming/availability/HotelClosesAndWillOpenAtEvent.ts +++ b/src/nitro/communication/messages/incoming/availability/HotelClosesAndWillOpenAtEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { HotelClosesAndWillOpenAtMessageParser } from '../../parser'; export class HotelClosesAndWillOpenAtEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/availability/HotelWillCloseInMinutesEvent.ts b/src/nitro/communication/messages/incoming/availability/HotelWillCloseInMinutesEvent.ts index ed16faee..f457a6c6 100644 --- a/src/nitro/communication/messages/incoming/availability/HotelWillCloseInMinutesEvent.ts +++ b/src/nitro/communication/messages/incoming/availability/HotelWillCloseInMinutesEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { HotelWillCloseInMinutesMessageParser } from '../../parser'; export class HotelWillCloseInMinutesEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/availability/MaintenanceStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/availability/MaintenanceStatusMessageEvent.ts index 8006558e..ec58bbd2 100644 --- a/src/nitro/communication/messages/incoming/availability/MaintenanceStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/availability/MaintenanceStatusMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { MaintenanceStatusMessageParser } from '../../parser'; export class MaintenanceStatusMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/avatar/ChangeUserNameResultMessageEvent.ts b/src/nitro/communication/messages/incoming/avatar/ChangeUserNameResultMessageEvent.ts index 01c02396..f816b19a 100644 --- a/src/nitro/communication/messages/incoming/avatar/ChangeUserNameResultMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/avatar/ChangeUserNameResultMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { ChangeUserNameResultMessageParser } from '../../parser/avatar/ChangeUserNameResultMessageParser'; export class ChangeUserNameResultMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/avatar/CheckUserNameResultMessageEvent.ts b/src/nitro/communication/messages/incoming/avatar/CheckUserNameResultMessageEvent.ts index 22e61167..91700289 100644 --- a/src/nitro/communication/messages/incoming/avatar/CheckUserNameResultMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/avatar/CheckUserNameResultMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CheckUserNameResultMessageParser } from '../../parser/avatar/CheckUserNameResultMessageParser'; export class CheckUserNameResultMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/avatar/FigureUpdateEvent.ts b/src/nitro/communication/messages/incoming/avatar/FigureUpdateEvent.ts index b8938155..398b46d8 100644 --- a/src/nitro/communication/messages/incoming/avatar/FigureUpdateEvent.ts +++ b/src/nitro/communication/messages/incoming/avatar/FigureUpdateEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { FigureUpdateParser } from '../../parser'; export class FigureUpdateEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/avatar/WardrobeMessageEvent.ts b/src/nitro/communication/messages/incoming/avatar/WardrobeMessageEvent.ts index 48435186..1337f40a 100644 --- a/src/nitro/communication/messages/incoming/avatar/WardrobeMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/avatar/WardrobeMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { WardrobeMessageParser } from '../../parser'; export class WardrobeMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/bots/BotAddedToInventoryEvent.ts b/src/nitro/communication/messages/incoming/bots/BotAddedToInventoryEvent.ts index 756ed488..90c26e35 100644 --- a/src/nitro/communication/messages/incoming/bots/BotAddedToInventoryEvent.ts +++ b/src/nitro/communication/messages/incoming/bots/BotAddedToInventoryEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { BotAddedToInventoryParser } from '../../parser/bots/BotAddedToInventoryParser'; export class BotAddedToInventoryEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/bots/BotInventoryMessageEvent.ts b/src/nitro/communication/messages/incoming/bots/BotInventoryMessageEvent.ts index 5d3ee304..a9ccfec3 100644 --- a/src/nitro/communication/messages/incoming/bots/BotInventoryMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/bots/BotInventoryMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { BotInventoryMessageParser } from '../../parser/bots/BotInventoryMessageParser'; export class BotInventoryMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/bots/BotReceivedMessageEvent.ts b/src/nitro/communication/messages/incoming/bots/BotReceivedMessageEvent.ts index 4e0edf02..f1dfc554 100644 --- a/src/nitro/communication/messages/incoming/bots/BotReceivedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/bots/BotReceivedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { BotReceivedMessageParser } from '../../parser/bots/BotReceivedMessageParser'; export class BotReceivedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/bots/BotRemovedFromInventoryEvent.ts b/src/nitro/communication/messages/incoming/bots/BotRemovedFromInventoryEvent.ts index 58d6e86d..0e9ea6b6 100644 --- a/src/nitro/communication/messages/incoming/bots/BotRemovedFromInventoryEvent.ts +++ b/src/nitro/communication/messages/incoming/bots/BotRemovedFromInventoryEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { BotRemovedFromInventoryParser } from '../../parser/bots/BotRemovedFromInventoryParser'; export class BotRemovedFromInventoryEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/callforhelp/CfhSanctionMessageEvent.ts b/src/nitro/communication/messages/incoming/callforhelp/CfhSanctionMessageEvent.ts index c95803df..3cd38c61 100644 --- a/src/nitro/communication/messages/incoming/callforhelp/CfhSanctionMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/callforhelp/CfhSanctionMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CfhSanctionMessageParser } from '../../parser/callforhelp/CfhSanctionMessageParser'; export class CfhSanctionMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/callforhelp/CfhTopicsInitEvent.ts b/src/nitro/communication/messages/incoming/callforhelp/CfhTopicsInitEvent.ts index 6788922a..0e604104 100644 --- a/src/nitro/communication/messages/incoming/callforhelp/CfhTopicsInitEvent.ts +++ b/src/nitro/communication/messages/incoming/callforhelp/CfhTopicsInitEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CfhTopicsInitMessageParser } from '../../parser/callforhelp/CfhTopicsInitMessageParser'; export class CfhTopicsInitEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/callforhelp/SanctionStatusEvent.ts b/src/nitro/communication/messages/incoming/callforhelp/SanctionStatusEvent.ts index aaf293ed..10c71b77 100644 --- a/src/nitro/communication/messages/incoming/callforhelp/SanctionStatusEvent.ts +++ b/src/nitro/communication/messages/incoming/callforhelp/SanctionStatusEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { SanctionStatusMessageParser } from '../../parser/callforhelp'; export class SanctionStatusEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/camera/CameraPublishStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/camera/CameraPublishStatusMessageEvent.ts index 7da5d50f..b7f301d6 100644 --- a/src/nitro/communication/messages/incoming/camera/CameraPublishStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/camera/CameraPublishStatusMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CameraPublishStatusMessageParser } from '../../parser/camera/CameraPublishStatusMessageParser'; export class CameraPublishStatusMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/camera/CameraPurchaseOKMessageEvent.ts b/src/nitro/communication/messages/incoming/camera/CameraPurchaseOKMessageEvent.ts index 4800dff4..ffa9168d 100644 --- a/src/nitro/communication/messages/incoming/camera/CameraPurchaseOKMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/camera/CameraPurchaseOKMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CameraPurchaseOKMessageParser } from '../../parser/camera/CameraPurchaseOKMessageParser'; export class CameraPurchaseOKMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/camera/CameraStorageUrlMessageEvent.ts b/src/nitro/communication/messages/incoming/camera/CameraStorageUrlMessageEvent.ts index 2e2e90d9..6845e9bf 100644 --- a/src/nitro/communication/messages/incoming/camera/CameraStorageUrlMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/camera/CameraStorageUrlMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CameraStorageUrlMessageParser } from '../../parser/camera/CameraStorageUrlMessageParser'; export class CameraStorageUrlMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/camera/CompetitionStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/camera/CompetitionStatusMessageEvent.ts index 6fb479f5..86d5b402 100644 --- a/src/nitro/communication/messages/incoming/camera/CompetitionStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/camera/CompetitionStatusMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CompetitionStatusMessageParser } from '../../parser/camera/CompetitionStatusMessageParser'; export class CompetitionStatusMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/camera/InitCameraMessageEvent.ts b/src/nitro/communication/messages/incoming/camera/InitCameraMessageEvent.ts index b42c63cc..d71b1820 100644 --- a/src/nitro/communication/messages/incoming/camera/InitCameraMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/camera/InitCameraMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { InitCameraMessageParser } from '../../parser/camera/InitCameraMessageParser'; export class InitCameraMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/camera/ThumbnailStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/camera/ThumbnailStatusMessageEvent.ts index e2a4e40f..d7992c71 100644 --- a/src/nitro/communication/messages/incoming/camera/ThumbnailStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/camera/ThumbnailStatusMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { ThumbnailStatusMessageParser } from '../../parser/camera/ThumbnailStatusMessageParser'; export class ThumbnailStatusMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/campaign/CampaignCalendarDataMessageEvent.ts b/src/nitro/communication/messages/incoming/campaign/CampaignCalendarDataMessageEvent.ts index 046b133c..f40dfc8b 100644 --- a/src/nitro/communication/messages/incoming/campaign/CampaignCalendarDataMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/campaign/CampaignCalendarDataMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CampaignCalendarDataMessageParser } from '../../parser/campaign'; export class CampaignCalendarDataMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/campaign/CampaignCalendarDoorOpenedMessageEvent.ts b/src/nitro/communication/messages/incoming/campaign/CampaignCalendarDoorOpenedMessageEvent.ts index a8b3c37a..d1e9e3cf 100644 --- a/src/nitro/communication/messages/incoming/campaign/CampaignCalendarDoorOpenedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/campaign/CampaignCalendarDoorOpenedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CampaignCalendarDoorOpenedMessageParser } from '../../parser/campaign'; export class CampaignCalendarDoorOpenedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/BonusRareInfoMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/BonusRareInfoMessageEvent.ts index f23ca691..44a8cb60 100644 --- a/src/nitro/communication/messages/incoming/catalog/BonusRareInfoMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/BonusRareInfoMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { BonusRareInfoMessageParser } from '../../parser'; export class BonusRareInfoMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/BuildersClubFurniCountMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/BuildersClubFurniCountMessageEvent.ts index 15824747..8282bdd6 100644 --- a/src/nitro/communication/messages/incoming/catalog/BuildersClubFurniCountMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/BuildersClubFurniCountMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { BuildersClubFurniCountMessageParser } from '../../parser'; export class BuildersClubFurniCountMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/BuildersClubSubscriptionStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/BuildersClubSubscriptionStatusMessageEvent.ts index 0bde526e..77a84ee4 100644 --- a/src/nitro/communication/messages/incoming/catalog/BuildersClubSubscriptionStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/BuildersClubSubscriptionStatusMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { BuildersClubSubscriptionStatusMessageParser } from '../../parser'; export class BuildersClubSubscriptionStatusMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/BundleDiscountRulesetMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/BundleDiscountRulesetMessageEvent.ts index a25ac574..9c9ad068 100644 --- a/src/nitro/communication/messages/incoming/catalog/BundleDiscountRulesetMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/BundleDiscountRulesetMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { BundleDiscountRulesetMessageParser } from '../../parser'; export class BundleDiscountRulesetMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/CatalogPageExpirationEvent.ts b/src/nitro/communication/messages/incoming/catalog/CatalogPageExpirationEvent.ts index e337b58a..ee463719 100644 --- a/src/nitro/communication/messages/incoming/catalog/CatalogPageExpirationEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/CatalogPageExpirationEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CatalogPageExpirationParser } from '../../parser'; export class CatalogPageExpirationEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/CatalogPageMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/CatalogPageMessageEvent.ts index f9e4f70c..de262a39 100644 --- a/src/nitro/communication/messages/incoming/catalog/CatalogPageMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/CatalogPageMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CatalogPageMessageParser } from '../../parser/catalog/CatalogPageMessageParser'; export class CatalogPageMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/CatalogPageWithEarliestExpiryMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/CatalogPageWithEarliestExpiryMessageEvent.ts index 2a22e3fd..79659f3e 100644 --- a/src/nitro/communication/messages/incoming/catalog/CatalogPageWithEarliestExpiryMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/CatalogPageWithEarliestExpiryMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CatalogPageWithEarliestExpiryMessageParser } from '../../parser'; export class CatalogPageWithEarliestExpiryMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/CatalogPagesListEvent.ts b/src/nitro/communication/messages/incoming/catalog/CatalogPagesListEvent.ts index bbee5241..3a9bf6d2 100644 --- a/src/nitro/communication/messages/incoming/catalog/CatalogPagesListEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/CatalogPagesListEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CatalogIndexMessageParser } from '../../parser'; export class CatalogPagesListEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/CatalogPublishedMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/CatalogPublishedMessageEvent.ts index 54416cdc..6cb6c3a0 100644 --- a/src/nitro/communication/messages/incoming/catalog/CatalogPublishedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/CatalogPublishedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CatalogPublishedMessageParser } from '../../parser/catalog/CatalogPublishedMessageParser'; export class CatalogPublishedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/ClubGiftInfoEvent.ts b/src/nitro/communication/messages/incoming/catalog/ClubGiftInfoEvent.ts index 6017ac55..752b9868 100644 --- a/src/nitro/communication/messages/incoming/catalog/ClubGiftInfoEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/ClubGiftInfoEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { ClubGiftInfoParser } from '../../parser'; export class ClubGiftInfoEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/ClubGiftSelectedEvent.ts b/src/nitro/communication/messages/incoming/catalog/ClubGiftSelectedEvent.ts index f52da0ac..f0c5d31b 100644 --- a/src/nitro/communication/messages/incoming/catalog/ClubGiftSelectedEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/ClubGiftSelectedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { ClubGiftSelectedParser } from '../../parser'; export class ClubGiftSelectedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/DirectSMSClubBuyAvailableMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/DirectSMSClubBuyAvailableMessageEvent.ts index 48a919df..70b98b1c 100644 --- a/src/nitro/communication/messages/incoming/catalog/DirectSMSClubBuyAvailableMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/DirectSMSClubBuyAvailableMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { DirectSMSClubBuyAvailableMessageParser } from '../../parser'; export class DirectSMSClubBuyAvailableMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/GiftReceiverNotFoundEvent.ts b/src/nitro/communication/messages/incoming/catalog/GiftReceiverNotFoundEvent.ts index 9d969273..1827ebda 100644 --- a/src/nitro/communication/messages/incoming/catalog/GiftReceiverNotFoundEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/GiftReceiverNotFoundEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { GiftReceiverNotFoundParser } from '../../parser'; export class GiftReceiverNotFoundEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/GiftWrappingConfigurationEvent.ts b/src/nitro/communication/messages/incoming/catalog/GiftWrappingConfigurationEvent.ts index 708de8b1..15899ca0 100644 --- a/src/nitro/communication/messages/incoming/catalog/GiftWrappingConfigurationEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/GiftWrappingConfigurationEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { GiftWrappingConfigurationParser } from '../../parser'; export class GiftWrappingConfigurationEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/HabboClubExtendOfferMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/HabboClubExtendOfferMessageEvent.ts index 6ba8d1c3..52fa4fb4 100644 --- a/src/nitro/communication/messages/incoming/catalog/HabboClubExtendOfferMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/HabboClubExtendOfferMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { HabboClubExtendOfferMessageParser } from '../../parser'; export class HabboClubExtendOfferMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/HabboClubOffersMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/HabboClubOffersMessageEvent.ts index b52a7624..b37ac258 100644 --- a/src/nitro/communication/messages/incoming/catalog/HabboClubOffersMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/HabboClubOffersMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { HabboClubOffersMessageParser } from '../../parser'; export class HabboClubOffersMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/IsOfferGiftableMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/IsOfferGiftableMessageEvent.ts index e6a4826c..ca418f61 100644 --- a/src/nitro/communication/messages/incoming/catalog/IsOfferGiftableMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/IsOfferGiftableMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { IsOfferGiftableMessageParser } from '../../parser'; export class IsOfferGiftableMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/LimitedEditionSoldOutEvent.ts b/src/nitro/communication/messages/incoming/catalog/LimitedEditionSoldOutEvent.ts index 2c061fac..08f05b99 100644 --- a/src/nitro/communication/messages/incoming/catalog/LimitedEditionSoldOutEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/LimitedEditionSoldOutEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { LimitedEditionSoldOutParser } from '../../parser'; export class LimitedEditionSoldOutEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/LimitedOfferAppearingNextMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/LimitedOfferAppearingNextMessageEvent.ts index 0521cba5..03044ff9 100644 --- a/src/nitro/communication/messages/incoming/catalog/LimitedOfferAppearingNextMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/LimitedOfferAppearingNextMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { LimitedOfferAppearingNextMessageParser } from '../../parser'; export class LimitedOfferAppearingNextMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/NotEnoughBalanceMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/NotEnoughBalanceMessageEvent.ts index 11e58e0e..c70741fa 100644 --- a/src/nitro/communication/messages/incoming/catalog/NotEnoughBalanceMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/NotEnoughBalanceMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { NotEnoughBalanceMessageParser } from '../../parser'; export class NotEnoughBalanceMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/ProductOfferEvent.ts b/src/nitro/communication/messages/incoming/catalog/ProductOfferEvent.ts index 7f8d79f6..da6a17d0 100644 --- a/src/nitro/communication/messages/incoming/catalog/ProductOfferEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/ProductOfferEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { ProductOfferMessageParser } from '../../parser'; export class ProductOfferEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/PurchaseErrorMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/PurchaseErrorMessageEvent.ts index 645dda1c..18cc5d16 100644 --- a/src/nitro/communication/messages/incoming/catalog/PurchaseErrorMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/PurchaseErrorMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { PurchaseErrorMessageParser } from '../../parser'; export class PurchaseErrorMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/PurchaseNotAllowedMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/PurchaseNotAllowedMessageEvent.ts index 826d8adf..77069cb6 100644 --- a/src/nitro/communication/messages/incoming/catalog/PurchaseNotAllowedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/PurchaseNotAllowedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { PurchaseNotAllowedMessageParser } from '../../parser'; export class PurchaseNotAllowedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/PurchaseOKMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/PurchaseOKMessageEvent.ts index 743037fa..d4fdd66d 100644 --- a/src/nitro/communication/messages/incoming/catalog/PurchaseOKMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/PurchaseOKMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { PurchaseOKMessageParser } from '../../parser'; export class PurchaseOKMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/RoomAdPurchaseInfoEvent.ts b/src/nitro/communication/messages/incoming/catalog/RoomAdPurchaseInfoEvent.ts index 6cad2045..7f9190eb 100644 --- a/src/nitro/communication/messages/incoming/catalog/RoomAdPurchaseInfoEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/RoomAdPurchaseInfoEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { RoomAdPurchaseInfoEventParser } from '../../parser'; export class RoomAdPurchaseInfoEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/SeasonalCalendarDailyOfferMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/SeasonalCalendarDailyOfferMessageEvent.ts index 8d13f8ce..541091d6 100644 --- a/src/nitro/communication/messages/incoming/catalog/SeasonalCalendarDailyOfferMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/SeasonalCalendarDailyOfferMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { SeasonalCalendarDailyOfferMessageParser } from '../../parser'; export class SeasonalCalendarDailyOfferMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/SellablePetPalettesMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/SellablePetPalettesMessageEvent.ts index 41ed7bff..5a365c4c 100644 --- a/src/nitro/communication/messages/incoming/catalog/SellablePetPalettesMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/SellablePetPalettesMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { SellablePetPalettesParser } from '../../parser'; export class SellablePetPalettesMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/TargetedOfferEvent.ts b/src/nitro/communication/messages/incoming/catalog/TargetedOfferEvent.ts index 819ae9c7..6a97978c 100644 --- a/src/nitro/communication/messages/incoming/catalog/TargetedOfferEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/TargetedOfferEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { TargetedOfferParser } from '../../parser'; export class TargetedOfferEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/TargetedOfferNotFoundEvent.ts b/src/nitro/communication/messages/incoming/catalog/TargetedOfferNotFoundEvent.ts index 9e1a64f8..f43cc5e5 100644 --- a/src/nitro/communication/messages/incoming/catalog/TargetedOfferNotFoundEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/TargetedOfferNotFoundEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { TargetedOfferNotFoundParser } from '../../parser'; export class TargetedOfferNotFoundEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/VoucherRedeemErrorMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/VoucherRedeemErrorMessageEvent.ts index be2717fc..7e2bdc60 100644 --- a/src/nitro/communication/messages/incoming/catalog/VoucherRedeemErrorMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/VoucherRedeemErrorMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { VoucherRedeemErrorMessageParser } from '../../parser'; export class VoucherRedeemErrorMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/VoucherRedeemOkMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/VoucherRedeemOkMessageEvent.ts index c30866c3..b08ce177 100644 --- a/src/nitro/communication/messages/incoming/catalog/VoucherRedeemOkMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/VoucherRedeemOkMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { VoucherRedeemOkMessageParser } from '../../parser/catalog/VoucherRedeemOkMessageParser'; export class VoucherRedeemOkMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/client/ClientPingEvent.ts b/src/nitro/communication/messages/incoming/client/ClientPingEvent.ts index b550e018..4834f1b2 100644 --- a/src/nitro/communication/messages/incoming/client/ClientPingEvent.ts +++ b/src/nitro/communication/messages/incoming/client/ClientPingEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { ClientPingParser } from '../../parser/client/ClientPingParser'; export class ClientPingEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/competition/CompetitionEntrySubmitResultEvent.ts b/src/nitro/communication/messages/incoming/competition/CompetitionEntrySubmitResultEvent.ts index a09d23b0..81ef339e 100644 --- a/src/nitro/communication/messages/incoming/competition/CompetitionEntrySubmitResultEvent.ts +++ b/src/nitro/communication/messages/incoming/competition/CompetitionEntrySubmitResultEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CompetitionEntrySubmitResultMessageParser } from '../../parser'; export class CompetitionEntrySubmitResultEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/competition/CompetitionVotingInfoMessageEvent.ts b/src/nitro/communication/messages/incoming/competition/CompetitionVotingInfoMessageEvent.ts index ff13ad7f..148fce84 100644 --- a/src/nitro/communication/messages/incoming/competition/CompetitionVotingInfoMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/competition/CompetitionVotingInfoMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CompetitionVotingInfoMessageParser } from '../../parser'; export class CompetitionVotingInfoMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/competition/CurrentTimingCodeMessageEvent.ts b/src/nitro/communication/messages/incoming/competition/CurrentTimingCodeMessageEvent.ts index 8b99a338..98f9f361 100644 --- a/src/nitro/communication/messages/incoming/competition/CurrentTimingCodeMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/competition/CurrentTimingCodeMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CurrentTimingCodeMessageParser } from '../../parser'; export class CurrentTimingCodeMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/competition/IsUserPartOfCompetitionMessageEvent.ts b/src/nitro/communication/messages/incoming/competition/IsUserPartOfCompetitionMessageEvent.ts index 8f8b0357..88881857 100644 --- a/src/nitro/communication/messages/incoming/competition/IsUserPartOfCompetitionMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/competition/IsUserPartOfCompetitionMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { IsUserPartOfCompetitionMessageParser } from '../../parser'; export class IsUserPartOfCompetitionMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/competition/NoOwnedRoomsAlertMessageEvent.ts b/src/nitro/communication/messages/incoming/competition/NoOwnedRoomsAlertMessageEvent.ts index 901b0373..8e111b37 100644 --- a/src/nitro/communication/messages/incoming/competition/NoOwnedRoomsAlertMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/competition/NoOwnedRoomsAlertMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { NoOwnedRoomsAlertMessageParser } from '../../parser'; export class NoOwnedRoomsAlertMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/competition/SecondsUntilMessageEvent.ts b/src/nitro/communication/messages/incoming/competition/SecondsUntilMessageEvent.ts index 968e3172..8cbbca4a 100644 --- a/src/nitro/communication/messages/incoming/competition/SecondsUntilMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/competition/SecondsUntilMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { SecondsUntilMessageParser } from '../../parser'; export class SecondsUntilMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/crafting/CraftableProductsEvent.ts b/src/nitro/communication/messages/incoming/crafting/CraftableProductsEvent.ts index 16480604..f2a5c66a 100644 --- a/src/nitro/communication/messages/incoming/crafting/CraftableProductsEvent.ts +++ b/src/nitro/communication/messages/incoming/crafting/CraftableProductsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CraftableProductsMessageParser } from '../../parser/crafting/CraftableProductsMessageParser'; export class CraftableProductsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/crafting/CraftingRecipeEvent.ts b/src/nitro/communication/messages/incoming/crafting/CraftingRecipeEvent.ts index 5b78c942..aaa84b7c 100644 --- a/src/nitro/communication/messages/incoming/crafting/CraftingRecipeEvent.ts +++ b/src/nitro/communication/messages/incoming/crafting/CraftingRecipeEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CraftingRecipeMessageParser } from '../../parser/crafting/CraftingRecipeMessageParser'; export class CraftingRecipeEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/crafting/CraftingRecipesAvailableEvent.ts b/src/nitro/communication/messages/incoming/crafting/CraftingRecipesAvailableEvent.ts index 03d93a1b..3fac46b4 100644 --- a/src/nitro/communication/messages/incoming/crafting/CraftingRecipesAvailableEvent.ts +++ b/src/nitro/communication/messages/incoming/crafting/CraftingRecipesAvailableEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CraftingRecipesAvailableMessageParser } from '../../parser/crafting/CraftingRecipesAvailableMessageParser'; export class CraftingRecipesAvailableEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/crafting/CraftingResultEvent.ts b/src/nitro/communication/messages/incoming/crafting/CraftingResultEvent.ts index c20999c7..2a84671a 100644 --- a/src/nitro/communication/messages/incoming/crafting/CraftingResultEvent.ts +++ b/src/nitro/communication/messages/incoming/crafting/CraftingResultEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CraftingResultMessageParser } from '../../parser/crafting/CraftingResultMessageParser'; export class CraftingResultEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/desktop/DesktopViewEvent.ts b/src/nitro/communication/messages/incoming/desktop/DesktopViewEvent.ts index 9699adb1..f80f56ae 100644 --- a/src/nitro/communication/messages/incoming/desktop/DesktopViewEvent.ts +++ b/src/nitro/communication/messages/incoming/desktop/DesktopViewEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { DesktopViewParser } from '../../parser/desktop/DesktopViewParser'; export class DesktopViewEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/AcceptFriendResultEvent.ts b/src/nitro/communication/messages/incoming/friendlist/AcceptFriendResultEvent.ts index 6fcad4b3..a2c7163f 100644 --- a/src/nitro/communication/messages/incoming/friendlist/AcceptFriendResultEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/AcceptFriendResultEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { AcceptFriendResultParser } from '../../parser/friendlist/AcceptFriendResultParser'; export class AcceptFriendResultEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/FindFriendsProcessResultEvent.ts b/src/nitro/communication/messages/incoming/friendlist/FindFriendsProcessResultEvent.ts index ed60c01d..39db4392 100644 --- a/src/nitro/communication/messages/incoming/friendlist/FindFriendsProcessResultEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/FindFriendsProcessResultEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { FindFriendsProcessResultParser } from '../../parser/friendlist/FindFriendsProcessResultParser'; export class FindFriendsProcessResultEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/FollowFriendFailedEvent.ts b/src/nitro/communication/messages/incoming/friendlist/FollowFriendFailedEvent.ts index 3065b86b..2c6cab97 100644 --- a/src/nitro/communication/messages/incoming/friendlist/FollowFriendFailedEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/FollowFriendFailedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { DesktopViewParser } from '../../parser/desktop/DesktopViewParser'; import { FollowFriendFailedParser } from '../../parser/friendlist/FollowFriendFailedParser'; diff --git a/src/nitro/communication/messages/incoming/friendlist/FriendListFragmentEvent.ts b/src/nitro/communication/messages/incoming/friendlist/FriendListFragmentEvent.ts index 60c41bf8..be786b17 100644 --- a/src/nitro/communication/messages/incoming/friendlist/FriendListFragmentEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/FriendListFragmentEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { FriendListFragmentParser } from '../../parser/friendlist/FriendListFragmentMessageParser'; export class FriendListFragmentEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/FriendListUpdateEvent.ts b/src/nitro/communication/messages/incoming/friendlist/FriendListUpdateEvent.ts index 286329bd..e7c08ca5 100644 --- a/src/nitro/communication/messages/incoming/friendlist/FriendListUpdateEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/FriendListUpdateEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { FriendListUpdateParser } from '../../parser/friendlist/FriendListUpdateParser'; export class FriendListUpdateEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/FriendNotificationEvent.ts b/src/nitro/communication/messages/incoming/friendlist/FriendNotificationEvent.ts index 98c98d4f..67d68dfa 100644 --- a/src/nitro/communication/messages/incoming/friendlist/FriendNotificationEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/FriendNotificationEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { DesktopViewParser } from '../../parser/desktop/DesktopViewParser'; import { FriendNotificationParser } from '../../parser/friendlist/FriendNotificationParser'; diff --git a/src/nitro/communication/messages/incoming/friendlist/FriendRequestsEvent.ts b/src/nitro/communication/messages/incoming/friendlist/FriendRequestsEvent.ts index c9f3d48c..7dbbaa23 100644 --- a/src/nitro/communication/messages/incoming/friendlist/FriendRequestsEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/FriendRequestsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { FriendRequestsParser } from '../../parser/friendlist/FriendRequestsParser'; export class FriendRequestsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/HabboSearchResultEvent.ts b/src/nitro/communication/messages/incoming/friendlist/HabboSearchResultEvent.ts index 9dfa7f43..df517e17 100644 --- a/src/nitro/communication/messages/incoming/friendlist/HabboSearchResultEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/HabboSearchResultEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { HabboSearchResultParser } from '../../parser/friendlist/HabboSearchResultParser'; export class HabboSearchResultEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/InstantMessageErrorEvent.ts b/src/nitro/communication/messages/incoming/friendlist/InstantMessageErrorEvent.ts index beaed3c0..4a1288ce 100644 --- a/src/nitro/communication/messages/incoming/friendlist/InstantMessageErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/InstantMessageErrorEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { InstantMessageErrorParser } from '../../parser/friendlist/InstantMessageErrorParser'; export class InstantMessageErrorEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/MessageErrorEvent.ts b/src/nitro/communication/messages/incoming/friendlist/MessageErrorEvent.ts index 190bb6f0..fa9cdd2a 100644 --- a/src/nitro/communication/messages/incoming/friendlist/MessageErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/MessageErrorEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { MessageErrorParser } from '../../parser/friendlist/MessageErrorParser'; export class MessageErrorEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/MessengerInitEvent.ts b/src/nitro/communication/messages/incoming/friendlist/MessengerInitEvent.ts index bfe90b0e..62dbb854 100644 --- a/src/nitro/communication/messages/incoming/friendlist/MessengerInitEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/MessengerInitEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { MessengerInitParser } from '../../parser/friendlist/MessengerInitParser'; export class MessengerInitEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/MiniMailNewMessageEvent.ts b/src/nitro/communication/messages/incoming/friendlist/MiniMailNewMessageEvent.ts index 6170bdb2..f4c51a62 100644 --- a/src/nitro/communication/messages/incoming/friendlist/MiniMailNewMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/MiniMailNewMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { MiniMailNewMessageParser } from '../../parser/friendlist/MiniMailNewMessageParser'; export class MiniMailNewMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/MiniMailUnreadCountEvent.ts b/src/nitro/communication/messages/incoming/friendlist/MiniMailUnreadCountEvent.ts index f4ebafd1..fccb4a10 100644 --- a/src/nitro/communication/messages/incoming/friendlist/MiniMailUnreadCountEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/MiniMailUnreadCountEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { MiniMailUnreadCountParser } from '../../parser/friendlist/MiniMailUnreadCountParser'; export class MiniMailUnreadCountEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/NewConsoleMessageEvent.ts b/src/nitro/communication/messages/incoming/friendlist/NewConsoleMessageEvent.ts index 675660d0..d324ebfd 100644 --- a/src/nitro/communication/messages/incoming/friendlist/NewConsoleMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/NewConsoleMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { NewConsoleMessageParser } from '../../parser/friendlist/NewConsoleMessageParser'; export class NewConsoleMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/NewFriendRequestEvent.ts b/src/nitro/communication/messages/incoming/friendlist/NewFriendRequestEvent.ts index 8f714b12..69f5c9e6 100644 --- a/src/nitro/communication/messages/incoming/friendlist/NewFriendRequestEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/NewFriendRequestEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { NewFriendRequestParser } from '../../parser/friendlist/NewFriendRequestMessageParser'; export class NewFriendRequestEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/RoomInviteErrorEvent.ts b/src/nitro/communication/messages/incoming/friendlist/RoomInviteErrorEvent.ts index 1d447655..356b77dc 100644 --- a/src/nitro/communication/messages/incoming/friendlist/RoomInviteErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/RoomInviteErrorEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { RoomInviteErrorParser } from '../../parser/friendlist/RoomInviteErrorParser'; export class RoomInviteErrorEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/RoomInviteEvent.ts b/src/nitro/communication/messages/incoming/friendlist/RoomInviteEvent.ts index 57adc0df..8b5dc6a0 100644 --- a/src/nitro/communication/messages/incoming/friendlist/RoomInviteEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/RoomInviteEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { RoomInviteParser } from '../../parser/friendlist/RoomInviteMessageParser'; export class RoomInviteEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/game/LoadGameUrlEvent.ts b/src/nitro/communication/messages/incoming/game/LoadGameUrlEvent.ts index e50fae0a..6d466541 100644 --- a/src/nitro/communication/messages/incoming/game/LoadGameUrlEvent.ts +++ b/src/nitro/communication/messages/incoming/game/LoadGameUrlEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { LoadGameUrlParser } from '../../parser/game/LoadGameUrlParser'; export class LoadGameUrlEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/generic/GenericErrorEvent.ts b/src/nitro/communication/messages/incoming/generic/GenericErrorEvent.ts index fdddbfa8..b8f3c45d 100644 --- a/src/nitro/communication/messages/incoming/generic/GenericErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/generic/GenericErrorEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { GenericErrorParser } from '../../parser/generic/GenericErrorParser'; export class GenericErrorEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/group/GroupBadgePartsEvent.ts b/src/nitro/communication/messages/incoming/group/GroupBadgePartsEvent.ts index eeda87cc..e6bfb685 100644 --- a/src/nitro/communication/messages/incoming/group/GroupBadgePartsEvent.ts +++ b/src/nitro/communication/messages/incoming/group/GroupBadgePartsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { GroupBadgePartsParser } from '../../parser/group/GroupBadgePartsParser'; export class GroupBadgePartsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/group/GroupBuyDataEvent.ts b/src/nitro/communication/messages/incoming/group/GroupBuyDataEvent.ts index 20454c56..795bfbdf 100644 --- a/src/nitro/communication/messages/incoming/group/GroupBuyDataEvent.ts +++ b/src/nitro/communication/messages/incoming/group/GroupBuyDataEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { GroupBuyDataParser } from '../../parser/group/GroupBuyDataParser'; export class GroupBuyDataEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/group/GroupConfirmMemberRemoveEvent.ts b/src/nitro/communication/messages/incoming/group/GroupConfirmMemberRemoveEvent.ts index f47b7f72..fabf8cf0 100644 --- a/src/nitro/communication/messages/incoming/group/GroupConfirmMemberRemoveEvent.ts +++ b/src/nitro/communication/messages/incoming/group/GroupConfirmMemberRemoveEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { GroupConfirmMemberRemoveParser } from '../../parser/group/GroupConfirmMemberRemoveParser'; export class GroupConfirmMemberRemoveEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/group/GroupInformationEvent.ts b/src/nitro/communication/messages/incoming/group/GroupInformationEvent.ts index f61591fc..639481c6 100644 --- a/src/nitro/communication/messages/incoming/group/GroupInformationEvent.ts +++ b/src/nitro/communication/messages/incoming/group/GroupInformationEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { GroupInformationParser } from '../../parser/group/GroupInformationParser'; export class GroupInformationEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/group/GroupMembersEvent.ts b/src/nitro/communication/messages/incoming/group/GroupMembersEvent.ts index ce802249..873f8060 100644 --- a/src/nitro/communication/messages/incoming/group/GroupMembersEvent.ts +++ b/src/nitro/communication/messages/incoming/group/GroupMembersEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { GroupMembersParser } from '../../parser/group/GroupMembersParser'; export class GroupMembersEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/group/GroupPurchasedEvent.ts b/src/nitro/communication/messages/incoming/group/GroupPurchasedEvent.ts index 883b3fae..c6aa04c8 100644 --- a/src/nitro/communication/messages/incoming/group/GroupPurchasedEvent.ts +++ b/src/nitro/communication/messages/incoming/group/GroupPurchasedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { GroupPurchasedParser } from '../../parser/group/GroupPurchasedParser'; export class GroupPurchasedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/group/GroupSettingsEvent.ts b/src/nitro/communication/messages/incoming/group/GroupSettingsEvent.ts index ebac6158..ed0ff9b0 100644 --- a/src/nitro/communication/messages/incoming/group/GroupSettingsEvent.ts +++ b/src/nitro/communication/messages/incoming/group/GroupSettingsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { GroupSettingsParser } from '../../parser/group/GroupSettingsParser'; export class GroupSettingsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/group/HabboGroupDeactivatedMessageEvent.ts b/src/nitro/communication/messages/incoming/group/HabboGroupDeactivatedMessageEvent.ts index 574cc3d4..22e2ed3c 100644 --- a/src/nitro/communication/messages/incoming/group/HabboGroupDeactivatedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/group/HabboGroupDeactivatedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { HabboGroupDeactivatedMessageParser } from '../../parser/group/HabboGroupDeactivatedMessageParser'; export class HabboGroupDeactivatedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/groupforums/ForumDataMessageEvent.ts b/src/nitro/communication/messages/incoming/groupforums/ForumDataMessageEvent.ts index b88b63c1..26e92aae 100644 --- a/src/nitro/communication/messages/incoming/groupforums/ForumDataMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/groupforums/ForumDataMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { ForumDataMessageParser } from '../../parser/groupforums/ForumDataMessageParser'; export class ForumDataMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/groupforums/ForumsListMessageEvent.ts b/src/nitro/communication/messages/incoming/groupforums/ForumsListMessageEvent.ts index 3c320533..65d75b3e 100644 --- a/src/nitro/communication/messages/incoming/groupforums/ForumsListMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/groupforums/ForumsListMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { GetForumsListMessageParser } from '../../parser/groupforums/GetForumsListMessageParser'; export class ForumsListMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/groupforums/GuildForumThreadsEvent.ts b/src/nitro/communication/messages/incoming/groupforums/GuildForumThreadsEvent.ts index 0f5c80a3..b31717c8 100644 --- a/src/nitro/communication/messages/incoming/groupforums/GuildForumThreadsEvent.ts +++ b/src/nitro/communication/messages/incoming/groupforums/GuildForumThreadsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { GuildForumThreadsParser } from '../../parser/groupforums/GuildForumThreadsParser'; export class GuildForumThreadsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/groupforums/PostMessageMessageEvent.ts b/src/nitro/communication/messages/incoming/groupforums/PostMessageMessageEvent.ts index efb56789..4c1b29aa 100644 --- a/src/nitro/communication/messages/incoming/groupforums/PostMessageMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/groupforums/PostMessageMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { PostMessageMessageParser } from '../../parser/groupforums/PostMessageMessageParser'; export class PostMessageMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/groupforums/PostThreadMessageEvent.ts b/src/nitro/communication/messages/incoming/groupforums/PostThreadMessageEvent.ts index d4d6734b..100cdc7f 100644 --- a/src/nitro/communication/messages/incoming/groupforums/PostThreadMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/groupforums/PostThreadMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { PostThreadMessageParser } from '../../parser/groupforums/PostThreadMessageParser'; export class PostThreadMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/groupforums/ThreadMessagesMessageEvent.ts b/src/nitro/communication/messages/incoming/groupforums/ThreadMessagesMessageEvent.ts index 6618d87e..8b45dbf5 100644 --- a/src/nitro/communication/messages/incoming/groupforums/ThreadMessagesMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/groupforums/ThreadMessagesMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { ThreadMessagesMessageParser } from '../../parser/groupforums/ThreadMessagesMessageParser'; export class ThreadMessagesMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/groupforums/UnreadForumsCountMessageEvent.ts b/src/nitro/communication/messages/incoming/groupforums/UnreadForumsCountMessageEvent.ts index b0fd08fd..36cd2ba3 100644 --- a/src/nitro/communication/messages/incoming/groupforums/UnreadForumsCountMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/groupforums/UnreadForumsCountMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { UnreadForumsCountMessageParser } from '../../parser/groupforums/UnreadForumsCountMessageParser'; export class UnreadForumsCountMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/groupforums/UpdateMessageMessageEvent.ts b/src/nitro/communication/messages/incoming/groupforums/UpdateMessageMessageEvent.ts index 216e62b2..dfa77879 100644 --- a/src/nitro/communication/messages/incoming/groupforums/UpdateMessageMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/groupforums/UpdateMessageMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { UpdateMessageMessageParser } from '../../parser/groupforums/UpdateMessageMessageParser'; export class UpdateMessageMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/groupforums/UpdateThreadMessageEvent.ts b/src/nitro/communication/messages/incoming/groupforums/UpdateThreadMessageEvent.ts index 11f4a12b..1a2f940d 100644 --- a/src/nitro/communication/messages/incoming/groupforums/UpdateThreadMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/groupforums/UpdateThreadMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { UpdateThreadMessageParser } from '../../parser/groupforums/UpdateThreadMessageParser'; export class UpdateThreadMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/handshake/NoobnessLevelMessageEvent.ts b/src/nitro/communication/messages/incoming/handshake/NoobnessLevelMessageEvent.ts index 52610426..f2f5b4b2 100644 --- a/src/nitro/communication/messages/incoming/handshake/NoobnessLevelMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/handshake/NoobnessLevelMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { NoobnessLevelMessageParser } from '../../parser/handshake/NoobnessLevelMessageParser'; export class NoobnessLevelMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/CallForHelpDisabledNotifyMessageEvent.ts b/src/nitro/communication/messages/incoming/help/CallForHelpDisabledNotifyMessageEvent.ts index 79031708..f981a893 100644 --- a/src/nitro/communication/messages/incoming/help/CallForHelpDisabledNotifyMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/CallForHelpDisabledNotifyMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CallForHelpDisabledNotifyMessageParser } from '../../parser/help/CallForHelpDisabledNotifyMessageParser'; export class CallForHelpDisabledNotifyMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/CallForHelpPendingCallsDeletedMessageEvent.ts b/src/nitro/communication/messages/incoming/help/CallForHelpPendingCallsDeletedMessageEvent.ts index 2cf56828..fb94bd94 100644 --- a/src/nitro/communication/messages/incoming/help/CallForHelpPendingCallsDeletedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/CallForHelpPendingCallsDeletedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CallForHelpPendingCallsDeletedMessageParser } from '../../parser/help/CallForHelpPendingCallsDeletedMessageParser'; export class CallForHelpPendingCallsDeletedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/CallForHelpPendingCallsMessageEvent.ts b/src/nitro/communication/messages/incoming/help/CallForHelpPendingCallsMessageEvent.ts index 2c2802d9..1b362cd9 100644 --- a/src/nitro/communication/messages/incoming/help/CallForHelpPendingCallsMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/CallForHelpPendingCallsMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CallForHelpPendingCallsMessageParser } from '../../parser/help/CallForHelpPendingCallsMessageParser'; export class CallForHelpPendingCallsMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/CallForHelpReplyMessageEvent.ts b/src/nitro/communication/messages/incoming/help/CallForHelpReplyMessageEvent.ts index 1a171c4c..2e01f02a 100644 --- a/src/nitro/communication/messages/incoming/help/CallForHelpReplyMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/CallForHelpReplyMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CallForHelpReplyMessageParser } from '../../parser/help/CallForHelpReplyMessageParser'; export class CallForHelpReplyMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/CallForHelpResultMessageEvent.ts b/src/nitro/communication/messages/incoming/help/CallForHelpResultMessageEvent.ts index 87792a70..e836417a 100644 --- a/src/nitro/communication/messages/incoming/help/CallForHelpResultMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/CallForHelpResultMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CallForHelpResultMessageParser } from '../../parser/help/CallForHelpResultMessageParser'; export class CallForHelpResultMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/ChatReviewSessionDetachedMessageEvent.ts b/src/nitro/communication/messages/incoming/help/ChatReviewSessionDetachedMessageEvent.ts index 93c03489..8c24e491 100644 --- a/src/nitro/communication/messages/incoming/help/ChatReviewSessionDetachedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/ChatReviewSessionDetachedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { ChatReviewSessionDetachedMessageParser } from '../../parser/help/ChatReviewSessionDetachedMessageParser'; export class ChatReviewSessionDetachedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/ChatReviewSessionOfferedToGuideMessageEvent.ts b/src/nitro/communication/messages/incoming/help/ChatReviewSessionOfferedToGuideMessageEvent.ts index 77dcca21..587ed2b7 100644 --- a/src/nitro/communication/messages/incoming/help/ChatReviewSessionOfferedToGuideMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/ChatReviewSessionOfferedToGuideMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { ChatReviewSessionOfferedToGuideMessageParser } from '../../parser/help/ChatReviewSessionOfferedToGuideMessageParser'; export class ChatReviewSessionOfferedToGuideMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/ChatReviewSessionResultsMessageEvent.ts b/src/nitro/communication/messages/incoming/help/ChatReviewSessionResultsMessageEvent.ts index 290ad974..f181b437 100644 --- a/src/nitro/communication/messages/incoming/help/ChatReviewSessionResultsMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/ChatReviewSessionResultsMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { ChatReviewSessionResultsMessageParser } from '../../parser/help/ChatReviewSessionResultsMessageParser'; export class ChatReviewSessionResultsMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/ChatReviewSessionStartedMessageEvent.ts b/src/nitro/communication/messages/incoming/help/ChatReviewSessionStartedMessageEvent.ts index 76363cc9..e8203af6 100644 --- a/src/nitro/communication/messages/incoming/help/ChatReviewSessionStartedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/ChatReviewSessionStartedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { ChatReviewSessionStartedMessageParser } from '../../parser/help/ChatReviewSessionStartedMessageParser'; export class ChatReviewSessionStartedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/ChatReviewSessionVotingStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/help/ChatReviewSessionVotingStatusMessageEvent.ts index 823130de..f1d6bd82 100644 --- a/src/nitro/communication/messages/incoming/help/ChatReviewSessionVotingStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/ChatReviewSessionVotingStatusMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { ChatReviewSessionVotingStatusMessageParser } from '../../parser/help/ChatReviewSessionVotingStatusMessageParser'; export class ChatReviewSessionVotingStatusMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/GuideOnDutyStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideOnDutyStatusMessageEvent.ts index 89aea980..bb4ff0f8 100644 --- a/src/nitro/communication/messages/incoming/help/GuideOnDutyStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideOnDutyStatusMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { GuideOnDutyStatusMessageParser } from '../../parser/help/GuideOnDutyStatusMessageParser'; export class GuideOnDutyStatusMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/GuideReportingStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideReportingStatusMessageEvent.ts index ed1844e9..15764ae6 100644 --- a/src/nitro/communication/messages/incoming/help/GuideReportingStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideReportingStatusMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { GuideReportingStatusMessageParser } from './../../parser/help/GuideReportingStatusMessageParser'; export class GuideReportingStatusMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/GuideSessionAttachedMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideSessionAttachedMessageEvent.ts index b57017b6..afdc3b3f 100644 --- a/src/nitro/communication/messages/incoming/help/GuideSessionAttachedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideSessionAttachedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { GuideSessionAttachedMessageParser } from '../../parser/help/GuideSessionAttachedMessageParser'; export class GuideSessionAttachedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/GuideSessionDetachedMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideSessionDetachedMessageEvent.ts index dd817394..89bc6426 100644 --- a/src/nitro/communication/messages/incoming/help/GuideSessionDetachedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideSessionDetachedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { GuideSessionDetachedMessageParser } from '../../parser/help/GuideSessionDetachedMessageParser'; export class GuideSessionDetachedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/GuideSessionEndedMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideSessionEndedMessageEvent.ts index 80762302..fc1100f8 100644 --- a/src/nitro/communication/messages/incoming/help/GuideSessionEndedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideSessionEndedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { GuideSessionEndedMessageParser } from '../../parser/help/GuideSessionEndedMessageParser'; export class GuideSessionEndedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/GuideSessionErrorMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideSessionErrorMessageEvent.ts index 0c8298b1..931488aa 100644 --- a/src/nitro/communication/messages/incoming/help/GuideSessionErrorMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideSessionErrorMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { GuideSessionErrorMessageParser } from '../../parser/help/GuideSessionErrorMessageParser'; export class GuideSessionErrorMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/GuideSessionInvitedToGuideRoomMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideSessionInvitedToGuideRoomMessageEvent.ts index 5a21fd24..c33bedea 100644 --- a/src/nitro/communication/messages/incoming/help/GuideSessionInvitedToGuideRoomMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideSessionInvitedToGuideRoomMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { GuideSessionInvitedToGuideRoomMessageParser } from '../../parser/help/GuideSessionInvitedToGuideRoomMessageParser'; export class GuideSessionInvitedToGuideRoomMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/GuideSessionMessageMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideSessionMessageMessageEvent.ts index 28eb0652..e8c04821 100644 --- a/src/nitro/communication/messages/incoming/help/GuideSessionMessageMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideSessionMessageMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { GuideSessionMessageMessageParser } from '../../parser/help/GuideSessionMessageMessageParser'; export class GuideSessionMessageMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/GuideSessionPartnerIsTypingMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideSessionPartnerIsTypingMessageEvent.ts index f3695bfa..db4fd468 100644 --- a/src/nitro/communication/messages/incoming/help/GuideSessionPartnerIsTypingMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideSessionPartnerIsTypingMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { GuideSessionPartnerIsTypingMessageParser } from '../../parser/help/GuideSessionPartnerIsTypingMessageParser'; export class GuideSessionPartnerIsTypingMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/GuideSessionRequesterRoomMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideSessionRequesterRoomMessageEvent.ts index fb1411df..e1072ef8 100644 --- a/src/nitro/communication/messages/incoming/help/GuideSessionRequesterRoomMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideSessionRequesterRoomMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { GuideSessionRequesterRoomMessageParser } from '../../parser/help/GuideSessionRequesterRoomMessageParser'; export class GuideSessionRequesterRoomMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/GuideSessionStartedMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideSessionStartedMessageEvent.ts index e3b503e2..59a871a1 100644 --- a/src/nitro/communication/messages/incoming/help/GuideSessionStartedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideSessionStartedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { GuideSessionStartedMessageParser } from '../../parser/help/GuideSessionStartedMessageParser'; export class GuideSessionStartedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/GuideTicketCreationResultMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideTicketCreationResultMessageEvent.ts index 3edf5741..59e39d2e 100644 --- a/src/nitro/communication/messages/incoming/help/GuideTicketCreationResultMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideTicketCreationResultMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { GuideTicketCreationResultMessageParser } from '../../parser/help/GuideTicketCreationResultMessageParser'; export class GuideTicketCreationResultMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/GuideTicketResolutionMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideTicketResolutionMessageEvent.ts index 045f50ef..4c407e8d 100644 --- a/src/nitro/communication/messages/incoming/help/GuideTicketResolutionMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideTicketResolutionMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { GuideTicketResolutionMessageParser } from '../../parser/help/GuideTicketResolutionMessageParser'; export class GuideTicketResolutionMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/HotelMergeNameChangeEvent.ts b/src/nitro/communication/messages/incoming/help/HotelMergeNameChangeEvent.ts index 9b96f68a..30d0fdac 100644 --- a/src/nitro/communication/messages/incoming/help/HotelMergeNameChangeEvent.ts +++ b/src/nitro/communication/messages/incoming/help/HotelMergeNameChangeEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { HotelMergeNameChangeParser } from '../../parser/help/HotelMergeNameChangeParser'; export class HotelMergeNameChangeEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/IssueCloseNotificationMessageEvent.ts b/src/nitro/communication/messages/incoming/help/IssueCloseNotificationMessageEvent.ts index dceb86b9..5f2b3413 100644 --- a/src/nitro/communication/messages/incoming/help/IssueCloseNotificationMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/IssueCloseNotificationMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { IssueCloseNotificationMessageParser } from '../../parser/help/IssueCloseNotificationMessageParser'; export class IssueCloseNotificationMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/QuizDataMessageEvent.ts b/src/nitro/communication/messages/incoming/help/QuizDataMessageEvent.ts index 1c832743..f89a77c8 100644 --- a/src/nitro/communication/messages/incoming/help/QuizDataMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/QuizDataMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { QuizDataMessageParser } from '../../parser/help/QuizDataMessageParser'; export class QuizDataMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/QuizResultsMessageEvent.ts b/src/nitro/communication/messages/incoming/help/QuizResultsMessageEvent.ts index 49a5503f..c7490d6a 100644 --- a/src/nitro/communication/messages/incoming/help/QuizResultsMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/QuizResultsMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { QuizResultsMessageParser } from '../../parser/help/QuizResultsMessageParser'; export class QuizResultsMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/achievements/AchievementEvent.ts b/src/nitro/communication/messages/incoming/inventory/achievements/AchievementEvent.ts index 94116287..2d917e03 100644 --- a/src/nitro/communication/messages/incoming/inventory/achievements/AchievementEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/achievements/AchievementEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { AchievementParser } from '../../../parser/inventory/achievements/AchievementParser'; export class AchievementEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/achievements/AchievementsEvent.ts b/src/nitro/communication/messages/incoming/inventory/achievements/AchievementsEvent.ts index b85fb7b6..775d2924 100644 --- a/src/nitro/communication/messages/incoming/inventory/achievements/AchievementsEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/achievements/AchievementsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { AchievementsParser } from '../../../parser/inventory/achievements/AchievementsParser'; export class AchievementsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/achievements/AchievementsScoreEvent.ts b/src/nitro/communication/messages/incoming/inventory/achievements/AchievementsScoreEvent.ts index 24f11b54..b2c67d44 100644 --- a/src/nitro/communication/messages/incoming/inventory/achievements/AchievementsScoreEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/achievements/AchievementsScoreEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { AchievementsScoreParser } from '../../../parser/inventory/achievements/AchievementsScoreParser'; export class AchievementsScoreEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectActivatedEvent.ts b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectActivatedEvent.ts index db0acfde..1d12e676 100644 --- a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectActivatedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectActivatedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { AvatarEffectActivatedParser } from '../../../parser/inventory/avatareffect/AvatarEffectActivatedParser'; export class AvatarEffectActivatedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectAddedEvent.ts b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectAddedEvent.ts index aee00215..f977e6aa 100644 --- a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectAddedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectAddedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { AvatarEffectAddedParser } from '../../../parser/inventory/avatareffect/AvatarEffectAddedParser'; export class AvatarEffectAddedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectExpiredEvent.ts b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectExpiredEvent.ts index 1b3e16ef..de6cee64 100644 --- a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectExpiredEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectExpiredEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { AvatarEffectExpiredParser } from '../../../parser/inventory/avatareffect/AvatarEffectExpiredParser'; export class AvatarEffectExpiredEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectSelectedEvent.ts b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectSelectedEvent.ts index 931f5e65..7ce283f0 100644 --- a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectSelectedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectSelectedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { AvatarEffectSelectedParser } from '../../../parser/inventory/avatareffect/AvatarEffectSelectedParser'; export class AvatarEffectSelectedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectsEvent.ts b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectsEvent.ts index c9913da1..e6705395 100644 --- a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectsEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { AvatarEffectsParser } from '../../../parser/inventory/avatareffect/AvatarEffectsParser'; export class AvatarEffectsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/badges/BadgePointLimitsEvent.ts b/src/nitro/communication/messages/incoming/inventory/badges/BadgePointLimitsEvent.ts index 56386fd1..15506831 100644 --- a/src/nitro/communication/messages/incoming/inventory/badges/BadgePointLimitsEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/badges/BadgePointLimitsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { BadgePointLimitsParser } from '../../../parser/inventory/badges/BadgePointLimitsParser'; export class BadgePointLimitsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/badges/BadgeReceivedEvent.ts b/src/nitro/communication/messages/incoming/inventory/badges/BadgeReceivedEvent.ts index e547c372..7ca6fd2e 100644 --- a/src/nitro/communication/messages/incoming/inventory/badges/BadgeReceivedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/badges/BadgeReceivedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { BadgeReceivedParser } from '../../../parser/inventory/badges/BadgeReceivedParser'; export class BadgeReceivedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/badges/BadgesEvent.ts b/src/nitro/communication/messages/incoming/inventory/badges/BadgesEvent.ts index d0439b15..5ad091c0 100644 --- a/src/nitro/communication/messages/incoming/inventory/badges/BadgesEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/badges/BadgesEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { BadgesParser } from '../../../parser/inventory/badges/BadgesParser'; export class BadgesEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/badges/IsBadgeRequestFulfilledEvent.ts b/src/nitro/communication/messages/incoming/inventory/badges/IsBadgeRequestFulfilledEvent.ts index 18dc9dbd..0f0ced3b 100644 --- a/src/nitro/communication/messages/incoming/inventory/badges/IsBadgeRequestFulfilledEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/badges/IsBadgeRequestFulfilledEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { IsBadgeRequestFulfilledParser } from '../../../parser/inventory/badges/IsBadgeRequestFulfilledParser'; export class IsBadgeRequestFulfilledEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/clothes/FigureSetIdsMessageEvent.ts b/src/nitro/communication/messages/incoming/inventory/clothes/FigureSetIdsMessageEvent.ts index bff27eac..78b26d58 100644 --- a/src/nitro/communication/messages/incoming/inventory/clothes/FigureSetIdsMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/clothes/FigureSetIdsMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { FigureSetIdsMessageParser } from '../../../parser/inventory/clothing/FigureSetIdsMessageParser'; export class FigureSetIdsMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/clothes/_Str_16135.ts b/src/nitro/communication/messages/incoming/inventory/clothes/_Str_16135.ts index 0279105f..0ae296ed 100644 --- a/src/nitro/communication/messages/incoming/inventory/clothes/_Str_16135.ts +++ b/src/nitro/communication/messages/incoming/inventory/clothes/_Str_16135.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { _Str_8728 } from '../../../parser/inventory/clothing/_Str_8728'; export class _Str_16135 extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/clothes/_Str_17532.ts b/src/nitro/communication/messages/incoming/inventory/clothes/_Str_17532.ts index 923d89b6..6a58b9b5 100644 --- a/src/nitro/communication/messages/incoming/inventory/clothes/_Str_17532.ts +++ b/src/nitro/communication/messages/incoming/inventory/clothes/_Str_17532.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { _Str_9021 } from '../../../parser/inventory/clothing/_Str_9021'; export class _Str_17532 extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListAddOrUpdateEvent.ts b/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListAddOrUpdateEvent.ts index 2f0a30ec..47d24956 100644 --- a/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListAddOrUpdateEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListAddOrUpdateEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { FurnitureListAddOrUpdateParser } from '../../../parser/inventory/furniture/FurnitureListAddOrUpdateParser'; export class FurnitureListAddOrUpdateEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListEvent.ts b/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListEvent.ts index 7d247a1f..ea16e249 100644 --- a/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { FurnitureListParser } from '../../../parser/inventory/furniture/FurnitureListParser'; export class FurnitureListEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListInvalidateEvent.ts b/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListInvalidateEvent.ts index 0aab03cb..3108dc13 100644 --- a/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListInvalidateEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListInvalidateEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { FurnitureListInvalidateParser } from '../../../parser/inventory/furniture/FurnitureListInvalidateParser'; export class FurnitureListInvalidateEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListRemovedEvent.ts b/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListRemovedEvent.ts index f28297a2..bc82cfd0 100644 --- a/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListRemovedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListRemovedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { FurnitureListRemovedParser } from '../../../parser/inventory/furniture/FurnitureListRemovedParser'; export class FurnitureListRemovedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/furni/FurniturePostItPlacedEvent.ts b/src/nitro/communication/messages/incoming/inventory/furni/FurniturePostItPlacedEvent.ts index e734fe2f..4cbfdf1c 100644 --- a/src/nitro/communication/messages/incoming/inventory/furni/FurniturePostItPlacedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/furni/FurniturePostItPlacedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { FurniturePostItPlacedParser } from '../../../parser/inventory/furniture/FurniturePostItPlacedParser'; export class FurniturePostItPlacedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/furni/gifts/PresentOpenedMessageEvent.ts b/src/nitro/communication/messages/incoming/inventory/furni/gifts/PresentOpenedMessageEvent.ts index 585956a9..3bb7956d 100644 --- a/src/nitro/communication/messages/incoming/inventory/furni/gifts/PresentOpenedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/furni/gifts/PresentOpenedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../../core'; import { PresentOpenedMessageParser } from '../../../../parser/inventory/furniture/PresentOpenedMessageParser'; export class PresentOpenedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/pets/PetAddedToInventoryEvent.ts b/src/nitro/communication/messages/incoming/inventory/pets/PetAddedToInventoryEvent.ts index 0f05b3e1..a97ec902 100644 --- a/src/nitro/communication/messages/incoming/inventory/pets/PetAddedToInventoryEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/pets/PetAddedToInventoryEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { PetAddedToInventoryParser } from '../../../parser/inventory/pets/PetAddedToInventoryParser'; export class PetAddedToInventoryEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/pets/PetInventoryEvent.ts b/src/nitro/communication/messages/incoming/inventory/pets/PetInventoryEvent.ts index 5d1e3e81..eab3ce36 100644 --- a/src/nitro/communication/messages/incoming/inventory/pets/PetInventoryEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/pets/PetInventoryEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { PetInventoryParser } from '../../../parser/inventory/pets/PetInventoryParser'; export class PetInventoryEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/pets/PetReceivedMessageEvent.ts b/src/nitro/communication/messages/incoming/inventory/pets/PetReceivedMessageEvent.ts index 391408cc..bcf01ff2 100644 --- a/src/nitro/communication/messages/incoming/inventory/pets/PetReceivedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/pets/PetReceivedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { PetReceivedMessageParser } from '../../../parser/inventory/pets/PetReceivedMessageParser'; export class PetReceivedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/pets/PetRemovedFromInventoryEvent.ts b/src/nitro/communication/messages/incoming/inventory/pets/PetRemovedFromInventoryEvent.ts index 3259b304..30af3d53 100644 --- a/src/nitro/communication/messages/incoming/inventory/pets/PetRemovedFromInventoryEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/pets/PetRemovedFromInventoryEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { PetRemovedFromInventoryParser } from '../../../parser/inventory/pets/PetRemovedFromInventoryParser'; export class PetRemovedFromInventory extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingAcceptEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingAcceptEvent.ts index 8bde2bb6..775b5469 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingAcceptEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingAcceptEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { TradingAcceptParser } from '../../../parser/inventory/trading/TradingAcceptParser'; export class TradingAcceptEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingCloseEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingCloseEvent.ts index 4bb40995..1121f570 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingCloseEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingCloseEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { TradingCloseParser } from '../../../parser/inventory/trading/TradingCloseParser'; export class TradingCloseEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingCompletedEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingCompletedEvent.ts index 05eb065d..8d7a6697 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingCompletedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingCompletedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { TradingCompletedParser } from '../../../parser/inventory/trading/TradingCompletedParser'; export class TradingCompletedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingConfirmationEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingConfirmationEvent.ts index 99ce1111..6d93b012 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingConfirmationEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingConfirmationEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { TradingConfirmationParser } from '../../../parser/inventory/trading/TradingConfirmationParser'; export class TradingConfirmationEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingListItemEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingListItemEvent.ts index fb4394c4..9d6f9bf0 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingListItemEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingListItemEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { TradingListItemParser } from '../../../parser/inventory/trading/TradingListItemParser'; import { ItemDataStructure } from './ItemDataStructure'; diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingNotOpenEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingNotOpenEvent.ts index cf28e7ec..e64a3961 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingNotOpenEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingNotOpenEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { TradingNotOpenParser } from '../../../parser/inventory/trading/TradingNotOpenParser'; export class TradingNotOpenEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingOpenEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingOpenEvent.ts index 790e5fc9..d5c52fec 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingOpenEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingOpenEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { TradingOpenParser } from '../../../parser/inventory/trading/TradingOpenParser'; export class TradingOpenEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingOpenFailedEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingOpenFailedEvent.ts index 5c926406..70a2424a 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingOpenFailedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingOpenFailedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { TradingOpenFailedParser } from '../../../parser/inventory/trading/TradingOpenFailedParser'; export class TradingOpenFailedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingOtherNotAllowedEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingOtherNotAllowedEvent.ts index 8866d63d..17623aab 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingOtherNotAllowedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingOtherNotAllowedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { TradingOtherNotAllowedParser } from '../../../parser/inventory/trading/TradingOtherNotAllowedParser'; export class TradingOtherNotAllowedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingYouAreNotAllowedEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingYouAreNotAllowedEvent.ts index ac80bd45..2fbdb87c 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingYouAreNotAllowedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingYouAreNotAllowedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { TradingYouAreNotAllowedParser } from '../../../parser/inventory/trading/TradingYouAreNotAllowedParser'; export class TradingYouAreNotAllowedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/landingview/PromoArticlesMessageEvent.ts b/src/nitro/communication/messages/incoming/landingview/PromoArticlesMessageEvent.ts index 37383273..32ca745b 100644 --- a/src/nitro/communication/messages/incoming/landingview/PromoArticlesMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/landingview/PromoArticlesMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { PromoArticlesMessageParser } from '../../parser/landingview/PromoArticlesMessageParser'; export class PromoArticlesMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/landingview/votes/CommunityGoalVoteMessageEvent.ts b/src/nitro/communication/messages/incoming/landingview/votes/CommunityGoalVoteMessageEvent.ts index cd28aefc..b936557f 100644 --- a/src/nitro/communication/messages/incoming/landingview/votes/CommunityGoalVoteMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/landingview/votes/CommunityGoalVoteMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { CommunityVoteReceivedParser } from '../../../parser/landingview/votes/CommunityVoteReceivedParser'; export class CommunityGoalVoteMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/marketplace/MarketplaceBuyOfferResultEvent.ts b/src/nitro/communication/messages/incoming/marketplace/MarketplaceBuyOfferResultEvent.ts index 9a82e32c..68a2ca6e 100644 --- a/src/nitro/communication/messages/incoming/marketplace/MarketplaceBuyOfferResultEvent.ts +++ b/src/nitro/communication/messages/incoming/marketplace/MarketplaceBuyOfferResultEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { MarketplaceBuyOfferResultParser } from '../../parser/marketplace/MarketplaceBuyOfferResultParser'; diff --git a/src/nitro/communication/messages/incoming/marketplace/MarketplaceCanMakeOfferResult.ts b/src/nitro/communication/messages/incoming/marketplace/MarketplaceCanMakeOfferResult.ts index e122bcb7..6dda05d1 100644 --- a/src/nitro/communication/messages/incoming/marketplace/MarketplaceCanMakeOfferResult.ts +++ b/src/nitro/communication/messages/incoming/marketplace/MarketplaceCanMakeOfferResult.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { MarketplaceCanMakeOfferResultParser } from '../../parser/marketplace/MarketplaceCanMakeOfferResultParser'; diff --git a/src/nitro/communication/messages/incoming/marketplace/MarketplaceCancelOfferResultEvent.ts b/src/nitro/communication/messages/incoming/marketplace/MarketplaceCancelOfferResultEvent.ts index 12274fb5..52615ae4 100644 --- a/src/nitro/communication/messages/incoming/marketplace/MarketplaceCancelOfferResultEvent.ts +++ b/src/nitro/communication/messages/incoming/marketplace/MarketplaceCancelOfferResultEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { MarketplaceCancelOfferResultParser } from '../../parser/marketplace/MarketplaceCancelOfferResultParser'; export class MarketplaceCancelOfferResultEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/marketplace/MarketplaceConfigurationEvent.ts b/src/nitro/communication/messages/incoming/marketplace/MarketplaceConfigurationEvent.ts index 6c5a015c..1d4b58d8 100644 --- a/src/nitro/communication/messages/incoming/marketplace/MarketplaceConfigurationEvent.ts +++ b/src/nitro/communication/messages/incoming/marketplace/MarketplaceConfigurationEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { MarketplaceConfigurationMessageParser } from '../../parser/marketplace/MarketplaceConfigurationMessageParser'; export class MarketplaceConfigurationEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/marketplace/MarketplaceItemStatsEvent.ts b/src/nitro/communication/messages/incoming/marketplace/MarketplaceItemStatsEvent.ts index c312132b..4014972f 100644 --- a/src/nitro/communication/messages/incoming/marketplace/MarketplaceItemStatsEvent.ts +++ b/src/nitro/communication/messages/incoming/marketplace/MarketplaceItemStatsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { MarketplaceItemStatsParser } from '../../parser/marketplace/MarketplaceItemStatsParser'; export class MarketplaceItemStatsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/marketplace/MarketplaceMakeOfferResult.ts b/src/nitro/communication/messages/incoming/marketplace/MarketplaceMakeOfferResult.ts index 98b9c8ff..3915e19e 100644 --- a/src/nitro/communication/messages/incoming/marketplace/MarketplaceMakeOfferResult.ts +++ b/src/nitro/communication/messages/incoming/marketplace/MarketplaceMakeOfferResult.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { MarketplaceMakeOfferResultParser } from '../../parser/marketplace/MarketplaceItemPostedParser'; diff --git a/src/nitro/communication/messages/incoming/marketplace/MarketplaceOffersEvent.ts b/src/nitro/communication/messages/incoming/marketplace/MarketplaceOffersEvent.ts index a17b11ea..7f8c0967 100644 --- a/src/nitro/communication/messages/incoming/marketplace/MarketplaceOffersEvent.ts +++ b/src/nitro/communication/messages/incoming/marketplace/MarketplaceOffersEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { MarketplaceOffersParser } from '../../parser/marketplace/MarketplaceOffersParser'; export class MarketPlaceOffersEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/marketplace/MarketplaceOwnOffersEvent.ts b/src/nitro/communication/messages/incoming/marketplace/MarketplaceOwnOffersEvent.ts index 22e22244..800a5ab3 100644 --- a/src/nitro/communication/messages/incoming/marketplace/MarketplaceOwnOffersEvent.ts +++ b/src/nitro/communication/messages/incoming/marketplace/MarketplaceOwnOffersEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { MarketplaceOwnOffersParser } from '../../parser/marketplace/MarketplaceOwnOffersParser'; export class MarketplaceOwnOffersEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/moderation/CfhChatlogEvent.ts b/src/nitro/communication/messages/incoming/moderation/CfhChatlogEvent.ts index 6c063894..de4a91d8 100644 --- a/src/nitro/communication/messages/incoming/moderation/CfhChatlogEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/CfhChatlogEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CfhChatlogMessageParser } from '../../parser/moderation/CfhChatlogMessageParser'; export class CfhChatlogEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/moderation/IssueDeletedMessageEvent.ts b/src/nitro/communication/messages/incoming/moderation/IssueDeletedMessageEvent.ts index 26cffafe..e9c5d363 100644 --- a/src/nitro/communication/messages/incoming/moderation/IssueDeletedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/IssueDeletedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { IssueDeletedMessageParser } from '../../parser/moderation/IssueDeletedMessageParser'; export class IssueDeletedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/moderation/IssueInfoMessageEvent.ts b/src/nitro/communication/messages/incoming/moderation/IssueInfoMessageEvent.ts index 6b7c0472..138cce47 100644 --- a/src/nitro/communication/messages/incoming/moderation/IssueInfoMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/IssueInfoMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { IssueInfoMessageParser } from '../../parser/moderation/IssueInfoMessageParser'; export class IssueInfoMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/moderation/IssuePickFailedMessageEvent.ts b/src/nitro/communication/messages/incoming/moderation/IssuePickFailedMessageEvent.ts index 08b012ae..a858efe3 100644 --- a/src/nitro/communication/messages/incoming/moderation/IssuePickFailedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/IssuePickFailedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { IssuePickFailedMessageParser } from '../../parser/moderation/IssuePickFailedMessageParser'; export class IssuePickFailedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/moderation/ModeratorActionResultMessageEvent.ts b/src/nitro/communication/messages/incoming/moderation/ModeratorActionResultMessageEvent.ts index 84685f87..359a8ba9 100644 --- a/src/nitro/communication/messages/incoming/moderation/ModeratorActionResultMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/ModeratorActionResultMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { ModeratorActionResultMessageParser } from '../../parser/moderation/ModeratorActionResultMessageParser'; export class ModeratorActionResultMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/moderation/ModeratorCautionEvent.ts b/src/nitro/communication/messages/incoming/moderation/ModeratorCautionEvent.ts index c116e9ec..bf983707 100644 --- a/src/nitro/communication/messages/incoming/moderation/ModeratorCautionEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/ModeratorCautionEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { ModerationCautionParser } from '../../parser/moderation'; export class ModeratorCautionEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/moderation/ModeratorInitMessageEvent.ts b/src/nitro/communication/messages/incoming/moderation/ModeratorInitMessageEvent.ts index 4b5f0d55..992eb44d 100644 --- a/src/nitro/communication/messages/incoming/moderation/ModeratorInitMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/ModeratorInitMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { ModeratorInitMessageParser } from '../../parser/moderation/ModeratorInitMessageParser'; export class ModeratorInitMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/moderation/ModeratorMessageEvent.ts b/src/nitro/communication/messages/incoming/moderation/ModeratorMessageEvent.ts index 1cbefc0f..7d58438a 100644 --- a/src/nitro/communication/messages/incoming/moderation/ModeratorMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/ModeratorMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { ModeratorMessageParser } from '../../parser/moderation/ModeratorMessageParser'; export class ModeratorMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/moderation/ModeratorRoomInfoEvent.ts b/src/nitro/communication/messages/incoming/moderation/ModeratorRoomInfoEvent.ts index 83b7f408..59f5a7a2 100644 --- a/src/nitro/communication/messages/incoming/moderation/ModeratorRoomInfoEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/ModeratorRoomInfoEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { ModeratorRoomInfoMessageParser } from '../../parser/moderation/ModeratorRoomInfoMessageParser'; export class ModeratorRoomInfoEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/moderation/ModeratorToolPreferencesEvent.ts b/src/nitro/communication/messages/incoming/moderation/ModeratorToolPreferencesEvent.ts index 19e18085..f50fd6bc 100644 --- a/src/nitro/communication/messages/incoming/moderation/ModeratorToolPreferencesEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/ModeratorToolPreferencesEvent.ts @@ -1,6 +1,6 @@ import { ModeratorToolPreferencesMessageParser } from '../..'; import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; export class ModeratorToolPreferencesEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/moderation/ModeratorUserInfoEvent.ts b/src/nitro/communication/messages/incoming/moderation/ModeratorUserInfoEvent.ts index 7acb4602..1301f69c 100644 --- a/src/nitro/communication/messages/incoming/moderation/ModeratorUserInfoEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/ModeratorUserInfoEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { ModeratorUserInfoMessageParser } from '../../parser/moderation/ModeratorUserInfoMessageParser'; export class ModeratorUserInfoEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/moderation/RoomChatlogEvent.ts b/src/nitro/communication/messages/incoming/moderation/RoomChatlogEvent.ts index 953ef352..b003db5a 100644 --- a/src/nitro/communication/messages/incoming/moderation/RoomChatlogEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/RoomChatlogEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { RoomChatlogMessageParser } from '../../parser/moderation/RoomChatlogMessageParser'; export class RoomChatlogEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/moderation/RoomVisitsEvent.ts b/src/nitro/communication/messages/incoming/moderation/RoomVisitsEvent.ts index 7634ac06..16f09036 100644 --- a/src/nitro/communication/messages/incoming/moderation/RoomVisitsEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/RoomVisitsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { RoomVisitsMessageParser } from '../../parser/moderation/RoomVisitsMessageParser'; export class RoomVisitsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/moderation/UserBannedMessageEvent.ts b/src/nitro/communication/messages/incoming/moderation/UserBannedMessageEvent.ts index f815a2bf..e6c95b26 100644 --- a/src/nitro/communication/messages/incoming/moderation/UserBannedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/UserBannedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { UserBannedMessageParser } from '../../parser/moderation'; export class UserBannedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/moderation/UserChatlogEvent.ts b/src/nitro/communication/messages/incoming/moderation/UserChatlogEvent.ts index a9ce8efe..7393e703 100644 --- a/src/nitro/communication/messages/incoming/moderation/UserChatlogEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/UserChatlogEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { UserChatlogMessageParser } from '../../parser/moderation/UserChatlogMessageParser'; export class UserChatlogEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/mysterybox/MysteryBoxKeysEvent.ts b/src/nitro/communication/messages/incoming/mysterybox/MysteryBoxKeysEvent.ts index deb2bf87..20b922ae 100644 --- a/src/nitro/communication/messages/incoming/mysterybox/MysteryBoxKeysEvent.ts +++ b/src/nitro/communication/messages/incoming/mysterybox/MysteryBoxKeysEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { MysteryBoxKeysParser } from '../../parser'; export class MysteryBoxKeysEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/CanCreateRoomEvent.ts b/src/nitro/communication/messages/incoming/navigator/CanCreateRoomEvent.ts index f93f2487..86b921bb 100644 --- a/src/nitro/communication/messages/incoming/navigator/CanCreateRoomEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/CanCreateRoomEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CanCreateRoomMessageParser } from '../../parser/navigator/CanCreateRoomMessageParser'; export class CanCreateRoomEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/CanCreateRoomEventEvent.ts b/src/nitro/communication/messages/incoming/navigator/CanCreateRoomEventEvent.ts index 640762d3..3f3b12d0 100644 --- a/src/nitro/communication/messages/incoming/navigator/CanCreateRoomEventEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/CanCreateRoomEventEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CanCreateRoomEventParser } from '../../parser/navigator/CanCreateRoomEventParser'; export class CanCreateRoomEventEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/CategoriesWithVisitorCountEvent.ts b/src/nitro/communication/messages/incoming/navigator/CategoriesWithVisitorCountEvent.ts index 7067825f..e8f5d236 100644 --- a/src/nitro/communication/messages/incoming/navigator/CategoriesWithVisitorCountEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/CategoriesWithVisitorCountEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CategoriesWithVisitorCountParser } from '../../parser/navigator/CategoriesWithVisitorCountParser'; export class CategoriesWithVisitorCountEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/CompetitionRoomsDataMessageEvent.ts b/src/nitro/communication/messages/incoming/navigator/CompetitionRoomsDataMessageEvent.ts index b01a183a..0120b206 100644 --- a/src/nitro/communication/messages/incoming/navigator/CompetitionRoomsDataMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/CompetitionRoomsDataMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CompetitionRoomsDataMessageParser } from '../../parser/navigator/CompetitionRoomsDataMessageParser'; export class CompetitionRoomsDataMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/ConvertedRoomIdEvent.ts b/src/nitro/communication/messages/incoming/navigator/ConvertedRoomIdEvent.ts index b4ae67b1..67173077 100644 --- a/src/nitro/communication/messages/incoming/navigator/ConvertedRoomIdEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/ConvertedRoomIdEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { ConvertedRoomIdMessageParser } from '../../parser/navigator/ConvertedRoomIdMessageParser'; export class ConvertedRoomIdEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/DoorbellMessageEvent.ts b/src/nitro/communication/messages/incoming/navigator/DoorbellMessageEvent.ts index 073c559b..755ce96d 100644 --- a/src/nitro/communication/messages/incoming/navigator/DoorbellMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/DoorbellMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { DoorbellMessageParser } from '../../parser/navigator/DoorbellMessageParser'; export class DoorbellMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/FavouriteChangedEvent.ts b/src/nitro/communication/messages/incoming/navigator/FavouriteChangedEvent.ts index 43163d2f..4b50f6c9 100644 --- a/src/nitro/communication/messages/incoming/navigator/FavouriteChangedEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/FavouriteChangedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { FavouriteChangedMessageParser } from '../../parser/navigator/FavouriteChangedMessageParser'; export class FavouriteChangedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/FavouritesEvent.ts b/src/nitro/communication/messages/incoming/navigator/FavouritesEvent.ts index a4d69df8..de00fdcd 100644 --- a/src/nitro/communication/messages/incoming/navigator/FavouritesEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/FavouritesEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { FavouritesMessageParser } from '../../parser/navigator/FavouritesMessageParser'; export class FavouritesEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/FlatAccessDeniedMessageEvent.ts b/src/nitro/communication/messages/incoming/navigator/FlatAccessDeniedMessageEvent.ts index 2fc26f4a..6b7b0ba0 100644 --- a/src/nitro/communication/messages/incoming/navigator/FlatAccessDeniedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/FlatAccessDeniedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { FlatAccessDeniedMessageParser } from '../../parser/navigator/FlatAccessDeniedMessageParser'; export class FlatAccessDeniedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/FlatCreatedEvent.ts b/src/nitro/communication/messages/incoming/navigator/FlatCreatedEvent.ts index 805994ec..2138747b 100644 --- a/src/nitro/communication/messages/incoming/navigator/FlatCreatedEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/FlatCreatedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { FlatCreatedMessageParser } from '../../parser/navigator/FlatCreatedMessageParser'; export class FlatCreatedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/GetGuestRoomResultEvent.ts b/src/nitro/communication/messages/incoming/navigator/GetGuestRoomResultEvent.ts index c33c1384..478fdb5e 100644 --- a/src/nitro/communication/messages/incoming/navigator/GetGuestRoomResultEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/GetGuestRoomResultEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { GetGuestRoomResultMessageParser } from '../../parser/navigator/GetGuestRoomResultMessageParser'; export class GetGuestRoomResultEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/GuestRoomSearchResultEvent.ts b/src/nitro/communication/messages/incoming/navigator/GuestRoomSearchResultEvent.ts index 01fbcf2d..468f3ce2 100644 --- a/src/nitro/communication/messages/incoming/navigator/GuestRoomSearchResultEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/GuestRoomSearchResultEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { GuestRoomSearchResultMessageParser } from '../../parser/navigator/GuestRoomSearchResultMessageParser'; export class GuestRoomSearchResultEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/NavigatorCollapsedEvent.ts b/src/nitro/communication/messages/incoming/navigator/NavigatorCollapsedEvent.ts index d13149d3..e9ac178c 100644 --- a/src/nitro/communication/messages/incoming/navigator/NavigatorCollapsedEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/NavigatorCollapsedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { NavigatorCollapsedParser } from '../../parser/navigator/NavigatorCollapsedParser'; export class NavigatorCollapsedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/NavigatorHomeRoomEvent.ts b/src/nitro/communication/messages/incoming/navigator/NavigatorHomeRoomEvent.ts index 440456e5..2462d4f1 100644 --- a/src/nitro/communication/messages/incoming/navigator/NavigatorHomeRoomEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/NavigatorHomeRoomEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { NavigatorHomeRoomParser } from '../../parser/navigator/NavigatorHomeRoomParser'; export class NavigatorHomeRoomEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/NavigatorLiftedEvent.ts b/src/nitro/communication/messages/incoming/navigator/NavigatorLiftedEvent.ts index 842737e9..e1678e9a 100644 --- a/src/nitro/communication/messages/incoming/navigator/NavigatorLiftedEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/NavigatorLiftedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { NavigatorLiftedParser } from '../../parser/navigator/NavigatorLiftedParser'; export class NavigatorLiftedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/NavigatorMetadataEvent.ts b/src/nitro/communication/messages/incoming/navigator/NavigatorMetadataEvent.ts index a25edec1..9daa396d 100644 --- a/src/nitro/communication/messages/incoming/navigator/NavigatorMetadataEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/NavigatorMetadataEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { NavigatorMetadataParser } from '../../parser/navigator/NavigatorMetadataParser'; export class NavigatorMetadataEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/NavigatorOpenRoomCreatorEvent.ts b/src/nitro/communication/messages/incoming/navigator/NavigatorOpenRoomCreatorEvent.ts index 4e138171..2fccab30 100644 --- a/src/nitro/communication/messages/incoming/navigator/NavigatorOpenRoomCreatorEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/NavigatorOpenRoomCreatorEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { NavigatorOpenRoomCreatorParser } from '../../parser/navigator/NavigatorOpenRoomCreatorParser'; export class NavigatorOpenRoomCreatorEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/NavigatorSearchEvent.ts b/src/nitro/communication/messages/incoming/navigator/NavigatorSearchEvent.ts index 98e855f0..214d8486 100644 --- a/src/nitro/communication/messages/incoming/navigator/NavigatorSearchEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/NavigatorSearchEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { NavigatorSearchParser } from '../../parser/navigator/NavigatorSearchParser'; export class NavigatorSearchEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/NavigatorSearchesEvent.ts b/src/nitro/communication/messages/incoming/navigator/NavigatorSearchesEvent.ts index 6e6c13a1..d700cc49 100644 --- a/src/nitro/communication/messages/incoming/navigator/NavigatorSearchesEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/NavigatorSearchesEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { NavigatorSearchesParser } from '../../parser/navigator/NavigatorSearchesParser'; export class NavigatorSearchesEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/NavigatorSettingsEvent.ts b/src/nitro/communication/messages/incoming/navigator/NavigatorSettingsEvent.ts index bfef4202..f6938f84 100644 --- a/src/nitro/communication/messages/incoming/navigator/NavigatorSettingsEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/NavigatorSettingsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { NavigatorSettingsParser } from '../../parser/navigator/NavigatorSettingsParser'; export class NavigatorSettingsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/RoomEventCancelEvent.ts b/src/nitro/communication/messages/incoming/navigator/RoomEventCancelEvent.ts index ffce09ba..11a4982e 100644 --- a/src/nitro/communication/messages/incoming/navigator/RoomEventCancelEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/RoomEventCancelEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { RoomEventCancelMessageParser } from '../../parser/navigator/RoomEventCancelMessageParser'; export class RoomEventCancelEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/RoomEventEvent.ts b/src/nitro/communication/messages/incoming/navigator/RoomEventEvent.ts index 30b45e3e..8ea8625f 100644 --- a/src/nitro/communication/messages/incoming/navigator/RoomEventEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/RoomEventEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { RoomEventMessageParser } from '../../parser/navigator/RoomEventMessageParser'; export class RoomEventEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/RoomSettingsUpdatedEvent.ts b/src/nitro/communication/messages/incoming/navigator/RoomSettingsUpdatedEvent.ts index 9c56a7fc..e471fb2f 100644 --- a/src/nitro/communication/messages/incoming/navigator/RoomSettingsUpdatedEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/RoomSettingsUpdatedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { RoomSettingsUpdatedParser } from '../../parser/navigator/RoomSettingsUpdatedParser'; export class RoomSettingsUpdatedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/RoomThumbnailUpdateResultEvent.ts b/src/nitro/communication/messages/incoming/navigator/RoomThumbnailUpdateResultEvent.ts index 2068c703..10389881 100644 --- a/src/nitro/communication/messages/incoming/navigator/RoomThumbnailUpdateResultEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/RoomThumbnailUpdateResultEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { RoomThumbnailUpdateResultMessageParser } from '../../parser/navigator/RoomThumbnailUpdateResultMessageParser'; export class RoomThumbnailUpdateResultEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/UserEventCatsEvent.ts b/src/nitro/communication/messages/incoming/navigator/UserEventCatsEvent.ts index 20ad89ba..810361ca 100644 --- a/src/nitro/communication/messages/incoming/navigator/UserEventCatsEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/UserEventCatsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { UserEventCatsMessageParser } from '../../parser/navigator/UserEventCatsMessageParser'; export class UserEventCatsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/UserFlatCatsEvent.ts b/src/nitro/communication/messages/incoming/navigator/UserFlatCatsEvent.ts index 02855b93..1e59c1c5 100644 --- a/src/nitro/communication/messages/incoming/navigator/UserFlatCatsEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/UserFlatCatsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { UserFlatCatsMessageParser } from '../../parser/navigator/UserFlatCatsMessageParser'; export class UserFlatCatsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/notifications/AchievementNotificationMessageEvent.ts b/src/nitro/communication/messages/incoming/notifications/AchievementNotificationMessageEvent.ts index 4684a838..fa0806f2 100644 --- a/src/nitro/communication/messages/incoming/notifications/AchievementNotificationMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/AchievementNotificationMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { AchievementNotificationMessageParser } from '../../parser'; export class AchievementNotificationMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/notifications/ActivityPointNotificationMessageEvent.ts b/src/nitro/communication/messages/incoming/notifications/ActivityPointNotificationMessageEvent.ts index 29863e05..03bd5145 100644 --- a/src/nitro/communication/messages/incoming/notifications/ActivityPointNotificationMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/ActivityPointNotificationMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { ActivityPointNotificationParser } from '../../parser/notifications/ActivityPointNotificationParser'; export class ActivityPointNotificationMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/notifications/BotErrorEvent.ts b/src/nitro/communication/messages/incoming/notifications/BotErrorEvent.ts index 582698d8..349ec0b3 100644 --- a/src/nitro/communication/messages/incoming/notifications/BotErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/BotErrorEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { BotErrorEventParser } from '../../parser/notifications/BotErrorEventParser'; export class BotErrorEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/notifications/ClubGiftNotificationEvent.ts b/src/nitro/communication/messages/incoming/notifications/ClubGiftNotificationEvent.ts index 448f2319..c6a0c918 100644 --- a/src/nitro/communication/messages/incoming/notifications/ClubGiftNotificationEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/ClubGiftNotificationEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { ClubGiftNotificationParser } from '../../parser'; export class ClubGiftNotificationEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/notifications/HabboBroadcastMessageEvent.ts b/src/nitro/communication/messages/incoming/notifications/HabboBroadcastMessageEvent.ts index fbd8714e..56126506 100644 --- a/src/nitro/communication/messages/incoming/notifications/HabboBroadcastMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/HabboBroadcastMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { HabboBroadcastMessageParser } from '../../parser/notifications/HabboBroadcastMessageParser'; export class HabboBroadcastMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/notifications/HotelWillShutdownEvent.ts b/src/nitro/communication/messages/incoming/notifications/HotelWillShutdownEvent.ts index 6363768b..8cef1cca 100644 --- a/src/nitro/communication/messages/incoming/notifications/HotelWillShutdownEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/HotelWillShutdownEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { HotelWillShutdownParser } from '../../parser/notifications/HotelWillShutdownParser'; export class HotelWillShutdownEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/notifications/InfoFeedEnableMessageEvent.ts b/src/nitro/communication/messages/incoming/notifications/InfoFeedEnableMessageEvent.ts index 041f3a25..ce99505c 100644 --- a/src/nitro/communication/messages/incoming/notifications/InfoFeedEnableMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/InfoFeedEnableMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { InfoFeedEnableMessageParser } from '../../parser'; export class InfoFeedEnableMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/notifications/MOTDNotificationEvent.ts b/src/nitro/communication/messages/incoming/notifications/MOTDNotificationEvent.ts index 7843f508..118846af 100644 --- a/src/nitro/communication/messages/incoming/notifications/MOTDNotificationEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/MOTDNotificationEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { MOTDNotificationParser } from '../../parser/notifications/MOTDNotificationParser'; export class MOTDNotificationEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/notifications/NotificationDialogMessageEvent.ts b/src/nitro/communication/messages/incoming/notifications/NotificationDialogMessageEvent.ts index 15e52eff..f51c819d 100644 --- a/src/nitro/communication/messages/incoming/notifications/NotificationDialogMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/NotificationDialogMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { NotificationDialogMessageParser } from '../../parser/notifications/NotificationDialogMessageParser'; export class NotificationDialogMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/notifications/PetLevelNotificationEvent.ts b/src/nitro/communication/messages/incoming/notifications/PetLevelNotificationEvent.ts index 9d4dc7ff..8d7a0eb0 100644 --- a/src/nitro/communication/messages/incoming/notifications/PetLevelNotificationEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/PetLevelNotificationEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { PetLevelNotificationParser } from '../../parser/notifications/PetLevelNotificationParser'; export class PetLevelNotificationEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/notifications/PetPlacingErrorEvent.ts b/src/nitro/communication/messages/incoming/notifications/PetPlacingErrorEvent.ts index 0e7f7c76..baaf48d6 100644 --- a/src/nitro/communication/messages/incoming/notifications/PetPlacingErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/PetPlacingErrorEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { PetPlacingErrorEventParser } from '../../parser/notifications/PetPlacingErrorEventParser'; export class PetPlacingErrorEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/notifications/UnseenItemsEvent.ts b/src/nitro/communication/messages/incoming/notifications/UnseenItemsEvent.ts index f12f928c..177559c9 100644 --- a/src/nitro/communication/messages/incoming/notifications/UnseenItemsEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/UnseenItemsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { UnseenItemsParser } from '../../parser/notifications/UnseenItemsParser'; export class UnseenItemsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/perk/PerkAllowancesMessageEvent.ts b/src/nitro/communication/messages/incoming/perk/PerkAllowancesMessageEvent.ts index dd9099e9..0974db43 100644 --- a/src/nitro/communication/messages/incoming/perk/PerkAllowancesMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/perk/PerkAllowancesMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { PerkAllowancesMessageParser } from './../../parser/perk/PerkAllowancesMessageParser'; export class PerkAllowancesMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/poll/PollContentsEvent.ts b/src/nitro/communication/messages/incoming/poll/PollContentsEvent.ts index 7972bb60..80cbe8c3 100644 --- a/src/nitro/communication/messages/incoming/poll/PollContentsEvent.ts +++ b/src/nitro/communication/messages/incoming/poll/PollContentsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { PollContentsParser } from '../../parser/poll/PollContentsParser'; export class PollContentsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/poll/PollErrorEvent.ts b/src/nitro/communication/messages/incoming/poll/PollErrorEvent.ts index d78e2541..4b1187d8 100644 --- a/src/nitro/communication/messages/incoming/poll/PollErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/poll/PollErrorEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { PollErrorParser } from '../../parser/poll/PollErrorParser'; export class PollErrorEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/poll/PollOfferEvent.ts b/src/nitro/communication/messages/incoming/poll/PollOfferEvent.ts index 4034f1b5..f6a4fabc 100644 --- a/src/nitro/communication/messages/incoming/poll/PollOfferEvent.ts +++ b/src/nitro/communication/messages/incoming/poll/PollOfferEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { PollOfferParser } from '../../parser/poll/PollOfferParser'; export class PollOfferEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/poll/QuestionAnsweredEvent.ts b/src/nitro/communication/messages/incoming/poll/QuestionAnsweredEvent.ts index 33839529..8049c085 100644 --- a/src/nitro/communication/messages/incoming/poll/QuestionAnsweredEvent.ts +++ b/src/nitro/communication/messages/incoming/poll/QuestionAnsweredEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { QuestionAnsweredParser } from '../../parser/poll/QuestionAnsweredParser'; export class QuestionAnsweredEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/poll/QuestionEvent.ts b/src/nitro/communication/messages/incoming/poll/QuestionEvent.ts index 481388d4..889c254b 100644 --- a/src/nitro/communication/messages/incoming/poll/QuestionEvent.ts +++ b/src/nitro/communication/messages/incoming/poll/QuestionEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { QuestionParser } from '../../parser/poll/QuestionParser'; export class QuestionEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/poll/QuestionFinishedEvent.ts b/src/nitro/communication/messages/incoming/poll/QuestionFinishedEvent.ts index c1218253..0fb2e103 100644 --- a/src/nitro/communication/messages/incoming/poll/QuestionFinishedEvent.ts +++ b/src/nitro/communication/messages/incoming/poll/QuestionFinishedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { QuestionFinishedParser } from '../../parser/poll/QuestionFinishedParser'; export class QuestionFinishedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/quest/CommunityGoalEarnedPrizesMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/CommunityGoalEarnedPrizesMessageEvent.ts index cbfc5576..b472f8eb 100644 --- a/src/nitro/communication/messages/incoming/quest/CommunityGoalEarnedPrizesMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/CommunityGoalEarnedPrizesMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CommunityGoalEarnedPrizesMessageParser } from '../../parser/quest/CommunityGoalEarnedPrizesMessageParser'; export class CommunityGoalEarnedPrizesMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/quest/CommunityGoalHallOfFameMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/CommunityGoalHallOfFameMessageEvent.ts index 6b0961fd..30664451 100644 --- a/src/nitro/communication/messages/incoming/quest/CommunityGoalHallOfFameMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/CommunityGoalHallOfFameMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CommunityGoalHallOfFameMessageParser } from '../../parser/quest/CommunityGoalHallOfFameMessageParser'; export class CommunityGoalHallOfFameMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/quest/CommunityGoalProgressMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/CommunityGoalProgressMessageEvent.ts index b8bc2765..98572cad 100644 --- a/src/nitro/communication/messages/incoming/quest/CommunityGoalProgressMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/CommunityGoalProgressMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { CommunityGoalProgressMessageParser } from '../../parser/quest/CommunityGoalProgressMessageParser'; export class CommunityGoalProgressMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/quest/ConcurrentUsersGoalProgressMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/ConcurrentUsersGoalProgressMessageEvent.ts index 955c5464..dc836817 100644 --- a/src/nitro/communication/messages/incoming/quest/ConcurrentUsersGoalProgressMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/ConcurrentUsersGoalProgressMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { ConcurrentUsersGoalProgressMessageParser } from '../../parser/quest/ConcurrentUsersGoalProgressMessageParser'; export class ConcurrentUsersGoalProgressMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/quest/EpicPopupMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/EpicPopupMessageEvent.ts index f14c3761..1630dd45 100644 --- a/src/nitro/communication/messages/incoming/quest/EpicPopupMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/EpicPopupMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { EpicPopupMessageParser } from '../../parser/quest/EpicPopupMessageParser'; export class EpicPopupMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/quest/QuestCancelledMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/QuestCancelledMessageEvent.ts index f5672ca3..61af94b9 100644 --- a/src/nitro/communication/messages/incoming/quest/QuestCancelledMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/QuestCancelledMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { QuestCancelledMessageParser } from '../../parser/quest/QuestCancelledMessageParser'; export class QuestCancelledMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/quest/QuestCompletedMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/QuestCompletedMessageEvent.ts index 224f7e75..19c3115c 100644 --- a/src/nitro/communication/messages/incoming/quest/QuestCompletedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/QuestCompletedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { QuestCompletedMessageParser } from '../../parser/quest/QuestCompletedMessageParser'; export class QuestCompletedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/quest/QuestDailyMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/QuestDailyMessageEvent.ts index 8697e792..fcef5d7f 100644 --- a/src/nitro/communication/messages/incoming/quest/QuestDailyMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/QuestDailyMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { QuestDailyMessageParser } from '../../parser/quest/QuestDailyMessageParser'; export class QuestDailyMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/quest/QuestMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/QuestMessageEvent.ts index 74750371..f2708a5e 100644 --- a/src/nitro/communication/messages/incoming/quest/QuestMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/QuestMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { QuestMessageParser } from '../../parser/quest/QuestMessageParser'; export class QuestMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/quest/QuestsMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/QuestsMessageEvent.ts index c8edf80f..dc1baa9e 100644 --- a/src/nitro/communication/messages/incoming/quest/QuestsMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/QuestsMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { QuestsMessageParser } from '../../parser/quest/QuestsMessageParser'; export class QuestsMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/quest/SeasonalQuestsMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/SeasonalQuestsMessageEvent.ts index f1487d88..90ab2917 100644 --- a/src/nitro/communication/messages/incoming/quest/SeasonalQuestsMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/SeasonalQuestsMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { SeasonalQuestsParser } from '../../parser/quest/SeasonalQuestsParser'; export class SeasonalQuestsMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/access/RoomEnterErrorEvent.ts b/src/nitro/communication/messages/incoming/room/access/RoomEnterErrorEvent.ts index 99a6b2e1..24fab5f9 100644 --- a/src/nitro/communication/messages/incoming/room/access/RoomEnterErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/room/access/RoomEnterErrorEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { CantConnectMessageParser } from '../../../parser/room/access/CantConnectMessageParser'; export class RoomEnterErrorEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/access/RoomEnterEvent.ts b/src/nitro/communication/messages/incoming/room/access/RoomEnterEvent.ts index 1f33def8..c9aba59a 100644 --- a/src/nitro/communication/messages/incoming/room/access/RoomEnterEvent.ts +++ b/src/nitro/communication/messages/incoming/room/access/RoomEnterEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { RoomEnterParser } from '../../../parser/room/access/RoomEnterParser'; export class RoomEnterEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/access/RoomForwardEvent.ts b/src/nitro/communication/messages/incoming/room/access/RoomForwardEvent.ts index 83689a22..3aa99861 100644 --- a/src/nitro/communication/messages/incoming/room/access/RoomForwardEvent.ts +++ b/src/nitro/communication/messages/incoming/room/access/RoomForwardEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { RoomFowardParser as RoomForwardParser } from '../../../parser/room/access/RoomFowardParser'; export class RoomForwardEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/access/doorbell/RoomDoorbellAcceptedEvent.ts b/src/nitro/communication/messages/incoming/room/access/doorbell/RoomDoorbellAcceptedEvent.ts index e99239ca..ac67b682 100644 --- a/src/nitro/communication/messages/incoming/room/access/doorbell/RoomDoorbellAcceptedEvent.ts +++ b/src/nitro/communication/messages/incoming/room/access/doorbell/RoomDoorbellAcceptedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../../core'; import { RoomDoorbellAcceptedParser } from '../../../../parser/room/access/doorbell/RoomDoorbellAcceptedParser'; export class RoomDoorbellAcceptedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsClearEvent.ts b/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsClearEvent.ts index 2cc6eb76..8660d540 100644 --- a/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsClearEvent.ts +++ b/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsClearEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../../core'; import { RoomRightsClearParser } from '../../../../parser/room/access/rights/RoomRightsClearParser'; export class RoomRightsClearEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsEvent.ts b/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsEvent.ts index 8335aee5..4c199f1a 100644 --- a/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsEvent.ts +++ b/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../../core'; import { RoomRightsParser } from '../../../../parser/room/access/rights/RoomRightsParser'; export class RoomRightsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsOwnerEvent.ts b/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsOwnerEvent.ts index df7f4f3c..c5b4d877 100644 --- a/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsOwnerEvent.ts +++ b/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsOwnerEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../../core'; import { RoomRightsOwnerParser } from '../../../../parser/room/access/rights/RoomRightsOwnerParser'; export class RoomRightsOwnerEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/bots/BotCommandConfigurationEvent.ts b/src/nitro/communication/messages/incoming/room/bots/BotCommandConfigurationEvent.ts index 43514121..ef13e99c 100644 --- a/src/nitro/communication/messages/incoming/room/bots/BotCommandConfigurationEvent.ts +++ b/src/nitro/communication/messages/incoming/room/bots/BotCommandConfigurationEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { BotCommandConfigurationParser } from '../../../parser/room/bots/BotCommandConfigurationParser'; export class BotCommandConfigurationEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/data/RoomChatSettingsEvent.ts b/src/nitro/communication/messages/incoming/room/data/RoomChatSettingsEvent.ts index 1ad8654f..d47dc022 100644 --- a/src/nitro/communication/messages/incoming/room/data/RoomChatSettingsEvent.ts +++ b/src/nitro/communication/messages/incoming/room/data/RoomChatSettingsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { RoomChatSettingsParser } from '../../../parser/room/data/RoomChatSettingsParser'; export class RoomChatSettingsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/data/RoomEntryInfoMessageEvent.ts b/src/nitro/communication/messages/incoming/room/data/RoomEntryInfoMessageEvent.ts index 831b9418..60909f5d 100644 --- a/src/nitro/communication/messages/incoming/room/data/RoomEntryInfoMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/data/RoomEntryInfoMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { RoomEntryInfoMessageParser } from '../../../parser/room/data/RoomEntryInfoMessageParser'; export class RoomEntryInfoMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/data/RoomScoreEvent.ts b/src/nitro/communication/messages/incoming/room/data/RoomScoreEvent.ts index ad96f97a..54401d46 100644 --- a/src/nitro/communication/messages/incoming/room/data/RoomScoreEvent.ts +++ b/src/nitro/communication/messages/incoming/room/data/RoomScoreEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { RoomScoreParser } from '../../../parser/room/data/RoomScoreParser'; export class RoomScoreEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/engine/FavoriteMembershipUpdateMessageEvent.ts b/src/nitro/communication/messages/incoming/room/engine/FavoriteMembershipUpdateMessageEvent.ts index fa458169..ddd822ce 100644 --- a/src/nitro/communication/messages/incoming/room/engine/FavoriteMembershipUpdateMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/engine/FavoriteMembershipUpdateMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { FavoriteMembershipUpdateMessageParser } from '../../../parser/room/engine/FavoriteMembershipUpdateMessageParser'; export class FavoriteMembershipUpdateMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/engine/ObjectsDataUpdateEvent.ts b/src/nitro/communication/messages/incoming/room/engine/ObjectsDataUpdateEvent.ts index f84e7930..f4408e8b 100644 --- a/src/nitro/communication/messages/incoming/room/engine/ObjectsDataUpdateEvent.ts +++ b/src/nitro/communication/messages/incoming/room/engine/ObjectsDataUpdateEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { ObjectsDataUpdateParser } from '../../../parser/room/engine/ObjectsDataUpdateParser'; export class ObjectsDataUpdateEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/engine/ObjectsRollingEvent.ts b/src/nitro/communication/messages/incoming/room/engine/ObjectsRollingEvent.ts index 46a4c3de..20785f8d 100644 --- a/src/nitro/communication/messages/incoming/room/engine/ObjectsRollingEvent.ts +++ b/src/nitro/communication/messages/incoming/room/engine/ObjectsRollingEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { ObjectsRollingParser } from '../../../parser/room/engine/ObjectsRollingParser'; export class ObjectsRollingEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/CustomUserNotificationMessageEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/CustomUserNotificationMessageEvent.ts index fac4da63..317839ad 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/CustomUserNotificationMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/CustomUserNotificationMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { CustomUserNotificationMessageParser } from '../../../parser/room/furniture/CustomUserNotificationMessageParser'; export class CustomUserNotificationMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/DiceValueMessageEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/DiceValueMessageEvent.ts index 92ce7191..5aff96b1 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/DiceValueMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/DiceValueMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { DiceValueMessageParser } from '../../../parser/room/furniture/DiceValueMessageParser'; export class DiceValueMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/FurnitureAliasesEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/FurnitureAliasesEvent.ts index 1e1638f2..a190094d 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/FurnitureAliasesEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/FurnitureAliasesEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { FurnitureAliasesParser } from '../../../parser/room/furniture/FurnitureAliasesParser'; export class FurnitureAliasesEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/FurnitureDataEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/FurnitureDataEvent.ts index 1858f210..1ba2ad1d 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/FurnitureDataEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/FurnitureDataEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { FurnitureDataParser } from '../../../parser/room/furniture/FurnitureDataParser'; export class FurnitureDataEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/FurnitureStackHeightEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/FurnitureStackHeightEvent.ts index f4b18460..14d1e4af 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/FurnitureStackHeightEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/FurnitureStackHeightEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { FurnitureStackHeightParser } from '../../../parser/room/furniture/FurnitureStackHeightParser'; export class FurnitureStackHeightEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/GroupFurniContextMenuInfoMessageEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/GroupFurniContextMenuInfoMessageEvent.ts index 0107453c..eac84321 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/GroupFurniContextMenuInfoMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/GroupFurniContextMenuInfoMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { GroupFurniContextMenuInfoMessageParser } from '../../../parser/room/furniture/GroupFurniContextMenuInfoMessageParser'; export class GroupFurniContextMenuInfoMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/ItemDataUpdateMessageEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/ItemDataUpdateMessageEvent.ts index 213162e9..f7d896ce 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/ItemDataUpdateMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/ItemDataUpdateMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { ItemDataUpdateMessageParser } from '../../../parser/room/furniture/ItemDataUpdateMessageParser'; export class ItemDataUpdateMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniFinishedEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniFinishedEvent.ts index 5ac69940..a12968e3 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniFinishedEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniFinishedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { LoveLockFurniFinishedParser } from '../../../parser/room/furniture/LoveLockFurniFinishedParser'; export class LoveLockFurniFinishedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniFriendConfirmedEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniFriendConfirmedEvent.ts index 801b9752..85e521ae 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniFriendConfirmedEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniFriendConfirmedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { LoveLockFurniFriendConfirmedParser } from '../../../parser/room/furniture/LoveLockFurniFriendConfirmedParser'; export class LoveLockFurniFriendConfirmedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniStartEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniStartEvent.ts index 68edb0ac..ff6aa342 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniStartEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniStartEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { LoveLockFurniStartParser } from '../../../parser/room/furniture/LoveLockFurniStartParser'; export class LoveLockFurniStartEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/OneWayDoorStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/OneWayDoorStatusMessageEvent.ts index 6bdb1385..0d157de0 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/OneWayDoorStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/OneWayDoorStatusMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { OneWayDoorStatusMessageParser } from '../../../parser/room/furniture/OneWayDoorStatusMessageParser'; export class OneWayDoorStatusMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/RequestSpamWallPostItMessageEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/RequestSpamWallPostItMessageEvent.ts index d634bc38..65e598ba 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/RequestSpamWallPostItMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/RequestSpamWallPostItMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { RequestSpamWallPostItMessageParser } from '../../../parser/room/furniture/RequestSpamWallPostItMessageParser'; export class RequestSpamWallPostItMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/RoomDimmerPresetsMessageEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/RoomDimmerPresetsMessageEvent.ts index a18dab09..742a86f6 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/RoomDimmerPresetsMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/RoomDimmerPresetsMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { RoomDimmerPresetsMessageParser } from '../../../parser/room/furniture/RoomDimmerPresetsMessageParser'; export class RoomDimmerPresetsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorAddEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorAddEvent.ts index 30d4d36a..cb5578d4 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorAddEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorAddEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../../core'; import { FurnitureFloorAddParser } from '../../../../parser/room/furniture/floor/FurnitureFloorAddParser'; export class FurnitureFloorAddEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorEvent.ts index a4c023bb..5de86d71 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../../core'; import { FurnitureFloorParser } from '../../../../parser/room/furniture/floor/FurnitureFloorParser'; export class FurnitureFloorEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorRemoveEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorRemoveEvent.ts index 534f1a02..c3acd326 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorRemoveEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorRemoveEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../../core'; import { FurnitureFloorRemoveParser } from '../../../../parser/room/furniture/floor/FurnitureFloorRemoveParser'; export class FurnitureFloorRemoveEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorUpdateEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorUpdateEvent.ts index d88d9775..a8d85430 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorUpdateEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorUpdateEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../../core'; import { FurnitureFloorUpdateParser } from '../../../../parser/room/furniture/floor/FurnitureFloorUpdateParser'; export class FurnitureFloorUpdateEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallAddEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallAddEvent.ts index f24144ee..a1e02cdd 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallAddEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallAddEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../../core'; import { FurnitureWallAddParser } from '../../../../parser/room/furniture/wall/FurnitureWallAddParser'; export class FurnitureWallAddEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallEvent.ts index a5f3efed..f61e43ce 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../../core'; import { FurnitureWallParser } from '../../../../parser/room/furniture/wall/FurnitureWallParser'; export class FurnitureWallEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallRemoveEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallRemoveEvent.ts index 1e11f5bb..15619e58 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallRemoveEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallRemoveEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../../core'; import { FurnitureWallRemoveParser } from '../../../../parser/room/furniture/wall/FurnitureWallRemoveParser'; export class FurnitureWallRemoveEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallUpdateEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallUpdateEvent.ts index d68b23c5..197f740a 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallUpdateEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallUpdateEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../../core'; import { FurnitureWallUpdateParser } from '../../../../parser/room/furniture/wall/FurnitureWallUpdateParser'; export class FurnitureWallUpdateEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeControlVideoMessageEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeControlVideoMessageEvent.ts index bdb4c5fc..0a9030f4 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeControlVideoMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeControlVideoMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../../core'; import { YoutubeControlVideoMessageParser } from '../../../../parser/room/furniture/youtube/YoutubeControlVideoMessageParser'; export class YoutubeControlVideoMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeDisplayPlaylistsEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeDisplayPlaylistsEvent.ts index bd0a0b3b..fce266d3 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeDisplayPlaylistsEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeDisplayPlaylistsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../../core'; import { YoutubeDisplayPlaylistsMessageParser } from '../../../../parser/room/furniture/youtube/YoutubeDisplayPlaylistsMessageParser'; export class YoutubeDisplayPlaylistsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeDisplayVideoMessageEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeDisplayVideoMessageEvent.ts index bb74a36d..2d65563c 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeDisplayVideoMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeDisplayVideoMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../../core'; import { YoutubeDisplayVideoMessageParser } from '../../../../parser/room/furniture/youtube/YoutubeDisplayVideoMessageParser'; export class YoutubeDisplayVideoMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/mapping/FloorHeightMapEvent.ts b/src/nitro/communication/messages/incoming/room/mapping/FloorHeightMapEvent.ts index 009e4a39..cd329d47 100644 --- a/src/nitro/communication/messages/incoming/room/mapping/FloorHeightMapEvent.ts +++ b/src/nitro/communication/messages/incoming/room/mapping/FloorHeightMapEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { FloorHeightMapMessageParser } from '../../../parser/room/mapping/FloorHeightMapMessageParser'; export class FloorHeightMapEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/mapping/RoomEntryTileMessageEvent.ts b/src/nitro/communication/messages/incoming/room/mapping/RoomEntryTileMessageEvent.ts index 23834e69..63debbc4 100644 --- a/src/nitro/communication/messages/incoming/room/mapping/RoomEntryTileMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/mapping/RoomEntryTileMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { RoomEntryTileMessageParser } from '../../../parser/room/mapping/RoomEntryTileMessageParser'; export class RoomEntryTileMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/mapping/RoomHeightMapEvent.ts b/src/nitro/communication/messages/incoming/room/mapping/RoomHeightMapEvent.ts index 6483908d..6a863e44 100644 --- a/src/nitro/communication/messages/incoming/room/mapping/RoomHeightMapEvent.ts +++ b/src/nitro/communication/messages/incoming/room/mapping/RoomHeightMapEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { RoomHeightMapParser } from '../../../parser/room/mapping/RoomHeightMapParser'; export class RoomHeightMapEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/mapping/RoomHeightMapUpdateEvent.ts b/src/nitro/communication/messages/incoming/room/mapping/RoomHeightMapUpdateEvent.ts index 309c1417..36368bb3 100644 --- a/src/nitro/communication/messages/incoming/room/mapping/RoomHeightMapUpdateEvent.ts +++ b/src/nitro/communication/messages/incoming/room/mapping/RoomHeightMapUpdateEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { RoomHeightMapUpdateParser } from '../../../parser/room/mapping/RoomHeightMapUpdateParser'; export class RoomHeightMapUpdateEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/mapping/RoomOccupiedTilesMessageEvent.ts b/src/nitro/communication/messages/incoming/room/mapping/RoomOccupiedTilesMessageEvent.ts index f14c5a80..081d7284 100644 --- a/src/nitro/communication/messages/incoming/room/mapping/RoomOccupiedTilesMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/mapping/RoomOccupiedTilesMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { RoomOccupiedTilesMessageParser } from '../../../parser/room/mapping/RoomOccupiedTilesMessageParser'; export class RoomOccupiedTilesMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/mapping/RoomPaintEvent.ts b/src/nitro/communication/messages/incoming/room/mapping/RoomPaintEvent.ts index 378ddd1b..5843d63a 100644 --- a/src/nitro/communication/messages/incoming/room/mapping/RoomPaintEvent.ts +++ b/src/nitro/communication/messages/incoming/room/mapping/RoomPaintEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { RoomPaintParser } from '../../../parser/room/mapping/RoomPaintParser'; export class RoomPaintEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/mapping/RoomReadyMessageEvent.ts b/src/nitro/communication/messages/incoming/room/mapping/RoomReadyMessageEvent.ts index 30120df2..07498be7 100644 --- a/src/nitro/communication/messages/incoming/room/mapping/RoomReadyMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/mapping/RoomReadyMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { RoomReadyMessageParser } from '../../../parser/room/mapping/RoomReadyMessageParser'; export class RoomReadyMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/mapping/RoomVisualizationSettingsEvent.ts b/src/nitro/communication/messages/incoming/room/mapping/RoomVisualizationSettingsEvent.ts index 620a3737..f2b568d3 100644 --- a/src/nitro/communication/messages/incoming/room/mapping/RoomVisualizationSettingsEvent.ts +++ b/src/nitro/communication/messages/incoming/room/mapping/RoomVisualizationSettingsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { RoomVisualizationSettingsParser } from '../../../parser/room/mapping/RoomVisualizationSettingsParser'; export class RoomVisualizationSettingsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/pet/PetExperienceEvent.ts b/src/nitro/communication/messages/incoming/room/pet/PetExperienceEvent.ts index 97795e67..b7521c61 100644 --- a/src/nitro/communication/messages/incoming/room/pet/PetExperienceEvent.ts +++ b/src/nitro/communication/messages/incoming/room/pet/PetExperienceEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { PetExperienceParser } from '../../../parser'; export class PetExperienceEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/pet/PetFigureUpdateEvent.ts b/src/nitro/communication/messages/incoming/room/pet/PetFigureUpdateEvent.ts index 438fe860..f1037dfc 100644 --- a/src/nitro/communication/messages/incoming/room/pet/PetFigureUpdateEvent.ts +++ b/src/nitro/communication/messages/incoming/room/pet/PetFigureUpdateEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { PetFigureUpdateParser } from '../../../parser/room/pet/PetFigureUpdateParser'; export class PetFigureUpdateEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/pet/PetInfoEvent.ts b/src/nitro/communication/messages/incoming/room/pet/PetInfoEvent.ts index e7f52347..07adde4f 100644 --- a/src/nitro/communication/messages/incoming/room/pet/PetInfoEvent.ts +++ b/src/nitro/communication/messages/incoming/room/pet/PetInfoEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { PetInfoParser } from '../../../parser/room/pet/PetInfoParser'; export class PetInfoEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/pet/PetStatusUpdateEvent.ts b/src/nitro/communication/messages/incoming/room/pet/PetStatusUpdateEvent.ts index b86fc8b8..9d8b9b8a 100644 --- a/src/nitro/communication/messages/incoming/room/pet/PetStatusUpdateEvent.ts +++ b/src/nitro/communication/messages/incoming/room/pet/PetStatusUpdateEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { PetStatusUpdateParser } from '../../../parser/room/pet/PetStatusUpdateParser'; export class PetStatusUpdateEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/session/YouArePlayingGameEvent.ts b/src/nitro/communication/messages/incoming/room/session/YouArePlayingGameEvent.ts index c28b71b8..3d5fae08 100644 --- a/src/nitro/communication/messages/incoming/room/session/YouArePlayingGameEvent.ts +++ b/src/nitro/communication/messages/incoming/room/session/YouArePlayingGameEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { YouArePlayingGameParser } from '../../../parser/room/session/YouArePlayingGameParser'; export class YouArePlayingGameEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/session/YouAreSpectatorMessageEvent.ts b/src/nitro/communication/messages/incoming/room/session/YouAreSpectatorMessageEvent.ts index 93ebb26e..68750adb 100644 --- a/src/nitro/communication/messages/incoming/room/session/YouAreSpectatorMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/session/YouAreSpectatorMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { YouAreSpectatorMessageParser } from '../../../parser/room/session/YouAreSpectatorMessageParser'; export class YouAreSpectatorMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitDanceEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitDanceEvent.ts index 960f92bc..8d5e4036 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitDanceEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitDanceEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { RoomUnitDanceParser } from '../../../parser/room/unit/RoomUnitDanceParser'; export class RoomUnitDanceEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitEffectEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitEffectEvent.ts index 088d2736..7280fcba 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitEffectEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitEffectEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { RoomUnitEffectParser } from '../../../parser/room/unit/RoomUnitEffectParser'; export class RoomUnitEffectEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitEvent.ts index 7ac70065..5ec05d48 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { RoomUnitParser } from '../../../parser/room/unit/RoomUnitParser'; export class RoomUnitEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitExpressionEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitExpressionEvent.ts index 6595fcfb..593a68b9 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitExpressionEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitExpressionEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { RoomUnitExpressionParser } from '../../../parser/room/unit/RoomUnitExpressionParser'; export class RoomUnitExpressionEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitHandItemEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitHandItemEvent.ts index 1a8c4ae6..fe293cdc 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitHandItemEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitHandItemEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { RoomUnitHandItemParser } from '../../../parser/room/unit/RoomUnitHandItemParser'; export class RoomUnitHandItemEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitHandItemReceivedEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitHandItemReceivedEvent.ts index 6747c09e..4be6b31f 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitHandItemReceivedEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitHandItemReceivedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { RoomUnitHandItemReceivedParser } from '../../../parser/room/unit/RoomUnitHandItemReceivedParser'; export class RoomUnitHandItemReceivedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitIdleEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitIdleEvent.ts index 0f8a6c54..42362f56 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitIdleEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitIdleEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { RoomUnitIdleParser } from '../../../parser/room/unit/RoomUnitIdleParser'; export class RoomUnitIdleEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitInfoEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitInfoEvent.ts index bf688db8..bc8fafe4 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitInfoEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitInfoEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { RoomUnitInfoParser } from '../../../parser/room/unit/RoomUnitInfoParser'; export class RoomUnitInfoEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitNumberEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitNumberEvent.ts index ae50b10c..0b28c50e 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitNumberEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitNumberEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { RoomUnitNumberParser } from '../../../parser/room/unit/RoomUnitNumberParser'; export class RoomUnitNumberEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitRemoveEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitRemoveEvent.ts index ece05166..d2200216 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitRemoveEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitRemoveEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { RoomUnitRemoveParser } from '../../../parser/room/unit/RoomUnitRemoveParser'; export class RoomUnitRemoveEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitStatusEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitStatusEvent.ts index 61dcd8b0..507b3c30 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitStatusEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitStatusEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { RoomUnitStatusParser } from '../../../parser/room/unit/RoomUnitStatusParser'; export class RoomUnitStatusEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/chat/FloodControlEvent.ts b/src/nitro/communication/messages/incoming/room/unit/chat/FloodControlEvent.ts index 14b9ac1b..9bad6179 100644 --- a/src/nitro/communication/messages/incoming/room/unit/chat/FloodControlEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/chat/FloodControlEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../../core'; import { FloodControlParser } from '../../../../parser/room/unit/chat/FloodControlParser'; export class FloodControlEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/chat/RemainingMuteEvent.ts b/src/nitro/communication/messages/incoming/room/unit/chat/RemainingMuteEvent.ts index 9c235495..f83c3920 100644 --- a/src/nitro/communication/messages/incoming/room/unit/chat/RemainingMuteEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/chat/RemainingMuteEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../../core'; import { RemainingMuteParser } from '../../../../parser/room/unit/chat/RemainingMuteParser'; export class RemainingMuteEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatEvent.ts b/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatEvent.ts index dad35b24..c4485f4a 100644 --- a/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../../core'; import { RoomUnitChatParser } from '../../../../parser/room/unit/chat/RoomUnitChatParser'; export class RoomUnitChatEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatShoutEvent.ts b/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatShoutEvent.ts index 240a6342..19d01883 100644 --- a/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatShoutEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatShoutEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../../core'; import { RoomUnitChatParser } from '../../../../parser/room/unit/chat/RoomUnitChatParser'; export class RoomUnitChatShoutEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatWhisperEvent.ts b/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatWhisperEvent.ts index 4f16a104..e1ef516b 100644 --- a/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatWhisperEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatWhisperEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../../core'; import { RoomUnitChatParser } from '../../../../parser/room/unit/chat/RoomUnitChatParser'; export class RoomUnitChatWhisperEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitTypingEvent.ts b/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitTypingEvent.ts index 8413ada1..fd83a769 100644 --- a/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitTypingEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitTypingEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../../core'; import { RoomUnitTypingParser } from '../../../../parser/room/unit/chat/RoomUnitTypingParser'; export class RoomUnitTypingEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomevents/WiredFurniActionEvent.ts b/src/nitro/communication/messages/incoming/roomevents/WiredFurniActionEvent.ts index 7490f4eb..941c2667 100644 --- a/src/nitro/communication/messages/incoming/roomevents/WiredFurniActionEvent.ts +++ b/src/nitro/communication/messages/incoming/roomevents/WiredFurniActionEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { WiredFurniActionParser } from '../../parser/roomevents/WiredFurniActionParser'; export class WiredFurniActionEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomevents/WiredFurniConditionEvent.ts b/src/nitro/communication/messages/incoming/roomevents/WiredFurniConditionEvent.ts index 16c0f3b0..988000b2 100644 --- a/src/nitro/communication/messages/incoming/roomevents/WiredFurniConditionEvent.ts +++ b/src/nitro/communication/messages/incoming/roomevents/WiredFurniConditionEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { WiredFurniConditionParser } from '../../parser/roomevents/WiredFurniConditionParser'; export class WiredFurniConditionEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomevents/WiredFurniTriggerEvent.ts b/src/nitro/communication/messages/incoming/roomevents/WiredFurniTriggerEvent.ts index 1228d945..055ccd94 100644 --- a/src/nitro/communication/messages/incoming/roomevents/WiredFurniTriggerEvent.ts +++ b/src/nitro/communication/messages/incoming/roomevents/WiredFurniTriggerEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { WiredFurniTriggerParser } from '../../parser/roomevents/WiredFurniTriggerParser'; export class WiredFurniTriggerEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomevents/WiredOpenEvent.ts b/src/nitro/communication/messages/incoming/roomevents/WiredOpenEvent.ts index e75f4ed6..06363d43 100644 --- a/src/nitro/communication/messages/incoming/roomevents/WiredOpenEvent.ts +++ b/src/nitro/communication/messages/incoming/roomevents/WiredOpenEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { WiredOpenParser } from '../../parser/roomevents/WiredOpenParser'; export class WiredOpenEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomevents/WiredRewardResultMessageEvent.ts b/src/nitro/communication/messages/incoming/roomevents/WiredRewardResultMessageEvent.ts index e1e7251b..7d6444d8 100644 --- a/src/nitro/communication/messages/incoming/roomevents/WiredRewardResultMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/roomevents/WiredRewardResultMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { WiredRewardResultMessageParser } from '../../parser/roomevents/WiredRewardResultMessageParser'; export class WiredRewardResultMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomevents/WiredSaveSuccessEvent.ts b/src/nitro/communication/messages/incoming/roomevents/WiredSaveSuccessEvent.ts index 91b9af63..ca8b451a 100644 --- a/src/nitro/communication/messages/incoming/roomevents/WiredSaveSuccessEvent.ts +++ b/src/nitro/communication/messages/incoming/roomevents/WiredSaveSuccessEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { WiredSaveSuccessParser } from '../../parser/roomevents/WiredSaveSuccessParser'; export class WiredSaveSuccessEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomevents/WiredValidationErrorEvent.ts b/src/nitro/communication/messages/incoming/roomevents/WiredValidationErrorEvent.ts index 187a8ba4..a4980dd7 100644 --- a/src/nitro/communication/messages/incoming/roomevents/WiredValidationErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/roomevents/WiredValidationErrorEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { WiredValidationErrorParser } from '../../parser/roomevents/WiredValidationErrorParser'; export class WiredValidationErrorEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomsettings/BannedUsersFromRoomEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/BannedUsersFromRoomEvent.ts index ab553aeb..bad0efe0 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/BannedUsersFromRoomEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/BannedUsersFromRoomEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { BannedUsersFromRoomParser } from '../../parser/roomsettings/BannedUsersFromRoomParser'; export class BannedUsersFromRoomEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomsettings/FlatControllerAddedEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/FlatControllerAddedEvent.ts index ad02eb83..7d606d03 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/FlatControllerAddedEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/FlatControllerAddedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { FlatControllerAddedParser } from '../../parser/roomsettings/FlatControllerAddedParser'; export class FlatControllerAddedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomsettings/FlatControllerRemovedEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/FlatControllerRemovedEvent.ts index c98c6370..0c033947 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/FlatControllerRemovedEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/FlatControllerRemovedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { FlatControllerRemovedParser } from '../../parser/roomsettings/FlatControllerRemovedParser'; export class FlatControllerRemovedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomsettings/FlatControllersEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/FlatControllersEvent.ts index cb721ce0..6a366375 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/FlatControllersEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/FlatControllersEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { FlatControllersParser } from '../../parser/roomsettings/FlatControllersParser'; export class FlatControllersEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomsettings/MuteAllInRoomEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/MuteAllInRoomEvent.ts index ee638f92..06098950 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/MuteAllInRoomEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/MuteAllInRoomEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { MuteAllInRoomParser } from '../../parser/roomsettings/MuteAllInRoomParser'; export class MuteAllInRoomEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomsettings/NoSuchFlatEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/NoSuchFlatEvent.ts index 7e1b2242..08bdea09 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/NoSuchFlatEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/NoSuchFlatEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { NoSuchFlatParser } from '../../parser/roomsettings/NoSuchFlatParser'; export class NoSuchFlatEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsDataEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsDataEvent.ts index 3b8fa1fd..0dac99e1 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsDataEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsDataEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { RoomSettingsDataParser } from '../../parser/roomsettings/RoomSettingsDataParser'; export class RoomSettingsDataEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsErrorEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsErrorEvent.ts index 895aec8b..ad6b9cf8 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsErrorEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { RoomSettingsErrorParser } from '../../parser/roomsettings/RoomSettingsErrorParser'; export class RoomSettingsErrorEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsSaveErrorEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsSaveErrorEvent.ts index f5527599..4f9ed67d 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsSaveErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsSaveErrorEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { RoomSettingsSaveErrorParser } from '../../parser/roomsettings/RoomSettingsSaveErrorParser'; export class RoomSettingsSaveErrorEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsSavedEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsSavedEvent.ts index 59bb5568..5a03f8bb 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsSavedEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsSavedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { RoomSettingsSavedParser } from '../../parser/roomsettings/RoomSettingsSavedParser'; export class RoomSettingsSavedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomsettings/ShowEnforceRoomCategoryDialogEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/ShowEnforceRoomCategoryDialogEvent.ts index 5aef9bf7..f649749a 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/ShowEnforceRoomCategoryDialogEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/ShowEnforceRoomCategoryDialogEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { ShowEnforceRoomCategoryDialogParser } from '../../parser/roomsettings/ShowEnforceRoomCategoryDialogParser'; export class ShowEnforceRoomCategoryDialogEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomsettings/UserUnbannedFromRoomEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/UserUnbannedFromRoomEvent.ts index b9ec74f5..4afb9b6c 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/UserUnbannedFromRoomEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/UserUnbannedFromRoomEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { UserUnbannedFromRoomParser } from '../../parser/roomsettings/UserUnbannedFromRoomParser'; export class UserUnbannedFromRoomEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/security/AuthenticatedEvent.ts b/src/nitro/communication/messages/incoming/security/AuthenticatedEvent.ts index 8fed92df..4cee03a3 100644 --- a/src/nitro/communication/messages/incoming/security/AuthenticatedEvent.ts +++ b/src/nitro/communication/messages/incoming/security/AuthenticatedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { AuthenticatedParser } from '../../parser/security/AuthenticatedParser'; export class AuthenticatedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/sound/JukeboxPlayListFullMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/JukeboxPlayListFullMessageEvent.ts index b0d4acc1..7cdb08b6 100644 --- a/src/nitro/communication/messages/incoming/sound/JukeboxPlayListFullMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/sound/JukeboxPlayListFullMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { JukeboxPlayListFullMessageParser } from '../../parser'; export class JukeboxPlayListFullMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/sound/JukeboxSongDisksMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/JukeboxSongDisksMessageEvent.ts index d3aa85a7..5ff2d285 100644 --- a/src/nitro/communication/messages/incoming/sound/JukeboxSongDisksMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/sound/JukeboxSongDisksMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { JukeboxSongDisksMessageParser } from '../../parser'; export class JukeboxSongDisksMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/sound/NowPlayingMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/NowPlayingMessageEvent.ts index 47f1ccc4..5022a146 100644 --- a/src/nitro/communication/messages/incoming/sound/NowPlayingMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/sound/NowPlayingMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { NowPlayingMessageParser } from '../../parser'; export class NowPlayingMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/sound/OfficialSongIdMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/OfficialSongIdMessageEvent.ts index cbc43d54..b1398512 100644 --- a/src/nitro/communication/messages/incoming/sound/OfficialSongIdMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/sound/OfficialSongIdMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { OfficialSongIdMessageParser } from '../../parser'; export class OfficialSongIdMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/sound/PlayListMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/PlayListMessageEvent.ts index c1a64899..49b52ec5 100644 --- a/src/nitro/communication/messages/incoming/sound/PlayListMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/sound/PlayListMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { PlayListMessageParser } from '../../parser'; export class PlayListMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/sound/PlayListSongAddedMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/PlayListSongAddedMessageEvent.ts index 4274c821..d4b02287 100644 --- a/src/nitro/communication/messages/incoming/sound/PlayListSongAddedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/sound/PlayListSongAddedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { PlayListSongAddedMessageParser } from '../../parser'; export class PlayListSongAddedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/sound/TraxSongInfoMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/TraxSongInfoMessageEvent.ts index b7330522..18587eb1 100644 --- a/src/nitro/communication/messages/incoming/sound/TraxSongInfoMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/sound/TraxSongInfoMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { TraxSongInfoMessageParser } from '../../parser'; export class TraxSongInfoMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/sound/UserSongDisksInventoryMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/UserSongDisksInventoryMessageEvent.ts index decd802f..5a953ff4 100644 --- a/src/nitro/communication/messages/incoming/sound/UserSongDisksInventoryMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/sound/UserSongDisksInventoryMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { UserSongDisksInventoryMessageParser } from '../../parser'; export class UserSongDisksInventoryMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/talent/TalentTrackMessageEvent.ts b/src/nitro/communication/messages/incoming/talent/TalentTrackMessageEvent.ts index 697f136a..c7066d30 100644 --- a/src/nitro/communication/messages/incoming/talent/TalentTrackMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/talent/TalentTrackMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { TalentTrackParser } from '../../parser/talent/TalentTrackParser'; export class TalentTrackMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/ApproveNameMessageEvent.ts b/src/nitro/communication/messages/incoming/user/ApproveNameMessageEvent.ts index 5df53dd4..124f5a1f 100644 --- a/src/nitro/communication/messages/incoming/user/ApproveNameMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/user/ApproveNameMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { ApproveNameResultParser } from '../../parser'; export class ApproveNameMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/GuildMembershipsMessageEvent.ts b/src/nitro/communication/messages/incoming/user/GuildMembershipsMessageEvent.ts index 8e21012c..2bddbd09 100644 --- a/src/nitro/communication/messages/incoming/user/GuildMembershipsMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/user/GuildMembershipsMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { GuildMembershipsMessageParser } from '../../parser/user/GuildMembershipsMessageParser'; export class GuildMembershipsMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/HabboGroupBadgesMessageEvent.ts b/src/nitro/communication/messages/incoming/user/HabboGroupBadgesMessageEvent.ts index f81156a9..340df56c 100644 --- a/src/nitro/communication/messages/incoming/user/HabboGroupBadgesMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/user/HabboGroupBadgesMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { HabboGroupBadgesMessageParser } from '../../parser/user/HabboGroupBadgesMessageParser'; export class HabboGroupBadgesMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/IgnoreResultEvent.ts b/src/nitro/communication/messages/incoming/user/IgnoreResultEvent.ts index a7cc4a63..7b57ad74 100644 --- a/src/nitro/communication/messages/incoming/user/IgnoreResultEvent.ts +++ b/src/nitro/communication/messages/incoming/user/IgnoreResultEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { IgnoreResultParser } from '../../parser/user/IgnoreResultParser'; export class IgnoreResultEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/IgnoredUsersEvent.ts b/src/nitro/communication/messages/incoming/user/IgnoredUsersEvent.ts index eff6e216..d1ef2904 100644 --- a/src/nitro/communication/messages/incoming/user/IgnoredUsersEvent.ts +++ b/src/nitro/communication/messages/incoming/user/IgnoredUsersEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { IgnoredUsersParser } from '../../parser/user/IgnoredUsersParser'; export class IgnoredUsersEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/InClientLinkEvent.ts b/src/nitro/communication/messages/incoming/user/InClientLinkEvent.ts index 0cb93973..389a6634 100644 --- a/src/nitro/communication/messages/incoming/user/InClientLinkEvent.ts +++ b/src/nitro/communication/messages/incoming/user/InClientLinkEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { InClientLinkParser } from '../../parser/user/InClientLinkParser'; export class InClientLinkEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/PetRespectNoficationEvent.ts b/src/nitro/communication/messages/incoming/user/PetRespectNoficationEvent.ts index d633dee9..a57f3c93 100644 --- a/src/nitro/communication/messages/incoming/user/PetRespectNoficationEvent.ts +++ b/src/nitro/communication/messages/incoming/user/PetRespectNoficationEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { PetRespectNotificationParser } from '../../parser/user/PetRespectNotificationParser'; export class PetRespectNoficationEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/PetSupplementedNotificationEvent.ts b/src/nitro/communication/messages/incoming/user/PetSupplementedNotificationEvent.ts index 5b7d6311..db0260de 100644 --- a/src/nitro/communication/messages/incoming/user/PetSupplementedNotificationEvent.ts +++ b/src/nitro/communication/messages/incoming/user/PetSupplementedNotificationEvent.ts @@ -1,6 +1,6 @@ import { PetSupplementedNotificationParser } from '../..'; import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; export class PetSupplementedNotificationEvent extends MessageEvent implements IMessageEvent { diff --git a/src/nitro/communication/messages/incoming/user/RespectReceivedEvent.ts b/src/nitro/communication/messages/incoming/user/RespectReceivedEvent.ts index 00dc830d..d070add5 100644 --- a/src/nitro/communication/messages/incoming/user/RespectReceivedEvent.ts +++ b/src/nitro/communication/messages/incoming/user/RespectReceivedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { RespectReceivedParser } from '../../parser/user/RespectReceivedParser'; export class RespectReceivedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/ScrSendKickbackInfoMessageEvent.ts b/src/nitro/communication/messages/incoming/user/ScrSendKickbackInfoMessageEvent.ts index 1f1a298b..f80bcf8e 100644 --- a/src/nitro/communication/messages/incoming/user/ScrSendKickbackInfoMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/user/ScrSendKickbackInfoMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../core'; import { ScrSendKickbackInfoMessageParser } from '../../parser/user/ScrSendKickbackInfoMessageParser'; export class ScrSendKickbackInfoMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/access/UserPermissionsEvent.ts b/src/nitro/communication/messages/incoming/user/access/UserPermissionsEvent.ts index c757c022..6f0b2138 100644 --- a/src/nitro/communication/messages/incoming/user/access/UserPermissionsEvent.ts +++ b/src/nitro/communication/messages/incoming/user/access/UserPermissionsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { UserPermissionsParser } from '../../../parser/user/access/UserPermissionsParser'; export class UserPermissionsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/data/RelationshipStatusInfoEvent.ts b/src/nitro/communication/messages/incoming/user/data/RelationshipStatusInfoEvent.ts index fd977953..b479f9d7 100644 --- a/src/nitro/communication/messages/incoming/user/data/RelationshipStatusInfoEvent.ts +++ b/src/nitro/communication/messages/incoming/user/data/RelationshipStatusInfoEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { RelationshipStatusInfoMessageParser } from '../../../parser/user/data/RelationshipStatusInfoMessageParser'; export class RelationshipStatusInfoEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/data/UserCurrentBadgesEvent.ts b/src/nitro/communication/messages/incoming/user/data/UserCurrentBadgesEvent.ts index 2c17c56e..823d01d4 100644 --- a/src/nitro/communication/messages/incoming/user/data/UserCurrentBadgesEvent.ts +++ b/src/nitro/communication/messages/incoming/user/data/UserCurrentBadgesEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { UserCurrentBadgesParser } from '../../../parser/user/data/UserCurrentBadgesParser'; export class UserCurrentBadgesEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/data/UserInfoEvent.ts b/src/nitro/communication/messages/incoming/user/data/UserInfoEvent.ts index 3205e818..b93ee000 100644 --- a/src/nitro/communication/messages/incoming/user/data/UserInfoEvent.ts +++ b/src/nitro/communication/messages/incoming/user/data/UserInfoEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { UserInfoParser } from '../../../parser/user/data/UserInfoParser'; export class UserInfoEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/data/UserNameChangeMessageEvent.ts b/src/nitro/communication/messages/incoming/user/data/UserNameChangeMessageEvent.ts index a7a20913..09470526 100644 --- a/src/nitro/communication/messages/incoming/user/data/UserNameChangeMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/user/data/UserNameChangeMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { UserNameChangeMessageParser } from '../../../parser/user/data/UserNameChangeMessageParser'; export class UserNameChangeMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/data/UserProfileEvent.ts b/src/nitro/communication/messages/incoming/user/data/UserProfileEvent.ts index c568c7c9..f8e74293 100644 --- a/src/nitro/communication/messages/incoming/user/data/UserProfileEvent.ts +++ b/src/nitro/communication/messages/incoming/user/data/UserProfileEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { UserProfileParser } from '../../../parser/user/data/UserProfileParser'; export class UserProfileEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/data/UserSettingsEvent.ts b/src/nitro/communication/messages/incoming/user/data/UserSettingsEvent.ts index bcdcc642..26f478fe 100644 --- a/src/nitro/communication/messages/incoming/user/data/UserSettingsEvent.ts +++ b/src/nitro/communication/messages/incoming/user/data/UserSettingsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { UserSettingsParser } from '../../../parser/user/data/UserSettingsParser'; export class UserSettingsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/inventory/currency/UserCreditsEvent.ts b/src/nitro/communication/messages/incoming/user/inventory/currency/UserCreditsEvent.ts index c858b849..10cc5b88 100644 --- a/src/nitro/communication/messages/incoming/user/inventory/currency/UserCreditsEvent.ts +++ b/src/nitro/communication/messages/incoming/user/inventory/currency/UserCreditsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../../core'; import { UserCreditsParser } from '../../../../parser/user/inventory/currency/UserCreditsParser'; export class UserCreditsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/inventory/currency/UserCurrencyEvent.ts b/src/nitro/communication/messages/incoming/user/inventory/currency/UserCurrencyEvent.ts index d5add8b3..74d28130 100644 --- a/src/nitro/communication/messages/incoming/user/inventory/currency/UserCurrencyEvent.ts +++ b/src/nitro/communication/messages/incoming/user/inventory/currency/UserCurrencyEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../../core'; import { UserCurrencyParser } from '../../../../parser/user/inventory/currency/UserCurrencyParser'; export class UserCurrencyEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/inventory/subscription/UserSubscriptionEvent.ts b/src/nitro/communication/messages/incoming/user/inventory/subscription/UserSubscriptionEvent.ts index a1dc6c18..bd864a9e 100644 --- a/src/nitro/communication/messages/incoming/user/inventory/subscription/UserSubscriptionEvent.ts +++ b/src/nitro/communication/messages/incoming/user/inventory/subscription/UserSubscriptionEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../../core'; import { UserSubscriptionParser } from '../../../../parser/user/inventory/subscription/UserSubscriptionParser'; export class UserSubscriptionEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/wardrobe/UserWardrobePageEvent.ts b/src/nitro/communication/messages/incoming/user/wardrobe/UserWardrobePageEvent.ts index 39e60d34..8a465ea8 100644 --- a/src/nitro/communication/messages/incoming/user/wardrobe/UserWardrobePageEvent.ts +++ b/src/nitro/communication/messages/incoming/user/wardrobe/UserWardrobePageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; +import { MessageEvent } from '../../../../../../core'; import { UserWardrobePageParser } from '../../../parser/user/wardrobe/UserWardrobePageParser'; export class UserWardrobePageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/outgoing/camera/RenderRoomMessageComposer.ts b/src/nitro/communication/messages/outgoing/camera/RenderRoomMessageComposer.ts index e9e081e9..2d11748d 100644 --- a/src/nitro/communication/messages/outgoing/camera/RenderRoomMessageComposer.ts +++ b/src/nitro/communication/messages/outgoing/camera/RenderRoomMessageComposer.ts @@ -1,6 +1,6 @@ import { RenderTexture } from '@pixi/core'; import { IMessageComposer } from '../../../../../api'; -import { TextureUtils } from '../../../../../room'; +import { TextureUtils } from '../../../../../pixi-proxy'; export class RenderRoomMessageComposer implements IMessageComposer> { diff --git a/src/nitro/communication/messages/parser/inventory/badges/BadgesParser.ts b/src/nitro/communication/messages/parser/inventory/badges/BadgesParser.ts index 743a587f..6e28ac51 100644 --- a/src/nitro/communication/messages/parser/inventory/badges/BadgesParser.ts +++ b/src/nitro/communication/messages/parser/inventory/badges/BadgesParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../../api'; -import { AdvancedMap } from '../../../../../../core/utils/AdvancedMap'; +import { AdvancedMap } from '../../../../../../core'; export class BadgesParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/notifications/UnseenItemsParser.ts b/src/nitro/communication/messages/parser/notifications/UnseenItemsParser.ts index 1bb4fb33..4753101b 100644 --- a/src/nitro/communication/messages/parser/notifications/UnseenItemsParser.ts +++ b/src/nitro/communication/messages/parser/notifications/UnseenItemsParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; -import { AdvancedMap } from '../../../../../core/utils/AdvancedMap'; +import { AdvancedMap } from '../../../../../core'; export class UnseenItemsParser implements IMessageParser { diff --git a/src/nitro/communication/messages/parser/user/data/RelationshipStatusInfoMessageParser.ts b/src/nitro/communication/messages/parser/user/data/RelationshipStatusInfoMessageParser.ts index ddb90ea3..9739e909 100644 --- a/src/nitro/communication/messages/parser/user/data/RelationshipStatusInfoMessageParser.ts +++ b/src/nitro/communication/messages/parser/user/data/RelationshipStatusInfoMessageParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IMessageParser } from '../../../../../../api'; -import { AdvancedMap } from '../../../../../../core/utils/AdvancedMap'; +import { AdvancedMap } from '../../../../../../core'; import { RelationshipStatusInfo } from './RelationshipStatusInfo'; export class RelationshipStatusInfoMessageParser implements IMessageParser diff --git a/src/nitro/events/NitroSettingsEvent.ts b/src/nitro/events/NitroSettingsEvent.ts index cc131da5..4ce5d853 100644 --- a/src/nitro/events/NitroSettingsEvent.ts +++ b/src/nitro/events/NitroSettingsEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../core/events/NitroEvent'; +import { NitroEvent } from '../../core'; export class NitroSettingsEvent extends NitroEvent { diff --git a/src/nitro/events/NitroSoundEvent.ts b/src/nitro/events/NitroSoundEvent.ts index 02a56d9d..810e9b3f 100644 --- a/src/nitro/events/NitroSoundEvent.ts +++ b/src/nitro/events/NitroSoundEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../core/events/NitroEvent'; +import { NitroEvent } from '../../core'; export class NitroSoundEvent extends NitroEvent { diff --git a/src/nitro/events/NitroToolbarEvent.ts b/src/nitro/events/NitroToolbarEvent.ts index e7aa29a1..fbefde50 100644 --- a/src/nitro/events/NitroToolbarEvent.ts +++ b/src/nitro/events/NitroToolbarEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../core/events/NitroEvent'; +import { NitroEvent } from '../../core'; export class NitroToolbarEvent extends NitroEvent { @@ -32,4 +32,4 @@ export class NitroToolbarEvent extends NitroEvent { this._iconName = name; } -} \ No newline at end of file +} diff --git a/src/nitro/localization/NitroLocalizationEvent.ts b/src/nitro/localization/NitroLocalizationEvent.ts index e4f6f3de..1d0e505c 100644 --- a/src/nitro/localization/NitroLocalizationEvent.ts +++ b/src/nitro/localization/NitroLocalizationEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../core/events/NitroEvent'; +import { NitroEvent } from '../../core'; export class NitroLocalizationEvent extends NitroEvent { @@ -9,4 +9,4 @@ export class NitroLocalizationEvent extends NitroEvent { super(type); } -} \ No newline at end of file +} diff --git a/src/nitro/localization/NitroLocalizationManager.ts b/src/nitro/localization/NitroLocalizationManager.ts index 3f478e4b..184ace14 100644 --- a/src/nitro/localization/NitroLocalizationManager.ts +++ b/src/nitro/localization/NitroLocalizationManager.ts @@ -1,4 +1,4 @@ -import { NitroManager } from '../../core/common/NitroManager'; +import { NitroManager } from '../../core'; import { INitroCommunicationManager } from '../communication/INitroCommunicationManager'; import { BadgePointLimitsEvent } from '../communication/messages/incoming/inventory/badges/BadgePointLimitsEvent'; import { Nitro } from '../Nitro'; @@ -33,12 +33,12 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca let urls: string[] = Nitro.instance.getConfiguration('external.texts.url'); - if(!Array.isArray(urls)) + if (!Array.isArray(urls)) { - urls = [ Nitro.instance.getConfiguration('external.texts.url') ]; + urls = [Nitro.instance.getConfiguration('external.texts.url')]; } - for(let i = 0; i < urls.length; i++) urls[i] = Nitro.instance.core.configuration.interpolate(urls[i]); + for (let i = 0; i < urls.length; i++) urls[i] = Nitro.instance.core.configuration.interpolate(urls[i]); this._pendingUrls = urls; @@ -47,7 +47,7 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca private loadNextLocalization(): void { - if(!this._pendingUrls.length) + if (!this._pendingUrls.length) { this.events && this.events.dispatchEvent(new NitroLocalizationEvent(NitroLocalizationEvent.LOADED)); @@ -67,13 +67,13 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca private onLocalizationLoaded(data: { [index: string]: any }, url: string): void { - if(!data) return; + if (!data) return; - if(!this.parseLocalization(data)) throw new Error(`Invalid json data for file ${url}`); + if (!this.parseLocalization(data)) throw new Error(`Invalid json data for file ${url}`); const index = this._pendingUrls.indexOf(url); - if(index >= 0) this._pendingUrls.splice(index, 1); + if (index >= 0) this._pendingUrls.splice(index, 1); this.loadNextLocalization(); } @@ -85,9 +85,9 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca private parseLocalization(data: { [index: string]: any }): boolean { - if(!data) return false; + if (!data) return false; - for(const key in data) this._definitions.set(key, data[key]); + for (const key in data) this._definitions.set(key, data[key]); return true; } @@ -96,7 +96,7 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca { const parser = event.getParser(); - for(const data of parser.data) this.setBadgePointLimit(data.badgeId, data.limit); + for (const data of parser.data) this.setBadgePointLimit(data.badgeId, data.limit); } public getBadgePointLimit(badge: string): number @@ -130,31 +130,31 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca public getValue(key: string, doParams: boolean = true): string { - if(!key || !key.length) return null; + if (!key || !key.length) return null; const keys = key.match(/\$\{.[^}]*\}/g); - if(keys && keys.length) + if (keys && keys.length) { - for(const splitKey of keys) key = key.replace(splitKey, this.getValue(splitKey.slice(2, -1), doParams)); + for (const splitKey of keys) key = key.replace(splitKey, this.getValue(splitKey.slice(2, -1), doParams)); } let value = (this._definitions.get(key) || null); - if(!value) + if (!value) { value = (Nitro.instance.core.configuration.definitions.get(key) as any); - if(value) return value; + if (value) return value; } - if(value && doParams) + if (value && doParams) { const parameters = this._parameters.get(key); - if(parameters) + if (parameters) { - for(const [ parameter, replacement ] of parameters) + for (const [parameter, replacement] of parameters) { value = value.replace('%' + parameter + '%', replacement); } @@ -170,7 +170,7 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca const replacedValue = value.replace('%' + parameter + '%', replacement); - if(value.startsWith('%{')) + if (value.startsWith('%{')) { // This adds support for multi-optioned texts like // catalog.vip.item.header.months=%{NUM_MONTHS|0 months|1 month|%% months} @@ -182,13 +182,13 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca const regex = new RegExp('%{' + parameter.toUpperCase() + '\\|([^|]*)\\|([^|]*)\\|([^|]*)}'); const result = value.match(regex); - if(!result) return replacedValue; + if (!result) return replacedValue; let indexKey = -1; const replacementAsNumber = Number.parseInt(replacement); let replace = false; - switch(replacementAsNumber) + switch (replacementAsNumber) { case 0: indexKey = 1; @@ -204,14 +204,14 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca } - if(indexKey == -1 || typeof result[indexKey] == 'undefined') + if (indexKey == -1 || typeof result[indexKey] == 'undefined') { return replacedValue; } const valueFromResults = result[indexKey]; - if(valueFromResults) + if (valueFromResults) { return valueFromResults.replace('%%', replacement); } @@ -224,30 +224,30 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca { let value = this.getValue(key, false); - if(parameters) + if (parameters) { - for(let i = 0; i < parameters.length; i++) + for (let i = 0; i < parameters.length; i++) { const parameter = parameters[i]; const replacement = replacements[i]; - if(replacement === undefined) continue; + if (replacement === undefined) continue; value = value.replace('%' + parameter + '%', replacement); - if(value.startsWith('%{')) + if (value.startsWith('%{')) { const regex = new RegExp('%{' + parameter.toUpperCase() + '\\|([^|]*)\\|([^|]*)\\|([^|]*)}'); const result = value.match(regex); - if(!result) continue; + if (!result) continue; const replacementAsNumber = parseInt(replacement); let indexKey = -1; let replace = false; - switch(replacementAsNumber) + switch (replacementAsNumber) { case 0: indexKey = 1; @@ -263,11 +263,11 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca } - if((indexKey === -1) || (typeof result[indexKey] === 'undefined')) continue; + if ((indexKey === -1) || (typeof result[indexKey] === 'undefined')) continue; const valueFromResults = result[indexKey]; - if(valueFromResults) + if (valueFromResults) { value = valueFromResults.replace('%%', replacement); } @@ -285,11 +285,11 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca public registerParameter(key: string, parameter: string, value: string): void { - if(!key || (key.length === 0) || !parameter || (parameter.length === 0)) return; + if (!key || (key.length === 0) || !parameter || (parameter.length === 0)) return; let existing = this._parameters.get(key); - if(!existing) + if (!existing) { existing = new Map(); @@ -302,7 +302,7 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca public getBadgeName(key: string): string { const badge = new BadgeBaseAndLevel(key); - const keys = [ 'badge_name_' + key, 'badge_name_' + badge.base ]; + const keys = ['badge_name_' + key, 'badge_name_' + badge.base]; let name = this._Str_2103(this.getExistingKey(keys)); @@ -314,13 +314,13 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca public getBadgeDesc(key: string): string { const badge = new BadgeBaseAndLevel(key); - const keys = [ 'badge_desc_' + key, 'badge_desc_' + badge.base ]; + const keys = ['badge_desc_' + key, 'badge_desc_' + badge.base]; let desc = this._Str_2103(this.getExistingKey(keys)); const limit = this.getBadgePointLimit(key); - if(limit > -1) desc = desc.replace('%limit%', limit.toString()); + if (limit > -1) desc = desc.replace('%limit%', limit.toString()); desc = desc.replace('%roman%', this.getRomanNumeral(badge.level)); @@ -329,10 +329,10 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca private getExistingKey(keys: string[]): string { - for(const entry of keys) + for (const entry of keys) { const item = this.getValue(entry); - if(item != entry) return item; + if (item != entry) return item; } return ''; diff --git a/src/nitro/room/ImageResult.ts b/src/nitro/room/ImageResult.ts index daf9d8c0..55666ac5 100644 --- a/src/nitro/room/ImageResult.ts +++ b/src/nitro/room/ImageResult.ts @@ -1,5 +1,5 @@ import { RenderTexture } from '@pixi/core'; -import { TextureUtils } from '../../room/utils/TextureUtils'; +import { TextureUtils } from '../../pixi-proxy'; export class ImageResult { @@ -9,9 +9,9 @@ export class ImageResult public getImage(): HTMLImageElement { - if(this.image) return this.image; + if (this.image) return this.image; - if(!this.data) return null; + if (!this.data) return null; return TextureUtils.generateImage(this.data); } diff --git a/src/nitro/room/RoomContentLoader.ts b/src/nitro/room/RoomContentLoader.ts index f39f1cab..f67f97a9 100644 --- a/src/nitro/room/RoomContentLoader.ts +++ b/src/nitro/room/RoomContentLoader.ts @@ -2,13 +2,9 @@ import { BaseTexture, Resource, Texture } from '@pixi/core'; import { Loader, LoaderResource } from '@pixi/loaders'; import { Spritesheet } from '@pixi/spritesheet'; import { IAssetData, IEventDispatcher, IGraphicAssetCollection, INitroLogger } from '../../api'; -import { NitroBundle } from '../../core/asset/NitroBundle'; -import { NitroLogger } from '../../core/common/NitroLogger'; -import { NitroEvent } from '../../core/events/NitroEvent'; +import { GraphicAssetCollection, GraphicAssetGifCollection, NitroBundle, NitroEvent, NitroLogger } from '../../core'; import { RoomContentLoadedEvent } from '../../room/events/RoomContentLoadedEvent'; import { IRoomObject } from '../../room/object/IRoomObject'; -import { GraphicAssetCollection } from '../../room/object/visualization/utils/GraphicAssetCollection'; -import { GraphicAssetGifCollection } from '../../room/object/visualization/utils/GraphicAssetGifCollection'; import { Nitro } from '../Nitro'; import { FurnitureType } from '../session/furniture/FurnitureType'; import { IFurnitureData } from '../session/furniture/IFurnitureData'; diff --git a/src/nitro/room/RoomEngine.ts b/src/nitro/room/RoomEngine.ts index 9dc2f4c2..375c7e6b 100644 --- a/src/nitro/room/RoomEngine.ts +++ b/src/nitro/room/RoomEngine.ts @@ -2,10 +2,8 @@ import { RenderTexture, Resource, Texture } from '@pixi/core'; import { Container, DisplayObject } from '@pixi/display'; import { Matrix, Point, Rectangle } from '@pixi/math'; import { IConnection, IDisposable, IMessageComposer, IUpdateReceiver } from '../../api'; -import { NitroManager } from '../../core/common/NitroManager'; -import { NitroEvent } from '../../core/events/NitroEvent'; -import { NitroSprite } from '../../pixi-proxy'; -import { TextureUtils } from '../../room'; +import { NitroEvent, NitroManager } from '../../core'; +import { NitroSprite, TextureUtils } from '../../pixi-proxy'; import { RoomObjectEvent } from '../../room/events/RoomObjectEvent'; import { RoomObjectMouseEvent } from '../../room/events/RoomObjectMouseEvent'; import { IRoomInstance } from '../../room/IRoomInstance'; diff --git a/src/nitro/room/RoomMessageHandler.ts b/src/nitro/room/RoomMessageHandler.ts index 1ff9ad17..cf42c529 100644 --- a/src/nitro/room/RoomMessageHandler.ts +++ b/src/nitro/room/RoomMessageHandler.ts @@ -1,5 +1,5 @@ import { IConnection } from '../../api'; -import { Disposable } from '../../core/common/Disposable'; +import { Disposable } from '../../core'; import { IVector3D } from '../../room/utils/IVector3D'; import { Vector3d } from '../../room/utils/Vector3d'; import { AvatarGuideStatus } from '../avatar/enum/AvatarGuideStatus'; diff --git a/src/nitro/room/RoomObjectEventHandler.ts b/src/nitro/room/RoomObjectEventHandler.ts index 87acd90a..db691077 100644 --- a/src/nitro/room/RoomObjectEventHandler.ts +++ b/src/nitro/room/RoomObjectEventHandler.ts @@ -1,5 +1,4 @@ -import { Disposable } from '../../core/common/Disposable'; -import { NitroLogger } from '../../core/common/NitroLogger'; +import { Disposable, NitroLogger } from '../../core'; import { RoomId } from '../../room'; import { RoomObjectEvent } from '../../room/events/RoomObjectEvent'; import { RoomObjectMouseEvent } from '../../room/events/RoomObjectMouseEvent'; diff --git a/src/nitro/room/RoomObjectLogicFactory.ts b/src/nitro/room/RoomObjectLogicFactory.ts index 29f22ff8..7651f746 100644 --- a/src/nitro/room/RoomObjectLogicFactory.ts +++ b/src/nitro/room/RoomObjectLogicFactory.ts @@ -1,6 +1,5 @@ import { IEventDispatcher } from '../../api'; -import { NitroLogger } from '../../core/common/NitroLogger'; -import { EventDispatcher } from '../../core/events/EventDispatcher'; +import { EventDispatcher, NitroLogger } from '../../core'; import { IRoomObjectEventHandler } from '../../room/object/logic/IRoomObjectEventHandler'; import { IRoomObjectLogicFactory } from '../../room/object/logic/IRoomObjectLogicFactory'; import { RoomObjectLogicBase } from '../../room/object/logic/RoomObjectLogicBase'; diff --git a/src/nitro/room/events/RoomEngineEvent.ts b/src/nitro/room/events/RoomEngineEvent.ts index 7a1b8078..6f3eae22 100644 --- a/src/nitro/room/events/RoomEngineEvent.ts +++ b/src/nitro/room/events/RoomEngineEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../../core/events/NitroEvent'; +import { NitroEvent } from '../../../core'; export class RoomEngineEvent extends NitroEvent { @@ -23,4 +23,4 @@ export class RoomEngineEvent extends NitroEvent { return this._roomId; } -} \ No newline at end of file +} diff --git a/src/nitro/room/object/RoomObjectVisualizationFactory.ts b/src/nitro/room/object/RoomObjectVisualizationFactory.ts index 066e95d3..f2383f17 100644 --- a/src/nitro/room/object/RoomObjectVisualizationFactory.ts +++ b/src/nitro/room/object/RoomObjectVisualizationFactory.ts @@ -1,5 +1,5 @@ import { IAssetData } from '../../../api'; -import { NitroLogger } from '../../../core/common/NitroLogger'; +import { NitroLogger } from '../../../core'; import { IRoomObjectGraphicVisualization } from '../../../room/object/visualization/IRoomObjectGraphicVisualization'; import { IObjectVisualizationData } from '../../../room/object/visualization/IRoomObjectVisualizationData'; import { IRoomObjectVisualizationFactory } from '../../../room/object/visualization/IRoomObjectVisualizationFactory'; diff --git a/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts b/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts index e31c12f3..a0841d16 100644 --- a/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts +++ b/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts @@ -1,7 +1,7 @@ import { BLEND_MODES } from '@pixi/constants'; import { Resource, Texture } from '@pixi/core'; import { IGraphicAsset } from '../../../../../api'; -import { AdvancedMap } from '../../../../../core/utils/AdvancedMap'; +import { AdvancedMap } from '../../../../../core'; import { AlphaTolerance } from '../../../../../room/object/enum/AlphaTolerance'; import { RoomObjectSpriteType } from '../../../../../room/object/enum/RoomObjectSpriteType'; import { IRoomObject } from '../../../../../room/object/IRoomObject'; diff --git a/src/nitro/room/object/visualization/avatar/AvatarVisualizationData.ts b/src/nitro/room/object/visualization/avatar/AvatarVisualizationData.ts index 66367bc8..b88a88a1 100644 --- a/src/nitro/room/object/visualization/avatar/AvatarVisualizationData.ts +++ b/src/nitro/room/object/visualization/avatar/AvatarVisualizationData.ts @@ -1,6 +1,6 @@ import { Resource, Texture } from '@pixi/core'; import { IAssetData } from '../../../../../api'; -import { Disposable } from '../../../../../core/common/Disposable'; +import { Disposable } from '../../../../../core'; import { IObjectVisualizationData } from '../../../../../room/object/visualization/IRoomObjectVisualizationData'; import { AvatarScaleType } from '../../../../avatar/enum/AvatarScaleType'; import { IAvatarEffectListener } from '../../../../avatar/IAvatarEffectListener'; diff --git a/src/nitro/room/object/visualization/furniture/FurnitureBrandedImageVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureBrandedImageVisualization.ts index 615e6196..cdcd6c1d 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureBrandedImageVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureBrandedImageVisualization.ts @@ -1,5 +1,5 @@ import { Resource, Texture } from '@pixi/core'; -import { GraphicAssetGifCollection } from '../../../../../room/object/visualization/utils/GraphicAssetGifCollection'; +import { GraphicAssetGifCollection } from '../../../../../core'; import { Nitro } from '../../../../Nitro'; import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureVisualization } from './FurnitureVisualization'; @@ -45,7 +45,7 @@ export class FurnitureBrandedImageVisualization extends FurnitureVisualization { super.dispose(); - if(this._imageUrl) + if (this._imageUrl) { (this.asset && this.asset.disposeAsset(this._imageUrl)); // dispose all @@ -54,9 +54,9 @@ export class FurnitureBrandedImageVisualization extends FurnitureVisualization protected updateObject(scale: number, direction: number): boolean { - if(!super.updateObject(scale, direction)) return false; + if (!super.updateObject(scale, direction)) return false; - if(this._imageReady) this.checkAndCreateImageForCurrentState(); + if (this._imageReady) this.checkAndCreateImageForCurrentState(); return true; } @@ -65,7 +65,7 @@ export class FurnitureBrandedImageVisualization extends FurnitureVisualization { const flag = super.updateModel(scale); - if(flag) + if (flag) { this._offsetX = (this.object.model.getValue(RoomObjectVariable.FURNITURE_BRANDING_OFFSET_X) || 0); this._offsetY = (this.object.model.getValue(RoomObjectVariable.FURNITURE_BRANDING_OFFSET_Y) || 0); @@ -73,11 +73,11 @@ export class FurnitureBrandedImageVisualization extends FurnitureVisualization this._isAnimated = (this.object.model.getValue(RoomObjectVariable.FURNITURE_BRANDING_IS_ANIMATED) || false); } - if(!this._imageReady) + if (!this._imageReady) { this._imageReady = this.checkIfImageReady(); - if(this._imageReady) + if (this._imageReady) { this.checkAndCreateImageForCurrentState(); @@ -86,7 +86,7 @@ export class FurnitureBrandedImageVisualization extends FurnitureVisualization } else { - if(this.checkIfImageChanged()) + if (this.checkIfImageChanged()) { this._imageReady = false; this._imageUrl = null; @@ -102,9 +102,9 @@ export class FurnitureBrandedImageVisualization extends FurnitureVisualization { const imageUrl = this.object.model.getValue(RoomObjectVariable.FURNITURE_BRANDING_IMAGE_URL); - if(imageUrl && (imageUrl === this._imageUrl)) return false; + if (imageUrl && (imageUrl === this._imageUrl)) return false; - if(this._gifCollection) + if (this._gifCollection) { // } @@ -120,25 +120,25 @@ export class FurnitureBrandedImageVisualization extends FurnitureVisualization { const model = this.object && this.object.model; - if(!model) return false; + if (!model) return false; const imageUrl = this.object.model.getValue(RoomObjectVariable.FURNITURE_BRANDING_IMAGE_URL); - if(!imageUrl) return false; + if (!imageUrl) return false; - if(this._imageUrl && (this._imageUrl === imageUrl)) return false; + if (this._imageUrl && (this._imageUrl === imageUrl)) return false; const imageStatus = this.object.model.getValue(RoomObjectVariable.FURNITURE_BRANDING_IMAGE_STATUS); - if(imageStatus === 1) + if (imageStatus === 1) { let texture: Texture = null; - if(this._isAnimated) + if (this._isAnimated) { const gifCollection = Nitro.instance.roomEngine.roomContentLoader.getGifCollection(imageUrl); - if(gifCollection) + if (gifCollection) { this._gifCollection = gifCollection; @@ -150,7 +150,7 @@ export class FurnitureBrandedImageVisualization extends FurnitureVisualization texture = Nitro.instance.core.asset.getTexture(imageUrl); } - if(!texture) return false; + if (!texture) return false; this.imageReady(texture, imageUrl); @@ -162,7 +162,7 @@ export class FurnitureBrandedImageVisualization extends FurnitureVisualization protected imageReady(texture: Texture, imageUrl: string): void { - if(!texture) + if (!texture) { this._imageUrl = null; @@ -174,18 +174,18 @@ export class FurnitureBrandedImageVisualization extends FurnitureVisualization protected checkAndCreateImageForCurrentState(): void { - if(this._isAnimated) + if (this._isAnimated) { this.buildAssetsForGif(); return; } - if(!this._imageUrl) return; + if (!this._imageUrl) return; const texture = Nitro.instance.core.asset.getTexture(this._imageUrl); - if(!texture) return; + if (!texture) return; const state = this.object.getState(0); @@ -194,21 +194,21 @@ export class FurnitureBrandedImageVisualization extends FurnitureVisualization protected buildAssetsForGif(): void { - if(!this._gifCollection) return; + if (!this._gifCollection) return; const textures = this._gifCollection.textures; const durations = this._gifCollection.durations; - if(!textures.length || !durations.length || (textures.length !== durations.length)) return; + if (!textures.length || !durations.length || (textures.length !== durations.length)) return; const state = this.object.getState(0); - for(let i = 0; i < textures.length; i++) + for (let i = 0; i < textures.length; i++) { const texture = textures[i]; const duration = durations[i]; - if(!texture) continue; + if (!texture) continue; this.addBackgroundAsset(texture, state, i); } @@ -224,7 +224,7 @@ export class FurnitureBrandedImageVisualization extends FurnitureVisualization let flipH = false; let flipV = false; - switch(state) + switch (state) { case FurnitureBrandedImageVisualization.STATE_0: x = 0; @@ -252,16 +252,16 @@ export class FurnitureBrandedImageVisualization extends FurnitureVisualization break; } - this.asset.addAsset(`${ this._imageUrl }_${ frame }`, texture, true, x, y, flipH, flipV); + this.asset.addAsset(`${this._imageUrl}_${frame}`, texture, true, x, y, flipH, flipV); } protected getSpriteAssetName(scale: number, layerId: number): string { const tag = this.getLayerTag(scale, this._direction, layerId); - if((tag === FurnitureBrandedImageVisualization.BRANDED_IMAGE) && this._imageUrl) + if ((tag === FurnitureBrandedImageVisualization.BRANDED_IMAGE) && this._imageUrl) { - return `${ this._imageUrl }_${ this.getFrameNumber(scale, layerId) }`; + return `${this._imageUrl}_${this.getFrameNumber(scale, layerId)}`; } return super.getSpriteAssetName(scale, layerId); @@ -269,22 +269,22 @@ export class FurnitureBrandedImageVisualization extends FurnitureVisualization protected updateAnimation(scale: number): number { - if(!this._imageReady || !this._isAnimated || (this._totalFrames <= 0)) return 0; + if (!this._imageReady || !this._isAnimated || (this._totalFrames <= 0)) return 0; return 1; } protected getFrameNumber(scale: number, layerId: number): number { - if(!this._imageReady || !this._isAnimated || (this._totalFrames <= 0)) return 0; + if (!this._imageReady || !this._isAnimated || (this._totalFrames <= 0)) return 0; const tag = this.getLayerTag(scale, this._direction, layerId); - if((tag === FurnitureBrandedImageVisualization.BRANDED_IMAGE) && this._imageUrl) + if ((tag === FurnitureBrandedImageVisualization.BRANDED_IMAGE) && this._imageUrl) { let newFrame = this._currentFrame; - if(newFrame < 0) + if (newFrame < 0) { newFrame = 0; } @@ -293,7 +293,7 @@ export class FurnitureBrandedImageVisualization extends FurnitureVisualization newFrame += 1; } - if(newFrame === this._totalFrames) newFrame = 0; + if (newFrame === this._totalFrames) newFrame = 0; this._currentFrame = newFrame; diff --git a/src/nitro/room/object/visualization/furniture/FurnitureIsometricBBVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureIsometricBBVisualization.ts index ed578cfc..74cbe1e9 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureIsometricBBVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureIsometricBBVisualization.ts @@ -1,7 +1,7 @@ import { RenderTexture, Resource, Texture } from '@pixi/core'; import { Matrix } from '@pixi/math'; import { IGraphicAsset } from '../../../../../api'; -import { NitroSprite } from '../../../../../pixi-proxy'; +import { NitroSprite, PixiApplicationProxy } from '../../../../../pixi-proxy'; import { Nitro } from '../../../../Nitro'; import { FurnitureBBVisualization } from './FurnitureBBVisualization'; import { FurnitureBrandedImageVisualization } from './FurnitureBrandedImageVisualization'; @@ -67,7 +67,7 @@ export class FurnitureIsometricBBVisualization extends FurnitureBBVisualization height: (asset.height + matrix.ty) }); - Nitro.instance.renderer.render(sprite, { + PixiApplicationProxy.instance.renderer.render(sprite, { renderTexture, clear: true, transform: matrix @@ -121,7 +121,7 @@ export class FurnitureIsometricBBVisualization extends FurnitureBBVisualization height: (asset.height + matrix.ty) }); - Nitro.instance.renderer.render(sprite, { + PixiApplicationProxy.instance.renderer.render(sprite, { renderTexture, clear: true, transform: matrix diff --git a/src/nitro/room/object/visualization/furniture/FurnitureParticleSystem.ts b/src/nitro/room/object/visualization/furniture/FurnitureParticleSystem.ts index 58cd8be8..42410375 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureParticleSystem.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureParticleSystem.ts @@ -4,10 +4,9 @@ import { Graphics } from '@pixi/graphics'; import { Matrix } from '@pixi/math'; import { IGraphicAsset, IParticleSystem } from '../../../../../api'; import { AdvancedMap } from '../../../../../core'; -import { NitroPoint, NitroSprite } from '../../../../../pixi-proxy'; +import { NitroPoint, NitroSprite, PixiApplicationProxy } from '../../../../../pixi-proxy'; import { IRoomObjectSprite } from '../../../../../room'; import { Vector3D } from '../../../../avatar'; -import { Nitro } from '../../../../Nitro'; import { FurnitureAnimatedVisualization } from './FurnitureAnimatedVisualization'; import { FurnitureParticleSystemEmitter } from './FurnitureParticleSystemEmitter'; @@ -192,7 +191,7 @@ export class FurnitureParticleSystem sprite.filters = [this._particleColorTransform]; - Nitro.instance.renderer.render(sprite, { + PixiApplicationProxy.instance.renderer.render(sprite, { renderTexture: this._canvasTexture, transform: this._translationMatrix, clear: false @@ -206,7 +205,7 @@ export class FurnitureParticleSystem sprite.x = point.x; sprite.y = point.y; - Nitro.instance.renderer.render(sprite, { + PixiApplicationProxy.instance.renderer.render(sprite, { renderTexture: this._canvasTexture, clear: false }); @@ -222,7 +221,7 @@ export class FurnitureParticleSystem sprite.width = 2; sprite.height = 2; - Nitro.instance.renderer.render(sprite, { + PixiApplicationProxy.instance.renderer.render(sprite, { renderTexture: this._canvasTexture, clear: false }); @@ -327,7 +326,7 @@ export class FurnitureParticleSystem } else { - Nitro.instance.renderer.render(this._emptySprite, { + PixiApplicationProxy.instance.renderer.render(this._emptySprite, { renderTexture: this._canvasTexture, clear: true }); diff --git a/src/nitro/room/object/visualization/furniture/IsometricImageFurniVisualization.ts b/src/nitro/room/object/visualization/furniture/IsometricImageFurniVisualization.ts index 04c64185..2fd735e4 100644 --- a/src/nitro/room/object/visualization/furniture/IsometricImageFurniVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/IsometricImageFurniVisualization.ts @@ -1,8 +1,7 @@ import { Resource, Texture } from '@pixi/core'; import { Matrix } from '@pixi/math'; import { IGraphicAsset } from '../../../../../api'; -import { NitroSprite, NitroTexture } from '../../../../../pixi-proxy'; -import { TextureUtils } from '../../../../../room/utils/TextureUtils'; +import { NitroSprite, NitroTexture, TextureUtils } from '../../../../../pixi-proxy'; import { FurnitureAnimatedVisualization } from './FurnitureAnimatedVisualization'; export class IsometricImageFurniVisualization extends FurnitureAnimatedVisualization diff --git a/src/nitro/room/object/visualization/pet/ExperienceData.ts b/src/nitro/room/object/visualization/pet/ExperienceData.ts index 3a82d649..ffa47108 100644 --- a/src/nitro/room/object/visualization/pet/ExperienceData.ts +++ b/src/nitro/room/object/visualization/pet/ExperienceData.ts @@ -1,9 +1,7 @@ import { RenderTexture, Resource, Texture } from '@pixi/core'; import { Sprite } from '@pixi/sprite'; import { Text } from '@pixi/text'; -import { NitroContainer, NitroSprite } from '../../../../../pixi-proxy'; -import { TextureUtils } from '../../../../../room'; -import { Nitro } from '../../../../Nitro'; +import { NitroContainer, NitroSprite, PixiApplicationProxy, TextureUtils } from '../../../../../pixi-proxy'; export class ExperienceData { @@ -48,7 +46,7 @@ export class ExperienceData } else { - Nitro.instance.renderer.render(container, { + PixiApplicationProxy.instance.renderer.render(container, { renderTexture: this._texture, clear: true }); diff --git a/src/nitro/room/object/visualization/room/RoomPlane.ts b/src/nitro/room/object/visualization/room/RoomPlane.ts index b1b754be..e5a47556 100644 --- a/src/nitro/room/object/visualization/room/RoomPlane.ts +++ b/src/nitro/room/object/visualization/room/RoomPlane.ts @@ -1,11 +1,10 @@ import { RenderTexture, Resource, Texture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; import { Matrix, Point, Rectangle } from '@pixi/math'; -import { NitroRenderTexture } from '../../../../../pixi-proxy'; +import { NitroRenderTexture, TextureUtils } from '../../../../../pixi-proxy'; import { IRoomPlane } from '../../../../../room/object/visualization/IRoomPlane'; import { IRoomGeometry } from '../../../../../room/utils/IRoomGeometry'; import { IVector3D } from '../../../../../room/utils/IVector3D'; -import { TextureUtils } from '../../../../../room/utils/TextureUtils'; import { Vector3d } from '../../../../../room/utils/Vector3d'; import { PlaneMaskManager } from './mask/PlaneMaskManager'; import { PlaneDrawingData } from './PlaneDrawingData'; diff --git a/src/nitro/room/object/visualization/room/RoomVisualization.ts b/src/nitro/room/object/visualization/room/RoomVisualization.ts index 5901b3bd..34bcacfa 100644 --- a/src/nitro/room/object/visualization/room/RoomVisualization.ts +++ b/src/nitro/room/object/visualization/room/RoomVisualization.ts @@ -1,6 +1,6 @@ import { RenderTexture, Resource, Texture } from '@pixi/core'; import { Rectangle } from '@pixi/math'; -import { AdvancedMap } from '../../../../../core/utils/AdvancedMap'; +import { AdvancedMap } from '../../../../../core'; import { AlphaTolerance } from '../../../../../room/object/enum/AlphaTolerance'; import { RoomObjectSpriteType } from '../../../../../room/object/enum/RoomObjectSpriteType'; import { IRoomObjectModel } from '../../../../../room/object/IRoomObjectModel'; @@ -116,18 +116,18 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements { const existing = RoomVisualization.RENDER_TEXTURE_CACHE.get(RoomVisualization.LAST_VISUALIZATION); - if(!existing) return null; + if (!existing) return null; return existing.getValue(key); } public static addTextureCache(key: any, value: RenderTexture): void { - if(!RoomVisualization.LAST_VISUALIZATION) return; + if (!RoomVisualization.LAST_VISUALIZATION) return; let existing = RoomVisualization.RENDER_TEXTURE_CACHE.get(RoomVisualization.LAST_VISUALIZATION); - if(!existing) + if (!existing) { existing = new AdvancedMap(); @@ -139,7 +139,7 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements public initialize(data: IObjectVisualizationData): boolean { - if(!(data instanceof RoomVisualizationData)) return false; + if (!(data instanceof RoomVisualizationData)) return false; this._data = data; @@ -160,21 +160,21 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements this._visiblePlanes = null; this._visiblePlaneSpriteNumbers = null; - if(this._roomPlaneParser) + if (this._roomPlaneParser) { this._roomPlaneParser.dispose(); this._roomPlaneParser = null; } - if(this._roomPlaneBitmapMaskParser) + if (this._roomPlaneBitmapMaskParser) { this._roomPlaneBitmapMaskParser.dispose(); this._roomPlaneBitmapMaskParser = null; } - if(this._data) + if (this._data) { this._data.clearCache(); @@ -183,9 +183,9 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements const existingTextureCache = RoomVisualization.RENDER_TEXTURE_CACHE.get(this); - if(existingTextureCache) + if (existingTextureCache) { - for(const texture of existingTextureCache.getValues()) + for (const texture of existingTextureCache.getValues()) { texture.destroy(true); } @@ -210,7 +210,7 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements public update(geometry: IRoomGeometry, time: number, update: boolean, skipUpdate: boolean): void { - if(!this.object || !geometry) return; + if (!this.object || !geometry) return; RoomVisualization.LAST_VISUALIZATION = this; @@ -218,28 +218,28 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements const existing = RoomVisualization.RENDER_TEXTURE_CACHE.get(RoomVisualization.LAST_VISUALIZATION); - if(existing) removeCount = existing.length; + if (existing) removeCount = existing.length; const geometryUpdate = this.updateGeometry(geometry); const objectModel = this.object.model; let needsUpdate = false; - if(this.updateThickness(objectModel)) needsUpdate = true; + if (this.updateThickness(objectModel)) needsUpdate = true; - if(this.updateHole(objectModel)) needsUpdate = true; + if (this.updateHole(objectModel)) needsUpdate = true; - if(this.initializeRoomPlanes()) + if (this.initializeRoomPlanes()) { - if(existing && removeCount) + if (existing && removeCount) { setTimeout(() => { - while(removeCount) + while (removeCount) { const texture = existing.getWithIndex(0); - if(texture) + if (texture) { texture.destroy(true); @@ -254,25 +254,25 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements needsUpdate = this.updateMasks(objectModel); - if(((time < (this._lastUpdateTime + this._updateIntervalTime)) && (!geometryUpdate)) && (!needsUpdate)) return; + if (((time < (this._lastUpdateTime + this._updateIntervalTime)) && (!geometryUpdate)) && (!needsUpdate)) return; - if(this.updatePlaneTexturesAndVisibilities(objectModel)) needsUpdate = true; + if (this.updatePlaneTexturesAndVisibilities(objectModel)) needsUpdate = true; - if(this.updatePlanes(geometry, geometryUpdate, time)) needsUpdate = true; + if (this.updatePlanes(geometry, geometryUpdate, time)) needsUpdate = true; - if(needsUpdate) + if (needsUpdate) { let index = 0; - while(index < this._visiblePlanes.length) + while (index < this._visiblePlanes.length) { const spriteIndex = this._visiblePlaneSpriteNumbers[index]; const sprite = this.getSprite(spriteIndex); const plane = this._visiblePlanes[index]; - if(sprite && plane && (plane.type !== RoomPlane.TYPE_LANDSCAPE)) + if (sprite && plane && (plane.type !== RoomPlane.TYPE_LANDSCAPE)) { - if(this._colorBackgroundOnly) + if (this._colorBackgroundOnly) { let _local_14 = plane.color; @@ -303,16 +303,16 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements private updateGeometry(k: IRoomGeometry): boolean { - if(!k) return false; + if (!k) return false; - if(this._geometryUpdateId === k.updateId) return false; + if (this._geometryUpdateId === k.updateId) return false; this._geometryUpdateId = k.updateId; this._boundingRectangle = null; const direction = k.direction; - if(direction && ((direction.x !== this._directionX) || (direction.y !== this._directionY) || (direction.z !== this._directionZ) || (k.scale !== this._roomScale))) + if (direction && ((direction.x !== this._directionX) || (direction.y !== this._directionY) || (direction.z !== this._directionZ) || (k.scale !== this._roomScale))) { this._directionX = direction.x; this._directionY = direction.y; @@ -327,12 +327,12 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements private updateThickness(k: IRoomObjectModel): boolean { - if(this.updateModelCounter === k.updateCounter) return false; + if (this.updateModelCounter === k.updateCounter) return false; const floorThickness = k.getValue(RoomObjectVariable.ROOM_FLOOR_THICKNESS); const wallThickness = k.getValue(RoomObjectVariable.ROOM_WALL_THICKNESS); - if((!isNaN(floorThickness) && !isNaN(wallThickness)) && ((floorThickness !== this._floorThickness) || (wallThickness !== this._wallThickness))) + if ((!isNaN(floorThickness) && !isNaN(wallThickness)) && ((floorThickness !== this._floorThickness) || (wallThickness !== this._wallThickness))) { this._floorThickness = floorThickness; this._wallThickness = wallThickness; @@ -347,11 +347,11 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements private updateHole(k: IRoomObjectModel): boolean { - if(this.updateModelCounter === k.updateCounter) return false; + if (this.updateModelCounter === k.updateCounter) return false; const holeUpdate = k.getValue(RoomObjectVariable.ROOM_FLOOR_HOLE_UPDATE_TIME); - if(!isNaN(holeUpdate) && (holeUpdate !== this._holeUpdateTime)) + if (!isNaN(holeUpdate) && (holeUpdate !== this._holeUpdateTime)) { this._holeUpdateTime = holeUpdate; @@ -365,13 +365,13 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements private updateMasks(k: IRoomObjectModel): boolean { - if(this.updateModelCounter === k.updateCounter) return false; + if (this.updateModelCounter === k.updateCounter) return false; let didUpdate = false; const planeMask = k.getValue(RoomObjectVariable.ROOM_PLANE_MASK_XML); - if(planeMask !== this._maskData) + if (planeMask !== this._maskData) { this.updatePlaneMasks(planeMask); @@ -382,7 +382,7 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements const backgroundColor = k.getValue(RoomObjectVariable.ROOM_BACKGROUND_COLOR); - if(backgroundColor !== this._color) + if (backgroundColor !== this._color) { this._color = backgroundColor; this._redColor = (this._color & 0xFF); @@ -394,7 +394,7 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements const backgroundOnly = (k.getValue(RoomObjectVariable.ROOM_COLORIZE_BG_ONLY) || false); - if(backgroundOnly !== this._colorBackgroundOnly) + if (backgroundOnly !== this._colorBackgroundOnly) { this._colorBackgroundOnly = backgroundOnly; @@ -406,7 +406,7 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements private updatePlaneTexturesAndVisibilities(model: IRoomObjectModel): boolean { - if(this.updateModelCounter === model.updateCounter) return false; + if (this.updateModelCounter === model.updateCounter) return false; const floorType = model.getValue(RoomObjectVariable.ROOM_FLOOR_TYPE); const wallType = model.getValue(RoomObjectVariable.ROOM_WALL_TYPE); @@ -425,13 +425,13 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements private clearPlanes(): void { - if(this._planes) + if (this._planes) { - while(this._planes.length) + while (this._planes.length) { const plane = this._planes[0]; - if(plane) plane.dispose(); + if (plane) plane.dispose(); this._planes.pop(); } @@ -448,14 +448,14 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements protected initializeRoomPlanes(): boolean { - if(!this.object || this._isPlaneSet) return false; + if (!this.object || this._isPlaneSet) return false; - if(!isNaN(this._floorThickness)) this._roomPlaneParser.floorThicknessMultiplier = this._floorThickness; - if(!isNaN(this._wallThickness)) this._roomPlaneParser.wallThicknessMultiplier = this._wallThickness; + if (!isNaN(this._floorThickness)) this._roomPlaneParser.floorThicknessMultiplier = this._floorThickness; + if (!isNaN(this._wallThickness)) this._roomPlaneParser.wallThicknessMultiplier = this._wallThickness; const mapData = this.object.model.getValue(RoomObjectVariable.ROOM_MAP_DATA); - if(!this._roomPlaneParser.initializeFromMapData(mapData)) return; + if (!this._roomPlaneParser.initializeFromMapData(mapData)) return; const _local_3 = this.getLandscapeWidth(); const _local_4 = this.getLandscapeHeight(); @@ -464,7 +464,7 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements let randomSeed = this.object.model.getValue(RoomObjectVariable.ROOM_RANDOM_SEED); let index = 0; - while(index < this._roomPlaneParser.planeCount) + while (index < this._roomPlaneParser.planeCount) { const location = this._roomPlaneParser.getPlaneLocation(index); const leftSide = this._roomPlaneParser.getPlaneLeftSide(index); @@ -474,14 +474,14 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements let plane: RoomPlane = null; - if(location && leftSide && rightSide) + if (location && leftSide && rightSide) { const _local_14 = Vector3d.crossProduct(leftSide, rightSide); randomSeed = ((randomSeed * 7613) + 517); plane = null; - if(planeType === RoomPlaneData.PLANE_FLOOR) + if (planeType === RoomPlaneData.PLANE_FLOOR) { const _local_15 = ((location.x + leftSide.x) + 0.5); const _local_16 = ((location.y + rightSide.y) + 0.5); @@ -490,7 +490,7 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements plane = new RoomPlane(this.object.getLocation(), location, leftSide, rightSide, RoomPlane.TYPE_FLOOR, true, secondaryNormals, randomSeed, -(textureOffsetX), -(textureOffsetY)); - if(_local_14.z !== 0) + if (_local_14.z !== 0) { plane.color = RoomVisualization.FLOOR_COLOR; } @@ -499,31 +499,31 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements plane.color = ((_local_14.x !== 0) ? RoomVisualization.FLOOR_COLOR_RIGHT : RoomVisualization.FLOOR_COLOR_LEFT); } - if(this._data) plane.rasterizer = this._data.floorRasterizer; + if (this._data) plane.rasterizer = this._data.floorRasterizer; } - else if(planeType === RoomPlaneData.PLANE_WALL) + else if (planeType === RoomPlaneData.PLANE_WALL) { plane = new RoomPlane(this.object.getLocation(), location, leftSide, rightSide, RoomPlane.TYPE_WALL, true, secondaryNormals, randomSeed); - if((leftSide.length < 1) || (rightSide.length < 1)) + if ((leftSide.length < 1) || (rightSide.length < 1)) { plane.hasTexture = false; } - if((_local_14.x === 0) && (_local_14.y === 0)) + if ((_local_14.x === 0) && (_local_14.y === 0)) { plane.color = RoomVisualization.WALL_COLOR_BORDER; } else { - if(_local_14.y > 0) + if (_local_14.y > 0) { plane.color = RoomVisualization.WALL_COLOR_TOP; } else { - if(_local_14.y === 0) + if (_local_14.y === 0) { plane.color = RoomVisualization.WALL_COLOR_SIDE; } @@ -534,20 +534,20 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements } } - if(this._data) plane.rasterizer = this._data.wallRasterizer; + if (this._data) plane.rasterizer = this._data.wallRasterizer; } - else if(planeType === RoomPlaneData.PLANE_LANDSCAPE) + else if (planeType === RoomPlaneData.PLANE_LANDSCAPE) { plane = new RoomPlane(this.object.getLocation(), location, leftSide, rightSide, RoomPlane.TYPE_LANDSCAPE, true, secondaryNormals, randomSeed, _local_5, 0, _local_3, _local_4); - if(_local_14.y > 0) + if (_local_14.y > 0) { plane.color = RoomVisualization.LANDSCAPE_COLOR_TOP; } else { - if(_local_14.y == 0) + if (_local_14.y == 0) { plane.color = RoomVisualization.LANDSCAPE_COLOR_SIDE; } @@ -557,31 +557,31 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements } } - if(this._data) plane.rasterizer = this._data.landscapeRasterizer; + if (this._data) plane.rasterizer = this._data.landscapeRasterizer; _local_5 = (_local_5 + leftSide.length); } - else if(planeType == RoomPlaneData.PLANE_BILLBOARD) + else if (planeType == RoomPlaneData.PLANE_BILLBOARD) { plane = new RoomPlane(this.object.getLocation(), location, leftSide, rightSide, RoomPlane.TYPE_WALL, true, secondaryNormals, randomSeed); - if(((leftSide.length < 1) || (rightSide.length < 1))) + if (((leftSide.length < 1) || (rightSide.length < 1))) { plane.hasTexture = false; } - if(((_local_14.x == 0) && (_local_14.y == 0))) + if (((_local_14.x == 0) && (_local_14.y == 0))) { plane.color = RoomVisualization.WALL_COLOR_BORDER; } else { - if(_local_14.y > 0) + if (_local_14.y > 0) { plane.color = RoomVisualization.WALL_COLOR_TOP; } else { - if(_local_14.y == 0) + if (_local_14.y == 0) { plane.color = RoomVisualization.WALL_COLOR_SIDE; } @@ -598,13 +598,13 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements } - if(plane) + if (plane) { plane.maskManager = this._data.maskManager; let _local_19 = 0; - while(_local_19 < this._roomPlaneParser.getPlaneMaskCount(index)) + while (_local_19 < this._roomPlaneParser.getPlaneMaskCount(index)) { const _local_20 = this._roomPlaneParser.getPlaneMaskLeftSideLoc(index, _local_19); const _local_21 = this._roomPlaneParser.getPlaneMaskRightSideLoc(index, _local_19); @@ -639,14 +639,14 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements let planeIndex = 0; - while(planeIndex < this._planes.length) + while (planeIndex < this._planes.length) { const plane = this._planes[planeIndex]; const sprite = this.getSprite(planeIndex); - if(plane && sprite && plane.leftSide && plane.rightSide) + if (plane && sprite && plane.leftSide && plane.rightSide) { - if((plane.type === RoomPlane.TYPE_WALL) && ((plane.leftSide.length < 1) || (plane.rightSide.length < 1))) + if ((plane.type === RoomPlane.TYPE_WALL) && ((plane.leftSide.length < 1) || (plane.rightSide.length < 1))) { sprite.alphaTolerance = AlphaTolerance.MATCH_NOTHING; } @@ -655,12 +655,12 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements sprite.alphaTolerance = AlphaTolerance.MATCH_OPAQUE_PIXELS; } - if(plane.type === RoomPlane.TYPE_WALL) + if (plane.type === RoomPlane.TYPE_WALL) { sprite.tag = 'plane.wall@' + (planeIndex + 1); } - else if(plane.type === RoomPlane.TYPE_FLOOR) + else if (plane.type === RoomPlane.TYPE_FLOOR) { sprite.tag = 'plane.floor@' + (planeIndex + 1); } @@ -682,11 +682,11 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements let length = 0; let index = 0; - while(index < this._roomPlaneParser.planeCount) + while (index < this._roomPlaneParser.planeCount) { const type = this._roomPlaneParser.getPlaneType(index); - if(type === RoomPlaneData.PLANE_LANDSCAPE) + if (type === RoomPlaneData.PLANE_LANDSCAPE) { const vector = this._roomPlaneParser.getPlaneLeftSide(index); @@ -704,57 +704,57 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements let length = 0; let index = 0; - while(index < this._roomPlaneParser.planeCount) + while (index < this._roomPlaneParser.planeCount) { const type = this._roomPlaneParser.getPlaneType(index); - if(type === RoomPlaneData.PLANE_LANDSCAPE) + if (type === RoomPlaneData.PLANE_LANDSCAPE) { const vector = this._roomPlaneParser.getPlaneRightSide(index); - if(vector.length > length) length = vector.length; + if (vector.length > length) length = vector.length; } index++; } - if(length > 5) length = 5; + if (length > 5) length = 5; return length; } protected updatePlaneTypes(floorType: string, wallType: string, landscapeType: string): boolean { - if(floorType !== this._floorType) this._floorType = floorType; + if (floorType !== this._floorType) this._floorType = floorType; else floorType = null; - if(wallType !== this._wallType) this._wallType = wallType; + if (wallType !== this._wallType) this._wallType = wallType; else wallType = null; - if(landscapeType !== this._landscapeType) this._landscapeType = landscapeType; + if (landscapeType !== this._landscapeType) this._landscapeType = landscapeType; else landscapeType = null; - if(!floorType && !wallType && !landscapeType) return false; + if (!floorType && !wallType && !landscapeType) return false; let index = 0; - while(index < this._planes.length) + while (index < this._planes.length) { const plane = this._planes[index]; - if(plane) + if (plane) { - if((plane.type === RoomPlane.TYPE_FLOOR) && floorType) + if ((plane.type === RoomPlane.TYPE_FLOOR) && floorType) { plane.id = floorType; } - else if((plane.type === RoomPlane.TYPE_WALL) && wallType) + else if ((plane.type === RoomPlane.TYPE_WALL) && wallType) { plane.id = wallType; } - else if((plane.type === RoomPlane.TYPE_LANDSCAPE) && landscapeType) + else if ((plane.type === RoomPlane.TYPE_LANDSCAPE) && landscapeType) { plane.id = landscapeType; } @@ -768,7 +768,7 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements private updatePlaneVisibility(k: boolean, _arg_2: boolean, _arg_3: boolean): void { - if((k === this._typeVisibility[RoomPlane.TYPE_FLOOR]) && (_arg_2 === this._typeVisibility[RoomPlane.TYPE_WALL]) && (_arg_3 === this._typeVisibility[RoomPlane.TYPE_LANDSCAPE])) return; + if ((k === this._typeVisibility[RoomPlane.TYPE_FLOOR]) && (_arg_2 === this._typeVisibility[RoomPlane.TYPE_WALL]) && (_arg_3 === this._typeVisibility[RoomPlane.TYPE_LANDSCAPE])) return; this._typeVisibility[RoomPlane.TYPE_FLOOR] = k; this._typeVisibility[RoomPlane.TYPE_WALL] = _arg_2; @@ -780,11 +780,11 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements protected updatePlanes(k: IRoomGeometry, _arg_2: boolean, _arg_3: number): boolean { - if(!k || !this.object) return; + if (!k || !this.object) return; this._assetUpdateCounter++; - if(_arg_2) + if (_arg_2) { this._visiblePlanes = []; this._visiblePlaneSpriteNumbers = []; @@ -794,39 +794,39 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements let _local_6 = this._visiblePlanes; - if(!this._visiblePlanes.length) _local_6 = this._planes; + if (!this._visiblePlanes.length) _local_6 = this._planes; let depth = 0; let updated = false; let index = 0; - while(index < _local_6.length) + while (index < _local_6.length) { let _local_10 = index; - if(_local_8) _local_10 = this._visiblePlaneSpriteNumbers[index]; + if (_local_8) _local_10 = this._visiblePlaneSpriteNumbers[index]; const _local_11 = this.getSprite(_local_10); - if(_local_11) + if (_local_11) { const _local_12 = _local_6[index]; - if(_local_12) + if (_local_12) { _local_11.id = _local_12.uniqueId; - if(_local_12.update(k, _arg_3)) + if (_local_12.update(k, _arg_3)) { - if(_local_12.visible) + if (_local_12.visible) { depth = ((_local_12.relativeDepth + this.floorRelativeDepth) + (_local_10 / 1000)); - if(_local_12.type !== RoomPlane.TYPE_FLOOR) + if (_local_12.type !== RoomPlane.TYPE_FLOOR) { depth = ((_local_12.relativeDepth + this.wallRelativeDepth) + (_local_10 / 1000)); - if((_local_12.leftSide.length < 1) || (_local_12.rightSide.length < 1)) + if ((_local_12.leftSide.length < 1) || (_local_12.rightSide.length < 1)) { depth = (depth + (RoomVisualization.ROOM_DEPTH_OFFSET * 0.5)); } @@ -838,14 +838,14 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements } updated = true; } - if(_local_11.visible != ((_local_12.visible) && (this._typeVisibility[_local_12.type]))) + if (_local_11.visible != ((_local_12.visible) && (this._typeVisibility[_local_12.type]))) { _local_11.visible = (!(_local_11.visible)); updated = true; } - if(_local_11.visible) + if (_local_11.visible) { - if(!_local_8) + if (!_local_8) { this._visiblePlanes.push(_local_12); this._visiblePlaneSpriteNumbers.push(index); @@ -855,7 +855,7 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements else { _local_11.id = 0; - if(_local_11.visible) + if (_local_11.visible) { _local_11.visible = false; updated = true; @@ -870,7 +870,7 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements protected updatePlaneMasks(k: RoomMapMaskData): void { - if(!k) return; + if (!k) return; this._roomPlaneBitmapMaskParser.initialize(k); @@ -880,57 +880,57 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements let _local_6 = false; let index = 0; - while(index < this._planes.length) + while (index < this._planes.length) { const plane = this._planes[index]; - if(plane) + if (plane) { plane.resetBitmapMasks(); - if(plane.type === RoomPlane.TYPE_LANDSCAPE) _local_4.push(index); + if (plane.type === RoomPlane.TYPE_LANDSCAPE) _local_4.push(index); } index++; } - for(const mask of this._roomPlaneBitmapMaskParser.masks.values()) + for (const mask of this._roomPlaneBitmapMaskParser.masks.values()) { const maskType = this._roomPlaneBitmapMaskParser.getMaskType(mask); const maskLocation = this._roomPlaneBitmapMaskParser.getMaskLocation(mask); const maskCategory = this._roomPlaneBitmapMaskParser.getMaskCategory(mask); - if(maskLocation) + if (maskLocation) { let i = 0; - while(i < this._planes.length) + while (i < this._planes.length) { const plane = this._planes[i]; - if((plane.type === RoomPlane.TYPE_WALL) || (plane.type === RoomPlane.TYPE_LANDSCAPE)) + if ((plane.type === RoomPlane.TYPE_WALL) || (plane.type === RoomPlane.TYPE_LANDSCAPE)) { - if(plane && plane.location && plane.normal) + if (plane && plane.location && plane.normal) { const _local_14 = Vector3d.dif(maskLocation, plane.location); const _local_15 = Math.abs(Vector3d.scalarProjection(_local_14, plane.normal)); - if(_local_15 < 0.01) + if (_local_15 < 0.01) { - if(plane.leftSide && plane.rightSide) + if (plane.leftSide && plane.rightSide) { const _local_16 = Vector3d.scalarProjection(_local_14, plane.leftSide); const _local_17 = Vector3d.scalarProjection(_local_14, plane.rightSide); - if((plane.type === RoomPlane.TYPE_WALL) || ((plane.type === RoomPlane.TYPE_LANDSCAPE) && (maskCategory === RoomPlaneBitmapMaskData.HOLE))) + if ((plane.type === RoomPlane.TYPE_WALL) || ((plane.type === RoomPlane.TYPE_LANDSCAPE) && (maskCategory === RoomPlaneBitmapMaskData.HOLE))) { plane.addBitmapMask(maskType, _local_16, _local_17); } else { - if(plane.type === RoomPlane.TYPE_LANDSCAPE) + if (plane.type === RoomPlane.TYPE_LANDSCAPE) { - if(!plane.canBeVisible) _local_6 = true; + if (!plane.canBeVisible) _local_6 = true; plane.canBeVisible = true; @@ -949,11 +949,11 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements index = 0; - while(index < _local_4.length) + while (index < _local_4.length) { const planeIndex = _local_4[index]; - if(_local_5.indexOf(planeIndex) < 0) + if (_local_5.indexOf(planeIndex) < 0) { const plane = this._planes[planeIndex]; @@ -964,7 +964,7 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements index++; } - if(_local_6) + if (_local_6) { this._visiblePlanes = []; this._visiblePlaneSpriteNumbers = []; @@ -990,7 +990,7 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements public getBoundingRectangle(): Rectangle { - if(!this._boundingRectangle) this._boundingRectangle = super.getBoundingRectangle(); + if (!this._boundingRectangle) this._boundingRectangle = super.getBoundingRectangle(); return new Rectangle(this._boundingRectangle.x, this._boundingRectangle.y, this._boundingRectangle.width, this._boundingRectangle.height); } @@ -999,7 +999,7 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements { const planes: IRoomPlane[] = []; - for(const plane of this._visiblePlanes) planes.push(plane); + for (const plane of this._visiblePlanes) planes.push(plane); return planes; } diff --git a/src/nitro/room/object/visualization/room/RoomVisualizationData.ts b/src/nitro/room/object/visualization/room/RoomVisualizationData.ts index 4322dd77..618aea18 100644 --- a/src/nitro/room/object/visualization/room/RoomVisualizationData.ts +++ b/src/nitro/room/object/visualization/room/RoomVisualizationData.ts @@ -1,5 +1,5 @@ import { IAssetData, IGraphicAssetCollection } from '../../../../../api'; -import { Disposable } from '../../../../../core/common/Disposable'; +import { Disposable } from '../../../../../core'; import { IObjectVisualizationData } from '../../../../../room/object/visualization/IRoomObjectVisualizationData'; import { PlaneMaskManager } from './mask/PlaneMaskManager'; import { LandscapeRasterizer } from './rasterizer/animated/LandscapeRasterizer'; 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 96735f5b..5c46f2fe 100644 --- a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCellMatrix.ts +++ b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCellMatrix.ts @@ -1,7 +1,7 @@ import { Graphics } from '@pixi/graphics'; import { Point, Rectangle } from '@pixi/math'; +import { TextureUtils } from '../../../../../../../pixi-proxy'; import { IVector3D } from '../../../../../../../room/utils/IVector3D'; -import { TextureUtils } from '../../../../../../../room/utils/TextureUtils'; import { Vector3d } from '../../../../../../../room/utils/Vector3d'; import { RoomVisualization } from '../../RoomVisualization'; import { Randomizer } from '../../utils/Randomizer'; @@ -36,15 +36,15 @@ export class PlaneMaterialCellMatrix private _normalMinY: number = -1; private _normalMaxY: number = 1; - constructor(totalColumns: number, repeatMode: number=1, align: number=1, normalMinX: number=-1, normalMaxX: number=1, normalMinY: number=-1, normalMaxY: number=1) + constructor(totalColumns: number, repeatMode: number = 1, align: number = 1, normalMinX: number = -1, normalMaxX: number = 1, normalMinY: number = -1, normalMaxY: number = 1) { this._columns = []; - if(totalColumns < 1) + if (totalColumns < 1) { totalColumns = 1; } let _local_8 = 0; - while(_local_8 < totalColumns) + while (_local_8 < totalColumns) { this._columns.push(null); _local_8++; @@ -55,7 +55,7 @@ export class PlaneMaterialCellMatrix this._normalMaxX = normalMaxX; this._normalMinY = normalMinY; this._normalMaxY = normalMaxY; - if(this._repeatMode == PlaneMaterialCellMatrix.REPEAT_MODE_RANDOM) + if (this._repeatMode == PlaneMaterialCellMatrix.REPEAT_MODE_RANDOM) { this._isStatic = false; } @@ -98,39 +98,39 @@ export class PlaneMaterialCellMatrix public dispose(): void { - if(this._cachedBitmapData) + if (this._cachedBitmapData) { this._cachedBitmapData.destroy(); this._cachedBitmapData = null; } - if(this._cachedBitmapNormal) this._cachedBitmapNormal = null; + if (this._cachedBitmapNormal) this._cachedBitmapNormal = null; } public clearCache(): void { - if(!this._isCached) return; + if (!this._isCached) return; - if(this._cachedBitmapData) + if (this._cachedBitmapData) { this._cachedBitmapData.destroy(); this._cachedBitmapData = null; } - if(this._cachedBitmapNormal) + if (this._cachedBitmapNormal) { this._cachedBitmapNormal.x = 0; this._cachedBitmapNormal.y = 0; this._cachedBitmapNormal.z = 0; } - if(this._columns && this._columns.length) + if (this._columns && this._columns.length) { - for(const column of this._columns) + for (const column of this._columns) { - if(!column) continue; + if (!column) continue; column.clearCache(); } @@ -139,39 +139,39 @@ export class PlaneMaterialCellMatrix this._isCached = false; } - public createColumn(index: number, width: number, cells: PlaneMaterialCell[], repeatMode: number=1): boolean + public createColumn(index: number, width: number, cells: PlaneMaterialCell[], repeatMode: number = 1): boolean { - if((index < 0) || (index >= this._columns.length)) return false; + if ((index < 0) || (index >= this._columns.length)) return false; const newColumn = new PlaneMaterialCellColumn(width, cells, repeatMode); const oldColumn = this._columns[index]; - if(oldColumn) oldColumn.dispose(); + if (oldColumn) oldColumn.dispose(); this._columns[index] = newColumn; - if(newColumn && !newColumn.isStatic) this._isStatic = false; + if (newColumn && !newColumn.isStatic) this._isStatic = false; return true; } public render(canvas: Graphics, width: number, height: number, normal: IVector3D, useTexture: boolean, offsetX: number, offsetY: number, topAlign: boolean): Graphics { - if(width < 1) width = 1; + if (width < 1) width = 1; - if(height < 1) height = 1; + if (height < 1) height = 1; - if(!canvas || (canvas.width !== width) || (canvas.height !== height)) canvas = null; + if (!canvas || (canvas.width !== width) || (canvas.height !== height)) canvas = null; - if(!this._cachedBitmapNormal) this._cachedBitmapNormal = new Vector3d(); + if (!this._cachedBitmapNormal) this._cachedBitmapNormal = new Vector3d(); - if(this.isStatic) + if (this.isStatic) { - if(this._cachedBitmapData) + if (this._cachedBitmapData) { - if(((this._cachedBitmapData.width === width) && (this._cachedBitmapData.height == height)) && Vector3d.isEqual(this._cachedBitmapNormal, normal)) + if (((this._cachedBitmapData.width === width) && (this._cachedBitmapData.height == height)) && Vector3d.isEqual(this._cachedBitmapNormal, normal)) { - if(canvas) + if (canvas) { this.copyCachedBitmapOnCanvas(canvas, this._cachedBitmapHeight, offsetY, topAlign); @@ -188,9 +188,9 @@ export class PlaneMaterialCellMatrix } else { - if(this._cachedBitmapData) + if (this._cachedBitmapData) { - if((this._cachedBitmapData.width === width) && (this._cachedBitmapData.height === height)) + if ((this._cachedBitmapData.width === width) && (this._cachedBitmapData.height === height)) { this._cachedBitmapData .beginFill(0xFFFFFF) @@ -209,11 +209,11 @@ export class PlaneMaterialCellMatrix this._isCached = true; this._cachedBitmapNormal.assign(normal); - if(!useTexture) + if (!useTexture) { this._cachedBitmapHeight = height; - if(!this._cachedBitmapData) + if (!this._cachedBitmapData) { const graphic = new Graphics() .beginFill(0xFFFFFF) @@ -230,7 +230,7 @@ export class PlaneMaterialCellMatrix .endFill(); } - if(canvas) + if (canvas) { this.copyCachedBitmapOnCanvas(canvas, height, offsetY, topAlign); @@ -240,7 +240,7 @@ export class PlaneMaterialCellMatrix return this._cachedBitmapData; } - if(!this._cachedBitmapData) + if (!this._cachedBitmapData) { this._cachedBitmapHeight = height; @@ -256,45 +256,45 @@ export class PlaneMaterialCellMatrix let columnIndex = 0; - while(columnIndex < this._columns.length) + while (columnIndex < this._columns.length) { const column = this._columns[columnIndex]; - if(column) + if (column) { const columnBitmapData = column.render(height, normal, offsetX, offsetY); - if(columnBitmapData) columns.push(columnBitmapData); + if (columnBitmapData) columns.push(columnBitmapData); } columnIndex++; } - if(!columns.length) + if (!columns.length) { - if(canvas) return canvas; + if (canvas) return canvas; return this._cachedBitmapData; } let maxColumnHeight = 0; - switch(this._repeatMode) + switch (this._repeatMode) { case PlaneMaterialCellMatrix.REPEAT_MODE_BORDERS: - // maxColumnHeight = this.renderRepeatBorders(this._cachedBitmapData, columns); + // maxColumnHeight = this.renderRepeatBorders(this._cachedBitmapData, columns); break; case PlaneMaterialCellMatrix.REPEAT_MODE_CENTER: - // maxColumnHeight = this.renderRepeatCenter(this._cachedBitmapData, columns); + // maxColumnHeight = this.renderRepeatCenter(this._cachedBitmapData, columns); break; case PlaneMaterialCellMatrix.REPEAT_MODE_FIRST: - // maxColumnHeight = this.renderRepeatFirst(this._cachedBitmapData, columns); + // maxColumnHeight = this.renderRepeatFirst(this._cachedBitmapData, columns); break; case PlaneMaterialCellMatrix.REPEAT_MODE_LAST: - // maxColumnHeight = this.renderRepeatLast(this._cachedBitmapData, columns); + // maxColumnHeight = this.renderRepeatLast(this._cachedBitmapData, columns); break; case PlaneMaterialCellMatrix.REPEAT_MODE_RANDOM: - // maxColumnHeight = this.renderRepeatRandom(this._cachedBitmapData, columns); + // maxColumnHeight = this.renderRepeatRandom(this._cachedBitmapData, columns); break; default: maxColumnHeight = this.renderRepeatAll(this._cachedBitmapData, columns); @@ -303,7 +303,7 @@ export class PlaneMaterialCellMatrix this._cachedBitmapHeight = maxColumnHeight; - if(canvas) + if (canvas) { this.copyCachedBitmapOnCanvas(canvas, maxColumnHeight, offsetY, topAlign); @@ -315,13 +315,13 @@ export class PlaneMaterialCellMatrix private copyCachedBitmapOnCanvas(canvas: Graphics, height: number, offsetY: number, topAlign: boolean): void { - if(!canvas || !this._cachedBitmapData || (canvas === this._cachedBitmapData)) return; + if (!canvas || !this._cachedBitmapData || (canvas === this._cachedBitmapData)) return; - if(!topAlign) offsetY = ((canvas.height - height) - offsetY); + if (!topAlign) offsetY = ((canvas.height - height) - offsetY); let _local_5: Rectangle; - if(this._align == PlaneMaterialCellMatrix.ALIGN_TOP) + if (this._align == PlaneMaterialCellMatrix.ALIGN_TOP) { _local_5 = new Rectangle(0, 0, this._cachedBitmapData.width, this._cachedBitmapHeight); } @@ -332,7 +332,7 @@ export class PlaneMaterialCellMatrix const texture = TextureUtils.generateTexture(this._cachedBitmapData, _local_5); - if(texture) + if (texture) { canvas .beginTextureFill({ texture }) @@ -343,13 +343,13 @@ export class PlaneMaterialCellMatrix private getColumnsWidth(columns: Graphics[]): number { - if(!columns || !columns.length) return 0; + if (!columns || !columns.length) return 0; let width = 0; - for(const graphic of columns) + for (const graphic of columns) { - if(!graphic) continue; + if (!graphic) continue; width += graphic.width; } @@ -359,26 +359,26 @@ export class PlaneMaterialCellMatrix private renderColumns(canvas: Graphics, columns: Graphics[], x: number, flag: boolean): Point { - if(!canvas || !columns || !columns.length) return new Point(x, 0); + if (!canvas || !columns || !columns.length) return new Point(x, 0); let height = 0; let i = 0; - while(i < columns.length) + while (i < columns.length) { const column = flag ? columns[i] : columns[((columns.length - 1) - i)]; - if(column) + if (column) { - if(!flag) x = (x - column.width); + if (!flag) x = (x - column.width); let y = 0; - if(this._align == PlaneMaterialCellMatrix.ALIGN_BOTTOM) y = (canvas.height - column.height); + if (this._align == PlaneMaterialCellMatrix.ALIGN_BOTTOM) y = (canvas.height - column.height); let texture = RoomVisualization.getTextureCache(column); - if(!texture) + if (!texture) { texture = TextureUtils.generateTexture(column, new Rectangle(0, 0, column.width, column.height)); @@ -389,11 +389,11 @@ export class PlaneMaterialCellMatrix canvas.drawRect(x, y, texture.width, texture.height); canvas.endFill(); - if(column.height > height) height = column.height; + if (column.height > height) height = column.height; - if(flag) x = (x + column.width); + if (flag) x = (x + column.width); - if((flag && (x >= canvas.width)) || (!flag && (x <= 0))) return new Point(x, height); + if ((flag && (x >= canvas.width)) || (!flag && (x <= 0))) return new Point(x, height); } i++; @@ -404,22 +404,22 @@ export class PlaneMaterialCellMatrix private renderRepeatAll(canvas: Graphics, columns: Graphics[]): number { - if(!canvas || !columns || !columns.length) return 0; + if (!canvas || !columns || !columns.length) return 0; const totalWidth: number = this.getColumnsWidth(columns); let x = 0; let y = 0; - while(x < canvas.width) + while (x < canvas.width) { const point = this.renderColumns(canvas, columns, x, true); x = point.x; - if(point.y > y) y = point.y; + if (point.y > y) y = point.y; - if(!point.x) return y; + if (!point.x) return y; } return y; @@ -681,21 +681,21 @@ export class PlaneMaterialCellMatrix public getColumns(width: number): PlaneMaterialCellColumn[] { - if(this._repeatMode === PlaneMaterialCellMatrix.REPEAT_MODE_RANDOM) + if (this._repeatMode === PlaneMaterialCellMatrix.REPEAT_MODE_RANDOM) { const columns: PlaneMaterialCellColumn[] = []; let columnIndex = 0; - while(columnIndex < width) + while (columnIndex < width) { const column = this._columns[PlaneMaterialCellMatrix.nextRandomColumnIndex(this._columns.length)]; - if(column) + if (column) { columns.push(column); - if(column.width > 1) columnIndex += column.width; + if (column.width > 1) columnIndex += column.width; else break; } } diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneVisualizationLayer.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneVisualizationLayer.ts index babb4f50..151372be 100644 --- a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneVisualizationLayer.ts +++ b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneVisualizationLayer.ts @@ -1,7 +1,7 @@ import { Graphics } from '@pixi/graphics'; import { Rectangle } from '@pixi/math'; +import { TextureUtils } from '../../../../../../../pixi-proxy'; import { IVector3D } from '../../../../../../../room/utils/IVector3D'; -import { TextureUtils } from '../../../../../../../room/utils/TextureUtils'; import { RoomVisualization } from '../../RoomVisualization'; import { PlaneMaterial } from './PlaneMaterial'; @@ -54,7 +54,7 @@ export class PlaneVisualizationLayer public clearCache(): void { - if(this._bitmapData) + if (this._bitmapData) { this._bitmapData.destroy(); @@ -64,17 +64,17 @@ export class PlaneVisualizationLayer public render(canvas: Graphics, width: number, height: number, normal: IVector3D, useTexture: boolean, offsetX: number, offsetY: number): Graphics { - if(!canvas || (canvas.width !== width) || (canvas.height !== height)) canvas = null; + if (!canvas || (canvas.width !== width) || (canvas.height !== height)) canvas = null; let bitmapData: Graphics = null; - if(this._material) + if (this._material) { bitmapData = this._material.render(null, width, height, normal, useTexture, offsetX, (offsetY + this.offset), (this.align === PlaneVisualizationLayer.ALIGN_TOP)); - if(bitmapData && (bitmapData !== canvas)) + if (bitmapData && (bitmapData !== canvas)) { - if(this._bitmapData) this._bitmapData.destroy(); + if (this._bitmapData) this._bitmapData.destroy(); this._bitmapData = bitmapData.clone(); @@ -83,11 +83,11 @@ export class PlaneVisualizationLayer } else { - if(!canvas) + if (!canvas) { - if(this._bitmapData && (this._bitmapData.width === width) && (this._bitmapData.height === height)) return this._bitmapData; + if (this._bitmapData && (this._bitmapData.width === width) && (this._bitmapData.height === height)) return this._bitmapData; - if(this._bitmapData) this._bitmapData.destroy(); + if (this._bitmapData) this._bitmapData.destroy(); const graphic = new Graphics() .beginFill(0xFFFFFF) @@ -109,15 +109,15 @@ export class PlaneVisualizationLayer } } - if(bitmapData) + if (bitmapData) { bitmapData.tint = this._color; - if(canvas && (bitmapData !== canvas)) + if (canvas && (bitmapData !== canvas)) { let texture = RoomVisualization.getTextureCache(bitmapData); - if(!texture) + if (!texture) { texture = TextureUtils.generateTexture(bitmapData, new Rectangle(0, 0, width, height)); diff --git a/src/nitro/room/utils/SpriteDataCollector.ts b/src/nitro/room/utils/SpriteDataCollector.ts index 9d5bd90b..53850be6 100644 --- a/src/nitro/room/utils/SpriteDataCollector.ts +++ b/src/nitro/room/utils/SpriteDataCollector.ts @@ -1,4 +1,5 @@ import { Point, Rectangle } from '@pixi/math'; +import { PixiApplicationProxy } from '../../../pixi-proxy'; import { RoomObjectSpriteData } from '../../../room/data/RoomObjectSpriteData'; import { IPlaneDrawingData } from '../../../room/object/visualization/IPlaneDrawingData'; import { IPlaneVisualization } from '../../../room/object/visualization/IPlaneVisualization'; @@ -6,7 +7,6 @@ import { IRoomObjectSpriteVisualization } from '../../../room/object/visualizati import { IRoomPlane } from '../../../room/object/visualization/IRoomPlane'; import { IRoomRenderingCanvas } from '../../../room/renderer/IRoomRenderingCanvas'; import { Vector3d } from '../../../room/utils/Vector3d'; -import { Nitro } from '../../Nitro'; import { RoomObjectCategory } from '../object/RoomObjectCategory'; import { PlaneDrawingData } from '../object/visualization/room/PlaneDrawingData'; import { RoomEngine } from '../RoomEngine'; @@ -26,21 +26,21 @@ export class SpriteDataCollector { const datas: RoomObjectSpriteData[] = []; - for(const data of k) + for (const data of k) { - if(!data) continue; + if (!data) continue; - if((data.type === 'boutique_mannequin1') && (data.name.indexOf('mannequin_') === 0)) + if ((data.type === 'boutique_mannequin1') && (data.name.indexOf('mannequin_') === 0)) { const roomObject = _arg_2.getRoomObject(_arg_2.activeRoomId, data.objectId, RoomObjectCategory.FLOOR); - if(roomObject) + if (roomObject) { const spriteList = (roomObject.visualization as IRoomObjectSpriteVisualization).getSpriteList(); - if(spriteList) + if (spriteList) { - for(const sprite of spriteList) + for (const sprite of spriteList) { sprite.x = (sprite.x + ((data.x + (data.width / 2)) + SpriteDataCollector.MANNEQUIN_MAGIC_X_OFFSET)); sprite.y = (sprite.y + ((data.y + data.height) + SpriteDataCollector.MANNEQUIN_MAGIC_Y_OFFSET)); @@ -61,14 +61,14 @@ export class SpriteDataCollector private static sortSpriteDataObjects(k: RoomObjectSpriteData, _arg_2: RoomObjectSpriteData): number { - if(k.z < _arg_2.z) return 1; + if (k.z < _arg_2.z) return 1; - if(k.z > _arg_2.z) return -1; + if (k.z > _arg_2.z) return -1; return -1; } - private static isSpriteInViewPort(k:RoomObjectSpriteData, _arg_2: Rectangle, _arg_3: IRoomRenderingCanvas): boolean + private static isSpriteInViewPort(k: RoomObjectSpriteData, _arg_2: Rectangle, _arg_3: IRoomRenderingCanvas): boolean { return true; // var _local_4 = new Rectangle((k.x + _arg_3.screenOffsetX), (k.y + _arg_3.screenOffsetY), k.width, k.height); @@ -80,19 +80,19 @@ export class SpriteDataCollector { const points: Point[] = []; - if(k.x == _arg_2.x) + if (k.x == _arg_2.x) { points.push(k, _arg_3, _arg_2, _arg_4); } else { - if(k.x == _arg_3.x) + if (k.x == _arg_3.x) { points.push(k, _arg_2, _arg_3, _arg_4); } else { - if((((_arg_2.x < k.x) && (_arg_2.y > k.y)) || ((_arg_2.x > k.x) && (_arg_2.y < k.y)))) + if ((((_arg_2.x < k.x) && (_arg_2.y > k.y)) || ((_arg_2.x > k.x) && (_arg_2.y < k.y)))) { points.push(k, _arg_3, _arg_2, _arg_4); } @@ -103,7 +103,7 @@ export class SpriteDataCollector } } - if(points[0].x < points[1].x) + if (points[0].x < points[1].x) { let _local_6 = points[0]; @@ -116,7 +116,7 @@ export class SpriteDataCollector points[3] = _local_6; } - if(points[0].y < points[2].y) + if (points[0].y < points[2].y) { let _local_6 = points[0]; @@ -133,27 +133,27 @@ export class SpriteDataCollector } - public getFurniData(k: Rectangle, _arg_2:IRoomRenderingCanvas, _arg_3:RoomEngine, _arg_4: number): string + public getFurniData(k: Rectangle, _arg_2: IRoomRenderingCanvas, _arg_3: RoomEngine, _arg_4: number): string { const _local_5: Object[] = []; let _local_6 = _arg_2.getSortableSpriteList(); const _local_7 = _arg_3.getRoomObjects(_arg_3.activeRoomId, RoomObjectCategory.UNIT); - for(const _local_8 of _local_7) + for (const _local_8 of _local_7) { - if(_local_8.id !== _arg_4) + if (_local_8.id !== _arg_4) { const _local_11 = (_local_8.visualization as IRoomObjectSpriteVisualization).getSpriteList(); - if(_local_11) + if (_local_11) { let _local_12 = 0; let _local_13 = 0; - for(const _local_14 of _local_6) + for (const _local_14 of _local_6) { - if(_local_14.name === ('avatar_' + _local_8.id)) + if (_local_14.name === ('avatar_' + _local_8.id)) { _local_12 = _local_14.z; _local_13 = ((_local_14.y + _local_14.height) - (_arg_2.geometry.scale / 4)); @@ -164,17 +164,17 @@ export class SpriteDataCollector const _local_15 = _arg_3.getRoomObjectScreenLocation(_arg_3.activeRoomId, _local_8.id, RoomObjectCategory.UNIT, _arg_2.id); - if(_local_15) + if (_local_15) { - if(_local_13 === 0) _local_13 = _local_15.y; + if (_local_13 === 0) _local_13 = _local_15.y; - for(const _local_16 of _local_11) + for (const _local_16 of _local_11) { _local_16.x = (_local_16.x + (_local_15.x - _arg_2.screenOffsetX)); _local_16.y = (_local_16.y + _local_13); _local_16.z = (_local_16.z + _local_12); - if(((_local_16.name.indexOf('h_std_fx29_') === 0) || (_local_16.name.indexOf('h_std_fx185_') === 0))) + if (((_local_16.name.indexOf('h_std_fx29_') === 0) || (_local_16.name.indexOf('h_std_fx185_') === 0))) { _local_16.y = (_local_16.y + SpriteDataCollector.AVATAR_WATER_EFFECT_MAGIC_Y_OFFSET); } @@ -189,13 +189,13 @@ export class SpriteDataCollector _local_6 = SpriteDataCollector.addMannequinSprites(_local_6, _arg_3); _local_6.sort(SpriteDataCollector.sortSpriteDataObjects); - for(const _local_9 of _local_6) + for (const _local_9 of _local_6) { - if((((((!(_local_9.name === null)) && (_local_9.name.length > 0)) && (!(_local_9.name.indexOf('tile_cursor_') === 0))) && (SpriteDataCollector.isSpriteInViewPort(_local_9, k, _arg_2))) && ((_arg_4 < 0) || (!(_local_9.objectId == _arg_4))))) + if ((((((!(_local_9.name === null)) && (_local_9.name.length > 0)) && (!(_local_9.name.indexOf('tile_cursor_') === 0))) && (SpriteDataCollector.isSpriteInViewPort(_local_9, k, _arg_2))) && ((_arg_4 < 0) || (!(_local_9.objectId == _arg_4))))) { _local_5.push(this.getSpriteDataObject(_local_9, k, _arg_2, _arg_3)); - if(!this.maxZ) this.maxZ = _local_9.z; + if (!this.maxZ) this.maxZ = _local_9.z; this.spriteCount++; } @@ -232,7 +232,7 @@ export class SpriteDataCollector let _local_6 = k.name; - if(k.name.indexOf('@') !== -1) + if (k.name.indexOf('@') !== -1) { _local_9 = k.name.split('@'); _local_6 = _local_9[0]; @@ -271,29 +271,29 @@ export class SpriteDataCollector _local_5.y = (_local_5.y + _arg_3.screenOffsetY); _local_5.z = k.z; - if(k.alpha && (k.alpha.toString() !== '255')) _local_5.alpha = k.alpha; + if (k.alpha && (k.alpha.toString() !== '255')) _local_5.alpha = k.alpha; - if(k.flipH) _local_5.flipH = k.flipH; + if (k.flipH) _local_5.flipH = k.flipH; - if(k.skew) _local_5.skew = k.skew; + if (k.skew) _local_5.skew = k.skew; - if(k.frame) _local_5.frame = k.frame; + if (k.frame) _local_5.frame = k.frame; - if(k.color && (k.color.length > 0)) _local_5.color = parseInt(k.color); + if (k.color && (k.color.length > 0)) _local_5.color = parseInt(k.color); - if(k.blendMode && (k.blendMode !== 'normal')) _local_5.blendMode = k.blendMode; + if (k.blendMode && (k.blendMode !== 'normal')) _local_5.blendMode = k.blendMode; - if(_local_6.indexOf('http') === 0) + if (_local_6.indexOf('http') === 0) { _local_5.width = k.width; _local_5.height = k.height; this.externalImageCount++; - if(this.externalImageCount > SpriteDataCollector.MAX_EXTERNAL_IMAGE_COUNT) _local_5.name = 'box'; + if (this.externalImageCount > SpriteDataCollector.MAX_EXTERNAL_IMAGE_COUNT) _local_5.name = 'box'; } - if(k.posture) _local_5.posture = k.posture; + if (k.posture) _local_5.posture = k.posture; return _local_5; } @@ -308,11 +308,11 @@ export class SpriteDataCollector let _local_9 = 0; - if(_arg_3.length > 0) + if (_arg_3.length > 0) { _local_9 = _arg_3[0].z; - if(this.maxZ) _local_9 = Math.max(this.maxZ, _local_9); + if (this.maxZ) _local_9 = Math.max(this.maxZ, _local_9); } else { @@ -335,12 +335,12 @@ export class SpriteDataCollector let _local_5 = 1; - if(this.maxZ) + if (this.maxZ) { _local_5 = (_local_5 + this.maxZ); } - for(const _local_6 of k) + for (const _local_6 of k) { const _local_10 = { plane: _local_6, @@ -361,15 +361,15 @@ export class SpriteDataCollector let _local_8: { plane: IRoomPlane, z: number }[] = []; - for(const sprite of sprites) + for (const sprite of sprites) { const objectSprite = sprite.sprite; - if(objectSprite) + if (objectSprite) { const _local_10 = _local_4.get(objectSprite.id); - if(_local_10) + if (_local_10) { _local_4.delete(objectSprite.id); @@ -392,13 +392,13 @@ export class SpriteDataCollector const roomObject = _arg_3.getRoomObject(_arg_3.activeRoomId, RoomEngine.ROOM_OBJECT_ID, RoomObjectCategory.ROOM); const visualization = (roomObject.visualization as unknown as IPlaneVisualization); - if(visualization) + if (visualization) { const _local_8 = _arg_2.geometry; const _local_9 = this.sortRoomPlanes(visualization.planes, _arg_2, _arg_3); - const _local_10 = Nitro.instance.stage; + const _local_10 = PixiApplicationProxy.instance.stage; - for(const _local_11 of _local_9) + for (const _local_11 of _local_9) { const _local_12 = _local_11.plane; const _local_13: Point[] = []; @@ -414,7 +414,7 @@ export class SpriteDataCollector let _local_19 = 0; let _local_20 = 0; - for(const _local_21 of _local_13) + for (const _local_21 of _local_13) { _local_21.x += (_local_10.width / 2); _local_21.y += (_local_10.height / 2); @@ -425,16 +425,16 @@ export class SpriteDataCollector _local_21.x += -(k.x); _local_21.y += -(k.y); - if(_local_21.x < 0) _local_19--; + if (_local_21.x < 0) _local_19--; - else if(_local_21.x >= k.width) _local_19++; + else if (_local_21.x >= k.width) _local_19++; - if(_local_21.y < 0) _local_20--; + if (_local_21.y < 0) _local_20--; - else if(_local_21.y >= k.height) _local_20++; + else if (_local_21.y >= k.height) _local_20++; } - if(((Math.abs(_local_19) === 4) || (Math.abs(_local_20) === 4))) + if (((Math.abs(_local_19) === 4) || (Math.abs(_local_20) === 4))) { // } @@ -442,7 +442,7 @@ export class SpriteDataCollector { const _local_22 = SpriteDataCollector.sortQuadPoints(_local_15, _local_16, _local_17, _local_18); - for(const _local_23 of _local_12.getDrawingDatas(_local_8)) + for (const _local_23 of _local_12.getDrawingDatas(_local_8)) { _local_23.cornerPoints = _local_22; _local_23.z = _local_11.z; diff --git a/src/nitro/room/utils/TileObjectMap.ts b/src/nitro/room/utils/TileObjectMap.ts index a432a6a3..65ef5f67 100644 --- a/src/nitro/room/utils/TileObjectMap.ts +++ b/src/nitro/room/utils/TileObjectMap.ts @@ -1,4 +1,4 @@ -import { NitroLogger } from '../../../core/common/NitroLogger'; +import { NitroLogger } from '../../../core'; import { IRoomObject } from '../../../room/object/IRoomObject'; import { RoomObjectVariable } from '../object/RoomObjectVariable'; diff --git a/src/nitro/session/RoomSession.ts b/src/nitro/session/RoomSession.ts index f4f57f79..3fac3a44 100644 --- a/src/nitro/session/RoomSession.ts +++ b/src/nitro/session/RoomSession.ts @@ -1,5 +1,5 @@ import { IConnection } from '../../api'; -import { Disposable } from '../../core/common/Disposable'; +import { Disposable } from '../../core'; import { CompostPlantMessageComposer, FurnitureMultiStateComposer, HarvestPetMessageComposer, PetMountComposer, PollAnswerComposer, PollRejectComposer, PollStartComposer, RemovePetSaddleComposer, TogglePetBreedingComposer, TogglePetRidingComposer, UsePetProductComposer } from '../communication'; import { RoomModerationSettings } from '../communication/messages/incoming/roomsettings/RoomModerationSettings'; import { RoomDoorbellAccessComposer } from '../communication/messages/outgoing/room/access/RoomDoorbellAccessComposer'; diff --git a/src/nitro/session/RoomSessionManager.ts b/src/nitro/session/RoomSessionManager.ts index 2c032c77..65c18e9c 100644 --- a/src/nitro/session/RoomSessionManager.ts +++ b/src/nitro/session/RoomSessionManager.ts @@ -1,4 +1,4 @@ -import { NitroManager } from '../../core/common/NitroManager'; +import { NitroManager } from '../../core'; import { INitroCommunicationManager } from '../communication/INitroCommunicationManager'; import { RoomEngineEvent } from '../room/events/RoomEngineEvent'; import { IRoomEngine } from '../room/IRoomEngine'; @@ -68,7 +68,7 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana { const connection = this._communication && this._communication.connection; - if(!connection) return; + if (!connection) return; this._handlers.push( new RoomChatHandler(connection, this), @@ -86,11 +86,11 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana private setHandlers(session: IRoomSession): void { - if(!this._handlers || !this._handlers.length) return; + if (!this._handlers || !this._handlers.length) return; - for(const handler of this._handlers) + for (const handler of this._handlers) { - if(!handler) continue; + if (!handler) continue; handler.setRoomId(session.roomId); } @@ -103,7 +103,7 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana private processPendingSession(): void { - if(!this._pendingSession || !this._roomEngine.ready) return; + if (!this._pendingSession || !this._roomEngine.ready) return; this.addSession(this._pendingSession); @@ -114,7 +114,7 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana { const existing = this._sessions.get(this.getRoomId(id)); - if(!existing) return null; + if (!existing) return null; return existing; } @@ -131,7 +131,7 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana private addSession(roomSession: IRoomSession): boolean { - if(!this._roomEngine.ready) + if (!this._roomEngine.ready) { this._pendingSession = roomSession; @@ -140,7 +140,7 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana this._sessionStarting = true; - if(this._sessions.get(this.getRoomId(roomSession.roomId))) + if (this._sessions.get(this.getRoomId(roomSession.roomId))) { this.removeSession(roomSession.roomId, false); } @@ -160,11 +160,11 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana public startSession(session: IRoomSession): boolean { - if(session.state === RoomSessionEvent.STARTED) return false; + if (session.state === RoomSessionEvent.STARTED) return false; this._sessionStarting = false; - if(!session.start()) + if (!session.start()) { this.removeSession(session.roomId); @@ -182,7 +182,7 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana { const session = this.getSession(id); - if(!session) return; + if (!session) return; this._sessions.delete(this.getRoomId(id)); @@ -195,9 +195,9 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana { const session = this.getSession(id); - if(!session) return; + if (!session) return; - switch(type) + switch (type) { case RoomSessionHandler.RS_CONNECTED: return; @@ -213,7 +213,7 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana { const existing = this.getSession(fromRoomId); - if(!existing) return; + if (!existing) return; this._sessions.delete(this.getRoomId(fromRoomId)); diff --git a/src/nitro/session/SessionDataManager.ts b/src/nitro/session/SessionDataManager.ts index 90d301e1..51a2898b 100644 --- a/src/nitro/session/SessionDataManager.ts +++ b/src/nitro/session/SessionDataManager.ts @@ -1,7 +1,6 @@ import { Resource, Texture } from '@pixi/core'; import { IMessageComposer } from '../../api'; -import { NitroManager } from '../../core/common/NitroManager'; -import { NitroEvent } from '../../core/events/NitroEvent'; +import { NitroEvent, NitroManager } from '../../core'; import { FigureUpdateEvent, MysteryBoxKeysEvent } from '../communication'; import { INitroCommunicationManager } from '../communication/INitroCommunicationManager'; import { AvailabilityStatusMessageEvent } from '../communication/messages/incoming/availability/AvailabilityStatusMessageEvent'; diff --git a/src/nitro/session/UserDataManager.ts b/src/nitro/session/UserDataManager.ts index a2dbb764..8d435e15 100644 --- a/src/nitro/session/UserDataManager.ts +++ b/src/nitro/session/UserDataManager.ts @@ -1,5 +1,5 @@ import { IConnection } from '../../api'; -import { Disposable } from '../../core/common/Disposable'; +import { Disposable } from '../../core'; import { RequestPetInfoComposer } from '../communication/messages/outgoing/pet/RequestPetInfoComposer'; import { UserCurrentBadgesComposer } from '../communication/messages/outgoing/user/data/UserCurrentBadgesComposer'; import { RoomUserData } from './RoomUserData'; diff --git a/src/nitro/session/badge/BadgeImageManager.ts b/src/nitro/session/badge/BadgeImageManager.ts index 140ebc85..4f9abcb7 100644 --- a/src/nitro/session/badge/BadgeImageManager.ts +++ b/src/nitro/session/badge/BadgeImageManager.ts @@ -1,10 +1,9 @@ import { Resource, Texture } from '@pixi/core'; import { IAssetManager, IDisposable, IMessageEvent } from '../../../api'; -import { NitroContainer, NitroSprite, NitroTexture } from '../../../pixi-proxy'; +import { NitroContainer, NitroSprite, NitroTexture, TextureUtils } from '../../../pixi-proxy'; import { GroupBadgePartsEvent } from '../../communication/messages/incoming/group/GroupBadgePartsEvent'; import { Nitro } from '../../Nitro'; import { BadgeImageReadyEvent } from '../events/BadgeImageReadyEvent'; -import { TextureUtils } from './../../../room/utils/TextureUtils'; import { SessionDataManager } from './../SessionDataManager'; import { BadgeInfo } from './BadgeInfo'; import { GroupBadge } from './GroupBadge'; diff --git a/src/nitro/session/events/BadgeImageReadyEvent.ts b/src/nitro/session/events/BadgeImageReadyEvent.ts index b3295a76..b8b16122 100644 --- a/src/nitro/session/events/BadgeImageReadyEvent.ts +++ b/src/nitro/session/events/BadgeImageReadyEvent.ts @@ -1,5 +1,5 @@ import { Resource, Texture } from '@pixi/core'; -import { NitroEvent } from '../../../core/events/NitroEvent'; +import { NitroEvent } from '../../../core'; export class BadgeImageReadyEvent extends NitroEvent { diff --git a/src/nitro/session/events/MysteryBoxKeysUpdateEvent.ts b/src/nitro/session/events/MysteryBoxKeysUpdateEvent.ts index 5ad409fe..96c27279 100644 --- a/src/nitro/session/events/MysteryBoxKeysUpdateEvent.ts +++ b/src/nitro/session/events/MysteryBoxKeysUpdateEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../../core/events/NitroEvent'; +import { NitroEvent } from '../../../core'; export class MysteryBoxKeysUpdateEvent extends NitroEvent { diff --git a/src/nitro/session/events/PerksUpdatedEvent.ts b/src/nitro/session/events/PerksUpdatedEvent.ts index 6bc421e4..9c721feb 100644 --- a/src/nitro/session/events/PerksUpdatedEvent.ts +++ b/src/nitro/session/events/PerksUpdatedEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../../core/events/NitroEvent'; +import { NitroEvent } from '../../../core'; export class PerksUpdatedEvent extends NitroEvent { @@ -8,4 +8,4 @@ export class PerksUpdatedEvent extends NitroEvent { super(PerksUpdatedEvent.PERKS_UPDATED); } -} \ No newline at end of file +} diff --git a/src/nitro/session/events/RoomSessionEvent.ts b/src/nitro/session/events/RoomSessionEvent.ts index ce0a6fd9..3163c1b0 100644 --- a/src/nitro/session/events/RoomSessionEvent.ts +++ b/src/nitro/session/events/RoomSessionEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../../core/events/NitroEvent'; +import { NitroEvent } from '../../../core'; import { IRoomSession } from '../IRoomSession'; export class RoomSessionEvent extends NitroEvent @@ -28,4 +28,4 @@ export class RoomSessionEvent extends NitroEvent { return this._openLandingView; } -} \ No newline at end of file +} diff --git a/src/nitro/session/events/RoomSessionUserTagsEvent.ts b/src/nitro/session/events/RoomSessionUserTagsEvent.ts index 7d2f6489..736c117e 100644 --- a/src/nitro/session/events/RoomSessionUserTagsEvent.ts +++ b/src/nitro/session/events/RoomSessionUserTagsEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../../core/events/NitroEvent'; +import { NitroEvent } from '../../../core'; export class RoomSessionUserTagsEvent extends NitroEvent { @@ -24,4 +24,4 @@ export class RoomSessionUserTagsEvent extends NitroEvent { return this._tags; } -} \ No newline at end of file +} diff --git a/src/nitro/session/events/SessionDataPreferencesEvent.ts b/src/nitro/session/events/SessionDataPreferencesEvent.ts index ae1fbaa6..b689ee1b 100644 --- a/src/nitro/session/events/SessionDataPreferencesEvent.ts +++ b/src/nitro/session/events/SessionDataPreferencesEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../../core/events/NitroEvent'; +import { NitroEvent } from '../../../core'; export class SessionDataPreferencesEvent extends NitroEvent { diff --git a/src/nitro/session/events/UserNameUpdateEvent.ts b/src/nitro/session/events/UserNameUpdateEvent.ts index 0560966b..ec2f62d0 100644 --- a/src/nitro/session/events/UserNameUpdateEvent.ts +++ b/src/nitro/session/events/UserNameUpdateEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../../core/events/NitroEvent'; +import { NitroEvent } from '../../../core'; export class UserNameUpdateEvent extends NitroEvent { @@ -17,4 +17,4 @@ export class UserNameUpdateEvent extends NitroEvent { return this._name; } -} \ No newline at end of file +} diff --git a/src/nitro/session/furniture/FurnitureDataLoader.ts b/src/nitro/session/furniture/FurnitureDataLoader.ts index 41c61908..0d95a20f 100644 --- a/src/nitro/session/furniture/FurnitureDataLoader.ts +++ b/src/nitro/session/furniture/FurnitureDataLoader.ts @@ -1,6 +1,4 @@ -import { NitroLogger } from '../../../core/common/NitroLogger'; -import { EventDispatcher } from '../../../core/events/EventDispatcher'; -import { NitroEvent } from '../../../core/events/NitroEvent'; +import { EventDispatcher, NitroEvent, NitroLogger } from '../../../core'; import { INitroLocalizationManager } from '../../localization/INitroLocalizationManager'; import { FurnitureData } from './FurnitureData'; import { FurnitureType } from './FurnitureType'; diff --git a/src/nitro/session/handler/BaseHandler.ts b/src/nitro/session/handler/BaseHandler.ts index 4121c51b..f2d80abc 100644 --- a/src/nitro/session/handler/BaseHandler.ts +++ b/src/nitro/session/handler/BaseHandler.ts @@ -1,5 +1,5 @@ import { IConnection } from '../../../api'; -import { Disposable } from '../../../core/common/Disposable'; +import { Disposable } from '../../../core'; import { IRoomHandlerListener } from '../IRoomHandlerListener'; export class BaseHandler extends Disposable diff --git a/src/nitro/session/product/ProductDataLoader.ts b/src/nitro/session/product/ProductDataLoader.ts index 093e5bca..fe2a5d77 100644 --- a/src/nitro/session/product/ProductDataLoader.ts +++ b/src/nitro/session/product/ProductDataLoader.ts @@ -1,5 +1,4 @@ -import { EventDispatcher } from '../../../core/events/EventDispatcher'; -import { NitroEvent } from '../../../core/events/NitroEvent'; +import { EventDispatcher, NitroEvent } from '../../../core'; import { IProductData } from './IProductData'; import { ProductData } from './ProductData'; @@ -24,7 +23,7 @@ export class ProductDataLoader extends EventDispatcher public loadProductData(url: string): void { - if(!url) return; + if (!url) return; fetch(url) .then(response => response.json()) @@ -34,7 +33,7 @@ export class ProductDataLoader extends EventDispatcher private onProductDataLoadedEvent(data: { [index: string]: any }): void { - if(!data) return; + if (!data) return; this.parseProducts(data.productdata); @@ -43,15 +42,15 @@ export class ProductDataLoader extends EventDispatcher private onProductDataError(error: Error): void { - if(!error) return; + if (!error) return; this.dispatchEvent(new NitroEvent(ProductDataLoader.PDP_PRODUCT_DATA_FAILED)); } private parseProducts(data: { [index: string]: any }): void { - if(!data) return; + if (!data) return; - for(const product of data.product) (product && this._products.set(product.code, new ProductData(product.code, product.name, product.description))); + for (const product of data.product) (product && this._products.set(product.code, new ProductData(product.code, product.name, product.description))); } } diff --git a/src/nitro/sound/SoundManager.ts b/src/nitro/sound/SoundManager.ts index 3db4fb1b..e9bb80e1 100644 --- a/src/nitro/sound/SoundManager.ts +++ b/src/nitro/sound/SoundManager.ts @@ -1,7 +1,8 @@ -import { AdvancedMap, Nitro, NitroSettingsEvent, RoomEngineEvent, RoomEngineObjectEvent, RoomEngineSamplePlaybackEvent } from '../..'; -import { NitroManager } from '../../core/common/NitroManager'; +import { AdvancedMap, NitroEvent, NitroManager } from '../../core'; +import { NitroSettingsEvent } from '../events'; import { NitroSoundEvent } from '../events/NitroSoundEvent'; -import { NitroEvent } from './../../core/events/NitroEvent'; +import { Nitro } from '../Nitro'; +import { RoomEngineEvent, RoomEngineObjectEvent, RoomEngineSamplePlaybackEvent } from '../room'; import { ISoundManager } from './ISoundManager'; import { IMusicManager } from './music/IMusicManager'; import { MusicManager } from './music/MusicManager'; @@ -48,7 +49,7 @@ export class SoundManager extends NitroManager implements ISoundManager public onDispose(): void { - if(this._musicManager) + if (this._musicManager) { this._musicManager.dispose(); this._musicManager = null; @@ -63,7 +64,7 @@ export class SoundManager extends NitroManager implements ISoundManager private onEvent(event: NitroEvent) { - switch(event.type) + switch (event.type) { case RoomEngineSamplePlaybackEvent.PLAY_SAMPLE: { const castedEvent = (event as RoomEngineSamplePlaybackEvent); @@ -93,7 +94,7 @@ export class SoundManager extends NitroManager implements ISoundManager this._volumeFurni = (castedEvent.volumeFurni / 100); this._volumeTrax = (castedEvent.volumeTrax / 100); - if(volumeFurniUpdated) this.updateFurniSamplesVolume(this._volumeFurni); + if (volumeFurniUpdated) this.updateFurniSamplesVolume(this._volumeFurni); return; } case NitroSoundEvent.PLAY_SOUND: { @@ -124,7 +125,7 @@ export class SoundManager extends NitroManager implements ISoundManager { let sample = this._internalSamples.getValue(code); - if(!sample) + if (!sample) { const sampleUrl = Nitro.instance.getConfiguration('sounds.url'); @@ -139,7 +140,7 @@ export class SoundManager extends NitroManager implements ISoundManager { let sample = this._furniSamples.getValue(code); - if(!sample) + if (!sample) { const sampleUrl = Nitro.instance.getConfiguration('external.samples.url'); @@ -147,7 +148,7 @@ export class SoundManager extends NitroManager implements ISoundManager this._furniSamples.add(code, sample); } - if(!this._furnitureBeingPlayed.hasKey(objectId)) this._furnitureBeingPlayed.add(objectId, code); + if (!this._furnitureBeingPlayed.hasKey(objectId)) this._furnitureBeingPlayed.add(objectId, code); sample.onended = (event) => { @@ -171,7 +172,7 @@ export class SoundManager extends NitroManager implements ISoundManager { const sample = this._internalSamples.getValue(code); - if(!sample) return; + if (!sample) return; try { @@ -187,13 +188,13 @@ export class SoundManager extends NitroManager implements ISoundManager { const furnitureBeingPlayed = this._furnitureBeingPlayed.getValue(objectId); - if(!furnitureBeingPlayed) return; + if (!furnitureBeingPlayed) return; const sample = this._furniSamples.getValue(furnitureBeingPlayed); this._furnitureBeingPlayed.remove(objectId); - if(!sample) return; + if (!sample) return; try { diff --git a/src/nitro/sound/common/TraxSample.ts b/src/nitro/sound/common/TraxSample.ts index 4968cd49..b6dad30f 100644 --- a/src/nitro/sound/common/TraxSample.ts +++ b/src/nitro/sound/common/TraxSample.ts @@ -1,5 +1,4 @@ -import { BinaryWriter } from '../../../core/communication/codec/BinaryWriter'; -import { BinaryReader } from './../../../core/communication/codec/BinaryReader'; +import { BinaryReader, BinaryWriter } from '../../../core'; export class TraxSample { @@ -30,7 +29,7 @@ export class TraxSample let local5 = 65536; - switch(sampleFrequency) + switch (sampleFrequency) { case TraxSample.SAMPLE_FREQUENCY_22KHZ: this._sampleRepeats = 2; @@ -42,7 +41,7 @@ export class TraxSample this._sampleRepeats = 1; } - if(sampleScale === TraxSample.SAMPLE_SCALE_8BIT) + if (sampleScale === TraxSample.SAMPLE_SCALE_8BIT) { this._samplesPerValue = 4; local5 = 0x0100; @@ -51,7 +50,7 @@ export class TraxSample const local6: number = this._samplesPerValue * this._sampleRepeats; const local7: number = (Math.trunc(k.getBuffer().byteLength / 8) / local6) * local6; - this._sampleData = new Array(local7/local6); + this._sampleData = new Array(local7 / local6); const local8: number = 1 / (local5 / 2); @@ -64,12 +63,12 @@ export class TraxSample let local12: number; let local15: number; - for(let i = 0; i < local10; i++) + for (let i = 0; i < local10; i++) { local12 = reader.readFloat(); reader.readFloat(); - for(let j = 2; j <= this._sampleRepeats; j++) + for (let j = 2; j <= this._sampleRepeats; j++) { local15 = reader.readFloat(); reader.readFloat(); @@ -77,22 +76,22 @@ export class TraxSample local12 = (((j * (j - 1)) / j) + (local15 / j)); } - if(i >= ((local10 - 1) - TraxSample._Str_14308)) local12 = (local12 * (((local10 - 1) - 1) / TraxSample._Str_14308)); + if (i >= ((local10 - 1) - TraxSample._Str_14308)) local12 = (local12 * (((local10 - 1) - 1) / TraxSample._Str_14308)); let local14 = ((local12 + 1) / local8); - if(local14 < 0) + if (local14 < 0) { local14 = 0; } - else if(local14 >= local5) + else if (local14 >= local5) { local14 = local5 - 1; } local9 = (local9 * local5) + local14; - if((i % this._samplesPerValue) === this._samplesPerValue - 1) + if ((i % this._samplesPerValue) === this._samplesPerValue - 1) { this._sampleData[Math.trunc(i / this._samplesPerValue)] = local9; } @@ -105,31 +104,31 @@ export class TraxSample let local9: number; let local10: number; - if(k === null || this._sampleData === null) return arg4; + if (k === null || this._sampleData === null) return arg4; const local5 = this._samplesPerValue * this._sampleRepeats; arg4 = arg4 / local5; - if(arg2 < 0) arg3 = arg3 + arg2; + if (arg2 < 0) arg3 = arg3 + arg2; - if(arg3 > k.length - arg2) arg3 = k.length - arg2; + if (arg3 > k.length - arg2) arg3 = k.length - arg2; let local6 = arg3 / local5; let local7: number; - if(local6 > this._sampleData.length - arg4) + if (local6 > this._sampleData.length - arg4) { local7 = (local6 - this._sampleData.length - arg4) * local5; local6 = this._sampleData.length - arg4; - if(local7 > (k.length - arg2)) local7 = k.length - arg2; + if (local7 > (k.length - arg2)) local7 = k.length - arg2; } - if(this._sampleRepeats === 1) + if (this._sampleRepeats === 1) { - if(this._samplesPerValue === 2) + if (this._samplesPerValue === 2) { - while(local6-- > 0) + while (local6-- > 0) { local8 = this._sampleData[arg4++]; @@ -137,9 +136,9 @@ export class TraxSample k[arg2++] = ((local8 & TraxSample.MASK_16BIT) - TraxSample.OFFSET_16BIT); } } - else if(this._samplesPerValue === 4) + else if (this._samplesPerValue === 4) { - while(local6-- > 0) + while (local6-- > 0) { local8 = this._sampleData[arg4++]; @@ -150,20 +149,20 @@ export class TraxSample } } } - else if(this._sampleRepeats >= 2) + else if (this._sampleRepeats >= 2) { local9 = 0; local10 = 0; - if(this._samplesPerValue === 2) + if (this._samplesPerValue === 2) { - while(local6-- > 0) + while (local6-- > 0) { local8 = this._sampleData[arg4++]; local10 = (((local8 >> 16) & TraxSample.MASK_16BIT) - TraxSample.OFFSET_16BIT); local9 = this._sampleRepeats; - while(local9 > 0) + while (local9 > 0) // eslint-disable-next-line no-empty { diff --git a/src/nitro/sound/events/SoundManagerEvent.ts b/src/nitro/sound/events/SoundManagerEvent.ts index a1e79de4..411e715c 100644 --- a/src/nitro/sound/events/SoundManagerEvent.ts +++ b/src/nitro/sound/events/SoundManagerEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../../core/events/NitroEvent'; +import { NitroEvent } from '../../../core'; export class SoundManagerEvent extends NitroEvent { diff --git a/src/nitro/sound/music/MusicManager.ts b/src/nitro/sound/music/MusicManager.ts index d0e22202..4f6a54bb 100644 --- a/src/nitro/sound/music/MusicManager.ts +++ b/src/nitro/sound/music/MusicManager.ts @@ -1,5 +1,4 @@ -import { NitroManager } from '../../../core/common/NitroManager'; -import { NitroEvent } from '../../../core/events/NitroEvent'; +import { NitroEvent, NitroManager } from '../../../core'; import { JukeboxPlayListFullMessageEvent } from '../../communication/messages/incoming/sound/JukeboxPlayListFullMessageEvent'; import { JukeboxSongDisksMessageEvent } from '../../communication/messages/incoming/sound/JukeboxSongDisksMessageEvent'; import { NowPlayingMessageEvent } from '../../communication/messages/incoming/sound/NowPlayingMessageEvent'; @@ -64,7 +63,7 @@ export class MusicManager extends NitroManager implements IMusicManager public onDispose(): void { - if(this._timerInstance) + if (this._timerInstance) { clearInterval(this._timerInstance); this._timerInstance = null; @@ -91,14 +90,14 @@ export class MusicManager extends NitroManager implements IMusicManager { const parser = event.getParser(); - for(const song of parser.songs) + for (const song of parser.songs) { const songAvailable: boolean = (this._availableSongs.get(song.id) !== null); const areSamplesRequested: boolean = (this._requestedSongs.get(song.id) !== null); - if(!songAvailable) + if (!songAvailable) { - if(areSamplesRequested) + if (areSamplesRequested) { //LoadTraxSong } @@ -120,7 +119,7 @@ export class MusicManager extends NitroManager implements IMusicManager this._isPlaying = (parser.currentSongId !== -1); - if(parser.currentSongId >= 0) + if (parser.currentSongId >= 0) { this.playSong(parser.currentSongId, MusicPriorities.PRIORITY_ROOM_PLAYLIST, (parser.syncCount / 1000), 0, 1, 1); } @@ -129,7 +128,7 @@ export class MusicManager extends NitroManager implements IMusicManager this.stopPlaying(); } - if(parser.nextSongId >= 0) this.requestSong(parser.nextSongId, true); + if (parser.nextSongId >= 0) this.requestSong(parser.nextSongId, true); this._playPosition = parser.currentPosition; //Dispatch local event NowPlayingEvent @@ -137,7 +136,7 @@ export class MusicManager extends NitroManager implements IMusicManager private onTick(): void { - if(this._songRequestList.length === 0) return; + if (this._songRequestList.length === 0) return; Nitro.instance.communication.connection.send(new GetSongInfoMessageComposer(...this._songRequestList)); this._songRequestList = []; @@ -145,7 +144,7 @@ export class MusicManager extends NitroManager implements IMusicManager private requestSong(songId: number, arg2: boolean): void { - if(this._requestedSongs.get(songId) === null) + if (this._requestedSongs.get(songId) === null) { this._requestedSongs.set(songId, arg2); this._songRequestList.push(songId); @@ -171,9 +170,9 @@ export class MusicManager extends NitroManager implements IMusicManager private getSongIdRequestedAtPriority(priorityIndex: number): number { - if(priorityIndex < 0 || priorityIndex >= MusicPriorities.PRIORITY_COUNT) return -1; + if (priorityIndex < 0 || priorityIndex >= MusicPriorities.PRIORITY_COUNT) return -1; - if(!this._songRequestsPerPriority[priorityIndex]) return -1; + if (!this._songRequestsPerPriority[priorityIndex]) return -1; return this._songRequestsPerPriority[priorityIndex].songId; } diff --git a/src/nitro/utils/HabboWebTools.ts b/src/nitro/utils/HabboWebTools.ts index 8ff84bbe..699f80ff 100644 --- a/src/nitro/utils/HabboWebTools.ts +++ b/src/nitro/utils/HabboWebTools.ts @@ -1,4 +1,4 @@ -import { NitroLogger } from '../../core/common/NitroLogger'; +import { NitroLogger } from '../../core'; import { LegacyExternalInterface } from '../externalInterface/LegacyExternalInterface'; export class HabboWebTools diff --git a/src/core/utils/PaletteMapFilter.ts b/src/pixi-proxy/PaletteMapFilter.ts similarity index 96% rename from src/core/utils/PaletteMapFilter.ts rename to src/pixi-proxy/PaletteMapFilter.ts index 19666440..451072f4 100644 --- a/src/core/utils/PaletteMapFilter.ts +++ b/src/pixi-proxy/PaletteMapFilter.ts @@ -1,4 +1,5 @@ -import { NitroBaseTexture, NitroFilter } from '../../pixi-proxy'; +import { NitroBaseTexture } from './NitroBaseTexture'; +import { NitroFilter } from './NitroFilter'; const vertex = ` attribute vec2 aVertexPosition; diff --git a/src/pixi-proxy/PixiApplicationProxy.ts b/src/pixi-proxy/PixiApplicationProxy.ts index 3b7eae72..fe8c0833 100644 --- a/src/pixi-proxy/PixiApplicationProxy.ts +++ b/src/pixi-proxy/PixiApplicationProxy.ts @@ -1,4 +1,18 @@ -import { Application } from '@pixi/app'; +import { Application, IApplicationOptions } from '@pixi/app'; export class PixiApplicationProxy extends Application -{} +{ + private static INSTANCE: Application = null; + + constructor(options?: IApplicationOptions) + { + super(options); + + if (!PixiApplicationProxy.INSTANCE) PixiApplicationProxy.INSTANCE = this; + } + + public static get instance(): Application + { + return this.INSTANCE || null; + } +} diff --git a/src/room/utils/TextureUtils.ts b/src/pixi-proxy/TextureUtils.ts similarity index 82% rename from src/room/utils/TextureUtils.ts rename to src/pixi-proxy/TextureUtils.ts index e6f4ed2d..20eaff35 100644 --- a/src/room/utils/TextureUtils.ts +++ b/src/pixi-proxy/TextureUtils.ts @@ -3,13 +3,13 @@ import { AbstractRenderer, Renderer, RenderTexture, Resource, Texture } from '@p import { DisplayObject } from '@pixi/display'; import { Extract } from '@pixi/extract'; import { Rectangle } from '@pixi/math'; -import { Nitro } from '../../nitro/Nitro'; +import { PixiApplicationProxy } from './PixiApplicationProxy'; export class TextureUtils { public static generateTexture(displayObject: DisplayObject, region: Rectangle = null, scaleMode: number = SCALE_MODES.NEAREST, resolution: number = 1): RenderTexture { - if(!displayObject) return null; + if (!displayObject) return null; return this.getRenderer().generateTexture(displayObject, { scaleMode, @@ -20,35 +20,35 @@ export class TextureUtils public static generateTextureFromImage(image: HTMLImageElement): Texture { - if(!image) return null; + if (!image) return null; return Texture.from(image); } public static generateImage(target: DisplayObject | RenderTexture): HTMLImageElement { - if(!target) return null; + if (!target) return null; return this.getExtractor().image(target); } public static generateImageUrl(target: DisplayObject | RenderTexture): string { - if(!target) return null; + if (!target) return null; return this.getExtractor().base64(target); } public static generateCanvas(target: DisplayObject | RenderTexture): HTMLCanvasElement { - if(!target) return null; + if (!target) return null; return this.getExtractor().canvas(target); } public static getRenderer(): Renderer | AbstractRenderer { - return Nitro.instance.renderer; + return PixiApplicationProxy.instance.renderer; } public static getExtractor(): Extract diff --git a/src/pixi-proxy/index.ts b/src/pixi-proxy/index.ts index 3e9d870a..78d38af8 100644 --- a/src/pixi-proxy/index.ts +++ b/src/pixi-proxy/index.ts @@ -11,7 +11,9 @@ export * from './NitroRenderTexture'; export * from './NitroSprite'; export * from './NitroSpritesheet'; export * from './NitroTexture'; +export * from './PaletteMapFilter'; export * from './PixiApplicationProxy'; export * from './PixiInteractionEventProxy'; export * from './PixiLoaderProxy'; +export * from './TextureUtils'; export * from './tilemap'; diff --git a/src/room/IRoomObjectManager.ts b/src/room/IRoomObjectManager.ts index a0b1de08..7df3cf19 100644 --- a/src/room/IRoomObjectManager.ts +++ b/src/room/IRoomObjectManager.ts @@ -1,4 +1,4 @@ -import { AdvancedMap } from '../core/utils/AdvancedMap'; +import { AdvancedMap } from '../core'; import { IRoomObjectController } from './object/IRoomObjectController'; export interface IRoomObjectManager @@ -11,4 +11,4 @@ export interface IRoomObjectManager removeAllObjects(): void; objects: AdvancedMap; totalObjects: number; -} \ No newline at end of file +} diff --git a/src/room/RoomInstance.ts b/src/room/RoomInstance.ts index bcf39de3..724b9061 100644 --- a/src/room/RoomInstance.ts +++ b/src/room/RoomInstance.ts @@ -1,4 +1,4 @@ -import { Disposable } from '../core/common/Disposable'; +import { Disposable } from '../core'; import { IRoomInstance } from './IRoomInstance'; import { IRoomInstanceContainer } from './IRoomInstanceContainer'; import { IRoomObjectManager } from './IRoomObjectManager'; diff --git a/src/room/RoomManager.ts b/src/room/RoomManager.ts index 614f0fd8..f3adfd06 100644 --- a/src/room/RoomManager.ts +++ b/src/room/RoomManager.ts @@ -1,5 +1,5 @@ import { IGraphicAssetCollection } from '../api'; -import { NitroManager } from '../core/common/NitroManager'; +import { NitroManager } from '../core'; import { RoomContentLoader } from '../nitro/room/RoomContentLoader'; import { RoomContentLoadedEvent } from './events/RoomContentLoadedEvent'; import { IRoomInstance } from './IRoomInstance'; diff --git a/src/room/RoomObjectManager.ts b/src/room/RoomObjectManager.ts index 0e3f0286..778bbfc8 100644 --- a/src/room/RoomObjectManager.ts +++ b/src/room/RoomObjectManager.ts @@ -1,4 +1,4 @@ -import { AdvancedMap } from '../core/utils/AdvancedMap'; +import { AdvancedMap } from '../core'; import { IRoomObjectManager } from './IRoomObjectManager'; import { IRoomObjectController } from './object/IRoomObjectController'; import { RoomObject } from './object/RoomObject'; @@ -23,7 +23,7 @@ export class RoomObjectManager implements IRoomObjectManager { const object = this._objects.getValue(id); - if(!object) return null; + if (!object) return null; return object; } @@ -32,7 +32,7 @@ export class RoomObjectManager implements IRoomObjectManager { const object = this._objects.getWithIndex(index); - if(!object) return null; + if (!object) return null; return object; } @@ -46,7 +46,7 @@ export class RoomObjectManager implements IRoomObjectManager private addObject(id: number, type: string, object: IRoomObjectController): IRoomObjectController { - if(this._objects.getValue(id)) + if (this._objects.getValue(id)) { object.dispose(); @@ -57,7 +57,7 @@ export class RoomObjectManager implements IRoomObjectManager const typeMap = this.getTypeMap(type); - if(typeMap) typeMap.add(id, object); + if (typeMap) typeMap.add(id, object); return object; } @@ -66,11 +66,11 @@ export class RoomObjectManager implements IRoomObjectManager { const object = this._objects.remove(id); - if(object) + if (object) { const typeMap = this.getTypeMap(object.type); - if(typeMap) typeMap.remove(object.id); + if (typeMap) typeMap.remove(object.id); object.dispose(); } @@ -80,11 +80,11 @@ export class RoomObjectManager implements IRoomObjectManager { let i = 0; - while(i < this._objects.length) + while (i < this._objects.length) { const object = this._objects.getWithIndex(i); - if(object) object.dispose(); + if (object) object.dispose(); i++; } @@ -93,11 +93,11 @@ export class RoomObjectManager implements IRoomObjectManager i = 0; - while(i < this._objectsPerType.length) + while (i < this._objectsPerType.length) { const typeMap = this._objectsPerType.getWithIndex(i); - if(typeMap) typeMap.dispose(); + if (typeMap) typeMap.dispose(); i++; } @@ -109,7 +109,7 @@ export class RoomObjectManager implements IRoomObjectManager { let existing = this._objectsPerType.getValue(k); - if(!existing && _arg_2) + if (!existing && _arg_2) { existing = new AdvancedMap(); @@ -128,4 +128,4 @@ export class RoomObjectManager implements IRoomObjectManager { return this._objects.length; } -} \ No newline at end of file +} diff --git a/src/room/events/RoomContentLoadedEvent.ts b/src/room/events/RoomContentLoadedEvent.ts index a8033f8f..9fc24c47 100644 --- a/src/room/events/RoomContentLoadedEvent.ts +++ b/src/room/events/RoomContentLoadedEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../core/events/NitroEvent'; +import { NitroEvent } from '../../core'; export class RoomContentLoadedEvent extends NitroEvent { @@ -19,4 +19,4 @@ export class RoomContentLoadedEvent extends NitroEvent { return this._contentType; } -} \ No newline at end of file +} diff --git a/src/room/events/RoomObjectEvent.ts b/src/room/events/RoomObjectEvent.ts index c6c949d3..f389bb02 100644 --- a/src/room/events/RoomObjectEvent.ts +++ b/src/room/events/RoomObjectEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../core/events/NitroEvent'; +import { NitroEvent } from '../../core'; import { IRoomObject } from '../object/IRoomObject'; export class RoomObjectEvent extends NitroEvent @@ -19,15 +19,15 @@ export class RoomObjectEvent extends NitroEvent public get objectId(): number { - if(!this._object) return -1; + if (!this._object) return -1; return this._object.id; } public get objectType(): string { - if(!this._object) return null; + if (!this._object) return null; return this._object.type; } -} \ No newline at end of file +} diff --git a/src/room/events/RoomToObjectEvent.ts b/src/room/events/RoomToObjectEvent.ts index aed45d91..930511d0 100644 --- a/src/room/events/RoomToObjectEvent.ts +++ b/src/room/events/RoomToObjectEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../core/events/NitroEvent'; +import { NitroEvent } from '../../core'; export class RoomToObjectEvent extends NitroEvent { @@ -6,4 +6,4 @@ export class RoomToObjectEvent extends NitroEvent { super(type); } -} \ No newline at end of file +} diff --git a/src/room/object/IRoomObjectModelController.ts b/src/room/object/IRoomObjectModelController.ts index 2c1113e9..b4823b1e 100644 --- a/src/room/object/IRoomObjectModelController.ts +++ b/src/room/object/IRoomObjectModelController.ts @@ -1,5 +1,5 @@ +import { AdvancedMap } from '../../core'; import { IRoomObjectModel } from './IRoomObjectModel'; -import { AdvancedMap } from '../../core/utils/AdvancedMap'; export interface IRoomObjectModelController extends IRoomObjectModel { diff --git a/src/room/object/RoomObject.ts b/src/room/object/RoomObject.ts index 7e79f501..f908ed20 100644 --- a/src/room/object/RoomObject.ts +++ b/src/room/object/RoomObject.ts @@ -1,4 +1,4 @@ -import { Disposable } from '../../core/common/Disposable'; +import { Disposable } from '../../core'; import { RoomObjectUpdateMessage } from '../messages/RoomObjectUpdateMessage'; import { IVector3D } from '../utils/IVector3D'; import { Vector3d } from '../utils/Vector3d'; diff --git a/src/room/object/logic/RoomObjectLogicBase.ts b/src/room/object/logic/RoomObjectLogicBase.ts index d59845e7..512f677d 100644 --- a/src/room/object/logic/RoomObjectLogicBase.ts +++ b/src/room/object/logic/RoomObjectLogicBase.ts @@ -1,5 +1,5 @@ import { IEventDispatcher } from '../../../api'; -import { Disposable } from '../../../core/common/Disposable'; +import { Disposable } from '../../../core'; import { RoomSpriteMouseEvent } from '../../events/RoomSpriteMouseEvent'; import { RoomObjectUpdateMessage } from '../../messages/RoomObjectUpdateMessage'; import { IRoomGeometry } from '../../utils/IRoomGeometry'; diff --git a/src/room/object/visualization/RoomObjectSpriteVisualization.ts b/src/room/object/visualization/RoomObjectSpriteVisualization.ts index 4b69ea03..a0c178bb 100644 --- a/src/room/object/visualization/RoomObjectSpriteVisualization.ts +++ b/src/room/object/visualization/RoomObjectSpriteVisualization.ts @@ -1,10 +1,9 @@ import { RenderTexture } from '@pixi/core'; import { Point, Rectangle } from '@pixi/math'; import { IGraphicAssetCollection } from '../../../api'; -import { NitroContainer, NitroSprite } from '../../../pixi-proxy'; +import { NitroContainer, NitroSprite, TextureUtils } from '../../../pixi-proxy'; import { RoomObjectSpriteData } from '../../data/RoomObjectSpriteData'; import { IRoomGeometry } from '../../utils/IRoomGeometry'; -import { TextureUtils } from '../../utils/TextureUtils'; import { IRoomObjectController } from '../IRoomObjectController'; import { IRoomObjectSprite } from './IRoomObjectSprite'; import { IRoomObjectSpriteVisualization } from './IRoomObjectSpriteVisualization'; diff --git a/src/room/object/visualization/index.ts b/src/room/object/visualization/index.ts index 1d3acbf8..6deb2049 100644 --- a/src/room/object/visualization/index.ts +++ b/src/room/object/visualization/index.ts @@ -10,4 +10,3 @@ export * from './IRoomPlane'; export * from './ISortableSprite'; export * from './RoomObjectSprite'; export * from './RoomObjectSpriteVisualization'; -export * from './utils'; diff --git a/src/room/object/visualization/utils/index.ts b/src/room/object/visualization/utils/index.ts deleted file mode 100644 index fe1e704f..00000000 --- a/src/room/object/visualization/utils/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export * from './GraphicAsset'; -/* export * from './GraphicAssetCollection'; */ -export * from './GraphicAssetGifCollection'; -export * from './GraphicAssetPalette'; diff --git a/src/room/renderer/RoomSpriteCanvas.ts b/src/room/renderer/RoomSpriteCanvas.ts index 811cc8b1..a2d8d562 100644 --- a/src/room/renderer/RoomSpriteCanvas.ts +++ b/src/room/renderer/RoomSpriteCanvas.ts @@ -5,7 +5,7 @@ import { Matrix, Point, Rectangle } from '@pixi/math'; import { Sprite } from '@pixi/sprite'; import { Nitro } from '../../nitro/Nitro'; import { MouseEventType } from '../../nitro/ui/MouseEventType'; -import { NitroContainer, NitroSprite } from '../../pixi-proxy'; +import { NitroContainer, NitroSprite, PixiApplicationProxy } from '../../pixi-proxy'; import { RoomObjectSpriteData } from '../data/RoomObjectSpriteData'; import { RoomSpriteMouseEvent } from '../events/RoomSpriteMouseEvent'; import { RoomObjectSpriteType } from '../object/enum/RoomObjectSpriteType'; @@ -1028,7 +1028,7 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas height: this._display.height }); - Nitro.instance.renderer.render(this._display, { + PixiApplicationProxy.instance.renderer.render(this._display, { renderTexture, clear: true, transform: new Matrix(1, 0, 0, 1, -(bounds.x), -(bounds.y)) diff --git a/src/room/renderer/utils/ExtendedSprite.ts b/src/room/renderer/utils/ExtendedSprite.ts index cd46e6fc..4803ae35 100644 --- a/src/room/renderer/utils/ExtendedSprite.ts +++ b/src/room/renderer/utils/ExtendedSprite.ts @@ -2,8 +2,7 @@ import { BLEND_MODES } from '@pixi/constants'; import { BaseTexture, RenderTexture, Resource, Texture } from '@pixi/core'; import { Point } from '@pixi/math'; import { Sprite } from '@pixi/sprite'; -import { NitroSprite } from '../../../pixi-proxy'; -import { TextureUtils } from '../../utils'; +import { NitroSprite, TextureUtils } from '../../../pixi-proxy'; export class ExtendedSprite extends Sprite { diff --git a/src/room/utils/Rasterizer.ts b/src/room/utils/Rasterizer.ts index 544542c0..1a534fbd 100644 --- a/src/room/utils/Rasterizer.ts +++ b/src/room/utils/Rasterizer.ts @@ -1,7 +1,7 @@ import { Resource, Texture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; import { Matrix } from '@pixi/math'; -import { TextureUtils } from './TextureUtils'; +import { TextureUtils } from '../../pixi-proxy'; export class Rasterizer { @@ -65,7 +65,7 @@ export class Rasterizer public static getFlipHBitmapData(k: Texture): Texture { - if(!k) return null; + if (!k) return null; const matrix = new Matrix(); @@ -87,7 +87,7 @@ export class Rasterizer public static getFlipVBitmapData(k: Texture): Texture { - if(!k) return null; + if (!k) return null; const matrix = new Matrix(); @@ -109,7 +109,7 @@ export class Rasterizer public static getFlipHVBitmapData(k: Texture): Texture { - if(!k) return null; + if (!k) return null; const matrix = new Matrix(); diff --git a/src/room/utils/index.ts b/src/room/utils/index.ts index e7e3285b..c5262f23 100644 --- a/src/room/utils/index.ts +++ b/src/room/utils/index.ts @@ -10,5 +10,4 @@ export * from './RoomId'; export * from './RoomRotatingEffect'; export * from './RoomShakingEffect'; export * from './SpriteUtilities'; -export * from './TextureUtils'; export * from './Vector3d';