From 28a2b07db6dbdc0ab49d0e3a4788d678110e7cba Mon Sep 17 00:00:00 2001 From: Gurkengewuerz Date: Sat, 18 Mar 2023 00:45:34 +0100 Subject: [PATCH] fix: fixed renderer typescript errors --- libs/renderer/.swcrc | 24 + libs/renderer/package.json | 6 +- libs/renderer/project.json | 18 +- .../api/configuration/NitroConfiguration.ts | 3 +- .../object/data/type/CrackableDataType.ts | 10 +- .../room/object/data/type/EmptyDataType.ts | 8 +- .../object/data/type/HighScoreDataType.ts | 8 +- .../room/object/data/type/LegacyDataType.ts | 10 +- .../room/object/data/type/MapDataType.ts | 12 +- .../room/object/data/type/NumberDataType.ts | 10 +- .../room/object/data/type/StringDataType.ts | 10 +- .../room/object/data/type/VoteDataType.ts | 8 +- libs/renderer/src/core/NitroCore.ts | 2 +- .../src/core/common/EventDispatcher.ts | 7 +- libs/renderer/src/core/common/NitroManager.ts | 2 +- .../communication/CommunicationManager.ts | 4 +- .../core/communication/SocketConnection.ts | 9 +- .../messages/MessageClassManager.ts | 4 +- .../configuration/ConfigurationManager.ts | 2 +- .../src/nitro/avatar/AvatarRenderManager.ts | 4 +- .../src/nitro/avatar/AvatarStructure.ts | 2 +- .../nitro/avatar/PlaceHolderAvatarImage.ts | 2 +- .../src/nitro/avatar/geometry/GeometryItem.ts | 2 +- .../communication/NitroCommunicationDemo.ts | 4 +- .../NitroCommunicationManager.ts | 4 +- .../parser/groupforums/ExtendedForumData.ts | 2 +- .../parser/room/unit/RoomUnitStatusParser.ts | 1 + .../parser/roomevents/ConditionDefinition.ts | 2 +- .../parser/roomevents/TriggerDefinition.ts | 2 +- .../roomevents/WiredActionDefinition.ts | 2 +- .../localization/NitroLocalizationManager.ts | 2 +- .../src/nitro/room/RoomContentLoader.ts | 1 + libs/renderer/src/nitro/room/RoomEngine.ts | 17 +- .../src/nitro/room/RoomMessageHandler.ts | 2 +- .../src/nitro/room/RoomObjectEventHandler.ts | 4 +- .../room/object/logic/MovingObjectLogic.ts | 8 +- .../room/object/logic/avatar/AvatarLogic.ts | 10 +- .../FurnitureAchievementResolutionLogic.ts | 8 +- .../furniture/FurnitureBadgeDisplayLogic.ts | 6 +- .../FurnitureChangeStateWhenStepOnLogic.ts | 4 +- .../furniture/FurnitureClothingChangeLogic.ts | 8 +- .../furniture/FurnitureCounterClockLogic.ts | 6 +- .../furniture/FurnitureCrackableLogic.ts | 2 +- .../furniture/FurnitureCraftingGizmoLogic.ts | 2 +- .../logic/furniture/FurnitureCreditLogic.ts | 6 +- .../furniture/FurnitureCuckooClockLogic.ts | 4 +- .../FurnitureCustomStackHeightLogic.ts | 6 +- .../logic/furniture/FurnitureDiceLogic.ts | 4 +- .../furniture/FurnitureEcotronBoxLogic.ts | 4 +- .../FurnitureEditableInternalLinkLogic.ts | 10 +- .../FurnitureEditableRoomLinkLogic.ts | 8 +- .../furniture/FurnitureEffectBoxLogic.ts | 6 +- .../furniture/FurnitureExternalImageLogic.ts | 6 +- .../furniture/FurnitureFireworksLogic.ts | 8 +- .../furniture/FurnitureFloorHoleLogic.ts | 8 +- .../furniture/FurnitureFriendFurniLogic.ts | 10 +- .../FurnitureGroupForumTerminalLogic.ts | 6 +- .../FurnitureGuildCustomizedLogic.ts | 6 +- .../furniture/FurnitureHabboWheelLogic.ts | 4 +- .../furniture/FurnitureHighScoreLogic.ts | 6 +- .../furniture/FurnitureHockeyScoreLogic.ts | 6 +- .../furniture/FurnitureHweenLovelockLogic.ts | 2 +- .../logic/furniture/FurnitureIceStormLogic.ts | 4 +- .../furniture/FurnitureInternalLinkLogic.ts | 10 +- .../logic/furniture/FurnitureJukeboxLogic.ts | 8 +- .../object/logic/furniture/FurnitureLogic.ts | 20 +- .../logic/furniture/FurnitureLoveLockLogic.ts | 2 +- .../furniture/FurnitureMannequinLogic.ts | 6 +- .../FurnitureMonsterplantSeedLogic.ts | 6 +- .../furniture/FurnitureMultiHeightLogic.ts | 2 +- .../furniture/FurnitureMultiStateLogic.ts | 4 +- .../furniture/FurnitureMysteryBoxLogic.ts | 6 +- .../furniture/FurnitureMysteryTrophyLogic.ts | 6 +- .../furniture/FurnitureOneWayDoorLogic.ts | 4 +- .../FurniturePetCustomizationLogic.ts | 6 +- .../furniture/FurniturePlaceholderLogic.ts | 4 +- .../furniture/FurniturePlanetSystemLogic.ts | 2 +- .../logic/furniture/FurniturePresentLogic.ts | 10 +- .../FurniturePurchaseableClothingLogic.ts | 6 +- .../logic/furniture/FurniturePushableLogic.ts | 4 +- .../furniture/FurnitureRandomStateLogic.ts | 4 +- .../furniture/FurnitureRandomTeleportLogic.ts | 2 +- .../furniture/FurnitureRentableSpaceLogic.ts | 6 +- .../FurnitureRoomBackgroundColorLogic.ts | 8 +- .../furniture/FurnitureRoomBackgroundLogic.ts | 2 +- .../furniture/FurnitureRoomBillboardLogic.ts | 4 +- .../furniture/FurnitureRoomBrandingLogic.ts | 8 +- .../furniture/FurnitureRoomDimmerLogic.ts | 10 +- .../logic/furniture/FurnitureScoreLogic.ts | 4 +- .../logic/furniture/FurnitureSongDiskLogic.ts | 2 +- .../furniture/FurnitureSoundBlockLogic.ts | 8 +- .../furniture/FurnitureSoundMachineLogic.ts | 6 +- .../logic/furniture/FurnitureStickieLogic.ts | 8 +- .../logic/furniture/FurnitureTrophyLogic.ts | 4 +- .../furniture/FurnitureVoteCounterLogic.ts | 4 +- .../furniture/FurnitureVoteMajorityLogic.ts | 2 +- .../furniture/FurnitureWelcomeGiftLogic.ts | 2 +- .../logic/furniture/FurnitureWindowLogic.ts | 2 +- .../logic/furniture/FurnitureYoutubeLogic.ts | 6 +- .../nitro/room/object/logic/pet/PetLogic.ts | 12 +- .../nitro/room/object/logic/room/RoomLogic.ts | 12 +- .../object/logic/room/SelectionArrowLogic.ts | 4 +- .../room/object/logic/room/TileCursorLogic.ts | 4 +- .../avatar/AvatarVisualization.ts | 8 +- .../avatar/AvatarVisualizationData.ts | 2 +- .../avatar/additions/FloatingHeartAddition.ts | 4 +- .../data/AnimationFrameDirectionalData.ts | 6 +- .../visualization/data/AnimationSizeData.ts | 2 +- .../FurnitureAnimatedVisualization.ts | 22 +- .../FurnitureAnimatedVisualizationData.ts | 4 +- .../furniture/FurnitureBBVisualization.ts | 6 +- .../FurnitureBadgeDisplayVisualization.ts | 8 +- .../furniture/FurnitureBottleVisualization.ts | 4 +- .../FurnitureBrandedImageVisualization.ts | 12 +- .../FurnitureCounterClockVisualization.ts | 4 +- .../FurnitureDynamicThumbnailVisualization.ts | 2 +- .../FurnitureExternalImageVisualization.ts | 2 +- .../FurnitureFireworksVisualization.ts | 12 +- ...nitureGiftWrappedFireworksVisualization.ts | 8 +- .../FurnitureGiftWrappedVisualization.ts | 6 +- .../FurnitureGuildCustomizedVisualization.ts | 8 +- ...rnitureGuildIsometricBadgeVisualization.ts | 8 +- .../FurnitureHabboWheelVisualization.ts | 4 +- .../FurnitureIsometricBBVisualization.ts | 4 +- .../FurnitureMannequinVisualization.ts | 16 +- .../FurnitureMannequinVisualizationData.ts | 2 +- .../FurnitureParticleSystemEmitter.ts | 6 +- .../FurniturePartyBeamerVisualization.ts | 6 +- .../FurniturePlanetSystemVisualization.ts | 12 +- .../FurnitureQueueTileVisualization.ts | 6 +- ...FurnitureResettingAnimatedVisualization.ts | 2 +- .../FurnitureRoomBackgroundVisualization.ts | 10 +- .../FurnitureScoreBoardVisualization.ts | 2 +- .../FurnitureSoundBlockVisualization.ts | 2 +- .../FurnitureStickieVisualization.ts | 2 +- .../FurnitureValRandomizerVisualization.ts | 4 +- .../furniture/FurnitureVisualization.ts | 8 +- .../FurnitureVoteCounterVisualization.ts | 6 +- .../FurnitureVoteMajorityVisualization.ts | 4 +- .../FurnitureYoutubeVisualization.ts | 2 +- .../IsometricImageFurniVisualization.ts | 4 +- .../visualization/pet/PetVisualization.ts | 40 +- .../visualization/pet/PetVisualizationData.ts | 6 +- .../visualization/room/RoomVisualization.ts | 10 +- .../room/RoomVisualizationData.ts | 2 +- .../room/TileCursorVisualization.ts | 2 +- .../rasterizer/animated/LandscapePlane.ts | 2 +- .../animated/LandscapeRasterizer.ts | 8 +- .../room/rasterizer/basic/FloorRasterizer.ts | 4 +- .../room/rasterizer/basic/WallRasterizer.ts | 6 +- .../renderer/src/nitro/session/RoomSession.ts | 2 +- .../src/nitro/session/RoomSessionManager.ts | 4 +- .../src/nitro/session/SessionDataManager.ts | 9 +- .../src/nitro/session/UserDataManager.ts | 2 +- .../nitro/session/badge/BadgeImageManager.ts | 2 +- .../session/furniture/FurnitureDataLoader.ts | 6 +- .../src/nitro/session/handler/BaseHandler.ts | 2 +- .../session/product/ProductDataLoader.ts | 6 +- libs/renderer/src/nitro/sound/SoundManager.ts | 4 +- .../src/nitro/sound/music/MusicController.ts | 2 +- .../src/nitro/window/motion/Callback.ts | 4 +- .../renderer/src/nitro/window/motion/Combo.ts | 4 +- .../src/nitro/window/motion/Dispose.ts | 2 +- .../src/nitro/window/motion/DropBounce.ts | 6 +- libs/renderer/src/nitro/window/motion/Ease.ts | 6 +- .../src/nitro/window/motion/EaseOut.ts | 2 +- .../src/nitro/window/motion/Interval.ts | 4 +- .../src/nitro/window/motion/JumpBy.ts | 4 +- .../src/nitro/window/motion/MoveBy.ts | 2 +- .../src/nitro/window/motion/MoveTo.ts | 4 +- .../renderer/src/nitro/window/motion/Queue.ts | 10 +- .../src/nitro/window/motion/ResizeTo.ts | 4 +- libs/renderer/src/nitro/window/motion/Wait.ts | 6 +- .../src/pixi-proxy/PaletteMapFilter.ts | 4 +- .../src/pixi-proxy/RoomTextureUtils.ts | 4 +- libs/renderer/src/pixi-proxy/TextureUtils.ts | 2 +- .../adjustment-filter/AdjustmentFilter.ts | 18 +- libs/renderer/src/room/RoomInstance.ts | 2 +- libs/renderer/src/room/RoomManager.ts | 4 +- libs/renderer/src/room/object/RoomObject.ts | 2 +- .../room/object/logic/RoomObjectLogicBase.ts | 2 +- .../src/room/renderer/RoomRenderer.ts | 2 +- .../src/room/renderer/utils/ExtendedSprite.ts | 6 +- package-lock.json | 1684 ++++++++++++++++- package.json | 3 + tsconfig.base.json | 3 +- 186 files changed, 2154 insertions(+), 597 deletions(-) create mode 100644 libs/renderer/.swcrc diff --git a/libs/renderer/.swcrc b/libs/renderer/.swcrc new file mode 100644 index 0000000..b1b9844 --- /dev/null +++ b/libs/renderer/.swcrc @@ -0,0 +1,24 @@ +{ + "jsc": { + "target": "es2017", + "parser": { + "syntax": "typescript", + "decorators": true, + "dynamicImport": true + }, + "transform": { + "decoratorMetadata": true, + "legacyDecorator": true + }, + "keepClassNames": true, + "externalHelpers": true, + "loose": true + }, + "module": { + "type": "commonjs", + "strict": true, + "noInterop": true + }, + "sourceMaps": true, + "exclude": ["jest.config.ts",".*\\.spec.tsx?$",".*\\.test.tsx?$","./src/jest-setup.ts$","./**/jest-setup.ts$",".*.js$"] +} \ No newline at end of file diff --git a/libs/renderer/package.json b/libs/renderer/package.json index 6082140..9d852e4 100644 --- a/libs/renderer/package.json +++ b/libs/renderer/package.json @@ -1,5 +1,9 @@ { "name": "@nitro/renderer", "version": "0.0.1", - "type": "commonjs" + "type": "commonjs", + "dependencies": { + "@swc/helpers": "~0.4.11" + }, + "devDependencies": {} } diff --git a/libs/renderer/project.json b/libs/renderer/project.json index d838ba9..184c479 100644 --- a/libs/renderer/project.json +++ b/libs/renderer/project.json @@ -5,20 +5,28 @@ "projectType": "library", "targets": { "build": { - "executor": "@nrwl/js:tsc", - "outputs": ["{options.outputPath}"], + "executor": "@nrwl/js:swc", + "outputs": [ + "{options.outputPath}" + ], "options": { "outputPath": "dist/libs/renderer", "main": "libs/renderer/src/index.ts", "tsConfig": "libs/renderer/tsconfig.lib.json", - "assets": ["libs/renderer/*.md"] + "assets": [ + "libs/renderer/*.md" + ] } }, "lint": { "executor": "@nrwl/linter:eslint", - "outputs": ["{options.outputFile}"], + "outputs": [ + "{options.outputFile}" + ], "options": { - "lintFilePatterns": ["libs/renderer/**/*.ts"] + "lintFilePatterns": [ + "libs/renderer/**/*.ts" + ] } } }, diff --git a/libs/renderer/src/api/configuration/NitroConfiguration.ts b/libs/renderer/src/api/configuration/NitroConfiguration.ts index 22ad40c..00bd046 100644 --- a/libs/renderer/src/api/configuration/NitroConfiguration.ts +++ b/libs/renderer/src/api/configuration/NitroConfiguration.ts @@ -25,8 +25,7 @@ export class NitroConfiguration { return true; } catch (e) { - NitroLogger.error(e.stack); - + if (e instanceof Error) NitroLogger.error(e.stack); return false; } } diff --git a/libs/renderer/src/api/nitro/room/object/data/type/CrackableDataType.ts b/libs/renderer/src/api/nitro/room/object/data/type/CrackableDataType.ts index 0897a51..ec395e1 100644 --- a/libs/renderer/src/api/nitro/room/object/data/type/CrackableDataType.ts +++ b/libs/renderer/src/api/nitro/room/object/data/type/CrackableDataType.ts @@ -20,7 +20,7 @@ export class CrackableDataType extends ObjectDataBase implements IObjectData { this._target = 0; } - public parseWrapper(wrapper: IMessageDataWrapper): void { + public override parseWrapper(wrapper: IMessageDataWrapper): void { if (!wrapper) return; this._state = wrapper.readString(); @@ -30,7 +30,7 @@ export class CrackableDataType extends ObjectDataBase implements IObjectData { super.parseWrapper(wrapper); } - public initializeFromRoomObjectModel(model: IRoomObjectModel): void { + public override initializeFromRoomObjectModel(model: IRoomObjectModel): void { super.initializeFromRoomObjectModel(model); this._state = model.getValue(RoomObjectVariable.FURNITURE_CRACKABLE_STATE); @@ -38,7 +38,7 @@ export class CrackableDataType extends ObjectDataBase implements IObjectData { this._target = model.getValue(RoomObjectVariable.FURNITURE_CRACKABLE_TARGET); } - public writeRoomObjectModel(model: IRoomObjectModel): void { + public override writeRoomObjectModel(model: IRoomObjectModel): void { super.writeRoomObjectModel(model); model.setValue(RoomObjectVariable.FURNITURE_DATA_FORMAT, CrackableDataType.FORMAT_KEY); @@ -47,11 +47,11 @@ export class CrackableDataType extends ObjectDataBase implements IObjectData { model.setValue(RoomObjectVariable.FURNITURE_CRACKABLE_TARGET, this._target); } - public getLegacyString(): string { + public override getLegacyString(): string { return this._state; } - public compare(data: IObjectData): boolean { + public override compare(data: IObjectData): boolean { return true; } diff --git a/libs/renderer/src/api/nitro/room/object/data/type/EmptyDataType.ts b/libs/renderer/src/api/nitro/room/object/data/type/EmptyDataType.ts index 6d443f0..1f8bd84 100644 --- a/libs/renderer/src/api/nitro/room/object/data/type/EmptyDataType.ts +++ b/libs/renderer/src/api/nitro/room/object/data/type/EmptyDataType.ts @@ -10,7 +10,7 @@ export class EmptyDataType extends ObjectDataBase implements IObjectData { private _state: string; - public parseWrapper(wrapper: IMessageDataWrapper): void { + public override parseWrapper(wrapper: IMessageDataWrapper): void { if (!wrapper) return; this._state = ""; @@ -18,17 +18,17 @@ export class EmptyDataType extends ObjectDataBase implements IObjectData { super.parseWrapper(wrapper); } - public writeRoomObjectModel(model: IRoomObjectModel): void { + public override writeRoomObjectModel(model: IRoomObjectModel): void { super.writeRoomObjectModel(model); model.setValue(RoomObjectVariable.FURNITURE_DATA_FORMAT, EmptyDataType.FORMAT_KEY); } - public getLegacyString(): string { + public override getLegacyString(): string { return this._state; } - public compare(data: IObjectData): boolean { + public override compare(data: IObjectData): boolean { return super.compare(data); } } diff --git a/libs/renderer/src/api/nitro/room/object/data/type/HighScoreDataType.ts b/libs/renderer/src/api/nitro/room/object/data/type/HighScoreDataType.ts index 95a7a35..0087cee 100644 --- a/libs/renderer/src/api/nitro/room/object/data/type/HighScoreDataType.ts +++ b/libs/renderer/src/api/nitro/room/object/data/type/HighScoreDataType.ts @@ -23,7 +23,7 @@ export class HighScoreDataType extends ObjectDataBase implements IObjectData { this._entries = []; } - public parseWrapper(wrapper: IMessageDataWrapper): void { + public override parseWrapper(wrapper: IMessageDataWrapper): void { if (!wrapper) return; this._state = wrapper.readString(); @@ -53,7 +53,7 @@ export class HighScoreDataType extends ObjectDataBase implements IObjectData { super.parseWrapper(wrapper); } - public initializeFromRoomObjectModel(model: IRoomObjectModel): void { + public override initializeFromRoomObjectModel(model: IRoomObjectModel): void { this._scoreType = model.getValue(RoomObjectVariable.FURNITURE_HIGHSCORE_SCORE_TYPE); this._clearType = model.getValue(RoomObjectVariable.FURNITURE_HIGHSCORE_CLEAR_TYPE); this._entries = []; @@ -76,7 +76,7 @@ export class HighScoreDataType extends ObjectDataBase implements IObjectData { super.initializeFromRoomObjectModel(model); } - public writeRoomObjectModel(model: IRoomObjectModel): void { + public override writeRoomObjectModel(model: IRoomObjectModel): void { super.writeRoomObjectModel(model); model.setValue(RoomObjectVariable.FURNITURE_DATA_FORMAT, HighScoreDataType.FORMAT_KEY); @@ -99,7 +99,7 @@ export class HighScoreDataType extends ObjectDataBase implements IObjectData { } } - public getLegacyString(): string { + public override getLegacyString(): string { return this._state; } diff --git a/libs/renderer/src/api/nitro/room/object/data/type/LegacyDataType.ts b/libs/renderer/src/api/nitro/room/object/data/type/LegacyDataType.ts index 963a68a..10afa48 100644 --- a/libs/renderer/src/api/nitro/room/object/data/type/LegacyDataType.ts +++ b/libs/renderer/src/api/nitro/room/object/data/type/LegacyDataType.ts @@ -16,7 +16,7 @@ export class LegacyDataType extends ObjectDataBase implements IObjectData { this._data = ""; } - public parseWrapper(wrapper: IMessageDataWrapper): void { + public override parseWrapper(wrapper: IMessageDataWrapper): void { if (!wrapper) return; this._data = wrapper.readString(); @@ -24,24 +24,24 @@ export class LegacyDataType extends ObjectDataBase implements IObjectData { super.parseWrapper(wrapper); } - public initializeFromRoomObjectModel(model: IRoomObjectModel): void { + public override initializeFromRoomObjectModel(model: IRoomObjectModel): void { super.initializeFromRoomObjectModel(model); this._data = model.getValue(RoomObjectVariable.FURNITURE_DATA); } - public writeRoomObjectModel(model: IRoomObjectModel): void { + public override writeRoomObjectModel(model: IRoomObjectModel): void { super.writeRoomObjectModel(model); model.setValue(RoomObjectVariable.FURNITURE_DATA_FORMAT, LegacyDataType.FORMAT_KEY); model.setValue(RoomObjectVariable.FURNITURE_DATA, this._data); } - public getLegacyString(): string { + public override getLegacyString(): string { return this._data; } - public compare(data: IObjectData): boolean { + public override compare(data: IObjectData): boolean { return this._data === data.getLegacyString(); } diff --git a/libs/renderer/src/api/nitro/room/object/data/type/MapDataType.ts b/libs/renderer/src/api/nitro/room/object/data/type/MapDataType.ts index f4abbb0..ace8669 100644 --- a/libs/renderer/src/api/nitro/room/object/data/type/MapDataType.ts +++ b/libs/renderer/src/api/nitro/room/object/data/type/MapDataType.ts @@ -19,7 +19,7 @@ export class MapDataType extends ObjectDataBase { this._data = {}; } - public parseWrapper(wrapper: IMessageDataWrapper): void { + public override parseWrapper(wrapper: IMessageDataWrapper): void { if (!wrapper) return; this._data = {}; @@ -31,20 +31,20 @@ export class MapDataType extends ObjectDataBase { super.parseWrapper(wrapper); } - public initializeFromRoomObjectModel(model: IRoomObjectModel): void { + public override initializeFromRoomObjectModel(model: IRoomObjectModel): void { super.initializeFromRoomObjectModel(model); this._data = model.getValue<{[index: string]: string}>(RoomObjectVariable.FURNITURE_DATA) || {}; } - public writeRoomObjectModel(model: IRoomObjectModel): void { + public override writeRoomObjectModel(model: IRoomObjectModel): void { super.writeRoomObjectModel(model); model.setValue(RoomObjectVariable.FURNITURE_DATA_FORMAT, MapDataType.FORMAT_KEY); model.setValue(RoomObjectVariable.FURNITURE_DATA, this._data); } - public getLegacyString(): string { + public override getLegacyString(): string { if (!this._data) return ""; const state = this._data[MapDataType.STATE]; @@ -54,7 +54,7 @@ export class MapDataType extends ObjectDataBase { return state; } - public compare(data: IObjectData): boolean { + public override compare(data: IObjectData): boolean { return false; } @@ -62,7 +62,7 @@ export class MapDataType extends ObjectDataBase { return this._data[key]; } - public get rarityLevel(): number { + public override get rarityLevel(): number { if (!this._data) return -1; const state = this._data[MapDataType.RARITY]; diff --git a/libs/renderer/src/api/nitro/room/object/data/type/NumberDataType.ts b/libs/renderer/src/api/nitro/room/object/data/type/NumberDataType.ts index e02b5e2..ea72484 100644 --- a/libs/renderer/src/api/nitro/room/object/data/type/NumberDataType.ts +++ b/libs/renderer/src/api/nitro/room/object/data/type/NumberDataType.ts @@ -18,7 +18,7 @@ export class NumberDataType extends ObjectDataBase { this._data = []; } - public parseWrapper(wrapper: IMessageDataWrapper): void { + public override parseWrapper(wrapper: IMessageDataWrapper): void { if (!wrapper) return; this._data = []; @@ -30,26 +30,26 @@ export class NumberDataType extends ObjectDataBase { super.parseWrapper(wrapper); } - public initializeFromRoomObjectModel(model: IRoomObjectModel): void { + public override initializeFromRoomObjectModel(model: IRoomObjectModel): void { super.initializeFromRoomObjectModel(model); this._data = model.getValue(RoomObjectVariable.FURNITURE_DATA); } - public writeRoomObjectModel(model: IRoomObjectModel): void { + public override writeRoomObjectModel(model: IRoomObjectModel): void { super.writeRoomObjectModel(model); model.setValue(RoomObjectVariable.FURNITURE_DATA_FORMAT, NumberDataType.FORMAT_KEY); model.setValue(RoomObjectVariable.FURNITURE_DATA, this._data); } - public getLegacyString(): string { + public override getLegacyString(): string { if (!this._data || !this._data.length) return ""; return this._data[NumberDataType.STATE].toString(); } - public compare(data: IObjectData): boolean { + public override compare(data: IObjectData): boolean { if (!(data instanceof NumberDataType)) return false; let i = 0; diff --git a/libs/renderer/src/api/nitro/room/object/data/type/StringDataType.ts b/libs/renderer/src/api/nitro/room/object/data/type/StringDataType.ts index c552701..09f8913 100644 --- a/libs/renderer/src/api/nitro/room/object/data/type/StringDataType.ts +++ b/libs/renderer/src/api/nitro/room/object/data/type/StringDataType.ts @@ -18,7 +18,7 @@ export class StringDataType extends ObjectDataBase { this._data = []; } - public parseWrapper(wrapper: IMessageDataWrapper): void { + public override parseWrapper(wrapper: IMessageDataWrapper): void { if (!wrapper) return; this._data = []; @@ -30,26 +30,26 @@ export class StringDataType extends ObjectDataBase { super.parseWrapper(wrapper); } - public initializeFromRoomObjectModel(model: IRoomObjectModel): void { + public override initializeFromRoomObjectModel(model: IRoomObjectModel): void { super.initializeFromRoomObjectModel(model); this._data = model.getValue(RoomObjectVariable.FURNITURE_DATA); } - public writeRoomObjectModel(model: IRoomObjectModel): void { + public override writeRoomObjectModel(model: IRoomObjectModel): void { super.writeRoomObjectModel(model); model.setValue(RoomObjectVariable.FURNITURE_DATA_FORMAT, StringDataType.FORMAT_KEY); model.setValue(RoomObjectVariable.FURNITURE_DATA, this._data); } - public getLegacyString(): string { + public override getLegacyString(): string { if (!this._data || !this._data.length) return ""; return this._data[StringDataType.STATE]; } - public compare(data: IObjectData): boolean { + public override compare(data: IObjectData): boolean { if (!(data instanceof StringDataType)) return false; let i = 0; diff --git a/libs/renderer/src/api/nitro/room/object/data/type/VoteDataType.ts b/libs/renderer/src/api/nitro/room/object/data/type/VoteDataType.ts index aede995..eed905f 100644 --- a/libs/renderer/src/api/nitro/room/object/data/type/VoteDataType.ts +++ b/libs/renderer/src/api/nitro/room/object/data/type/VoteDataType.ts @@ -18,7 +18,7 @@ export class VoteDataType extends ObjectDataBase { this._result = 0; } - public parseWrapper(wrapper: IMessageDataWrapper): void { + public override parseWrapper(wrapper: IMessageDataWrapper): void { if (!wrapper) return; this._state = wrapper.readString(); @@ -27,7 +27,7 @@ export class VoteDataType extends ObjectDataBase { super.parseWrapper(wrapper); } - public writeRoomObjectModel(model: IRoomObjectModel): void { + public override writeRoomObjectModel(model: IRoomObjectModel): void { super.writeRoomObjectModel(model); model.setValue(RoomObjectVariable.FURNITURE_DATA_FORMAT, VoteDataType.FORMAT_KEY); @@ -40,11 +40,11 @@ export class VoteDataType extends ObjectDataBase { model.setValue(RoomObjectVariable.FURNITURE_DATA, data); } - public getLegacyString(): string { + public override getLegacyString(): string { return this._state; } - public compare(data: IObjectData): boolean { + public override compare(data: IObjectData): boolean { return true; } diff --git a/libs/renderer/src/core/NitroCore.ts b/libs/renderer/src/core/NitroCore.ts index e6fe13f..c7cda5b 100644 --- a/libs/renderer/src/core/NitroCore.ts +++ b/libs/renderer/src/core/NitroCore.ts @@ -17,7 +17,7 @@ export class NitroCore extends Disposable implements INitroCore { this._communication = new CommunicationManager(); } - protected onDispose(): void { + protected override onDispose(): void { if (this._communication) { this._communication.dispose(); diff --git a/libs/renderer/src/core/common/EventDispatcher.ts b/libs/renderer/src/core/common/EventDispatcher.ts index b4277a7..af987fa 100644 --- a/libs/renderer/src/core/common/EventDispatcher.ts +++ b/libs/renderer/src/core/common/EventDispatcher.ts @@ -10,7 +10,7 @@ export class EventDispatcher extends Disposable implements IEventDispatcher, IDi this._listeners = new Map(); } - protected onDispose(): void { + protected override onDispose(): void { this.removeAllListeners(); super.onDispose(); @@ -76,9 +76,8 @@ export class EventDispatcher extends Disposable implements IEventDispatcher, IDi try { callback(event); - } catch (err) { - NitroLogger.error(err.stack); - + } catch (e) { + if (e instanceof Error) NitroLogger.error(e.stack); return; } } diff --git a/libs/renderer/src/core/common/NitroManager.ts b/libs/renderer/src/core/common/NitroManager.ts index aef3565..cb09f73 100644 --- a/libs/renderer/src/core/common/NitroManager.ts +++ b/libs/renderer/src/core/common/NitroManager.ts @@ -32,7 +32,7 @@ export class NitroManager extends Disposable implements INitroManager { return; } - protected onDispose(): void { + protected override onDispose(): void { if (this._events) this._events.dispose(); super.onDispose(); diff --git a/libs/renderer/src/core/communication/CommunicationManager.ts b/libs/renderer/src/core/communication/CommunicationManager.ts index 7666e9f..fc957c5 100644 --- a/libs/renderer/src/core/communication/CommunicationManager.ts +++ b/libs/renderer/src/core/communication/CommunicationManager.ts @@ -11,7 +11,7 @@ export class CommunicationManager extends Disposable implements ICommunicationMa this._connections = []; } - protected onDispose(): void { + protected override onDispose(): void { if (!this._connections || !this._connections.length) return; for (const connection of this._connections.values()) connection && connection.dispose(); @@ -20,7 +20,7 @@ export class CommunicationManager extends Disposable implements ICommunicationMa public createConnection(stateListener: IConnectionStateListener = null): IConnection { const connection = new SocketConnection(this, stateListener); - if (!connection) return; + if (!connection) return null; this._connections.push(connection); diff --git a/libs/renderer/src/core/communication/SocketConnection.ts b/libs/renderer/src/core/communication/SocketConnection.ts index 4322b70..034f054 100644 --- a/libs/renderer/src/core/communication/SocketConnection.ts +++ b/libs/renderer/src/core/communication/SocketConnection.ts @@ -59,7 +59,7 @@ export class SocketConnection extends EventDispatcher implements IConnection { this.createSocket(socketUrl); } - protected onDispose(): void { + protected override onDispose(): void { super.onDispose(); this.destroySocket(); @@ -115,7 +115,7 @@ export class SocketConnection extends EventDispatcher implements IConnection { this.dispatchConnectionEvent(SocketConnectionEvent.CONNECTION_OPENED, event); } - private onClose(event: CloseEvent): void { + private onClose(event: Event): void { this.dispatchConnectionEvent(SocketConnectionEvent.CONNECTION_CLOSED, event); } @@ -123,8 +123,9 @@ export class SocketConnection extends EventDispatcher implements IConnection { this.dispatchConnectionEvent(SocketConnectionEvent.CONNECTION_ERROR, event); } - private onMessage(event: MessageEvent): void { + private onMessage(event: Event): void { if (!event) return; + if (!(event instanceof MessageEvent)) return; //this.dispatchConnectionEvent(SocketConnectionEvent.CONNECTION_MESSAGE, event); @@ -257,7 +258,7 @@ export class SocketConnection extends EventDispatcher implements IConnection { if (!events || !events.length) { NitroLogger.packets("IncomingMessage", wrapper.header, "UNREGISTERED", wrapper); - return; + return null; } try { diff --git a/libs/renderer/src/core/communication/messages/MessageClassManager.ts b/libs/renderer/src/core/communication/messages/MessageClassManager.ts index e956233..1d0fbf0 100644 --- a/libs/renderer/src/core/communication/messages/MessageClassManager.ts +++ b/libs/renderer/src/core/communication/messages/MessageClassManager.ts @@ -81,11 +81,11 @@ export class MessageClassManager { } public getEvents(header: number): IMessageEvent[] { - if (!header) return; + if (!header) return null; const existing = this._messageInstancesById.get(header); - if (!existing) return; + if (!existing) return null; return existing; } diff --git a/libs/renderer/src/core/configuration/ConfigurationManager.ts b/libs/renderer/src/core/configuration/ConfigurationManager.ts index 56a50c2..f17e48b 100644 --- a/libs/renderer/src/core/configuration/ConfigurationManager.ts +++ b/libs/renderer/src/core/configuration/ConfigurationManager.ts @@ -19,7 +19,7 @@ export class ConfigurationManager extends NitroManager implements IConfiguration this.onConfigurationLoaded = this.onConfigurationLoaded.bind(this); } - protected onInit(): void { + protected override onInit(): void { NitroConfiguration.parseConfiguration(this.getDefaultConfig(), true); this._pendingUrls = NitroConfiguration.getValue("config.urls").slice(); diff --git a/libs/renderer/src/nitro/avatar/AvatarRenderManager.ts b/libs/renderer/src/nitro/avatar/AvatarRenderManager.ts index e510ae2..b20f94e 100644 --- a/libs/renderer/src/nitro/avatar/AvatarRenderManager.ts +++ b/libs/renderer/src/nitro/avatar/AvatarRenderManager.ts @@ -74,7 +74,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa this.onAvatarStructureDownloadDone = this.onAvatarStructureDownloadDone.bind(this); } - public onInit(): void { + public override onInit(): void { this._structure = new AvatarStructure(this); this.loadGeometry(); @@ -104,7 +104,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa this.checkReady(); } - public onDispose(): void { + public override onDispose(): void { if (this._avatarAssetDownloadManager) { this._avatarAssetDownloadManager.removeEventListener(AvatarAssetDownloadManager.DOWNLOADER_READY, this.onAvatarAssetDownloaderReady); diff --git a/libs/renderer/src/nitro/avatar/AvatarStructure.ts b/libs/renderer/src/nitro/avatar/AvatarStructure.ts index ef22d5c..756fd10 100644 --- a/libs/renderer/src/nitro/avatar/AvatarStructure.ts +++ b/libs/renderer/src/nitro/avatar/AvatarStructure.ts @@ -49,7 +49,7 @@ export class AvatarStructure extends EventDispatcher { public init(): void {} - public dispose(): void { + public override dispose(): void { if (this.disposed) return; super.dispose(); diff --git a/libs/renderer/src/nitro/avatar/PlaceHolderAvatarImage.ts b/libs/renderer/src/nitro/avatar/PlaceHolderAvatarImage.ts index 535557d..f77c1b0 100644 --- a/libs/renderer/src/nitro/avatar/PlaceHolderAvatarImage.ts +++ b/libs/renderer/src/nitro/avatar/PlaceHolderAvatarImage.ts @@ -9,7 +9,7 @@ export class PlaceHolderAvatarImage extends AvatarImage { super(k, _arg_2, _arg_3, _arg_4, _arg_5, null); } - public isPlaceholder(): boolean { + public override isPlaceholder(): boolean { return true; } } diff --git a/libs/renderer/src/nitro/avatar/geometry/GeometryItem.ts b/libs/renderer/src/nitro/avatar/geometry/GeometryItem.ts index 1fb4143..6cddedc 100644 --- a/libs/renderer/src/nitro/avatar/geometry/GeometryItem.ts +++ b/libs/renderer/src/nitro/avatar/geometry/GeometryItem.ts @@ -37,7 +37,7 @@ export class GeometryItem extends Node3D { return this._isDoubleSided; } - public toString(): string { + public override toString(): string { return this._id + ": " + this.location + " - " + this.transformedLocation; } diff --git a/libs/renderer/src/nitro/communication/NitroCommunicationDemo.ts b/libs/renderer/src/nitro/communication/NitroCommunicationDemo.ts index 083b0f3..d13d40f 100644 --- a/libs/renderer/src/nitro/communication/NitroCommunicationDemo.ts +++ b/libs/renderer/src/nitro/communication/NitroCommunicationDemo.ts @@ -36,7 +36,7 @@ export class NitroCommunicationDemo extends NitroManager implements INitroCommun this.sendPong = this.sendPong.bind(this); } - protected onInit(): void { + protected override onInit(): void { const connection = this._communication.connection; if (connection) { @@ -49,7 +49,7 @@ export class NitroCommunicationDemo extends NitroManager implements INitroCommun this._communication.registerMessageEvent(new AuthenticatedEvent(this.onAuthenticatedEvent.bind(this))); } - protected onDispose(): void { + protected override onDispose(): void { const connection = this._communication.connection; if (connection) { diff --git a/libs/renderer/src/nitro/communication/NitroCommunicationManager.ts b/libs/renderer/src/nitro/communication/NitroCommunicationManager.ts index 9485592..58c0e34 100644 --- a/libs/renderer/src/nitro/communication/NitroCommunicationManager.ts +++ b/libs/renderer/src/nitro/communication/NitroCommunicationManager.ts @@ -38,7 +38,7 @@ export class NitroCommunicationManager extends NitroManager implements INitroCom this.onConnectionAuthenticatedEvent = this.onConnectionAuthenticatedEvent.bind(this); } - protected onInit(): void { + protected override onInit(): void { if (this._connection) return; Nitro.instance.events.addEventListener(NitroCommunicationDemoEvent.CONNECTION_AUTHENTICATED, this.onConnectionAuthenticatedEvent); @@ -56,7 +56,7 @@ export class NitroCommunicationManager extends NitroManager implements INitroCom this._connection.init(NitroConfiguration.getValue("socket.url")); } - protected onDispose(): void { + protected override onDispose(): void { if (this._demo) this._demo.dispose(); if (this._connection) { diff --git a/libs/renderer/src/nitro/communication/messages/parser/groupforums/ExtendedForumData.ts b/libs/renderer/src/nitro/communication/messages/parser/groupforums/ExtendedForumData.ts index b14c9a0..28a40c8 100644 --- a/libs/renderer/src/nitro/communication/messages/parser/groupforums/ExtendedForumData.ts +++ b/libs/renderer/src/nitro/communication/messages/parser/groupforums/ExtendedForumData.ts @@ -14,7 +14,7 @@ export class ExtendedForumData extends ForumData { private _canChangeSettings: boolean; private _isStaff: boolean; - public static parse(wrapper: IMessageDataWrapper): ExtendedForumData { + public static override parse(wrapper: IMessageDataWrapper): ExtendedForumData { const extendedForumData: ExtendedForumData = new ExtendedForumData(); ForumData.fillFromMessage(extendedForumData, wrapper); diff --git a/libs/renderer/src/nitro/communication/messages/parser/room/unit/RoomUnitStatusParser.ts b/libs/renderer/src/nitro/communication/messages/parser/room/unit/RoomUnitStatusParser.ts index 8656b0d..c413072 100644 --- a/libs/renderer/src/nitro/communication/messages/parser/room/unit/RoomUnitStatusParser.ts +++ b/libs/renderer/src/nitro/communication/messages/parser/room/unit/RoomUnitStatusParser.ts @@ -101,6 +101,7 @@ export class RoomUnitStatusParser implements IMessageParser { new RoomUnitStatusMessage(unitId, x, y, z, height, headDirection, direction, targetX, targetY, targetZ, didMove, canStandUp, statusActions) ); } + return null; } public get statuses(): RoomUnitStatusMessage[] { diff --git a/libs/renderer/src/nitro/communication/messages/parser/roomevents/ConditionDefinition.ts b/libs/renderer/src/nitro/communication/messages/parser/roomevents/ConditionDefinition.ts index 237257c..1f11d60 100644 --- a/libs/renderer/src/nitro/communication/messages/parser/roomevents/ConditionDefinition.ts +++ b/libs/renderer/src/nitro/communication/messages/parser/roomevents/ConditionDefinition.ts @@ -14,7 +14,7 @@ export class ConditionDefinition extends Triggerable { return this._type; } - public get code(): number { + public override get code(): number { return this._type; } } diff --git a/libs/renderer/src/nitro/communication/messages/parser/roomevents/TriggerDefinition.ts b/libs/renderer/src/nitro/communication/messages/parser/roomevents/TriggerDefinition.ts index ed16b6a..0a19323 100644 --- a/libs/renderer/src/nitro/communication/messages/parser/roomevents/TriggerDefinition.ts +++ b/libs/renderer/src/nitro/communication/messages/parser/roomevents/TriggerDefinition.ts @@ -20,7 +20,7 @@ export class TriggerDefinition extends Triggerable { } } - public get code(): number { + public override get code(): number { return this._triggerConf; } diff --git a/libs/renderer/src/nitro/communication/messages/parser/roomevents/WiredActionDefinition.ts b/libs/renderer/src/nitro/communication/messages/parser/roomevents/WiredActionDefinition.ts index 2392682..d4ccbfe 100644 --- a/libs/renderer/src/nitro/communication/messages/parser/roomevents/WiredActionDefinition.ts +++ b/libs/renderer/src/nitro/communication/messages/parser/roomevents/WiredActionDefinition.ts @@ -26,7 +26,7 @@ export class WiredActionDefinition extends Triggerable { return this._type; } - public get code(): number { + public override get code(): number { return this._type; } diff --git a/libs/renderer/src/nitro/localization/NitroLocalizationManager.ts b/libs/renderer/src/nitro/localization/NitroLocalizationManager.ts index 92134b3..f8577cf 100644 --- a/libs/renderer/src/nitro/localization/NitroLocalizationManager.ts +++ b/libs/renderer/src/nitro/localization/NitroLocalizationManager.ts @@ -54,7 +54,7 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca this._pendingUrls = []; } - protected onInit(): void { + protected override onInit(): void { this._communication.registerMessageEvent(new BadgePointLimitsEvent(this.onBadgePointLimitsEvent.bind(this))); let urls: string[] = NitroConfiguration.getValue("external.texts.url"); diff --git a/libs/renderer/src/nitro/room/RoomContentLoader.ts b/libs/renderer/src/nitro/room/RoomContentLoader.ts index fc58dd7..c04f44f 100644 --- a/libs/renderer/src/nitro/room/RoomContentLoader.ts +++ b/libs/renderer/src/nitro/room/RoomContentLoader.ts @@ -358,6 +358,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo this._petColors.set(petIndex, palettes); } + return null; } public getPlaceholderName(type: string): string { diff --git a/libs/renderer/src/nitro/room/RoomEngine.ts b/libs/renderer/src/nitro/room/RoomEngine.ts index e7ca99b..3a743a0 100644 --- a/libs/renderer/src/nitro/room/RoomEngine.ts +++ b/libs/renderer/src/nitro/room/RoomEngine.ts @@ -212,7 +212,7 @@ export class RoomEngine this.onBadgeImageReadyEvent = this.onBadgeImageReadyEvent.bind(this); } - public onInit(): void { + public override onInit(): void { if (this._ready) return; this._imageObjectIdBank = new NumberBank(1000); @@ -247,7 +247,7 @@ export class RoomEngine document.addEventListener("visibilitychange", this.runVisibilityUpdate); } - public onDispose(): void { + public override onDispose(): void { if (!this._ready) return; for (const [key, value] of this._roomInstanceDatas) { @@ -394,7 +394,7 @@ export class RoomEngine landscapeType: string, worldType: string ): IRoomInstance { - if (!this._ready || !this._roomManager) return; + if (!this._ready || !this._roomManager) return null; const instance = this._roomManager.createRoomInstance(this.getRoomId(roomId)); @@ -633,7 +633,7 @@ export class RoomEngine const x = ~~point.x; const y = ~~point.y; - if (renderingCanvas.screenOffsetX === x && renderingCanvas.screenOffsetY === y) return; + if (renderingCanvas.screenOffsetX === x && renderingCanvas.screenOffsetY === y) return false; this.events.dispatchEvent(new RoomDragEvent(roomId, -(renderingCanvas.screenOffsetX - x), -(renderingCanvas.screenOffsetY - y))); @@ -2543,22 +2543,25 @@ export class RoomEngine if (!this._roomObjectEventHandler) return false; this._roomObjectEventHandler.modifyRoomObject(this._activeRoomId, objectId, category, operation); + return true; } public modifyRoomObjectDataWithMap(objectId: number, category: number, operation: string, data: Map): boolean { if (!this._roomObjectEventHandler) return false; - if (category !== RoomObjectCategory.FLOOR) return; + if (category !== RoomObjectCategory.FLOOR) return false; this._roomObjectEventHandler.modifyRoomObjectDataWithMap(this._activeRoomId, objectId, category, operation, data); + return true; } public modifyRoomObjectData(objectId: number, category: number, colorHex: string, data: string): boolean { if (!this._roomObjectEventHandler) return false; - if (category !== RoomObjectCategory.WALL) return; + if (category !== RoomObjectCategory.WALL) return false; this._roomObjectEventHandler.modifyWallItemData(this._activeRoomId, objectId, colorHex, data); + return true; } private processRoomObjectEvent(event: RoomObjectEvent): void { @@ -2654,7 +2657,7 @@ export class RoomEngine } private addOverlayIconSprite(k: NitroSprite, _arg_2: string, _arg_3: Texture, scale: number = 1): NitroSprite { - if (!k || !_arg_3) return; + if (!k || !_arg_3) return null; let sprite = this.getOverlayIconSprite(k, _arg_2); diff --git a/libs/renderer/src/nitro/room/RoomMessageHandler.ts b/libs/renderer/src/nitro/room/RoomMessageHandler.ts index e5db2ef..bffe4a8 100644 --- a/libs/renderer/src/nitro/room/RoomMessageHandler.ts +++ b/libs/renderer/src/nitro/room/RoomMessageHandler.ts @@ -94,7 +94,7 @@ export class RoomMessageHandler extends Disposable { this._requesterId = -1; } - protected onDispose(): void { + protected override onDispose(): void { super.onDispose(); this._connection = null; diff --git a/libs/renderer/src/nitro/room/RoomObjectEventHandler.ts b/libs/renderer/src/nitro/room/RoomObjectEventHandler.ts index e9c19b4..482e7f4 100644 --- a/libs/renderer/src/nitro/room/RoomObjectEventHandler.ts +++ b/libs/renderer/src/nitro/room/RoomObjectEventHandler.ts @@ -117,7 +117,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou this._roomEngine.events.addEventListener(RoomEngineObjectEvent.ADDED, this.onRoomEngineObjectEvent); } - public dispose(): void { + public override dispose(): void { if (this._eventIds) { this._eventIds = null; } @@ -1618,7 +1618,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou _arg_2.objectType === RoomObjectUserType.RENTABLE_BOT || _arg_2.objectType === RoomObjectUserType.MONSTER_PLANT ) - return; + return false; const _local_3 = this._roomEngine.getRoomObject(k, _arg_2.objectId, RoomObjectCategory.FLOOR); const _local_4 = this.getActiveSurfaceLocation(_local_3, _arg_2); diff --git a/libs/renderer/src/nitro/room/object/logic/MovingObjectLogic.ts b/libs/renderer/src/nitro/room/object/logic/MovingObjectLogic.ts index 856cf4e..9c578c6 100644 --- a/libs/renderer/src/nitro/room/object/logic/MovingObjectLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/MovingObjectLogic.ts @@ -26,13 +26,13 @@ export class MovingObjectLogic extends RoomObjectLogicBase { this._updateInterval = MovingObjectLogic.DEFAULT_UPDATE_INTERVAL; } - protected onDispose(): void { + protected override onDispose(): void { this._liftAmount = 0; super.onDispose(); } - public update(time: number): void { + public override update(time: number): void { super.update(time); const locationOffset = this.getLocationOffset(); @@ -85,13 +85,13 @@ export class MovingObjectLogic extends RoomObjectLogicBase { this._lastUpdateTime = this.time; } - public setObject(object: IRoomObjectController): void { + public override setObject(object: IRoomObjectController): void { super.setObject(object); if (object) this._location.assign(object.getLocation()); } - public processUpdateMessage(message: IRoomObjectUpdateMessage): void { + public override processUpdateMessage(message: IRoomObjectUpdateMessage): void { if (!message) return; super.processUpdateMessage(message); diff --git a/libs/renderer/src/nitro/room/object/logic/avatar/AvatarLogic.ts b/libs/renderer/src/nitro/room/object/logic/avatar/AvatarLogic.ts index 814f74e..fe32daf 100644 --- a/libs/renderer/src/nitro/room/object/logic/avatar/AvatarLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/avatar/AvatarLogic.ts @@ -72,7 +72,7 @@ export class AvatarLogic extends MovingObjectLogic { this._numberValueEndTimestamp = 0; } - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [ RoomObjectMouseEvent.CLICK, RoomObjectMouseEvent.DOUBLE_CLICK, @@ -86,7 +86,7 @@ export class AvatarLogic extends MovingObjectLogic { return this.mergeTypes(super.getEventTypes(), types); } - public dispose(): void { + public override dispose(): void { if (this._selected && this.object) { if (this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectMoveEvent(RoomObjectMoveEvent.OBJECT_REMOVED, this.object)); } @@ -96,7 +96,7 @@ export class AvatarLogic extends MovingObjectLogic { this._reportedLocation = null; } - public update(time: number): void { + public override update(time: number): void { super.update(time); if (this._selected && this.object) { @@ -216,7 +216,7 @@ export class AvatarLogic extends MovingObjectLogic { } } - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { if (!message || !this.object) return; super.processUpdateMessage(message); @@ -406,7 +406,7 @@ export class AvatarLogic extends MovingObjectLogic { model.setValue(RoomObjectVariable.FIGURE_EFFECT, effect); } - public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { + public override mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { let eventType: string = null; switch (event.type) { diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureAchievementResolutionLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureAchievementResolutionLogic.ts index 1e51bfe..f501c80 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureAchievementResolutionLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureAchievementResolutionLogic.ts @@ -12,7 +12,7 @@ export class FurnitureAchievementResolutionLogic extends FurnitureBadgeDisplayLo private static ACH_NOT_SET: string = "ach_0"; private static BADGE_VISIBLE_IN_STATE: number = 2; - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [ RoomObjectWidgetRequestEvent.ACHIEVEMENT_RESOLUTION_OPEN, RoomObjectWidgetRequestEvent.ACHIEVEMENT_RESOLUTION_ENGRAVING, @@ -23,7 +23,7 @@ export class FurnitureAchievementResolutionLogic extends FurnitureBadgeDisplayLo return this.mergeTypes(super.getEventTypes(), types); } - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { super.processUpdateMessage(message); if (message instanceof ObjectGroupBadgeUpdateMessage) { @@ -39,7 +39,7 @@ export class FurnitureAchievementResolutionLogic extends FurnitureBadgeDisplayLo } } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; let event: RoomObjectEvent = null; @@ -60,7 +60,7 @@ export class FurnitureAchievementResolutionLogic extends FurnitureBadgeDisplayLo if (event) this.eventDispatcher.dispatchEvent(event); } - protected updateBadge(badgeId: string): void { + protected override updateBadge(badgeId: string): void { if (badgeId === FurnitureAchievementResolutionLogic.ACH_NOT_SET) return; super.updateBadge(badgeId); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureBadgeDisplayLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureBadgeDisplayLogic.ts index 4bf0899..ae2f2c5 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureBadgeDisplayLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureBadgeDisplayLogic.ts @@ -6,13 +6,13 @@ import {ObjectDataUpdateMessage, ObjectGroupBadgeUpdateMessage} from "../../../m import {FurnitureLogic} from "./FurnitureLogic"; export class FurnitureBadgeDisplayLogic extends FurnitureLogic { - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectWidgetRequestEvent.BADGE_DISPLAY_ENGRAVING, RoomObjectBadgeAssetEvent.LOAD_BADGE]; return this.mergeTypes(super.getEventTypes(), types); } - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { super.processUpdateMessage(message); if (!this.object) return; @@ -37,7 +37,7 @@ export class FurnitureBadgeDisplayLogic extends FurnitureLogic { } } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.BADGE_DISPLAY_ENGRAVING, this.object)); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureChangeStateWhenStepOnLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureChangeStateWhenStepOnLogic.ts index d31f174..0e46031 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureChangeStateWhenStepOnLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureChangeStateWhenStepOnLogic.ts @@ -9,13 +9,13 @@ export class FurnitureChangeStateWhenStepOnLogic extends FurnitureLogic { this.onRoomToObjectOwnAvatarMoveEvent = this.onRoomToObjectOwnAvatarMoveEvent.bind(this); } - public initialize(asset: IAssetData): void { + public override initialize(asset: IAssetData): void { super.initialize(asset); if (this.eventDispatcher) this.eventDispatcher.addEventListener(RoomToObjectOwnAvatarMoveEvent.ROAME_MOVE_TO, this.onRoomToObjectOwnAvatarMoveEvent); } - public tearDown(): void { + public override tearDown(): void { if (this.eventDispatcher) this.eventDispatcher.removeEventListener(RoomToObjectOwnAvatarMoveEvent.ROAME_MOVE_TO, this.onRoomToObjectOwnAvatarMoveEvent); super.tearDown(); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureClothingChangeLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureClothingChangeLogic.ts index f338e36..c68ac22 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureClothingChangeLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureClothingChangeLogic.ts @@ -5,13 +5,13 @@ import {ObjectDataUpdateMessage} from "../../../messages"; import {FurnitureLogic} from "./FurnitureLogic"; export class FurnitureClothingChangeLogic extends FurnitureLogic { - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectWidgetRequestEvent.CLOTHING_CHANGE]; return this.mergeTypes(super.getEventTypes(), types); } - public initialize(asset: IAssetData): void { + public override initialize(asset: IAssetData): void { super.initialize(asset); const furniData = this.object.model.getValue(RoomObjectVariable.FURNITURE_DATA); @@ -19,7 +19,7 @@ export class FurnitureClothingChangeLogic extends FurnitureLogic { this.updateClothingData(furniData); } - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { super.processUpdateMessage(message); if (message instanceof ObjectDataUpdateMessage) message.data && this.updateClothingData(message.data.getLegacyString()); @@ -34,7 +34,7 @@ export class FurnitureClothingChangeLogic extends FurnitureLogic { if (girlClothing && girlClothing.length) this.object.model.setValue(RoomObjectVariable.FURNITURE_CLOTHING_GIRL, girlClothing); } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.CLOTHING_CHANGE, this.object)); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureCounterClockLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureCounterClockLogic.ts index 18925a3..25e677a 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureCounterClockLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureCounterClockLogic.ts @@ -3,13 +3,13 @@ import {RoomObjectEvent, RoomObjectStateChangedEvent, RoomSpriteMouseEvent} from import {FurnitureLogic} from "./FurnitureLogic"; export class FurnitureCounterClockLogic extends FurnitureLogic { - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectStateChangedEvent.STATE_CHANGE]; return this.mergeTypes(super.getEventTypes(), types); } - public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { + public override mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { if (!event || !geometry || !this.object) return; let objectEvent: RoomObjectEvent = null; @@ -36,7 +36,7 @@ export class FurnitureCounterClockLogic extends FurnitureLogic { super.mouseEvent(event, geometry); } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_CHANGE, this.object, 1)); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureCrackableLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureCrackableLogic.ts index cd963db..91924d2 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureCrackableLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureCrackableLogic.ts @@ -3,7 +3,7 @@ import {RoomObjectUpdateMessage} from "../../../../../room"; import {FurnitureLogic} from "./FurnitureLogic"; export class FurnitureCrackableLogic extends FurnitureLogic { - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { super.processUpdateMessage(message); if (!this.object) return; diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureCraftingGizmoLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureCraftingGizmoLogic.ts index 480eb37..5ca14d2 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureCraftingGizmoLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureCraftingGizmoLogic.ts @@ -2,7 +2,7 @@ import {RoomWidgetEnum} from "../../../../../api"; import {FurnitureLogic} from "./FurnitureLogic"; export class FurnitureCraftingGizmoLogic extends FurnitureLogic { - public get widget(): string { + public override get widget(): string { return RoomWidgetEnum.CRAFTING; } } diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureCreditLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureCreditLogic.ts index a8d6615..3670608 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureCreditLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureCreditLogic.ts @@ -3,13 +3,13 @@ import {RoomObjectWidgetRequestEvent} from "../../../../../events"; import {FurnitureLogic} from "./FurnitureLogic"; export class FurnitureCreditLogic extends FurnitureLogic { - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectWidgetRequestEvent.CREDITFURNI]; return this.mergeTypes(super.getEventTypes(), types); } - public initialize(asset: IAssetData): void { + public override initialize(asset: IAssetData): void { super.initialize(asset); let creditValue = 0; @@ -21,7 +21,7 @@ export class FurnitureCreditLogic extends FurnitureLogic { this.object.model.setValue(RoomObjectVariable.FURNITURE_CREDIT_VALUE, creditValue); } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.CREDITFURNI, this.object)); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureCuckooClockLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureCuckooClockLogic.ts index e0dd096..165f381 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureCuckooClockLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureCuckooClockLogic.ts @@ -6,13 +6,13 @@ import {FurnitureMultiStateLogic} from "./FurnitureMultiStateLogic"; export class FurnitureCuckooClockLogic extends FurnitureMultiStateLogic { private _state: number = 1; - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectPlaySoundIdEvent.PLAY_SOUND_AT_PITCH]; return this.mergeTypes(super.getEventTypes(), types); } - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { super.processUpdateMessage(message); if (message instanceof ObjectDataUpdateMessage) { diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureCustomStackHeightLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureCustomStackHeightLogic.ts index ecdf044..6656366 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureCustomStackHeightLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureCustomStackHeightLogic.ts @@ -3,19 +3,19 @@ import {RoomObjectWidgetRequestEvent} from "../../../../../events"; import {FurnitureMultiStateLogic} from "./FurnitureMultiStateLogic"; export class FurnitureCustomStackHeightLogic extends FurnitureMultiStateLogic { - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectWidgetRequestEvent.STACK_HEIGHT]; return this.mergeTypes(super.getEventTypes(), types); } - public initialize(asset: IAssetData): void { + public override initialize(asset: IAssetData): void { super.initialize(asset); if (this.object && this.object.model) this.object.model.setValue(RoomObjectVariable.FURNITURE_ALWAYS_STACKABLE, 1); } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.STACK_HEIGHT, this.object)); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureDiceLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureDiceLogic.ts index 80101d8..ea2d81d 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureDiceLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureDiceLogic.ts @@ -13,13 +13,13 @@ export class FurnitureDiceLogic extends FurnitureLogic { this._noTagsLastStateActivate = false; } - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectFurnitureActionEvent.DICE_ACTIVATE, RoomObjectFurnitureActionEvent.DICE_OFF]; return this.mergeTypes(super.getEventTypes(), types); } - public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { + public override mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { if (!event || !geometry || !this.object) return; let objectEvent: RoomObjectEvent = null; diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureEcotronBoxLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureEcotronBoxLogic.ts index 0ea0f23..5d6fbf1 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureEcotronBoxLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureEcotronBoxLogic.ts @@ -2,13 +2,13 @@ import {RoomObjectWidgetRequestEvent} from "../../../../../events"; import {FurnitureLogic} from "./FurnitureLogic"; export class FurnitureEcotronBoxLogic extends FurnitureLogic { - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectWidgetRequestEvent.ECOTRONBOX]; return this.mergeTypes(super.getEventTypes(), types); } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.ECOTRONBOX, this.object)); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureEditableInternalLinkLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureEditableInternalLinkLogic.ts index 073b6fa..5bdea20 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureEditableInternalLinkLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureEditableInternalLinkLogic.ts @@ -13,13 +13,13 @@ export class FurnitureEditableInternalLinkLogic extends FurnitureLogic { this._updateCount = 0; } - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectWidgetRequestEvent.INERNAL_LINK]; return this.mergeTypes(super.getEventTypes(), types); } - public initialize(asset: IAssetData): void { + public override initialize(asset: IAssetData): void { super.initialize(asset); if (asset.logic) { @@ -29,7 +29,7 @@ export class FurnitureEditableInternalLinkLogic extends FurnitureLogic { } } - public update(time: number): void { + public override update(time: number): void { super.update(time); if (!this._showStateOnceRendered) return; @@ -51,7 +51,7 @@ export class FurnitureEditableInternalLinkLogic extends FurnitureLogic { } } - public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { + public override mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { if (!event || !geometry) return; if (event.type === MouseEventType.DOUBLE_CLICK) { @@ -61,7 +61,7 @@ export class FurnitureEditableInternalLinkLogic extends FurnitureLogic { super.mouseEvent(event, geometry); } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.INERNAL_LINK, this.object)); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureEditableRoomLinkLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureEditableRoomLinkLogic.ts index 7aa8bbb..dcf32bd 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureEditableRoomLinkLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureEditableRoomLinkLogic.ts @@ -5,13 +5,13 @@ import {FurnitureLogic} from "./FurnitureLogic"; export class FurnitureEditableRoomLinkLogic extends FurnitureLogic { private _timer: any; - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectWidgetRequestEvent.ROOM_LINK]; return this.mergeTypes(super.getEventTypes(), types); } - public initialize(asset: IAssetData): void { + public override initialize(asset: IAssetData): void { super.initialize(asset); if (asset.logic) { @@ -23,7 +23,7 @@ export class FurnitureEditableRoomLinkLogic extends FurnitureLogic { } } - protected onDispose(): void { + protected override onDispose(): void { if (this._timer) { clearTimeout(this._timer); @@ -41,7 +41,7 @@ export class FurnitureEditableRoomLinkLogic extends FurnitureLogic { } } - public useObject(): void { + public override useObject(): void { this.setAutomaticStateIndex(1); if (this._timer) { diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureEffectBoxLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureEffectBoxLogic.ts index e48ca08..5f3c8a8 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureEffectBoxLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureEffectBoxLogic.ts @@ -5,19 +5,19 @@ import {FurnitureLogic} from "./FurnitureLogic"; export class FurnitureEffectBoxLogic extends FurnitureLogic { private _timer: any; - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectWidgetRequestEvent.EFFECTBOX_OPEN_DIALOG]; return this.mergeTypes(super.getEventTypes(), types); } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.EFFECTBOX_OPEN_DIALOG, this.object)); } - public get contextMenu(): string { + public override get contextMenu(): string { return ContextMenuEnum.EFFECT_BOX; } } diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureExternalImageLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureExternalImageLogic.ts index fc09009..a7ee000 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureExternalImageLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureExternalImageLogic.ts @@ -3,13 +3,13 @@ import {RoomObjectWidgetRequestEvent} from "../../../../../events"; import {FurnitureMultiStateLogic} from "./FurnitureMultiStateLogic"; export class FurnitureExternalImageLogic extends FurnitureMultiStateLogic { - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectWidgetRequestEvent.EXTERNAL_IMAGE]; return this.mergeTypes(super.getEventTypes(), types); } - public initialize(asset: IAssetData): void { + public override initialize(asset: IAssetData): void { super.initialize(asset); if (!asset) return; @@ -26,7 +26,7 @@ export class FurnitureExternalImageLogic extends FurnitureMultiStateLogic { } } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.EXTERNAL_IMAGE, this.object)); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureFireworksLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureFireworksLogic.ts index 49eba6b..fc3632a 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureFireworksLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureFireworksLogic.ts @@ -3,13 +3,13 @@ import {RoomObjectEvent, RoomObjectStateChangedEvent, RoomSpriteMouseEvent} from import {FurnitureLogic} from "./FurnitureLogic"; export class FurnitureFireworksLogic extends FurnitureLogic { - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectStateChangedEvent.STATE_CHANGE]; return this.mergeTypes(super.getEventTypes(), types); } - public initialize(asset: IAssetData): void { + public override initialize(asset: IAssetData): void { super.initialize(asset); if (asset.logic) { @@ -19,7 +19,7 @@ export class FurnitureFireworksLogic extends FurnitureLogic { } } - public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { + public override mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { if (!event || !geometry || !this.object) return; let objectEvent: RoomObjectEvent = null; @@ -46,7 +46,7 @@ export class FurnitureFireworksLogic extends FurnitureLogic { super.mouseEvent(event, geometry); } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_CHANGE, this.object, 0)); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureFloorHoleLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureFloorHoleLogic.ts index f35dfbc..51cf419 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureFloorHoleLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureFloorHoleLogic.ts @@ -17,13 +17,13 @@ export class FurnitureFloorHoleLogic extends FurnitureMultiStateLogic { this._currentLocation = null; } - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectFloorHoleEvent.ADD_HOLE, RoomObjectFloorHoleEvent.REMOVE_HOLE]; return this.mergeTypes(super.getEventTypes(), types); } - protected onDispose(): void { + protected override onDispose(): void { if (this._currentState === FurnitureFloorHoleLogic.STATE_HOLE) { this.eventDispatcher.dispatchEvent(new RoomObjectFloorHoleEvent(RoomObjectFloorHoleEvent.REMOVE_HOLE, this.object)); } @@ -31,13 +31,13 @@ export class FurnitureFloorHoleLogic extends FurnitureMultiStateLogic { super.onDispose(); } - public update(time: number): void { + public override update(time: number): void { super.update(time); this.handleAutomaticStateUpdate(); } - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { super.processUpdateMessage(message); if (!this.object) return; diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureFriendFurniLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureFriendFurniLogic.ts index ef379fe..895da07 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureFriendFurniLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureFriendFurniLogic.ts @@ -11,13 +11,13 @@ export class FurnitureFriendFurniLogic extends FurnitureMultiStateLogic { private _state: number = -1; - public initialize(asset: IAssetData): void { + public override initialize(asset: IAssetData): void { super.initialize(asset); if (this.object) this.object.model.setValue(RoomObjectVariable.FURNITURE_FRIENDFURNI_ENGRAVING, this.engravingDialogType); } - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { if (message instanceof ObjectDataUpdateMessage) { const data = message.data as StringDataType; @@ -31,13 +31,13 @@ export class FurnitureFriendFurniLogic extends FurnitureMultiStateLogic { super.processUpdateMessage(message); } - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectWidgetRequestEvent.FRIEND_FURNITURE_ENGRAVING]; return this.mergeTypes(super.getEventTypes(), types); } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; if (this._state === FurnitureFriendFurniLogic.STATE_LOCKED) { @@ -51,7 +51,7 @@ export class FurnitureFriendFurniLogic extends FurnitureMultiStateLogic { return 0; } - public get contextMenu(): string { + public override get contextMenu(): string { return this._state === FurnitureFriendFurniLogic.STATE_UNLOCKED ? ContextMenuEnum.FRIEND_FURNITURE : ContextMenuEnum.DUMMY; } } diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureGroupForumTerminalLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureGroupForumTerminalLogic.ts index 0642631..91dbec9 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureGroupForumTerminalLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureGroupForumTerminalLogic.ts @@ -3,19 +3,19 @@ import {RoomObjectWidgetRequestEvent} from "../../../../../events"; import {FurnitureGuildCustomizedLogic} from "./FurnitureGuildCustomizedLogic"; export class FurnitureGroupForumTerminalLogic extends FurnitureGuildCustomizedLogic { - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectWidgetRequestEvent.INERNAL_LINK]; return this.mergeTypes(super.getEventTypes(), types); } - protected updateGroupId(id: string): void { + protected override updateGroupId(id: string): void { super.updateGroupId(id); this.object.model.setValue(RoomObjectVariable.FURNITURE_INTERNAL_LINK, `groupforum/${id}`); } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.INERNAL_LINK, this.object)); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureGuildCustomizedLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureGuildCustomizedLogic.ts index 3e5372e..7a2ad62 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureGuildCustomizedLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureGuildCustomizedLogic.ts @@ -11,7 +11,7 @@ export class FurnitureGuildCustomizedLogic extends FurnitureMultiStateLogic { public static COLOR1_KEY: number = 3; public static COLOR2_KEY: number = 4; - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [ RoomObjectBadgeAssetEvent.LOAD_BADGE, RoomObjectWidgetRequestEvent.GUILD_FURNI_CONTEXT_MENU, @@ -21,7 +21,7 @@ export class FurnitureGuildCustomizedLogic extends FurnitureMultiStateLogic { return this.mergeTypes(super.getEventTypes(), types); } - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { super.processUpdateMessage(message); if (message instanceof ObjectDataUpdateMessage) { @@ -58,7 +58,7 @@ export class FurnitureGuildCustomizedLogic extends FurnitureMultiStateLogic { this.object.model.setValue(RoomObjectVariable.FURNITURE_GUILD_CUSTOMIZED_COLOR_2, parseInt(color2, 16)); } - public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { + public override mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { if (!event || !geometry || !this.object) return; switch (event.type) { diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureHabboWheelLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureHabboWheelLogic.ts index 0c1ccdc..e0d0819 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureHabboWheelLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureHabboWheelLogic.ts @@ -2,13 +2,13 @@ import {RoomObjectFurnitureActionEvent} from "../../../../../events"; import {FurnitureLogic} from "./FurnitureLogic"; export class FurnitureHabboWheelLogic extends FurnitureLogic { - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectFurnitureActionEvent.USE_HABBOWHEEL]; return this.mergeTypes(super.getEventTypes(), types); } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.USE_HABBOWHEEL, this.object)); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureHighScoreLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureHighScoreLogic.ts index db54fde..dfd8ddd 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureHighScoreLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureHighScoreLogic.ts @@ -9,11 +9,11 @@ export class FurnitureHighScoreLogic extends FurnitureLogic { private _state = -1; - public getEventTypes(): string[] { + public override getEventTypes(): string[] { return [RoomObjectWidgetRequestEvent.HIGH_SCORE_DISPLAY, RoomObjectWidgetRequestEvent.HIDE_HIGH_SCORE_DISPLAY]; } - public tearDown(): void { + public override tearDown(): void { if (this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) { this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.HIDE_HIGH_SCORE_DISPLAY, this.object)); } @@ -21,7 +21,7 @@ export class FurnitureHighScoreLogic extends FurnitureLogic { super.tearDown(); } - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { super.processUpdateMessage(message); if (this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) !== 1) return; diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureHockeyScoreLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureHockeyScoreLogic.ts index d973540..60b2777 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureHockeyScoreLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureHockeyScoreLogic.ts @@ -3,13 +3,13 @@ import {RoomObjectEvent, RoomObjectStateChangedEvent, RoomSpriteMouseEvent} from import {FurnitureLogic} from "./FurnitureLogic"; export class FurnitureHockeyScoreLogic extends FurnitureLogic { - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectStateChangedEvent.STATE_CHANGE]; return this.mergeTypes(super.getEventTypes(), types); } - public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { + public override mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { if (!event || !geometry || !this.object) return; let objectEvent: RoomObjectEvent = null; @@ -43,7 +43,7 @@ export class FurnitureHockeyScoreLogic extends FurnitureLogic { super.mouseEvent(event, geometry); } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_CHANGE, this.object, 3)); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureHweenLovelockLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureHweenLovelockLogic.ts index c20e35b..138470c 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureHweenLovelockLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureHweenLovelockLogic.ts @@ -2,7 +2,7 @@ import {FriendFurniEngravingWidgetType} from "../../../../../api"; import {FurnitureFriendFurniLogic} from "./FurnitureFriendFurniLogic"; export class FurnitureHweenLovelockLogic extends FurnitureFriendFurniLogic { - public get engravingDialogType(): number { + public override get engravingDialogType(): number { return FriendFurniEngravingWidgetType.HABBOWEEN; } } diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureIceStormLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureIceStormLogic.ts index 9b14cea..005c99f 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureIceStormLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureIceStormLogic.ts @@ -15,7 +15,7 @@ export class FurnitureIceStormLogic extends FurnitureMultiStateLogic { this._nextStateTimestamp = 0; } - public update(totalTimeRunning: number): void { + public override update(totalTimeRunning: number): void { if (this._nextStateTimestamp > 0 && totalTimeRunning >= this._nextStateTimestamp) { this._nextStateTimestamp = 0; @@ -29,7 +29,7 @@ export class FurnitureIceStormLogic extends FurnitureMultiStateLogic { super.update(totalTimeRunning); } - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { if (message instanceof ObjectDataUpdateMessage) { this.processUpdate(message); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureInternalLinkLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureInternalLinkLogic.ts index 5aa020c..19bca13 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureInternalLinkLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureInternalLinkLogic.ts @@ -6,13 +6,13 @@ export class FurnitureInternalLinkLogic extends FurnitureLogic { private _showStateOnceRendered: boolean = false; private _updateCount: number = 0; - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectWidgetRequestEvent.INERNAL_LINK]; return this.mergeTypes(super.getEventTypes(), types); } - public initialize(asset: IAssetData): void { + public override initialize(asset: IAssetData): void { super.initialize(asset); if (asset.logic) { @@ -24,7 +24,7 @@ export class FurnitureInternalLinkLogic extends FurnitureLogic { } } - public update(time: number): void { + public override update(time: number): void { super.update(time); if (!this._showStateOnceRendered) return; @@ -46,7 +46,7 @@ export class FurnitureInternalLinkLogic extends FurnitureLogic { } } - public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { + public override mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { if (!event || !geometry) return; if (event.type === MouseEventType.DOUBLE_CLICK && this._showStateOnceRendered) { @@ -56,7 +56,7 @@ export class FurnitureInternalLinkLogic extends FurnitureLogic { super.mouseEvent(event, geometry); } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.INERNAL_LINK, this.object)); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureJukeboxLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureJukeboxLogic.ts index 432a1b4..c77968e 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureJukeboxLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureJukeboxLogic.ts @@ -9,7 +9,7 @@ export class FurnitureJukeboxLogic extends FurnitureMultiStateLogic { private _isInitialized: boolean = false; private _currentState: number = -1; - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [ RoomObjectFurnitureActionEvent.JUKEBOX_START, RoomObjectFurnitureActionEvent.JUKEBOX_MACHINE_STOP, @@ -21,13 +21,13 @@ export class FurnitureJukeboxLogic extends FurnitureMultiStateLogic { return this.mergeTypes(super.getEventTypes(), types); } - protected onDispose(): void { + protected override onDispose(): void { this.requestDispose(); super.onDispose(); } - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { super.processUpdateMessage(message); if (this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) !== 1) return; @@ -78,7 +78,7 @@ export class FurnitureJukeboxLogic extends FurnitureMultiStateLogic { this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.JUKEBOX_DISPOSE, this.object)); } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.JUKEBOX_PLAYLIST_EDITOR, this.object)); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureLogic.ts index 0d3fa2d..aa078a6 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureLogic.ts @@ -74,7 +74,7 @@ export class FurnitureLogic extends MovingObjectLogic { } } - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [ RoomObjectStateChangedEvent.STATE_CHANGE, RoomObjectMouseEvent.CLICK, @@ -93,7 +93,7 @@ export class FurnitureLogic extends MovingObjectLogic { return this.mergeTypes(super.getEventTypes(), types); } - public initialize(asset: IAssetData): void { + public override initialize(asset: IAssetData): void { if (!asset) return; const model = this.object && this.object.model; @@ -142,14 +142,14 @@ export class FurnitureLogic extends MovingObjectLogic { model.setValue(RoomObjectVariable.FURNITURE_ALPHA_MULTIPLIER, 1); } - protected onDispose(): void { + protected override onDispose(): void { this._storedRotateMessage = null; this._directions = null; super.onDispose(); } - public setObject(object: IRoomObjectController): void { + public override setObject(object: IRoomObjectController): void { super.setObject(object); if (object && object.getLocation().length) this._directionInitialized = true; @@ -165,7 +165,7 @@ export class FurnitureLogic extends MovingObjectLogic { this.eventDispatcher.dispatchEvent(new RoomObjectRoomAdEvent(RoomObjectRoomAdEvent.ROOM_AD_FURNI_CLICK, this.object)); } - public update(time: number): void { + public override update(time: number): void { super.update(time); if (this._bouncingStep > 0) { @@ -175,7 +175,7 @@ export class FurnitureLogic extends MovingObjectLogic { } } - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { if (message instanceof ObjectDataUpdateMessage) { this.processDataUpdateMessage(message); @@ -249,7 +249,7 @@ export class FurnitureLogic extends MovingObjectLogic { this.object.model.setValue(RoomObjectVariable.FURNITURE_ITEMDATA, message.data); } - public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { + public override mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { const adUrl = this.getAdClickUrl(this.object.model); switch (event.type) { @@ -391,7 +391,7 @@ export class FurnitureLogic extends MovingObjectLogic { } } - protected getLocationOffset(): IVector3D { + protected override getLocationOffset(): IVector3D { if (this._bouncingStep <= 0) return null; this._locationOffset.x = 0; @@ -414,7 +414,7 @@ export class FurnitureLogic extends MovingObjectLogic { return this._locationOffset; } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; const clickUrl = this.getAdClickUrl(this.object.model); @@ -428,7 +428,7 @@ export class FurnitureLogic extends MovingObjectLogic { this.eventDispatcher.dispatchEvent(new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_CHANGE, this.object)); } - public tearDown(): void { + public override tearDown(): void { if (this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) { if (this.widget) this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.CLOSE_WIDGET, this.object)); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureLoveLockLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureLoveLockLogic.ts index 4b0b463..6f647df 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureLoveLockLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureLoveLockLogic.ts @@ -2,7 +2,7 @@ import {FriendFurniEngravingWidgetType} from "../../../../../api"; import {FurnitureFriendFurniLogic} from "./FurnitureFriendFurniLogic"; export class FurnitureLoveLockLogic extends FurnitureFriendFurniLogic { - public get engravingDialogType(): number { + public override get engravingDialogType(): number { return FriendFurniEngravingWidgetType.LOVE_LOCK; } } diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureMannequinLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureMannequinLogic.ts index 4e8e247..d8ee571 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureMannequinLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureMannequinLogic.ts @@ -9,13 +9,13 @@ export class FurnitureMannequinLogic extends FurnitureLogic { private static FIGURE: string = "FIGURE"; private static OUTFIT_NAME: string = "OUTFIT_NAME"; - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectWidgetRequestEvent.MANNEQUIN]; return this.mergeTypes(super.getEventTypes(), types); } - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { super.processUpdateMessage(message); if (message instanceof ObjectDataUpdateMessage) { @@ -37,7 +37,7 @@ export class FurnitureMannequinLogic extends FurnitureLogic { this.object.model.setValue(RoomObjectVariable.FURNITURE_MANNEQUIN_NAME, data.getValue(FurnitureMannequinLogic.OUTFIT_NAME)); } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.MANNEQUIN, this.object)); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureMonsterplantSeedLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureMonsterplantSeedLogic.ts index 56e015c..85e4657 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureMonsterplantSeedLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureMonsterplantSeedLogic.ts @@ -3,19 +3,19 @@ import {RoomObjectWidgetRequestEvent} from "../../../../../events"; import {FurnitureMultiStateLogic} from "./FurnitureMultiStateLogic"; export class FurnitureMonsterplantSeedLogic extends FurnitureMultiStateLogic { - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectWidgetRequestEvent.MONSTERPLANT_SEED_PLANT_CONFIRMATION_DIALOG]; return this.mergeTypes(super.getEventTypes(), types); } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.MONSTERPLANT_SEED_PLANT_CONFIRMATION_DIALOG, this.object)); } - public get contextMenu(): string { + public override get contextMenu(): string { return ContextMenuEnum.MONSTERPLANT_SEED; } } diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureMultiHeightLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureMultiHeightLogic.ts index 1f2445e..ece9531 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureMultiHeightLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureMultiHeightLogic.ts @@ -2,7 +2,7 @@ import {IAssetData, RoomObjectVariable} from "../../../../../api"; import {FurnitureMultiStateLogic} from "./FurnitureMultiStateLogic"; export class FurnitureMultiHeightLogic extends FurnitureMultiStateLogic { - public initialize(asset: IAssetData): void { + public override initialize(asset: IAssetData): void { super.initialize(asset); if (this.object && this.object.model) this.object.model.setValue(RoomObjectVariable.FURNITURE_IS_VARIABLE_HEIGHT, 1); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureMultiStateLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureMultiStateLogic.ts index 43b6d50..c99807c 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureMultiStateLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureMultiStateLogic.ts @@ -3,13 +3,13 @@ import {RoomObjectFurnitureActionEvent, RoomSpriteMouseEvent} from "../../../../ import {FurnitureLogic} from "./FurnitureLogic"; export class FurnitureMultiStateLogic extends FurnitureLogic { - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectFurnitureActionEvent.MOUSE_BUTTON, RoomObjectFurnitureActionEvent.MOUSE_ARROW]; return this.mergeTypes(super.getEventTypes(), types); } - public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { + public override mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { if (!event || !geometry || !this.object) return; switch (event.type) { diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureMysteryBoxLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureMysteryBoxLogic.ts index cd8211f..7d28502 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureMysteryBoxLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureMysteryBoxLogic.ts @@ -3,19 +3,19 @@ import {RoomObjectWidgetRequestEvent} from "../../../../../events"; import {FurnitureMultiStateLogic} from "./FurnitureMultiStateLogic"; export class FurnitureMysteryBoxLogic extends FurnitureMultiStateLogic { - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectWidgetRequestEvent.MYSTERYBOX_OPEN_DIALOG]; return this.mergeTypes(super.getEventTypes(), types); } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.MYSTERYBOX_OPEN_DIALOG, this.object)); } - public get contextMenu(): string { + public override get contextMenu(): string { return ContextMenuEnum.MYSTERY_BOX; } } diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureMysteryTrophyLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureMysteryTrophyLogic.ts index b10fdeb..119e03d 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureMysteryTrophyLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureMysteryTrophyLogic.ts @@ -3,19 +3,19 @@ import {RoomObjectWidgetRequestEvent} from "../../../../../events"; import {FurnitureMultiStateLogic} from "./FurnitureMultiStateLogic"; export class FurnitureMysteryTrophyLogic extends FurnitureMultiStateLogic { - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectWidgetRequestEvent.MYSTERYTROPHY_OPEN_DIALOG]; return this.mergeTypes(super.getEventTypes(), types); } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.MYSTERYTROPHY_OPEN_DIALOG, this.object)); } - public get contextMenu(): string { + public override get contextMenu(): string { return ContextMenuEnum.MYSTERY_TROPHY; } } diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureOneWayDoorLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureOneWayDoorLogic.ts index de33c5d..8c1d5f9 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureOneWayDoorLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureOneWayDoorLogic.ts @@ -2,13 +2,13 @@ import {RoomObjectFurnitureActionEvent} from "../../../../../events"; import {FurnitureLogic} from "./FurnitureLogic"; export class FurnitureOneWayDoorLogic extends FurnitureLogic { - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectFurnitureActionEvent.ENTER_ONEWAYDOOR]; return this.mergeTypes(super.getEventTypes(), types); } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.ENTER_ONEWAYDOOR, this.object)); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurniturePetCustomizationLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurniturePetCustomizationLogic.ts index a15b06a..3b5e3e2 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurniturePetCustomizationLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurniturePetCustomizationLogic.ts @@ -4,13 +4,13 @@ import {RoomObjectUpdateMessage} from "../../../../../room"; import {FurnitureLogic} from "./FurnitureLogic"; export class FurniturePetCustomizationLogic extends FurnitureLogic { - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectWidgetRequestEvent.PET_PRODUCT_MENU]; return this.mergeTypes(super.getEventTypes(), types); } - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { super.processUpdateMessage(message); if (!this.object) return; @@ -20,7 +20,7 @@ export class FurniturePetCustomizationLogic extends FurnitureLogic { } } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.PET_PRODUCT_MENU, this.object)); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurniturePlaceholderLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurniturePlaceholderLogic.ts index 787073e..fa88a9b 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurniturePlaceholderLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurniturePlaceholderLogic.ts @@ -2,13 +2,13 @@ import {RoomObjectWidgetRequestEvent} from "../../../../../events"; import {FurnitureLogic} from "./FurnitureLogic"; export class FurniturePlaceholderLogic extends FurnitureLogic { - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectWidgetRequestEvent.PLACEHOLDER]; return this.mergeTypes(super.getEventTypes(), types); } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.PLACEHOLDER, this.object)); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurniturePlanetSystemLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurniturePlanetSystemLogic.ts index b411508..5d90035 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurniturePlanetSystemLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurniturePlanetSystemLogic.ts @@ -2,7 +2,7 @@ import {IAssetData, IAssetLogicPlanetSystem, RoomObjectVariable} from "../../../ import {FurnitureLogic} from "./FurnitureLogic"; export class FurniturePlanetSystemLogic extends FurnitureLogic { - public initialize(asset: IAssetData): void { + public override initialize(asset: IAssetData): void { super.initialize(asset); if (asset.logic) { diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurniturePresentLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurniturePresentLogic.ts index b10abc9..b3c8c68 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurniturePresentLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurniturePresentLogic.ts @@ -11,13 +11,13 @@ export class FurniturePresentLogic extends FurnitureLogic { private static PURCHASER_NAME: string = "PURCHASER_NAME"; private static PURCHASER_FIGURE: string = "PURCHASER_FIGURE"; - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectWidgetRequestEvent.PRESENT]; return this.mergeTypes(super.getEventTypes(), types); } - public initialize(asset: IAssetData): void { + public override initialize(asset: IAssetData): void { super.initialize(asset); if (asset.logic) { @@ -27,7 +27,7 @@ export class FurniturePresentLogic extends FurnitureLogic { } } - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { super.processUpdateMessage(message); if (message instanceof ObjectDataUpdateMessage) { @@ -70,7 +70,7 @@ export class FurniturePresentLogic extends FurnitureLogic { this.object.model.setValue(key, value); } - public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { + public override mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { if (!event || !geometry || !this.object) return; switch (event.type) { @@ -85,7 +85,7 @@ export class FurniturePresentLogic extends FurnitureLogic { super.mouseEvent(event, geometry); } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.PRESENT, this.object)); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurniturePurchaseableClothingLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurniturePurchaseableClothingLogic.ts index 48cc12c..2199de2 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurniturePurchaseableClothingLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurniturePurchaseableClothingLogic.ts @@ -3,19 +3,19 @@ import {RoomObjectWidgetRequestEvent} from "../../../../../events"; import {FurnitureMultiStateLogic} from "./FurnitureMultiStateLogic"; export class FurniturePurchaseableClothingLogic extends FurnitureMultiStateLogic { - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectWidgetRequestEvent.PURCHASABLE_CLOTHING_CONFIRMATION_DIALOG]; return this.mergeTypes(super.getEventTypes(), types); } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.PURCHASABLE_CLOTHING_CONFIRMATION_DIALOG, this.object)); } - public get contextMenu(): string { + public override get contextMenu(): string { return ContextMenuEnum.PURCHASABLE_CLOTHING; } } diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurniturePushableLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurniturePushableLogic.ts index 7972fce..cbb7558 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurniturePushableLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurniturePushableLogic.ts @@ -18,7 +18,7 @@ export class FurniturePushableLogic extends FurnitureMultiStateLogic { this._oldLocation = new Vector3d(); } - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { if (!message) return; const isMoveMessage = message instanceof ObjectMoveUpdateMessage; @@ -83,7 +83,7 @@ export class FurniturePushableLogic extends FurnitureMultiStateLogic { super.processUpdateMessage(message); } - public update(time: number): void { + public override update(time: number): void { if (!this.object) return; this._oldLocation.assign(this.object.getLocation()); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRandomStateLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRandomStateLogic.ts index 4511f74..1d514e1 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRandomStateLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRandomStateLogic.ts @@ -2,13 +2,13 @@ import {RoomObjectStateChangedEvent} from "../../../../../events"; import {FurnitureLogic} from "./FurnitureLogic"; export class FurnitureRandomStateLogic extends FurnitureLogic { - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectStateChangedEvent.STATE_RANDOM]; return this.mergeTypes(super.getEventTypes(), types); } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_RANDOM, this.object)); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRandomTeleportLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRandomTeleportLogic.ts index 02d06bc..e84998d 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRandomTeleportLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRandomTeleportLogic.ts @@ -2,7 +2,7 @@ import {ContextMenuEnum} from "../../../../../api"; import {FurnitureMultiStateLogic} from "./FurnitureMultiStateLogic"; export class FurnitureRandomTeleportLogic extends FurnitureMultiStateLogic { - public get contextMenu(): string { + public override get contextMenu(): string { return ContextMenuEnum.RANDOM_TELEPORT; } } diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRentableSpaceLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRentableSpaceLogic.ts index be906ca..a15b5a5 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRentableSpaceLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRentableSpaceLogic.ts @@ -3,13 +3,13 @@ import {RoomObjectDataRequestEvent} from "../../../../../events"; import {FurnitureLogic} from "./FurnitureLogic"; export class FurnitureRentableSpaceLogic extends FurnitureLogic { - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectDataRequestEvent.RODRE_CURRENT_USER_ID]; return this.mergeTypes(super.getEventTypes(), types); } - public update(time: number): void { + public override update(time: number): void { super.update(time); if (this.object && this.object.model) { @@ -29,7 +29,7 @@ export class FurnitureRentableSpaceLogic extends FurnitureLogic { } } - public get widget(): string { + public override get widget(): string { return RoomWidgetEnum.RENTABLESPACE; } } diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRoomBackgroundColorLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRoomBackgroundColorLogic.ts index 58d4806..417971d 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRoomBackgroundColorLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRoomBackgroundColorLogic.ts @@ -13,13 +13,13 @@ export class FurnitureRoomBackgroundColorLogic extends FurnitureMultiStateLogic this._roomColorUpdated = false; } - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectWidgetRequestEvent.BACKGROUND_COLOR, RoomObjectHSLColorEnableEvent.ROOM_BACKGROUND_COLOR]; return this.mergeTypes(super.getEventTypes(), types); } - protected onDispose(): void { + protected override onDispose(): void { if (this._roomColorUpdated) { if (this.eventDispatcher && this.object) { const realRoomObject = this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT); @@ -37,7 +37,7 @@ export class FurnitureRoomBackgroundColorLogic extends FurnitureMultiStateLogic super.onDispose(); } - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { super.processUpdateMessage(message); if (message instanceof ObjectDataUpdateMessage) { @@ -78,7 +78,7 @@ export class FurnitureRoomBackgroundColorLogic extends FurnitureMultiStateLogic } } - public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { + public override mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { if (!event || !geometry || !this.object) return; switch (event.type) { diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRoomBackgroundLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRoomBackgroundLogic.ts index 134f39d..73a925d 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRoomBackgroundLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRoomBackgroundLogic.ts @@ -2,7 +2,7 @@ import {IRoomObjectModel} from "../../../../../api"; import {FurnitureRoomBrandingLogic} from "./FurnitureRoomBrandingLogic"; export class FurnitureRoomBackgroundLogic extends FurnitureRoomBrandingLogic { - protected getAdClickUrl(model: IRoomObjectModel): string { + protected override getAdClickUrl(model: IRoomObjectModel): string { return null; } } diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRoomBillboardLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRoomBillboardLogic.ts index d250437..c7bdc70 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRoomBillboardLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRoomBillboardLogic.ts @@ -10,11 +10,11 @@ export class FurnitureRoomBillboardLogic extends FurnitureRoomBrandingLogic { this._hasClickUrl = true; } - protected getAdClickUrl(model: IRoomObjectModel): string { + protected override getAdClickUrl(model: IRoomObjectModel): string { return model.getValue(RoomObjectVariable.FURNITURE_BRANDING_URL); } - protected handleAdClick(objectId: number, objectType: string, clickUrl: string): void { + protected override handleAdClick(objectId: number, objectType: string, clickUrl: string): void { if (clickUrl.indexOf("http") === 0) { HabboWebTools.openWebPage(clickUrl); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRoomBrandingLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRoomBrandingLogic.ts index 5645a43..41eead2 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRoomBrandingLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRoomBrandingLogic.ts @@ -34,13 +34,13 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic { this._hasClickUrl = false; } - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectRoomAdEvent.ROOM_AD_LOAD_IMAGE]; return this.mergeTypes(super.getEventTypes(), types); } - public initialize(asset: IAssetData): void { + public override initialize(asset: IAssetData): void { super.initialize(asset); if (this._disableFurnitureSelection) { @@ -48,7 +48,7 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic { } } - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { super.processUpdateMessage(message); if (message instanceof ObjectDataUpdateMessage) this.processAdDataUpdateMessage(message); @@ -121,7 +121,7 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic { } } - public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { + public override mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { if (!event || !geometry) return; if (event.type === MouseEventType.MOUSE_MOVE || event.type === MouseEventType.DOUBLE_CLICK) return; diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRoomDimmerLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRoomDimmerLogic.ts index ea1d250..efa12a0 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRoomDimmerLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureRoomDimmerLogic.ts @@ -13,13 +13,13 @@ export class FurnitureRoomDimmerLogic extends FurnitureLogic { this._roomColorUpdated = false; } - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectWidgetRequestEvent.DIMMER, RoomObjectWidgetRequestEvent.WIDGET_REMOVE_DIMMER, RoomObjectDimmerStateUpdateEvent.DIMMER_STATE]; return this.mergeTypes(super.getEventTypes(), types); } - protected onDispose(): void { + protected override onDispose(): void { if (this._roomColorUpdated) { if (this.eventDispatcher && this.object) { const realRoomObject = this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT); @@ -36,7 +36,7 @@ export class FurnitureRoomDimmerLogic extends FurnitureLogic { super.onDispose(); } - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { if (message instanceof ObjectDataUpdateMessage) { if (message.data) { const extra = message.data.getLegacyString(); @@ -91,13 +91,13 @@ export class FurnitureRoomDimmerLogic extends FurnitureLogic { } } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.DIMMER, this.object)); } - public update(time: number): void { + public override update(time: number): void { super.update(time); // if(this.object && this.object.model) diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureScoreLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureScoreLogic.ts index 28f0d7d..431747d 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureScoreLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureScoreLogic.ts @@ -19,7 +19,7 @@ export class FurnitureScoreLogic extends FurnitureLogic { this._scoreTimer = 0; } - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { if (message instanceof ObjectDataUpdateMessage) return this.updateScore(message.state); super.processUpdateMessage(message); @@ -43,7 +43,7 @@ export class FurnitureScoreLogic extends FurnitureLogic { } } - public update(time: number): void { + public override update(time: number): void { super.update(time); const currentScore = this.object.getState(0); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureSongDiskLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureSongDiskLogic.ts index 83ff05c..c848049 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureSongDiskLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureSongDiskLogic.ts @@ -3,7 +3,7 @@ import {RoomObjectUpdateMessage} from "../../../../../room"; import {FurnitureLogic} from "./FurnitureLogic"; export class FurnitureSongDiskLogic extends FurnitureLogic { - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { super.processUpdateMessage(message); if (this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) { diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureSoundBlockLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureSoundBlockLogic.ts index fafc4be..0b67ce8 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureSoundBlockLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureSoundBlockLogic.ts @@ -14,7 +14,7 @@ export class FurnitureSoundBlockLogic extends FurnitureMultiStateLogic { private _noPitch: boolean = false; private _lastLocZ: number = 0; - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [ RoomObjectSamplePlaybackEvent.ROOM_OBJECT_INITIALIZED, RoomObjectSamplePlaybackEvent.ROOM_OBJECT_DISPOSED, @@ -25,7 +25,7 @@ export class FurnitureSoundBlockLogic extends FurnitureMultiStateLogic { return this.mergeTypes(super.getEventTypes(), types); } - public initialize(asset: IAssetData): void { + public override initialize(asset: IAssetData): void { super.initialize(asset); if (asset.logic) { @@ -38,7 +38,7 @@ export class FurnitureSoundBlockLogic extends FurnitureMultiStateLogic { this.object.model.setValue(RoomObjectVariable.FURNITURE_SOUNDBLOCK_RELATIVE_ANIMATION_SPEED, 1); } - protected onDispose(): void { + protected override onDispose(): void { if (this._state !== FurnitureSoundBlockLogic.STATE_UNINITIALIZED) { this.eventDispatcher.dispatchEvent(new RoomObjectSamplePlaybackEvent(RoomObjectSamplePlaybackEvent.ROOM_OBJECT_DISPOSED, this.object, this._sampleId)); } @@ -46,7 +46,7 @@ export class FurnitureSoundBlockLogic extends FurnitureMultiStateLogic { super.onDispose(); } - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { super.processUpdateMessage(message); if (message instanceof ObjectDataUpdateMessage) this.updateSoundBlockMessage(message); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureSoundMachineLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureSoundMachineLogic.ts index d0714e2..399d99b 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureSoundMachineLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureSoundMachineLogic.ts @@ -9,7 +9,7 @@ export class FurnitureSoundMachineLogic extends FurnitureMultiStateLogic { private _isInitialized: boolean = false; private _currentState: number = -1; - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [ RoomObjectFurnitureActionEvent.SOUND_MACHINE_START, RoomObjectFurnitureActionEvent.SOUND_MACHINE_STOP, @@ -20,13 +20,13 @@ export class FurnitureSoundMachineLogic extends FurnitureMultiStateLogic { return this.mergeTypes(super.getEventTypes(), types); } - protected onDispose(): void { + protected override onDispose(): void { this.requestDispose(); super.onDispose(); } - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { super.processUpdateMessage(message); if (this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) !== 1) return; diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureStickieLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureStickieLogic.ts index b201d75..2a08383 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureStickieLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureStickieLogic.ts @@ -7,13 +7,13 @@ import {FurnitureLogic} from "./FurnitureLogic"; export class FurnitureStickieLogic extends FurnitureLogic { private static STICKIE_COLORS: string[] = ["9CCEFF", "FF9CFF", "9CFF9C", "FFFF33"]; - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectWidgetRequestEvent.STICKIE, RoomObjectFurnitureActionEvent.STICKIE]; return this.mergeTypes(super.getEventTypes(), types); } - public initialize(asset: IAssetData): void { + public override initialize(asset: IAssetData): void { super.initialize(asset); this.updateColor(); @@ -21,7 +21,7 @@ export class FurnitureStickieLogic extends FurnitureLogic { if (this.object) this.object.model.setValue(RoomObjectVariable.FURNITURE_IS_STICKIE, ""); } - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { super.processUpdateMessage(message); if (message instanceof ObjectItemDataUpdateMessage) { @@ -43,7 +43,7 @@ export class FurnitureStickieLogic extends FurnitureLogic { this.object.model.setValue(RoomObjectVariable.FURNITURE_COLOR, colorIndex + 1); } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.STICKIE, this.object)); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureTrophyLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureTrophyLogic.ts index 2925b8b..ea6f480 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureTrophyLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureTrophyLogic.ts @@ -2,13 +2,13 @@ import {RoomObjectWidgetRequestEvent} from "../../../../../events"; import {FurnitureLogic} from "./FurnitureLogic"; export class FurnitureTrophyLogic extends FurnitureLogic { - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectWidgetRequestEvent.TROPHY]; return this.mergeTypes(super.getEventTypes(), types); } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.TROPHY, this.object)); diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureVoteCounterLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureVoteCounterLogic.ts index 4d3a1b9..1d2424b 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureVoteCounterLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureVoteCounterLogic.ts @@ -20,7 +20,7 @@ export class FurnitureVoteCounterLogic extends FurnitureMultiStateLogic { this._interval = 33; } - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { super.processUpdateMessage(message); if (message instanceof ObjectDataUpdateMessage) { @@ -56,7 +56,7 @@ export class FurnitureVoteCounterLogic extends FurnitureMultiStateLogic { } } - public update(time: number): void { + public override update(time: number): void { super.update(time); if (this.object) { diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureVoteMajorityLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureVoteMajorityLogic.ts index 2c0b983..902bfe9 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureVoteMajorityLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureVoteMajorityLogic.ts @@ -4,7 +4,7 @@ import {ObjectDataUpdateMessage} from "../../../messages"; import {FurnitureMultiStateLogic} from "./FurnitureMultiStateLogic"; export class FurnitureVoteMajorityLogic extends FurnitureMultiStateLogic { - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { super.processUpdateMessage(message); if (!this.object) return; diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureWelcomeGiftLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureWelcomeGiftLogic.ts index 31621f1..ab1ff1d 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureWelcomeGiftLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureWelcomeGiftLogic.ts @@ -3,7 +3,7 @@ import {RoomObjectStateChangedEvent, RoomSpriteMouseEvent} from "../../../../../ import {FurnitureMultiStateLogic} from "./FurnitureMultiStateLogic"; export class FurnitureWelcomeGiftLogic extends FurnitureMultiStateLogic { - public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { + public override mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { if (!event || !geometry) return; if (event.type === MouseEventType.DOUBLE_CLICK) { diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureWindowLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureWindowLogic.ts index 2631ad7..e55487b 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureWindowLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureWindowLogic.ts @@ -2,7 +2,7 @@ import {IAssetData, RoomObjectVariable} from "../../../../../api"; import {FurnitureMultiStateLogic} from "./FurnitureMultiStateLogic"; export class FurnitureWindowLogic extends FurnitureMultiStateLogic { - public initialize(asset: IAssetData): void { + public override initialize(asset: IAssetData): void { super.initialize(asset); let maskType = ""; diff --git a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureYoutubeLogic.ts b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureYoutubeLogic.ts index 3562b38..35ce907 100644 --- a/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureYoutubeLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/furniture/FurnitureYoutubeLogic.ts @@ -3,13 +3,13 @@ import {RoomObjectDataRequestEvent, RoomObjectWidgetRequestEvent} from "../../.. import {FurnitureLogic} from "./FurnitureLogic"; export class FurnitureYoutubeLogic extends FurnitureLogic { - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectWidgetRequestEvent.YOUTUBE, RoomObjectDataRequestEvent.RODRE_URL_PREFIX]; return this.mergeTypes(super.getEventTypes(), types); } - public update(time: number): void { + public override update(time: number): void { super.update(time); if (!this.object.model.getValue(RoomObjectVariable.SESSION_URL_PREFIX)) { @@ -17,7 +17,7 @@ export class FurnitureYoutubeLogic extends FurnitureLogic { } } - public useObject(): void { + public override useObject(): void { if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.YOUTUBE, this.object)); diff --git a/libs/renderer/src/nitro/room/object/logic/pet/PetLogic.ts b/libs/renderer/src/nitro/room/object/logic/pet/PetLogic.ts index e2f3068..031ea96 100644 --- a/libs/renderer/src/nitro/room/object/logic/pet/PetLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/pet/PetLogic.ts @@ -41,13 +41,13 @@ export class PetLogic extends MovingObjectLogic { this._expressionEndTimestamp = 0; } - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectMouseEvent.CLICK, RoomObjectMoveEvent.POSITION_CHANGED]; return this.mergeTypes(super.getEventTypes(), types); } - public initialize(asset: IAssetData): void { + public override initialize(asset: IAssetData): void { if (!asset) return; const model = this.object && this.object.model; @@ -69,7 +69,7 @@ export class PetLogic extends MovingObjectLogic { model.setValue(RoomObjectVariable.PET_ALLOWED_DIRECTIONS, this._directions); } - public dispose(): void { + public override dispose(): void { if (this._selected && this.object) { if (this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectMoveEvent(RoomObjectMoveEvent.OBJECT_REMOVED, this.object)); } @@ -78,7 +78,7 @@ export class PetLogic extends MovingObjectLogic { this._reportedLocation = null; } - public update(totalTimeRunning: number): void { + public override update(totalTimeRunning: number): void { super.update(totalTimeRunning); if (this._selected && this.object) { @@ -125,7 +125,7 @@ export class PetLogic extends MovingObjectLogic { } } - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { if (!message || !this.object) return; super.processUpdateMessage(message); @@ -199,7 +199,7 @@ export class PetLogic extends MovingObjectLogic { } } - public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { + public override mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { let eventType: string = null; switch (event.type) { diff --git a/libs/renderer/src/nitro/room/object/logic/room/RoomLogic.ts b/libs/renderer/src/nitro/room/object/logic/room/RoomLogic.ts index a8a3a1c..3422008 100644 --- a/libs/renderer/src/nitro/room/object/logic/room/RoomLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/room/RoomLogic.ts @@ -51,13 +51,13 @@ export class RoomLogic extends RoomObjectLogicBase { this._skipColorTransition = false; } - public getEventTypes(): string[] { + public override getEventTypes(): string[] { const types = [RoomObjectMouseEvent.MOUSE_MOVE, RoomObjectMouseEvent.CLICK]; return this.mergeTypes(super.getEventTypes(), types); } - public dispose(): void { + public override dispose(): void { super.dispose(); if (this._planeParser) { @@ -73,7 +73,7 @@ export class RoomLogic extends RoomObjectLogicBase { } } - public initialize(roomMap: RoomMapData): void { + public override initialize(roomMap: RoomMapData): void { if (!roomMap || !this.object) return; if (!(roomMap instanceof RoomMapData)) return; @@ -89,7 +89,7 @@ export class RoomLogic extends RoomObjectLogicBase { this._skipColorTransition = NitroConfiguration.getValue("room.color.skip.transition") === true; } - public update(time: number): void { + public override update(time: number): void { super.update(time); this.updateBackgroundColor(time); @@ -153,7 +153,7 @@ export class RoomLogic extends RoomObjectLogicBase { if (this.object.model) this.object.model.setValue(RoomObjectVariable.ROOM_BACKGROUND_COLOR, color); } - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { if (!message || !this.object) return; const model = this.object.model; @@ -303,7 +303,7 @@ export class RoomLogic extends RoomObjectLogicBase { this._planeParser.initializeFromMapData(message.mapData); } - public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { + public override mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { if (!event || !geometry || !this.object || !this.object.model) return; const tag = event.spriteTag; diff --git a/libs/renderer/src/nitro/room/object/logic/room/SelectionArrowLogic.ts b/libs/renderer/src/nitro/room/object/logic/room/SelectionArrowLogic.ts index f56662c..9426123 100644 --- a/libs/renderer/src/nitro/room/object/logic/room/SelectionArrowLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/room/SelectionArrowLogic.ts @@ -3,7 +3,7 @@ import {RoomObjectLogicBase, RoomObjectUpdateMessage} from "../../../../../room" import {ObjectVisibilityUpdateMessage} from "../../../messages"; export class SelectionArrowLogic extends RoomObjectLogicBase { - public initialize(data: IAssetData): void { + public override initialize(data: IAssetData): void { if (!this.object) return; this.object.model.setValue(RoomObjectVariable.FURNITURE_ALPHA_MULTIPLIER, 1); @@ -11,7 +11,7 @@ export class SelectionArrowLogic extends RoomObjectLogicBase { this.object.setState(1, 0); } - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { super.processUpdateMessage(message); if (!(message instanceof ObjectVisibilityUpdateMessage)) return; diff --git a/libs/renderer/src/nitro/room/object/logic/room/TileCursorLogic.ts b/libs/renderer/src/nitro/room/object/logic/room/TileCursorLogic.ts index 5ee2946..ce118ea 100644 --- a/libs/renderer/src/nitro/room/object/logic/room/TileCursorLogic.ts +++ b/libs/renderer/src/nitro/room/object/logic/room/TileCursorLogic.ts @@ -17,7 +17,7 @@ export class TileCursorLogic extends RoomObjectLogicBase { this._isHidden = false; } - public initialize(data: IAssetData): void { + public override initialize(data: IAssetData): void { if (!this.object) return; this.object.model.setValue(RoomObjectVariable.FURNITURE_ALPHA_MULTIPLIER, 1); @@ -25,7 +25,7 @@ export class TileCursorLogic extends RoomObjectLogicBase { this.object.setState(TileCursorLogic.CURSOR_HIDDEN_STATE, 0); } - public processUpdateMessage(message: RoomObjectUpdateMessage): void { + public override processUpdateMessage(message: RoomObjectUpdateMessage): void { if (!(message instanceof ObjectTileCursorUpdateMessage)) return; if (this._lastEventId && this._lastEventId === message.sourceEventId) return; diff --git a/libs/renderer/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts index 96657d9..561d4de 100644 --- a/libs/renderer/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts @@ -154,7 +154,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement this._additions = new Map(); } - public initialize(data: IObjectVisualizationData): boolean { + public override initialize(data: IObjectVisualizationData): boolean { if (!(data instanceof AvatarVisualizationData)) return false; this._data = data; @@ -166,7 +166,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement return true; } - public dispose(): void { + public override dispose(): void { if (this._disposed) return; super.dispose(); @@ -177,7 +177,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement this._disposed = true; } - public update(geometry: IRoomGeometry, time: number, update: boolean, skipUpdate: boolean): void { + public override update(geometry: IRoomGeometry, time: number, update: boolean, skipUpdate: boolean): void { if (!this.object || !geometry || !this._data) return; if (time < this._lastUpdate + AvatarVisualization.UPDATE_TIME_INCREASER) return; @@ -918,7 +918,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement private addAddition(addition: IAvatarAddition): IAvatarAddition { const existing = this.getAddition(addition.id); - if (existing) return; + if (existing) return null; this._additions.set(addition.id, addition); diff --git a/libs/renderer/src/nitro/room/object/visualization/avatar/AvatarVisualizationData.ts b/libs/renderer/src/nitro/room/object/visualization/avatar/AvatarVisualizationData.ts index 31dca6e..4620f54 100644 --- a/libs/renderer/src/nitro/room/object/visualization/avatar/AvatarVisualizationData.ts +++ b/libs/renderer/src/nitro/room/object/visualization/avatar/AvatarVisualizationData.ts @@ -22,7 +22,7 @@ export class AvatarVisualizationData extends Disposable implements IObjectVisual return true; } - public onDispose(): void { + public override onDispose(): void { this._avatarRenderer = null; } diff --git a/libs/renderer/src/nitro/room/object/visualization/avatar/additions/FloatingHeartAddition.ts b/libs/renderer/src/nitro/room/object/visualization/avatar/additions/FloatingHeartAddition.ts index 79d8f7f..a430fb8 100644 --- a/libs/renderer/src/nitro/room/object/visualization/avatar/additions/FloatingHeartAddition.ts +++ b/libs/renderer/src/nitro/room/object/visualization/avatar/additions/FloatingHeartAddition.ts @@ -30,7 +30,7 @@ export class FloatingHeartAddition extends ExpressionAddition { this._state = 0; } - public update(sprite: IRoomObjectSprite, scale: number): void { + public override update(sprite: IRoomObjectSprite, scale: number): void { if (!sprite) return; this._scale = scale; @@ -83,7 +83,7 @@ export class FloatingHeartAddition extends ExpressionAddition { } } - public animate(sprite: IRoomObjectSprite): boolean { + public override animate(sprite: IRoomObjectSprite): boolean { if (!sprite) return false; if (this._asset) sprite.texture = this._asset; diff --git a/libs/renderer/src/nitro/room/object/visualization/data/AnimationFrameDirectionalData.ts b/libs/renderer/src/nitro/room/object/visualization/data/AnimationFrameDirectionalData.ts index 8e0bd45..9242b22 100644 --- a/libs/renderer/src/nitro/room/object/visualization/data/AnimationFrameDirectionalData.ts +++ b/libs/renderer/src/nitro/room/object/visualization/data/AnimationFrameDirectionalData.ts @@ -10,17 +10,17 @@ export class AnimationFrameDirectionalData extends AnimationFrameData { this._directionalOffsets = offsets; } - public hasDirectionalOffsets(): boolean { + public override hasDirectionalOffsets(): boolean { return this._directionalOffsets !== null; } - public getX(direction: number): number { + public override getX(direction: number): number { if (!this._directionalOffsets) return super.getX(direction); return this._directionalOffsets.getXOffset(direction, super.getX(direction)); } - public getY(direction: number): number { + public override getY(direction: number): number { if (!this._directionalOffsets) return super.getY(direction); return this._directionalOffsets.getYOffset(direction, super.getY(direction)); diff --git a/libs/renderer/src/nitro/room/object/visualization/data/AnimationSizeData.ts b/libs/renderer/src/nitro/room/object/visualization/data/AnimationSizeData.ts index b871310..ef105d7 100644 --- a/libs/renderer/src/nitro/room/object/visualization/data/AnimationSizeData.ts +++ b/libs/renderer/src/nitro/room/object/visualization/data/AnimationSizeData.ts @@ -14,7 +14,7 @@ export class AnimationSizeData extends SizeData { this._animationIds = []; } - public dispose(): void { + public override dispose(): void { super.dispose(); for (const animation of this._animations.values()) { diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureAnimatedVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureAnimatedVisualization.ts index 825d40d..611a649 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureAnimatedVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureAnimatedVisualization.ts @@ -4,7 +4,7 @@ import {FurnitureAnimatedVisualizationData} from "./FurnitureAnimatedVisualizati import {FurnitureVisualization} from "./FurnitureVisualization"; export class FurnitureAnimatedVisualization extends FurnitureVisualization { - public static TYPE: string = RoomObjectVisualizationType.FURNITURE_ANIMATED; + public static override TYPE: string = RoomObjectVisualizationType.FURNITURE_ANIMATED; public static DEFAULT_ANIMATION_ID: number = 0; protected _state: number; @@ -27,13 +27,13 @@ export class FurnitureAnimatedVisualization extends FurnitureVisualization { this._directionChanged = false; } - public initialize(data: IObjectVisualizationData): boolean { + public override initialize(data: IObjectVisualizationData): boolean { if (!(data instanceof FurnitureAnimatedVisualizationData)) return false; return super.initialize(data); } - public dispose(): void { + public override dispose(): void { super.dispose(); if (this._animationData) { @@ -58,7 +58,7 @@ export class FurnitureAnimatedVisualization extends FurnitureVisualization { return FurnitureAnimatedVisualization.DEFAULT_ANIMATION_ID; } - protected updateObject(scale: number, direction: number): boolean { + protected override updateObject(scale: number, direction: number): boolean { if (super.updateObject(scale, direction)) { const state = this.object.getState(0); @@ -76,7 +76,7 @@ export class FurnitureAnimatedVisualization extends FurnitureVisualization { return false; } - protected updateModel(scale: number): boolean { + protected override updateModel(scale: number): boolean { if (super.updateModel(scale)) { if (this.usesAnimationResetting()) { const updateTime = this.object.model.getValue(RoomObjectVariable.FURNITURE_STATE_UPDATE_TIME); @@ -197,7 +197,7 @@ export class FurnitureAnimatedVisualization extends FurnitureVisualization { this._animationData.setLayerCount(this._animatedLayerCount); } - protected updateAnimation(scale: number): number { + protected override updateAnimation(scale: number): number { if (!this.data) return 0; if (scale !== this._animationScale) { @@ -308,7 +308,7 @@ export class FurnitureAnimatedVisualization extends FurnitureVisualization { return update; } - protected getFrameNumber(scale: number, layerId: number): number { + protected override getFrameNumber(scale: number, layerId: number): number { const currentFrame = this._animationData.getFrame(layerId); if (!currentFrame) return super.getFrameNumber(scale, layerId); @@ -316,7 +316,7 @@ export class FurnitureAnimatedVisualization extends FurnitureVisualization { return currentFrame.id; } - protected getLayerXOffset(scale: number, direction: number, layerId: number): number { + protected override getLayerXOffset(scale: number, direction: number, layerId: number): number { const offset = super.getLayerXOffset(scale, direction, layerId); const currentFrame = this._animationData.getFrame(layerId); @@ -326,7 +326,7 @@ export class FurnitureAnimatedVisualization extends FurnitureVisualization { return offset + currentFrame.x; } - protected getLayerYOffset(scale: number, direction: number, layerId: number): number { + protected override getLayerYOffset(scale: number, direction: number, layerId: number): number { const offset = super.getLayerYOffset(scale, direction, layerId); const currentFrame = this._animationData.getFrame(layerId); @@ -340,7 +340,7 @@ export class FurnitureAnimatedVisualization extends FurnitureVisualization { return false; } - protected setDirection(direction: number): void { + protected override setDirection(direction: number): void { if (this._direction === direction) return; super.setDirection(direction); @@ -352,7 +352,7 @@ export class FurnitureAnimatedVisualization extends FurnitureVisualization { return this._frameIncrease; } - protected get data(): FurnitureAnimatedVisualizationData { + protected override get data(): FurnitureAnimatedVisualizationData { return this._data as FurnitureAnimatedVisualizationData; } } diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureAnimatedVisualizationData.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureAnimatedVisualizationData.ts index 7d7c12b..51a3348 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureAnimatedVisualizationData.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureAnimatedVisualizationData.ts @@ -2,11 +2,11 @@ import {AnimationFrame, AnimationSizeData, SizeData} from "../data"; import {FurnitureVisualizationData} from "./FurnitureVisualizationData"; export class FurnitureAnimatedVisualizationData extends FurnitureVisualizationData { - protected createSizeData(scale: number, layerCount: number, angle: number): SizeData { + protected override createSizeData(scale: number, layerCount: number, angle: number): SizeData { return new AnimationSizeData(layerCount, angle); } - protected processVisualElement(sizeData: SizeData, key: string, data: any): boolean { + protected override processVisualElement(sizeData: SizeData, key: string, data: any): boolean { if (!sizeData || !key || !data) return false; switch (key) { diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureBBVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureBBVisualization.ts index ef996be..21454cd 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureBBVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureBBVisualization.ts @@ -1,15 +1,15 @@ import {FurnitureBrandedImageVisualization} from "./FurnitureBrandedImageVisualization"; export class FurnitureBBVisualization extends FurnitureBrandedImageVisualization { - protected getLayerXOffset(scale: number, direction: number, layerId: number): number { + protected override getLayerXOffset(scale: number, direction: number, layerId: number): number { return super.getLayerXOffset(scale, direction, layerId) + this._offsetX; } - protected getLayerYOffset(scale: number, direction: number, layerId: number): number { + protected override getLayerYOffset(scale: number, direction: number, layerId: number): number { return super.getLayerYOffset(scale, direction, layerId) + this._offsetY; } - protected getLayerZOffset(scale: number, direction: number, layerId: number): number { + protected override getLayerZOffset(scale: number, direction: number, layerId: number): number { return super.getLayerZOffset(scale, direction, layerId) + this._offsetZ; } } diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureBadgeDisplayVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureBadgeDisplayVisualization.ts index f89207f..0eecfcb 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureBadgeDisplayVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureBadgeDisplayVisualization.ts @@ -18,7 +18,7 @@ export class FurnitureBadgeDisplayVisualization extends FurnitureAnimatedVisuali this._badgeVisibleInState = -1; } - protected updateModel(scale: number): boolean { + protected override updateModel(scale: number): boolean { let updateModel = super.updateModel(scale); const badgeStatus = this.object.model.getValue(RoomObjectVariable.FURNITURE_BADGE_IMAGE_STATUS); @@ -43,7 +43,7 @@ export class FurnitureBadgeDisplayVisualization extends FurnitureAnimatedVisuali return updateModel; } - protected getSpriteAssetName(scale: number, layerId: number): string { + protected override getSpriteAssetName(scale: number, layerId: number): string { const tag = this.getLayerTag(scale, this.direction, layerId); if (tag !== FurnitureBadgeDisplayVisualization.BADGE || (this._badgeVisibleInState !== -1 && this.object.getState(0) !== this._badgeVisibleInState)) @@ -54,7 +54,7 @@ export class FurnitureBadgeDisplayVisualization extends FurnitureAnimatedVisuali return this._badgeAssetNameNormalScale; } - protected getLayerXOffset(scale: number, direction: number, layerId: number): number { + protected override getLayerXOffset(scale: number, direction: number, layerId: number): number { let offset = super.getLayerXOffset(scale, direction, layerId); if (this.getLayerTag(scale, direction, layerId) === FurnitureBadgeDisplayVisualization.BADGE) { @@ -69,7 +69,7 @@ export class FurnitureBadgeDisplayVisualization extends FurnitureAnimatedVisuali return offset; } - protected getLayerYOffset(scale: number, direction: number, layerId: number): number { + protected override getLayerYOffset(scale: number, direction: number, layerId: number): number { let offset = super.getLayerYOffset(scale, direction, layerId); if (this.getLayerTag(scale, direction, layerId) === FurnitureBadgeDisplayVisualization.BADGE) { diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureBottleVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureBottleVisualization.ts index 105e6d5..1f288b0 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureBottleVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureBottleVisualization.ts @@ -15,7 +15,7 @@ export class FurnitureBottleVisualization extends FurnitureAnimatedVisualization this._running = false; } - protected setAnimation(animationId: number): void { + protected override setAnimation(animationId: number): void { if (animationId === -1) { if (!this._running) { this._running = true; @@ -43,7 +43,7 @@ export class FurnitureBottleVisualization extends FurnitureAnimatedVisualization } } - protected updateAnimation(scale: number): number { + protected override updateAnimation(scale: number): number { if (this.getLastFramePlayed(0)) { if (this._stateQueue.length) super.setAnimation(this._stateQueue.shift()); } diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureBrandedImageVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureBrandedImageVisualization.ts index 36df475..5632324 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureBrandedImageVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureBrandedImageVisualization.ts @@ -39,7 +39,7 @@ export class FurnitureBrandedImageVisualization extends FurnitureVisualization { this._totalFrames = -1; } - public dispose(): void { + public override dispose(): void { super.dispose(); if (this._imageUrl) { @@ -48,7 +48,7 @@ export class FurnitureBrandedImageVisualization extends FurnitureVisualization { } } - protected updateObject(scale: number, direction: number): boolean { + protected override updateObject(scale: number, direction: number): boolean { if (!super.updateObject(scale, direction)) return false; if (this._imageReady) this.checkAndCreateImageForCurrentState(); @@ -56,7 +56,7 @@ export class FurnitureBrandedImageVisualization extends FurnitureVisualization { return true; } - protected updateModel(scale: number): boolean { + protected override updateModel(scale: number): boolean { const flag = super.updateModel(scale); if (flag) { @@ -227,7 +227,7 @@ export class FurnitureBrandedImageVisualization extends FurnitureVisualization { this.asset.addAsset(`${this._imageUrl}_${frame}`, texture, true, x, y, flipH, flipV); } - protected getSpriteAssetName(scale: number, layerId: number): string { + protected override getSpriteAssetName(scale: number, layerId: number): string { const tag = this.getLayerTag(scale, this._direction, layerId); if (tag === FurnitureBrandedImageVisualization.BRANDED_IMAGE && this._imageUrl) { @@ -237,13 +237,13 @@ export class FurnitureBrandedImageVisualization extends FurnitureVisualization { return super.getSpriteAssetName(scale, layerId); } - protected updateAnimation(scale: number): number { + protected override updateAnimation(scale: number): number { if (!this._imageReady || !this._isAnimated || this._totalFrames <= 0) return 0; return 1; } - protected getFrameNumber(scale: number, layerId: number): number { + protected override getFrameNumber(scale: number, layerId: number): number { if (!this._imageReady || !this._isAnimated || this._totalFrames <= 0) return 0; const tag = this.getLayerTag(scale, this._direction, layerId); diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureCounterClockVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureCounterClockVisualization.ts index fb33f4f..7854ba8 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureCounterClockVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureCounterClockVisualization.ts @@ -6,7 +6,7 @@ export class FurnitureCounterClockVisualization extends FurnitureAnimatedVisuali private static MINUTES_SPRITE: string = "minutes_sprite"; private static TEN_MINUTES_SPRITE: string = "ten_minutes_sprite"; - protected getFrameNumber(scale: number, layerId: number): number { + protected override getFrameNumber(scale: number, layerId: number): number { const tag = this.getLayerTag(scale, this.direction, layerId); const animation = this.object.getState(0); @@ -24,7 +24,7 @@ export class FurnitureCounterClockVisualization extends FurnitureAnimatedVisuali } } - public get animationId(): number { + public override get animationId(): number { return 0; } } diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureDynamicThumbnailVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureDynamicThumbnailVisualization.ts index ec6386c..e8c98a9 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureDynamicThumbnailVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureDynamicThumbnailVisualization.ts @@ -13,7 +13,7 @@ export class FurnitureDynamicThumbnailVisualization extends IsometricImageFurniV this._hasOutline = true; } - protected updateModel(scale: number): boolean { + protected override updateModel(scale: number): boolean { if (this.object) { const thumbnailUrl = this.getThumbnailURL(); diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureExternalImageVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureExternalImageVisualization.ts index f80879c..b04a9b0 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureExternalImageVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureExternalImageVisualization.ts @@ -12,7 +12,7 @@ export class FurnitureExternalImageVisualization extends FurnitureDynamicThumbna this._typePrefix = null; } - protected getThumbnailURL(): string { + protected override getThumbnailURL(): string { if (!this.object) return null; if (this._url) return this._url; diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureFireworksVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureFireworksVisualization.ts index 76f90f3..658743f 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureFireworksVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureFireworksVisualization.ts @@ -6,7 +6,7 @@ export class FurnitureFireworksVisualization extends FurnitureAnimatedVisualizat private _particleSystems: IAdvancedMap; private _currentParticleSystem: FurnitureParticleSystem; - public dispose(): void { + public override dispose(): void { super.dispose(); this._currentParticleSystem = null; @@ -18,7 +18,7 @@ export class FurnitureFireworksVisualization extends FurnitureAnimatedVisualizat } } - protected updateObject(scale: number, direction: number): boolean { + protected override updateObject(scale: number, direction: number): boolean { if (super.updateObject(scale, direction)) { if (!this._particleSystems) { this.readDefinition(); @@ -43,25 +43,25 @@ export class FurnitureFireworksVisualization extends FurnitureAnimatedVisualizat return false; } - protected updateSprites(scale: number, update: boolean, animation: number): void { + protected override updateSprites(scale: number, update: boolean, animation: number): void { super.updateSprites(scale, update, animation); if (this._currentParticleSystem) this._currentParticleSystem.updateSprites(); } - protected updateAnimation(scale: number): number { + protected override updateAnimation(scale: number): number { if (this._currentParticleSystem) this._currentParticleSystem.updateAnimation(); return super.updateAnimation(scale); } - protected setAnimation(id: number): void { + protected override setAnimation(id: number): void { if (this._currentParticleSystem) this._currentParticleSystem.setAnimation(id); super.setAnimation(id); } - protected getLayerYOffset(scale: number, direction: number, layerId: number): number { + protected override getLayerYOffset(scale: number, direction: number, layerId: number): number { if (this._currentParticleSystem && this._currentParticleSystem.controlsSprite(layerId)) { return this._currentParticleSystem.getLayerYOffset(scale, direction, layerId); } diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureGiftWrappedFireworksVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureGiftWrappedFireworksVisualization.ts index 614300e..e36ddeb 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureGiftWrappedFireworksVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureGiftWrappedFireworksVisualization.ts @@ -10,7 +10,7 @@ export class FurnitureGiftWrappedFireworksVisualization extends FurnitureFirewor private _ribbonType: number = 0; private _lastAnimationId: number = 0; - public update(geometry: IRoomGeometry, time: number, update: boolean, skipUpdate: boolean) { + public override update(geometry: IRoomGeometry, time: number, update: boolean, skipUpdate: boolean) { this.updatePresentWrap(); super.update(geometry, time, update, skipUpdate); @@ -30,7 +30,7 @@ export class FurnitureGiftWrappedFireworksVisualization extends FurnitureFirewor this._ribbonType = ribbonType > FurnitureGiftWrappedFireworksVisualization.MAX_RIBBON_TYPE_VALUE ? 0 : ribbonType; } - public getFrameNumber(scale: number, layerId: number): number { + public override getFrameNumber(scale: number, layerId: number): number { if (this._lastAnimationId === FurnitureGiftWrappedFireworksVisualization.PRESENT_DEFAULT_STATE) { if (layerId <= 1) return this._packetType; @@ -40,7 +40,7 @@ export class FurnitureGiftWrappedFireworksVisualization extends FurnitureFirewor return super.getFrameNumber(scale, layerId); } - public getSpriteAssetName(scale: number, layerId: number): string { + public override getSpriteAssetName(scale: number, layerId: number): string { const size = this.getValidSize(scale); let assetName = this._type; @@ -60,7 +60,7 @@ export class FurnitureGiftWrappedFireworksVisualization extends FurnitureFirewor return assetName; } - protected setAnimation(animationId: number): void { + protected override setAnimation(animationId: number): void { this._lastAnimationId = animationId; super.setAnimation(animationId); diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureGiftWrappedVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureGiftWrappedVisualization.ts index 7e68a05..a13c63d 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureGiftWrappedVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureGiftWrappedVisualization.ts @@ -5,7 +5,7 @@ export class FurnitureGiftWrappedVisualization extends FurnitureVisualization { private _packetType: number = 0; private _ribbonType: number = 0; - public update(geometry: IRoomGeometry, time: number, update: boolean, skipUpdate: boolean): void { + public override update(geometry: IRoomGeometry, time: number, update: boolean, skipUpdate: boolean): void { this.updatePresentWrap(); super.update(geometry, time, update, skipUpdate); @@ -23,13 +23,13 @@ export class FurnitureGiftWrappedVisualization extends FurnitureVisualization { this._ribbonType = typeIndex % local3; } - public getFrameNumber(scale: number, layerId: number): number { + public override getFrameNumber(scale: number, layerId: number): number { if (layerId <= 1) return this._packetType; return this._ribbonType; } - public getSpriteAssetName(scale: number, layerId: number): string { + public override getSpriteAssetName(scale: number, layerId: number): string { const size = this.getValidSize(scale); let assetName = this._type; diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureGuildCustomizedVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureGuildCustomizedVisualization.ts index 76f96e4..dcb641b 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureGuildCustomizedVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureGuildCustomizedVisualization.ts @@ -22,7 +22,7 @@ export class FurnitureGuildCustomizedVisualization extends FurnitureAnimatedVisu this._badgeAssetNameSmallScale = ""; } - protected updateModel(scale: number): boolean { + protected override updateModel(scale: number): boolean { const flag = super.updateModel(scale); if (this._badgeAssetNameNormalScale === "") { @@ -45,7 +45,7 @@ export class FurnitureGuildCustomizedVisualization extends FurnitureAnimatedVisu return flag; } - protected getLayerColor(scale: number, layerId: number, colorId: number): number { + protected override getLayerColor(scale: number, layerId: number, colorId: number): number { const tag = this.getLayerTag(scale, this._direction, layerId); switch (tag) { @@ -58,7 +58,7 @@ export class FurnitureGuildCustomizedVisualization extends FurnitureAnimatedVisu return super.getLayerColor(scale, layerId, colorId); } - public getSpriteAssetName(scale: number, layerId: number): string { + public override getSpriteAssetName(scale: number, layerId: number): string { const tag = this.getLayerTag(scale, this._direction, layerId); if (tag === FurnitureGuildCustomizedVisualization.BADGE) { @@ -70,7 +70,7 @@ export class FurnitureGuildCustomizedVisualization extends FurnitureAnimatedVisu return super.getSpriteAssetName(scale, layerId); } - protected getLibraryAssetNameForSprite(asset: IGraphicAsset, sprite: IRoomObjectSprite): string { + protected override getLibraryAssetNameForSprite(asset: IGraphicAsset, sprite: IRoomObjectSprite): string { if (sprite.tag === FurnitureGuildCustomizedVisualization.BADGE) { return "%group.badge.url%" + sprite.libraryAssetName.replace("badge_", ""); } diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureGuildIsometricBadgeVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureGuildIsometricBadgeVisualization.ts index 0057aaf..7b0090c 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureGuildIsometricBadgeVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureGuildIsometricBadgeVisualization.ts @@ -14,7 +14,7 @@ export class FurnitureGuildIsometricBadgeVisualization extends IsometricImageFur private _color1: number; private _color2: number; - protected updateModel(scale: number): boolean { + protected override updateModel(scale: number): boolean { const flag = super.updateModel(scale); if (!this.hasThumbnailImage) { @@ -34,7 +34,7 @@ export class FurnitureGuildIsometricBadgeVisualization extends IsometricImageFur return flag; } - protected generateTransformedThumbnail(texture: Texture, asset: IGraphicAsset): Texture { + protected override generateTransformedThumbnail(texture: Texture, asset: IGraphicAsset): Texture { const scale = 1.1; const matrix = new Matrix(); const difference = asset.width / texture.width; @@ -104,7 +104,7 @@ export class FurnitureGuildIsometricBadgeVisualization extends IsometricImageFur return renderTexture; */ } - protected getLayerColor(scale: number, layerId: number, colorId: number): number { + protected override getLayerColor(scale: number, layerId: number, colorId: number): number { const tag = this.getLayerTag(scale, this._direction, layerId); switch (tag) { @@ -117,7 +117,7 @@ export class FurnitureGuildIsometricBadgeVisualization extends IsometricImageFur return super.getLayerColor(scale, layerId, colorId); } - protected getLibraryAssetNameForSprite(asset: IGraphicAsset, sprite: IRoomObjectSprite): string { + protected override getLibraryAssetNameForSprite(asset: IGraphicAsset, sprite: IRoomObjectSprite): string { if (sprite.tag === FurnitureGuildIsometricBadgeVisualization.THUMBNAIL) { if (this.object && this.object.model.getValue(RoomObjectVariable.FURNITURE_GUILD_CUSTOMIZED_ASSET_NAME)) { return "%group.badge.url%" + this.object.model.getValue(RoomObjectVariable.FURNITURE_GUILD_CUSTOMIZED_ASSET_NAME); diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureHabboWheelVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureHabboWheelVisualization.ts index 6e8c97d..1fb1ad7 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureHabboWheelVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureHabboWheelVisualization.ts @@ -16,7 +16,7 @@ export class FurnitureHabboWheelVisualization extends FurnitureAnimatedVisualiza this._running = false; } - protected setAnimation(animationId: number): void { + protected override setAnimation(animationId: number): void { if (animationId === -1) { if (!this._running) { this._running = true; @@ -45,7 +45,7 @@ export class FurnitureHabboWheelVisualization extends FurnitureAnimatedVisualiza } } - protected updateAnimation(scale: number): number { + protected override updateAnimation(scale: number): number { if (this.getLastFramePlayed(1) && this.getLastFramePlayed(2) && this.getLastFramePlayed(3)) { if (this._stateQueue.length) super.setAnimation(this._stateQueue.shift()); } diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureIsometricBBVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureIsometricBBVisualization.ts index 70c06f9..71428cd 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureIsometricBBVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureIsometricBBVisualization.ts @@ -127,13 +127,13 @@ export class FurnitureIsometricBBVisualization extends FurnitureBBVisualization this._needsTransform = false; } - protected checkAndCreateImageForCurrentState(): void { + protected override checkAndCreateImageForCurrentState(): void { super.checkAndCreateImageForCurrentState(); this._needsTransform = true; } - protected getSpriteAssetName(scale: number, layerId: number): string { + protected override getSpriteAssetName(scale: number, layerId: number): string { const tag = this.getLayerTag(scale, this._direction, layerId); if (tag === FurnitureBrandedImageVisualization.BRANDED_IMAGE && this._imageUrl) { diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualization.ts index a816e4e..b9634a7 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualization.ts @@ -29,13 +29,13 @@ export class FurnitureMannequinVisualization extends FurnitureVisualization impl this._disposed = false; } - public initialize(data: IObjectVisualizationData): boolean { + public override initialize(data: IObjectVisualizationData): boolean { if (!(data instanceof FurnitureMannequinVisualizationData)) return false; return super.initialize(data); } - public dispose(): void { + public override dispose(): void { if (this._disposed) return; this._disposed = true; @@ -49,7 +49,7 @@ export class FurnitureMannequinVisualization extends FurnitureVisualization impl super.dispose(); } - protected updateObject(scale: number, direction: number): boolean { + protected override updateObject(scale: number, direction: number): boolean { const updateObject = super.updateObject(scale, direction); if (updateObject) { @@ -63,7 +63,7 @@ export class FurnitureMannequinVisualization extends FurnitureVisualization impl return updateObject; } - protected updateModel(scale: number): boolean { + protected override updateModel(scale: number): boolean { let updateModel = super.updateModel(scale); if (updateModel) { @@ -115,7 +115,7 @@ export class FurnitureMannequinVisualization extends FurnitureVisualization impl if (figure === this._figure) this.updateAvatar(true); } - protected getSpriteAssetName(scale: number, layerId: number): string { + protected override getSpriteAssetName(scale: number, layerId: number): string { const tag = this.getLayerTag(scale, this.direction, layerId); if (this._figure && tag === FurnitureMannequinVisualization.AVATAR_IMAGE_SPRITE_TAG && this.avatarExists()) { @@ -125,7 +125,7 @@ export class FurnitureMannequinVisualization extends FurnitureVisualization impl return super.getSpriteAssetName(scale, layerId); } - protected getLayerXOffset(scale: number, direction: number, layerId: number): number { + protected override getLayerXOffset(scale: number, direction: number, layerId: number): number { const tag = this.getLayerTag(scale, direction, layerId); if (tag === FurnitureMannequinVisualization.AVATAR_IMAGE_SPRITE_TAG && this.avatarExists()) return -this.getSprite(layerId).width / 2; @@ -133,7 +133,7 @@ export class FurnitureMannequinVisualization extends FurnitureVisualization impl return super.getLayerXOffset(scale, direction, layerId); } - protected getLayerYOffset(scale: number, direction: number, layerId: number): number { + protected override getLayerYOffset(scale: number, direction: number, layerId: number): number { const tag = this.getLayerTag(scale, direction, layerId); if (tag === FurnitureMannequinVisualization.AVATAR_IMAGE_SPRITE_TAG && this.avatarExists()) return -this.getSprite(layerId).height; @@ -145,7 +145,7 @@ export class FurnitureMannequinVisualization extends FurnitureVisualization impl return this._disposed; } - protected get data(): FurnitureMannequinVisualizationData { + protected override get data(): FurnitureMannequinVisualizationData { return this._data as FurnitureMannequinVisualizationData; } } diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualizationData.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualizationData.ts index 2002b84..38f63a7 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualizationData.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualizationData.ts @@ -11,7 +11,7 @@ export class FurnitureMannequinVisualizationData extends FurnitureVisualizationD this._avatarData = new AvatarVisualizationData(); } - public dispose(): void { + public override dispose(): void { super.dispose(); if (this._avatarData) { diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureParticleSystemEmitter.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureParticleSystemEmitter.ts index 459eb24..87d8971 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureParticleSystemEmitter.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureParticleSystemEmitter.ts @@ -35,7 +35,7 @@ export class FurnitureParticleSystemEmitter extends FurnitureParticleSystemParti this._particleConfigurations = []; } - public dispose(): void { + public override dispose(): void { for (const k of this._particles) k.dispose(); this._particles = null; @@ -106,7 +106,7 @@ export class FurnitureParticleSystemEmitter extends FurnitureParticleSystemParti this._particleConfigurations.push(particle); } - protected ignite(): void { + protected override ignite(): void { this._hasIgnited = true; if (this._emittedParticles < this._maxNumberOfParticles) { @@ -176,7 +176,7 @@ export class FurnitureParticleSystemEmitter extends FurnitureParticleSystemParti return this._particleConfigurations[index]; } - public update(): void { + public override update(): void { super.update(); this.accumulateForces(); diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurniturePartyBeamerVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurniturePartyBeamerVisualization.ts index 81e9197..812a23e 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurniturePartyBeamerVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurniturePartyBeamerVisualization.ts @@ -20,7 +20,7 @@ export class FurniturePartyBeamerVisualization extends FurnitureAnimatedVisualiz this._animOffsetIndex = []; } - protected updateAnimation(scale: number): number { + protected override updateAnimation(scale: number): number { if (!this._animSpeedIndex) this.initItems(scale); let sprite = this.getSprite(2); @@ -111,7 +111,7 @@ export class FurniturePartyBeamerVisualization extends FurnitureAnimatedVisualiz this._animFactorIndex.push(this.getRandomAmplitudeFactor()); } - protected getLayerXOffset(scale: number, direction: number, layerId: number): number { + protected override getLayerXOffset(scale: number, direction: number, layerId: number): number { if (layerId === 2 || layerId === 3) { if (this._animOffsetIndex.length == 2) { return this._animOffsetIndex[layerId - 2].x; @@ -120,7 +120,7 @@ export class FurniturePartyBeamerVisualization extends FurnitureAnimatedVisualiz return super.getLayerXOffset(scale, direction, layerId); } - protected getLayerYOffset(scale: number, direction: number, layerId: number): number { + protected override getLayerYOffset(scale: number, direction: number, layerId: number): number { if (layerId === 2 || layerId === 3) { if (this._animOffsetIndex.length == 2) { return this._animOffsetIndex[layerId - 2].y; diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurniturePlanetSystemVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurniturePlanetSystemVisualization.ts index bfdbafe..f1dbcfb 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurniturePlanetSystemVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurniturePlanetSystemVisualization.ts @@ -15,7 +15,7 @@ export class FurniturePlanetSystemVisualization extends FurnitureAnimatedVisuali this._rootPosition = new Vector3d(); } - public dispose(): void { + public override dispose(): void { if (this._planetIndex) { while (this._planetIndex.length > 0) { const planet = this._planetIndex.shift(); @@ -28,7 +28,7 @@ export class FurniturePlanetSystemVisualization extends FurnitureAnimatedVisuali this._planetNameIndex = null; } - protected updateAnimation(scale: number): number { + protected override updateAnimation(scale: number): number { if (!this._planetIndex && this.spriteCount > 0) { if (!this.processPlanets()) return 0; } @@ -42,7 +42,7 @@ export class FurniturePlanetSystemVisualization extends FurnitureAnimatedVisuali return 0; } - protected getLayerXOffset(scale: number, direction: number, layerId: number): number { + protected override getLayerXOffset(scale: number, direction: number, layerId: number): number { if (this._offsetArray[layerId]) { return this._offsetArray[layerId].x; } @@ -50,7 +50,7 @@ export class FurniturePlanetSystemVisualization extends FurnitureAnimatedVisuali return super.getLayerXOffset(scale, direction, layerId); } - protected getLayerYOffset(scale: number, direction: number, layerId: number): number { + protected override getLayerYOffset(scale: number, direction: number, layerId: number): number { if (this._offsetArray[layerId]) { return this._offsetArray[layerId].y; } @@ -58,7 +58,7 @@ export class FurniturePlanetSystemVisualization extends FurnitureAnimatedVisuali return super.getLayerYOffset(scale, direction, layerId); } - protected getLayerZOffset(scale: number, direction: number, layerId: number): number { + protected override getLayerZOffset(scale: number, direction: number, layerId: number): number { if (this._offsetArray[layerId]) { return this._offsetArray[layerId].z; } @@ -67,7 +67,7 @@ export class FurniturePlanetSystemVisualization extends FurnitureAnimatedVisuali } private processPlanets(): boolean { - if (!this.object || !this.object.model) return; + if (!this.object || !this.object.model) return false; const planetSystems = this.object.model.getValue(RoomObjectVariable.FURNITURE_PLANETSYSTEM_DATA); diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureQueueTileVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureQueueTileVisualization.ts index e59548f..99fbee8 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureQueueTileVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureQueueTileVisualization.ts @@ -16,7 +16,7 @@ export class FurnitureQueueTileVisualization extends FurnitureAnimatedVisualizat this._animationCounter = -1; } - protected setAnimation(animationId: number): void { + protected override setAnimation(animationId: number): void { if (animationId === FurnitureQueueTileVisualization.ANIMATION_ID_ROLL_ONCE) { this._stateQueue = []; this._stateQueue.push(FurnitureQueueTileVisualization.ANIMATION_ID_NORMAL); @@ -27,7 +27,7 @@ export class FurnitureQueueTileVisualization extends FurnitureAnimatedVisualizat return super.setAnimation(animationId); } - protected updateAnimation(scale: number): number { + protected override updateAnimation(scale: number): number { if (this._animationCounter > 0) this._animationCounter--; if (!this._animationCounter) { @@ -37,7 +37,7 @@ export class FurnitureQueueTileVisualization extends FurnitureAnimatedVisualizat return super.updateAnimation(scale); } - protected usesAnimationResetting(): boolean { + protected override usesAnimationResetting(): boolean { return true; } } diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureResettingAnimatedVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureResettingAnimatedVisualization.ts index ad84b19..c6ad984 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureResettingAnimatedVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureResettingAnimatedVisualization.ts @@ -1,7 +1,7 @@ import {FurnitureAnimatedVisualization} from "./FurnitureAnimatedVisualization"; export class FurnitureResettingAnimatedVisualization extends FurnitureAnimatedVisualization { - protected usesAnimationResetting(): boolean { + protected override usesAnimationResetting(): boolean { return true; } } diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureRoomBackgroundVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureRoomBackgroundVisualization.ts index 51a0790..15a64eb 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureRoomBackgroundVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureRoomBackgroundVisualization.ts @@ -6,7 +6,7 @@ import {FurnitureBrandedImageVisualization} from "./FurnitureBrandedImageVisuali export class FurnitureRoomBackgroundVisualization extends FurnitureBrandedImageVisualization { private _imageOffset: DirectionalOffsetData; - protected imageReady(texture: Texture, imageUrl: string): void { + protected override imageReady(texture: Texture, imageUrl: string): void { super.imageReady(texture, imageUrl); if (!texture) return; @@ -26,7 +26,7 @@ export class FurnitureRoomBackgroundVisualization extends FurnitureBrandedImageV this._imageOffset = offsetData; } - protected getLayerXOffset(scale: number, direction: number, layerId: number): number { + protected override getLayerXOffset(scale: number, direction: number, layerId: number): number { if (this._imageOffset) { const offset = this._imageOffset.getXOffset(direction, 0); @@ -36,7 +36,7 @@ export class FurnitureRoomBackgroundVisualization extends FurnitureBrandedImageV return super.getLayerXOffset(scale, direction, layerId) + this._offsetX; } - protected getLayerYOffset(scale: number, direction: number, layerId: number): number { + protected override getLayerYOffset(scale: number, direction: number, layerId: number): number { if (this._imageOffset) { const offset = this._imageOffset.getYOffset(direction, 0); @@ -46,11 +46,11 @@ export class FurnitureRoomBackgroundVisualization extends FurnitureBrandedImageV return super.getLayerYOffset(scale, direction, layerId) + this._offsetY; } - protected getLayerZOffset(scale: number, direction: number, layerId: number): number { + protected override getLayerZOffset(scale: number, direction: number, layerId: number): number { return super.getLayerZOffset(scale, direction, layerId) + -this._offsetZ; } - protected getLayerIgnoreMouse(scale: number, direction: number, layerId: number): boolean { + protected override getLayerIgnoreMouse(scale: number, direction: number, layerId: number): boolean { return true; } } diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureScoreBoardVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureScoreBoardVisualization.ts index 522972f..eefba20 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureScoreBoardVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureScoreBoardVisualization.ts @@ -6,7 +6,7 @@ export class FurnitureScoreBoardVisualization extends FurnitureAnimatedVisualiza private static HUNDREDS_SPRITE: string = "hundreds_sprite"; private static THOUSANDS_SPRITE: string = "thousands_sprite"; - protected getFrameNumber(scale: number, layerId: number): number { + protected override getFrameNumber(scale: number, layerId: number): number { const tag = this.getLayerTag(scale, this.direction, layerId); const animation = this.object.getState(0); diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureSoundBlockVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureSoundBlockVisualization.ts index be4e81f..fdd4d07 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureSoundBlockVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureSoundBlockVisualization.ts @@ -4,7 +4,7 @@ import {FurnitureAnimatedVisualization} from "./FurnitureAnimatedVisualization"; export class FurnitureSoundBlockVisualization extends FurnitureAnimatedVisualization { private _internalFrameIncreaseCounter: number = 0; - protected updateAnimations(scale: number): number { + protected override updateAnimations(scale: number): number { this._internalFrameIncreaseCounter = this._internalFrameIncreaseCounter + this.object.model.getValue(RoomObjectVariable.FURNITURE_SOUNDBLOCK_RELATIVE_ANIMATION_SPEED); this._frameIncrease = this._internalFrameIncreaseCounter; diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureStickieVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureStickieVisualization.ts index 0cf46fc..b703000 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureStickieVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureStickieVisualization.ts @@ -2,7 +2,7 @@ import {ColorData} from "../data/ColorData"; import {FurnitureVisualization} from "./FurnitureVisualization"; export class FurnitureStickieVisualization extends FurnitureVisualization { - protected getLayerColor(scale: number, layerId: number, colorId: number): number { + protected override getLayerColor(scale: number, layerId: number, colorId: number): number { if (!this._data) return ColorData.DEFAULT_COLOR; return this._data.getLayerColor(scale, layerId, colorId); diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureValRandomizerVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureValRandomizerVisualization.ts index d6864de..ccbbcb0 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureValRandomizerVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureValRandomizerVisualization.ts @@ -19,7 +19,7 @@ export class FurnitureValRandomizerVisualization extends FurnitureAnimatedVisual super.setAnimation(FurnitureValRandomizerVisualization.ANIMATION_ID_OFF); } - protected setAnimation(animationId: number): void { + protected override setAnimation(animationId: number): void { if (animationId === 0) { if (!this._running) { this._running = true; @@ -54,7 +54,7 @@ export class FurnitureValRandomizerVisualization extends FurnitureAnimatedVisual } } - protected updateAnimation(scale: number): number { + protected override updateAnimation(scale: number): number { if (this.getLastFramePlayed(11)) { if (this._stateQueue.length) super.setAnimation(this._stateQueue.shift()); } diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureVisualization.ts index e3e8da5..329a301 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureVisualization.ts @@ -82,7 +82,7 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization { this._animationNumber = 0; } - public initialize(data: IObjectVisualizationData): boolean { + public override initialize(data: IObjectVisualizationData): boolean { this.reset(); if (!(data instanceof FurnitureVisualizationData)) return false; @@ -93,7 +93,7 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization { return true; } - public dispose(): void { + public override dispose(): void { super.dispose(); this._data = null; @@ -109,7 +109,7 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization { this._spriteZOffsets = null; } - protected reset(): void { + protected override reset(): void { super.reset(); this.setDirection(-1); @@ -150,7 +150,7 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization { this.setLayerCount(((this._data && this._data.getLayerCount(scale)) || 0) + this.getAdditionalLayerCount()); } - public update(geometry: IRoomGeometry, time: number, update: boolean, skipUpdate: boolean): void { + public override update(geometry: IRoomGeometry, time: number, update: boolean, skipUpdate: boolean): void { if (!geometry) return; const scale = geometry.scale; diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureVoteCounterVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureVoteCounterVisualization.ts index 20fe769..46cc7b7 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureVoteCounterVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureVoteCounterVisualization.ts @@ -7,13 +7,13 @@ export class FurnitureVoteCounterVisualization extends FurnitureAnimatedVisualiz private static HUNDREDS_SPRITE: string = "hundreds_sprite"; private static HIDE_COUNTER_SCORE: number = -1; - protected updateObject(scale: number, direction: number): boolean { + protected override updateObject(scale: number, direction: number): boolean { super.updateObject(scale, direction); return true; } - protected getFrameNumber(scale: number, layerId: number): number { + protected override getFrameNumber(scale: number, layerId: number): number { const result = this.object.model.getValue(RoomObjectVariable.FURNITURE_VOTE_COUNTER_COUNT); const tag = this.getLayerTag(scale, this.direction, layerId); @@ -29,7 +29,7 @@ export class FurnitureVoteCounterVisualization extends FurnitureAnimatedVisualiz } } - protected getLayerAlpha(scale: number, direction: number, layerId: number): number { + protected override getLayerAlpha(scale: number, direction: number, layerId: number): number { const result = this.object.model.getValue(RoomObjectVariable.FURNITURE_VOTE_COUNTER_COUNT); if (result === FurnitureVoteCounterVisualization.HIDE_COUNTER_SCORE) { diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureVoteMajorityVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureVoteMajorityVisualization.ts index 5363cab..4990a57 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureVoteMajorityVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureVoteMajorityVisualization.ts @@ -8,7 +8,7 @@ export class FurnitureVoteMajorityVisualization extends FurnitureAnimatedVisuali private static HIDE_RESULTS_STATES: number[] = [-1, 1]; private static HIDE_RESULTS_VALUE: number = -1; - protected getFrameNumber(scale: number, layerId: number): number { + protected override getFrameNumber(scale: number, layerId: number): number { const result = this.object.model.getValue(RoomObjectVariable.FURNITURE_VOTE_MAJORITY_RESULT); const tag = this.getLayerTag(scale, this.direction, layerId); @@ -24,7 +24,7 @@ export class FurnitureVoteMajorityVisualization extends FurnitureAnimatedVisuali } } - protected getLayerAlpha(scale: number, direction: number, layerId: number): number { + protected override getLayerAlpha(scale: number, direction: number, layerId: number): number { const result = this.object.model.getValue(RoomObjectVariable.FURNITURE_VOTE_MAJORITY_RESULT); if ( diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureYoutubeVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureYoutubeVisualization.ts index f187d7a..1878dbd 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureYoutubeVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/FurnitureYoutubeVisualization.ts @@ -4,7 +4,7 @@ import {FurnitureDynamicThumbnailVisualization} from "./FurnitureDynamicThumbnai export class FurnitureYoutubeVisualization extends FurnitureDynamicThumbnailVisualization { protected static THUMBNAIL_URL: string = "THUMBNAIL_URL"; - protected getThumbnailURL(): string { + protected override getThumbnailURL(): string { if (!this.object) return null; const furnitureData = this.object.model.getValue<{[index: string]: string}>(RoomObjectVariable.FURNITURE_DATA); diff --git a/libs/renderer/src/nitro/room/object/visualization/furniture/IsometricImageFurniVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/furniture/IsometricImageFurniVisualization.ts index bf79ab0..da7a14b 100644 --- a/libs/renderer/src/nitro/room/object/visualization/furniture/IsometricImageFurniVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/furniture/IsometricImageFurniVisualization.ts @@ -33,7 +33,7 @@ export class IsometricImageFurniVisualization extends FurnitureAnimatedVisualiza this._thumbnailChanged = true; } - protected updateModel(scale: number): boolean { + protected override updateModel(scale: number): boolean { const flag = super.updateModel(scale); if (!this._thumbnailChanged && this._thumbnailDirection === this.direction) return flag; @@ -137,7 +137,7 @@ export class IsometricImageFurniVisualization extends FurnitureAnimatedVisualiza return TextureUtils.generateTexture(sprite); } - protected getSpriteAssetName(scale: number, layerId: number): string { + protected override getSpriteAssetName(scale: number, layerId: number): string { if (this._thumbnailImageNormal && this.getLayerTag(scale, this.direction, layerId) === IsometricImageFurniVisualization.THUMBNAIL) return this.getThumbnailAssetName(scale); diff --git a/libs/renderer/src/nitro/room/object/visualization/pet/PetVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/pet/PetVisualization.ts index 47fcea4..7cb7f40 100644 --- a/libs/renderer/src/nitro/room/object/visualization/pet/PetVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/pet/PetVisualization.ts @@ -7,7 +7,7 @@ import {ExperienceData} from "./ExperienceData"; import {PetVisualizationData} from "./PetVisualizationData"; export class PetVisualization extends FurnitureAnimatedVisualization { - public static TYPE: string = RoomObjectVisualizationType.PET_ANIMATED; + public static override TYPE: string = RoomObjectVisualizationType.PET_ANIMATED; private static HEAD: string = "head"; private static SADDLE: string = "saddle"; @@ -71,7 +71,7 @@ export class PetVisualization extends FurnitureAnimatedVisualization { while (this._animationStates.length < PetVisualization.ANIMATION_INDEX_COUNT) this._animationStates.push(new AnimationStateData()); } - public initialize(data: IObjectVisualizationData): boolean { + public override initialize(data: IObjectVisualizationData): boolean { if (!(data instanceof PetVisualizationData)) return false; const texture = this.getPetAdditionAsset(PetVisualization.PET_EXPERIENCE_BUBBLE); @@ -83,7 +83,7 @@ export class PetVisualization extends FurnitureAnimatedVisualization { return super.initialize(data); } - public dispose(): void { + public override dispose(): void { super.dispose(); if (this._animationStates) { @@ -99,11 +99,11 @@ export class PetVisualization extends FurnitureAnimatedVisualization { } } - protected getAnimationId(animationData: AnimationStateData): number { + protected override getAnimationId(animationData: AnimationStateData): number { return animationData.animationId; } - public update(geometry: IRoomGeometry, time: number, update: boolean, skipUpdate: boolean): void { + public override update(geometry: IRoomGeometry, time: number, update: boolean, skipUpdate: boolean): void { super.update(geometry, time, update, skipUpdate); this.updateExperienceBubble(time); @@ -147,7 +147,7 @@ export class PetVisualization extends FurnitureAnimatedVisualization { } } - protected updateModel(scale: number): boolean { + protected override updateModel(scale: number): boolean { const model = this.object && this.object.model; if (!model) return false; @@ -208,7 +208,7 @@ export class PetVisualization extends FurnitureAnimatedVisualization { return true; } - protected updateAnimation(scale: number): number { + protected override updateAnimation(scale: number): number { if (this.object) { const direction = this.object.getDirection().x; @@ -254,7 +254,7 @@ export class PetVisualization extends FurnitureAnimatedVisualization { } } - protected resetAllAnimationFrames(): void { + protected override resetAllAnimationFrames(): void { this._animationOver = false; let index = this._animationStates.length - 1; @@ -268,7 +268,7 @@ export class PetVisualization extends FurnitureAnimatedVisualization { } } - protected updateAnimations(scale: number): number { + protected override updateAnimations(scale: number): number { if (this._animationOver) return 0; let animationOver = true; @@ -304,7 +304,7 @@ export class PetVisualization extends FurnitureAnimatedVisualization { return _local_3; } - protected getSpriteAssetName(scale: number, layerId: number): string { + protected override getSpriteAssetName(scale: number, layerId: number): string { if (this._headOnly && this.isNonHeadSprite(layerId)) return null; if (this._isRiding && this._parser3(layerId)) return null; @@ -330,13 +330,13 @@ export class PetVisualization extends FurnitureAnimatedVisualization { return null; } - protected getLayerColor(scale: number, layerId: number, colorId: number): number { + protected override getLayerColor(scale: number, layerId: number, colorId: number): number { if (layerId < this.totalSprites - PetVisualization.ADDITIONAL_SPRITE_COUNT) return this._color; return 0xffffff; } - protected getLayerXOffset(scale: number, direction: number, layerId: number): number { + protected override getLayerXOffset(scale: number, direction: number, layerId: number): number { let offset = super.getLayerXOffset(scale, direction, layerId); let index = this._animationStates.length - 1; @@ -355,7 +355,7 @@ export class PetVisualization extends FurnitureAnimatedVisualization { return offset; } - protected getLayerYOffset(scale: number, direction: number, layerId: number): number { + protected override getLayerYOffset(scale: number, direction: number, layerId: number): number { let offset = super.getLayerYOffset(scale, direction, layerId); let index = this._animationStates.length - 1; @@ -374,7 +374,7 @@ export class PetVisualization extends FurnitureAnimatedVisualization { return offset; } - protected getLayerZOffset(scale: number, direction: number, layerId: number): number { + protected override getLayerZOffset(scale: number, direction: number, layerId: number): number { if (!this.data) return LayerData.DEFAULT_ZOFFSET; return this.data.getLayerZOffset(scale, this.getDirection(scale, layerId), layerId); @@ -386,7 +386,7 @@ export class PetVisualization extends FurnitureAnimatedVisualization { return this.data.getValidDirection(scale, this._headDirection); } - protected getFrameNumber(scale: number, layerId: number): number { + protected override getFrameNumber(scale: number, layerId: number): number { let index = this._animationStates.length - 1; while (index >= 0) { @@ -446,7 +446,7 @@ export class PetVisualization extends FurnitureAnimatedVisualization { return this._saddleSprites[layerId]; } - public getAsset(name: string, layerId: number = -1): IGraphicAsset { + public override getAsset(name: string, layerId: number = -1): IGraphicAsset { if (!this.asset) return null; const layerIndex = this._customLayerIds.indexOf(layerId); @@ -467,17 +467,17 @@ export class PetVisualization extends FurnitureAnimatedVisualization { return this.asset.getAssetWithPalette(name, paletteName); } - protected getAdditionalLayerCount(): number { + protected override getAdditionalLayerCount(): number { return super.getAdditionalLayerCount() + PetVisualization.ADDITIONAL_SPRITE_COUNT; } - protected setLayerCount(count: number): void { + protected override setLayerCount(count: number): void { super.setLayerCount(count); this._headSprites = []; } - protected getPostureForAsset(scale: number, name: string): string { + protected override getPostureForAsset(scale: number, name: string): string { const parts = name.split("_"); let length = parts.length; let i = 0; @@ -511,7 +511,7 @@ export class PetVisualization extends FurnitureAnimatedVisualization { return GetAssetManager().getTexture(name); } - protected get data(): PetVisualizationData { + protected override get data(): PetVisualizationData { return this._data as PetVisualizationData; } } diff --git a/libs/renderer/src/nitro/room/object/visualization/pet/PetVisualizationData.ts b/libs/renderer/src/nitro/room/object/visualization/pet/PetVisualizationData.ts index 1db7ff6..3bc8b84 100644 --- a/libs/renderer/src/nitro/room/object/visualization/pet/PetVisualizationData.ts +++ b/libs/renderer/src/nitro/room/object/visualization/pet/PetVisualizationData.ts @@ -11,18 +11,18 @@ export class PetVisualizationData extends FurnitureAnimatedVisualizationData { this._isAllowedToTurnHead = true; } - protected createSizeData(scale: number, layerCount: number, angle: number): SizeData { + protected override createSizeData(scale: number, layerCount: number, angle: number): SizeData { if (scale > 1) return new PetSizeData(layerCount, angle); else return new AnimationSizeData(layerCount, angle); } - protected defineVisualizations(visualizations: IAssetVisualizationData[]): boolean { + protected override defineVisualizations(visualizations: IAssetVisualizationData[]): boolean { this._isAllowedToTurnHead = true; //check visualization for '@disableheadturn' return super.defineVisualizations(visualizations); } - protected processVisualElement(sizeData: SizeData, key: string, data: any): boolean { + protected override processVisualElement(sizeData: SizeData, key: string, data: any): boolean { if (!sizeData || !key || !data) return false; switch (key) { diff --git a/libs/renderer/src/nitro/room/object/visualization/room/RoomVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/room/RoomVisualization.ts index 4a2f18b..530b823 100644 --- a/libs/renderer/src/nitro/room/object/visualization/room/RoomVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/room/RoomVisualization.ts @@ -111,7 +111,7 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements this._typeVisibility[RoomPlane.TYPE_LANDSCAPE] = true; } - public initialize(data: IObjectVisualizationData): boolean { + public override initialize(data: IObjectVisualizationData): boolean { if (!(data instanceof RoomVisualizationData)) return false; this._data = data; @@ -123,7 +123,7 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements return true; } - public dispose(): void { + public override dispose(): void { super.dispose(); this.clearPlanes(); @@ -155,7 +155,7 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements } } - protected reset(): void { + protected override reset(): void { super.reset(); this._floorType = null; @@ -166,7 +166,7 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements this._roomScale = 0; } - public update(geometry: IRoomGeometry, time: number, update: boolean, skipUpdate: boolean): void { + public override update(geometry: IRoomGeometry, time: number, update: boolean, skipUpdate: boolean): void { if (!this.object || !geometry) return; const geometryUpdate = this.updateGeometry(geometry); @@ -836,7 +836,7 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements sprite.name = _arg_3 + "_" + this._assetUpdateCounter; } - public getBoundingRectangle(): Rectangle { + public override getBoundingRectangle(): Rectangle { if (!this._boundingRectangle) this._boundingRectangle = super.getBoundingRectangle(); return new Rectangle(this._boundingRectangle.x, this._boundingRectangle.y, this._boundingRectangle.width, this._boundingRectangle.height); diff --git a/libs/renderer/src/nitro/room/object/visualization/room/RoomVisualizationData.ts b/libs/renderer/src/nitro/room/object/visualization/room/RoomVisualizationData.ts index 63c4284..15daebf 100644 --- a/libs/renderer/src/nitro/room/object/visualization/room/RoomVisualizationData.ts +++ b/libs/renderer/src/nitro/room/object/visualization/room/RoomVisualizationData.ts @@ -42,7 +42,7 @@ export class RoomVisualizationData extends Disposable implements IObjectVisualiz return true; } - protected onDispose(): void { + protected override onDispose(): void { if (this._wallRasterizer) { this._wallRasterizer.dispose(); diff --git a/libs/renderer/src/nitro/room/object/visualization/room/TileCursorVisualization.ts b/libs/renderer/src/nitro/room/object/visualization/room/TileCursorVisualization.ts index 1ac3e14..976c45b 100644 --- a/libs/renderer/src/nitro/room/object/visualization/room/TileCursorVisualization.ts +++ b/libs/renderer/src/nitro/room/object/visualization/room/TileCursorVisualization.ts @@ -10,7 +10,7 @@ export class TileCursorVisualization extends FurnitureAnimatedVisualization { this._tileHeight = 0; } - protected getLayerYOffset(scale: number, direction: number, layerId: number): number { + protected override getLayerYOffset(scale: number, direction: number, layerId: number): number { if (layerId === 1) { this._tileHeight = this.object.model.getValue(RoomObjectVariable.TILE_CURSOR_HEIGHT); diff --git a/libs/renderer/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapePlane.ts b/libs/renderer/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapePlane.ts index fcf963f..b66bb53 100644 --- a/libs/renderer/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapePlane.ts +++ b/libs/renderer/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapePlane.ts @@ -12,7 +12,7 @@ export class LandscapePlane extends Plane { private _width: number = 0; private _height: number = 0; - public isStatic(scale: number): boolean { + public override isStatic(scale: number): boolean { const visualization = this.getPlaneVisualization(scale); if (visualization) return !visualization.hasAnimationLayers; diff --git a/libs/renderer/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapeRasterizer.ts b/libs/renderer/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapeRasterizer.ts index 245c81e..79a302f 100644 --- a/libs/renderer/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapeRasterizer.ts +++ b/libs/renderer/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapeRasterizer.ts @@ -16,7 +16,7 @@ export class LandscapeRasterizer extends PlaneRasterizer { private _landscapeHeight: number = 0; private _cachedBitmap: RenderTexture = null; - public initializeDimensions(k: number, _arg_2: number): boolean { + public override initializeDimensions(k: number, _arg_2: number): boolean { if (k < 0) k = 0; if (_arg_2 < 0) _arg_2 = 0; @@ -27,7 +27,7 @@ export class LandscapeRasterizer extends PlaneRasterizer { return true; } - protected initializePlanes(): void { + protected override initializePlanes(): void { if (!this.data) return; const landscapes = this.data.planes; @@ -161,7 +161,7 @@ export class LandscapeRasterizer extends PlaneRasterizer { return _local_3; } - public render( + public override render( planeId: string, textureCache: PlaneTextureCache, canvas: RenderTexture, @@ -207,7 +207,7 @@ export class LandscapeRasterizer extends PlaneRasterizer { return planeBitmapData; } - public getTextureIdentifier(k: number, _arg_2: IVector3D): string { + public override getTextureIdentifier(k: number, _arg_2: IVector3D): string { if (_arg_2) { if (_arg_2.x < 0) return k + "_0"; diff --git a/libs/renderer/src/nitro/room/object/visualization/room/rasterizer/basic/FloorRasterizer.ts b/libs/renderer/src/nitro/room/object/visualization/room/rasterizer/basic/FloorRasterizer.ts index 7689449..e23a502 100644 --- a/libs/renderer/src/nitro/room/object/visualization/room/rasterizer/basic/FloorRasterizer.ts +++ b/libs/renderer/src/nitro/room/object/visualization/room/rasterizer/basic/FloorRasterizer.ts @@ -7,7 +7,7 @@ import {FloorPlane} from "./FloorPlane"; import {PlaneRasterizer} from "./PlaneRasterizer"; export class FloorRasterizer extends PlaneRasterizer { - protected initializePlanes(): void { + protected override initializePlanes(): void { if (!this.data) return; const floors = this.data.planes; @@ -33,7 +33,7 @@ export class FloorRasterizer extends PlaneRasterizer { } } - public render( + public override render( planeId: string, textureCache: PlaneTextureCache, canvas: RenderTexture, diff --git a/libs/renderer/src/nitro/room/object/visualization/room/rasterizer/basic/WallRasterizer.ts b/libs/renderer/src/nitro/room/object/visualization/room/rasterizer/basic/WallRasterizer.ts index 5e05270..55b53ca 100644 --- a/libs/renderer/src/nitro/room/object/visualization/room/rasterizer/basic/WallRasterizer.ts +++ b/libs/renderer/src/nitro/room/object/visualization/room/rasterizer/basic/WallRasterizer.ts @@ -7,7 +7,7 @@ import {PlaneRasterizer} from "./PlaneRasterizer"; import {WallPlane} from "./WallPlane"; export class WallRasterizer extends PlaneRasterizer { - protected initializePlanes(): void { + protected override initializePlanes(): void { if (!this.data) return; const walls = this.data.planes; @@ -33,7 +33,7 @@ export class WallRasterizer extends PlaneRasterizer { } } - public render( + public override render( planeId: string, textureCache: PlaneTextureCache, canvas: RenderTexture, @@ -68,7 +68,7 @@ export class WallRasterizer extends PlaneRasterizer { return new PlaneBitmapData(graphic, -1); } - public getTextureIdentifier(k: number, normal: IVector3D): string { + public override getTextureIdentifier(k: number, normal: IVector3D): string { if (normal) { return `${k}_${normal.x}_${normal.y}_${normal.z}`; } diff --git a/libs/renderer/src/nitro/session/RoomSession.ts b/libs/renderer/src/nitro/session/RoomSession.ts index b556364..731c6b8 100644 --- a/libs/renderer/src/nitro/session/RoomSession.ts +++ b/libs/renderer/src/nitro/session/RoomSession.ts @@ -88,7 +88,7 @@ export class RoomSession extends Disposable implements IRoomSession { this._moderationSettings = null; } - protected onDispose(): void { + protected override onDispose(): void { if (this._userData) { this._userData.dispose(); diff --git a/libs/renderer/src/nitro/session/RoomSessionManager.ts b/libs/renderer/src/nitro/session/RoomSessionManager.ts index 66e386c..de02bd9 100644 --- a/libs/renderer/src/nitro/session/RoomSessionManager.ts +++ b/libs/renderer/src/nitro/session/RoomSessionManager.ts @@ -44,7 +44,7 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana this.onRoomEngineEvent = this.onRoomEngineEvent.bind(this); } - protected onInit(): void { + protected override onInit(): void { this.createHandlers(); this.processPendingSession(); @@ -52,7 +52,7 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana this._roomEngine.events.addEventListener(RoomEngineEvent.ENGINE_INITIALIZED, this.onRoomEngineEvent); } - protected onDispose(): void { + protected override onDispose(): void { this._roomEngine.events.removeEventListener(RoomEngineEvent.ENGINE_INITIALIZED, this.onRoomEngineEvent); super.onDispose(); diff --git a/libs/renderer/src/nitro/session/SessionDataManager.ts b/libs/renderer/src/nitro/session/SessionDataManager.ts index 92d6902..7ca4e85 100644 --- a/libs/renderer/src/nitro/session/SessionDataManager.ts +++ b/libs/renderer/src/nitro/session/SessionDataManager.ts @@ -131,7 +131,7 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana this.onNitroSettingsEvent = this.onNitroSettingsEvent.bind(this); } - protected onInit(): void { + protected override onInit(): void { this.loadFurnitureData(); this.loadProductData(); this.loadBadgeImageManager(); @@ -157,7 +157,7 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana Nitro.instance.events.addEventListener(NitroSettingsEvent.SETTINGS_UPDATED, this.onNitroSettingsEvent); } - protected onDispose(): void { + protected override onDispose(): void { this.destroyFurnitureData(); if (this._ignoredUsersManager) { @@ -476,6 +476,7 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana return item; } + return null; } public getWallItemData(id: number): IFurnitureData { @@ -494,6 +495,7 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana return item; } + return null; } public getProductData(type: string): IProductData { @@ -519,9 +521,10 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana } public getUserTags(roomUnitId: number): string[] { - if (roomUnitId < 0) return; + if (roomUnitId < 0) return null; this.send(new GetUserTagsComposer(roomUnitId)); + return [] as string[]; } public loadBadgeImage(name: string): string { diff --git a/libs/renderer/src/nitro/session/UserDataManager.ts b/libs/renderer/src/nitro/session/UserDataManager.ts index 0306b0f..ed06d09 100644 --- a/libs/renderer/src/nitro/session/UserDataManager.ts +++ b/libs/renderer/src/nitro/session/UserDataManager.ts @@ -24,7 +24,7 @@ export class UserDataManager extends Disposable { this._userBadges = new Map(); } - protected onDispose(): void { + protected override onDispose(): void { this._connection = null; } diff --git a/libs/renderer/src/nitro/session/badge/BadgeImageManager.ts b/libs/renderer/src/nitro/session/badge/BadgeImageManager.ts index d7a81b5..f55d513 100644 --- a/libs/renderer/src/nitro/session/badge/BadgeImageManager.ts +++ b/libs/renderer/src/nitro/session/badge/BadgeImageManager.ts @@ -107,7 +107,7 @@ export class BadgeImageManager implements IDisposable { }) .catch(err => {}); } else if (type === BadgeImageManager.GROUP_BADGE) { - if (this._groupBadgesQueue.get(badgeName)) return; + if (this._groupBadgesQueue.get(badgeName)) return null; this._groupBadgesQueue.set(badgeName, true); diff --git a/libs/renderer/src/nitro/session/furniture/FurnitureDataLoader.ts b/libs/renderer/src/nitro/session/furniture/FurnitureDataLoader.ts index 0ee3ce5..ed9104b 100644 --- a/libs/renderer/src/nitro/session/furniture/FurnitureDataLoader.ts +++ b/libs/renderer/src/nitro/session/furniture/FurnitureDataLoader.ts @@ -31,12 +31,12 @@ export class FurnitureDataLoader extends EventDispatcher { private onFurnitureDataLoaded(data: {[index: string]: any}): void { if (!data) return; - if (typeof data.roomitemtypes == "undefined" || typeof data.wallitemtypes == "undefined") + if (typeof data["roomitemtypes"] == "undefined" || typeof data["wallitemtypes"] == "undefined") NitroLogger.warn("Could not find `roomitemtypes` or `wallitemtypes` in furnidata."); - if (data.roomitemtypes) this.parseFloorItems(data.roomitemtypes); + if (data["roomitemtypes"]) this.parseFloorItems(data["roomitemtypes"]); - if (data.wallitemtypes) this.parseWallItems(data.wallitemtypes); + if (data["wallitemtypes"]) this.parseWallItems(data["wallitemtypes"]); this.dispatchEvent(new NitroEvent(FurnitureDataLoader.FURNITURE_DATA_READY)); } diff --git a/libs/renderer/src/nitro/session/handler/BaseHandler.ts b/libs/renderer/src/nitro/session/handler/BaseHandler.ts index 111cdac..8222a01 100644 --- a/libs/renderer/src/nitro/session/handler/BaseHandler.ts +++ b/libs/renderer/src/nitro/session/handler/BaseHandler.ts @@ -14,7 +14,7 @@ export class BaseHandler extends Disposable { this._roomId = 0; } - protected onDispose(): void { + protected override onDispose(): void { this._connection = null; this._listener = null; } diff --git a/libs/renderer/src/nitro/session/product/ProductDataLoader.ts b/libs/renderer/src/nitro/session/product/ProductDataLoader.ts index eabbd93..ae9f907 100644 --- a/libs/renderer/src/nitro/session/product/ProductDataLoader.ts +++ b/libs/renderer/src/nitro/session/product/ProductDataLoader.ts @@ -15,7 +15,7 @@ export class ProductDataLoader extends EventDispatcher { this._products = products; } - public dispose(): void { + public override dispose(): void { this._products = null; } @@ -31,7 +31,7 @@ export class ProductDataLoader extends EventDispatcher { private onProductDataLoadedEvent(data: {[index: string]: any}): void { if (!data) return; - this.parseProducts(data.productdata); + this.parseProducts(data["productdata"]); this.dispatchEvent(new NitroEvent(ProductDataLoader.PDP_PRODUCT_DATA_READY)); } @@ -45,6 +45,6 @@ export class ProductDataLoader extends EventDispatcher { private parseProducts(data: {[index: string]: any}): void { 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/libs/renderer/src/nitro/sound/SoundManager.ts b/libs/renderer/src/nitro/sound/SoundManager.ts index 78042b9..67ba42b 100644 --- a/libs/renderer/src/nitro/sound/SoundManager.ts +++ b/libs/renderer/src/nitro/sound/SoundManager.ts @@ -30,7 +30,7 @@ export class SoundManager extends NitroManager implements ISoundManager { this.onEvent = this.onEvent.bind(this); } - public onInit(): void { + public override onInit(): void { this._musicController.init(); Nitro.instance.roomEngine.events.addEventListener(RoomEngineSamplePlaybackEvent.PLAY_SAMPLE, this.onEvent); @@ -40,7 +40,7 @@ export class SoundManager extends NitroManager implements ISoundManager { Nitro.instance.events.addEventListener(NitroSoundEvent.PLAY_SOUND, this.onEvent); } - public onDispose(): void { + public override onDispose(): void { if (this._musicController) { this._musicController.dispose(); this._musicController = null; diff --git a/libs/renderer/src/nitro/sound/music/MusicController.ts b/libs/renderer/src/nitro/sound/music/MusicController.ts index 3c0fb60..6b679cb 100644 --- a/libs/renderer/src/nitro/sound/music/MusicController.ts +++ b/libs/renderer/src/nitro/sound/music/MusicController.ts @@ -166,7 +166,7 @@ export class MusicController implements IMusicController { public get samplesIdsInUse(): number[] { let _local_3: SongStartRequestData; let _local_4: SongDataEntry; - let k = []; + let k = [] as number[]; for (let i = 0; i < this._songRequestsPerPriority.length; i++) { if (this._songRequestsPerPriority[i]) { _local_3 = this._songRequestsPerPriority[i]; diff --git a/libs/renderer/src/nitro/window/motion/Callback.ts b/libs/renderer/src/nitro/window/motion/Callback.ts index bc4c490..5ce0572 100644 --- a/libs/renderer/src/nitro/window/motion/Callback.ts +++ b/libs/renderer/src/nitro/window/motion/Callback.ts @@ -9,11 +9,11 @@ export class Callback extends Motion { this._callback = k; } - public get running(): boolean { + public override get running(): boolean { return this._running && !!this._callback; } - public tick(k: number): void { + public override tick(k: number): void { super.tick(k); if (this._callback) { diff --git a/libs/renderer/src/nitro/window/motion/Combo.ts b/libs/renderer/src/nitro/window/motion/Combo.ts index 655b45a..f63f39c 100644 --- a/libs/renderer/src/nitro/window/motion/Combo.ts +++ b/libs/renderer/src/nitro/window/motion/Combo.ts @@ -13,13 +13,13 @@ export class Combo extends Motion { for (const motion of motions) this._runningMotions.push(motion); } - public start(): void { + public override start(): void { super.start(); for (const motion of this._runningMotions) motion.start(); } - public tick(k: number): void { + public override tick(k: number): void { super.tick(k); let motion: Motion = null; diff --git a/libs/renderer/src/nitro/window/motion/Dispose.ts b/libs/renderer/src/nitro/window/motion/Dispose.ts index 6c4e8b9..cc4fb20 100644 --- a/libs/renderer/src/nitro/window/motion/Dispose.ts +++ b/libs/renderer/src/nitro/window/motion/Dispose.ts @@ -5,7 +5,7 @@ export class Dispose extends Motion { super(k); } - public tick(k: number): void { + public override tick(k: number): void { super.tick(k); if (this.target) { diff --git a/libs/renderer/src/nitro/window/motion/DropBounce.ts b/libs/renderer/src/nitro/window/motion/DropBounce.ts index 8cdb7e7..7eb7239 100644 --- a/libs/renderer/src/nitro/window/motion/DropBounce.ts +++ b/libs/renderer/src/nitro/window/motion/DropBounce.ts @@ -10,7 +10,7 @@ export class DropBounce extends Interval { this._height = height; } - public start(): void { + public override start(): void { super.start(); this._offset = 0; @@ -18,7 +18,7 @@ export class DropBounce extends Interval { this.target.style.top = this._offset - this._height + "px"; } - public update(time: number): void { + public override update(time: number): void { super.update(time); this.target.style.top = this._offset - this._height + this.getBounceOffset(time) * this._height + "px"; @@ -44,7 +44,7 @@ export class DropBounce extends Interval { return 7.5625 * k * k + 0.984375; } - public stop(): void { + public override stop(): void { this.target.style.top = this._offset + "px"; super.stop(); diff --git a/libs/renderer/src/nitro/window/motion/Ease.ts b/libs/renderer/src/nitro/window/motion/Ease.ts index d660fc4..6d09bc4 100644 --- a/libs/renderer/src/nitro/window/motion/Ease.ts +++ b/libs/renderer/src/nitro/window/motion/Ease.ts @@ -9,19 +9,19 @@ export class Ease extends Interval { this._interval = k; } - public start(): void { + public override start(): void { super.start(); this._interval.start(); } - public update(k: number): void { + public override update(k: number): void { super.update(k); this._interval.update(k); } - public stop(): void { + public override stop(): void { super.stop(); this._interval.stop(); diff --git a/libs/renderer/src/nitro/window/motion/EaseOut.ts b/libs/renderer/src/nitro/window/motion/EaseOut.ts index 5490964..e2a0ffe 100644 --- a/libs/renderer/src/nitro/window/motion/EaseOut.ts +++ b/libs/renderer/src/nitro/window/motion/EaseOut.ts @@ -6,7 +6,7 @@ export class EaseOut extends EaseRate { super(k, _arg_2); } - public update(k: number): void { + public override update(k: number): void { this._interval.update(Math.pow(k, 1 / this._rate)); } } diff --git a/libs/renderer/src/nitro/window/motion/Interval.ts b/libs/renderer/src/nitro/window/motion/Interval.ts index da85446..efc1ab7 100644 --- a/libs/renderer/src/nitro/window/motion/Interval.ts +++ b/libs/renderer/src/nitro/window/motion/Interval.ts @@ -16,14 +16,14 @@ export class Interval extends Motion { return this._duration; } - public start(): void { + public override start(): void { super.start(); this._complete = false; this._startTimeMs = GetTickerTime(); } - public tick(time: number): void { + public override tick(time: number): void { super.tick(time); const elapsed = (time - this._startTimeMs) / this._duration; diff --git a/libs/renderer/src/nitro/window/motion/JumpBy.ts b/libs/renderer/src/nitro/window/motion/JumpBy.ts index 78c24f2..ff67838 100644 --- a/libs/renderer/src/nitro/window/motion/JumpBy.ts +++ b/libs/renderer/src/nitro/window/motion/JumpBy.ts @@ -17,14 +17,14 @@ export class JumpBy extends Interval { this._numJumps = numJumps; } - public start(): void { + public override start(): void { super.start(); this._startX = this.target.offsetLeft; this._startY = this.target.offsetTop; } - public update(k: number): void { + public override update(k: number): void { super.update(k); this.target.style.left = this._startX + this._deltaX * k + "px"; diff --git a/libs/renderer/src/nitro/window/motion/MoveBy.ts b/libs/renderer/src/nitro/window/motion/MoveBy.ts index ea91f05..8aded7e 100644 --- a/libs/renderer/src/nitro/window/motion/MoveBy.ts +++ b/libs/renderer/src/nitro/window/motion/MoveBy.ts @@ -5,7 +5,7 @@ export class MoveBy extends MoveTo { super(k, _arg_2, _arg_3, _arg_4); } - public start(): void { + public override start(): void { this._endX = this.target.offsetLeft + this._endX; this._endY = this.target.offsetTop + this._endY; diff --git a/libs/renderer/src/nitro/window/motion/MoveTo.ts b/libs/renderer/src/nitro/window/motion/MoveTo.ts index 3885795..1a03881 100644 --- a/libs/renderer/src/nitro/window/motion/MoveTo.ts +++ b/libs/renderer/src/nitro/window/motion/MoveTo.ts @@ -15,7 +15,7 @@ export class MoveTo extends Interval { this._endY = _arg_4; } - public start(): void { + public override start(): void { super.start(); this._startX = this.target.offsetLeft; @@ -24,7 +24,7 @@ export class MoveTo extends Interval { this._deltaY = this._endY - this._startY; } - public update(k: number): void { + public override update(k: number): void { this.target.style.left = this._startX + this._deltaX * k + "px"; this.target.style.top = this._startY + this._deltaY * k + "px"; } diff --git a/libs/renderer/src/nitro/window/motion/Queue.ts b/libs/renderer/src/nitro/window/motion/Queue.ts index 038885b..b2d1192 100644 --- a/libs/renderer/src/nitro/window/motion/Queue.ts +++ b/libs/renderer/src/nitro/window/motion/Queue.ts @@ -15,29 +15,29 @@ export class Queue extends Motion { this._complete = !this._motion; } - public get running(): boolean { + public override get running(): boolean { return this._running && this._motion ? this._motion.running : false; } - public start(): void { + public override start(): void { super.start(); this._motion.start(); } - public update(k: number): void { + public override update(k: number): void { super.update(k); if (this._motion.running) this._motion.update(k); } - public stop(): void { + public override stop(): void { super.stop(); this._motion.stop(); } - public tick(k: number): void { + public override tick(k: number): void { super.tick(k); this._motion.tick(k); diff --git a/libs/renderer/src/nitro/window/motion/ResizeTo.ts b/libs/renderer/src/nitro/window/motion/ResizeTo.ts index c14b198..79ef4a7 100644 --- a/libs/renderer/src/nitro/window/motion/ResizeTo.ts +++ b/libs/renderer/src/nitro/window/motion/ResizeTo.ts @@ -15,7 +15,7 @@ export class ResizeTo extends Interval { this._endH = _arg_4; } - public start(): void { + public override start(): void { super.start(); this._startW = this.target.offsetWidth; @@ -24,7 +24,7 @@ export class ResizeTo extends Interval { this._deltaH = this._endH - this._startH; } - public update(k: number): void { + public override update(k: number): void { this.target.style.width = this._startW + this._deltaW * k + "px"; this.target.style.height = this._startH + this._deltaH * k + "px"; } diff --git a/libs/renderer/src/nitro/window/motion/Wait.ts b/libs/renderer/src/nitro/window/motion/Wait.ts index f292f93..31905be 100644 --- a/libs/renderer/src/nitro/window/motion/Wait.ts +++ b/libs/renderer/src/nitro/window/motion/Wait.ts @@ -11,18 +11,18 @@ export class Wait extends Motion { this._waitTimeMs = k; } - public get running(): boolean { + public override get running(): boolean { return this._running; } - public start(): void { + public override start(): void { super.start(); this._complete = false; this._startTimeMs = GetTickerTime(); } - public tick(k: number): void { + public override tick(k: number): void { super.tick(k); this._complete = k - this._startTimeMs >= this._waitTimeMs; diff --git a/libs/renderer/src/pixi-proxy/PaletteMapFilter.ts b/libs/renderer/src/pixi-proxy/PaletteMapFilter.ts index 39faeed..939ac97 100644 --- a/libs/renderer/src/pixi-proxy/PaletteMapFilter.ts +++ b/libs/renderer/src/pixi-proxy/PaletteMapFilter.ts @@ -57,8 +57,8 @@ export class PaletteMapFilter extends NitroFilter { this._lut = NitroBaseTexture.fromBuffer(Uint8Array.from(lut), lut.length / 4, 1, {mipmap: 0, scaleMode: 0}); - this.uniforms.lut = this._lut; - this.uniforms.channel = this._channel; + this.uniforms["lut"] = this._lut; + this.uniforms["channel"] = this._channel; } private getLutForPalette(data: number[]): number[] { diff --git a/libs/renderer/src/pixi-proxy/RoomTextureUtils.ts b/libs/renderer/src/pixi-proxy/RoomTextureUtils.ts index 7cfb7e8..b7e626f 100644 --- a/libs/renderer/src/pixi-proxy/RoomTextureUtils.ts +++ b/libs/renderer/src/pixi-proxy/RoomTextureUtils.ts @@ -61,7 +61,7 @@ export class PlaneTextureCache { return renderTexture; } - public createAndFillRenderTexture(width: number, height: number, planeId = null, color: number = 16777215): RenderTexture { + public createAndFillRenderTexture(width: number, height: number, planeId: string = null, color: number = 16777215): RenderTexture { if (width < 0 || height < 0) return null; const renderTexture = this.createRenderTexture(width, height, planeId); @@ -117,6 +117,6 @@ export class PlaneTextureCache { } public getExtractor(): Extract { - return this.getRenderer().plugins.extract as Extract; + return this.getRenderer().plugins["extract"] as Extract; } } diff --git a/libs/renderer/src/pixi-proxy/TextureUtils.ts b/libs/renderer/src/pixi-proxy/TextureUtils.ts index 0e77f8c..ccc758c 100644 --- a/libs/renderer/src/pixi-proxy/TextureUtils.ts +++ b/libs/renderer/src/pixi-proxy/TextureUtils.ts @@ -114,6 +114,6 @@ export class TextureUtils { } public static getExtractor(): Extract { - return this.getRenderer().plugins.extract as Extract; + return this.getRenderer().plugins["extract"] as Extract; } } diff --git a/libs/renderer/src/pixi-proxy/adjustment-filter/AdjustmentFilter.ts b/libs/renderer/src/pixi-proxy/adjustment-filter/AdjustmentFilter.ts index 208370f..52cce35 100644 --- a/libs/renderer/src/pixi-proxy/adjustment-filter/AdjustmentFilter.ts +++ b/libs/renderer/src/pixi-proxy/adjustment-filter/AdjustmentFilter.ts @@ -102,15 +102,15 @@ export class AdjustmentFilter extends Filter { * Override existing apply method in PIXI.Filter * @ignore */ - apply(filterManager: FilterSystem, input: RenderTexture, output: RenderTexture, clear: CLEAR_MODES): void { - this.uniforms.gamma = Math.max(this.gamma, 0.0001); - this.uniforms.saturation = this.saturation; - this.uniforms.contrast = this.contrast; - this.uniforms.brightness = this.brightness; - this.uniforms.red = this.red; - this.uniforms.green = this.green; - this.uniforms.blue = this.blue; - this.uniforms.alpha = this.alpha; + override apply(filterManager: FilterSystem, input: RenderTexture, output: RenderTexture, clear: CLEAR_MODES): void { + this.uniforms["gamma"] = Math.max(this.gamma, 0.0001); + this.uniforms["saturation"] = this.saturation; + this.uniforms["contrast"] = this.contrast; + this.uniforms["brightness"] = this.brightness; + this.uniforms["red"] = this.red; + this.uniforms["green"] = this.green; + this.uniforms["blue"] = this.blue; + this.uniforms["alpha"] = this.alpha; filterManager.applyFilter(this, input, output, clear); } diff --git a/libs/renderer/src/room/RoomInstance.ts b/libs/renderer/src/room/RoomInstance.ts index 6d0056e..5f76ba1 100644 --- a/libs/renderer/src/room/RoomInstance.ts +++ b/libs/renderer/src/room/RoomInstance.ts @@ -21,7 +21,7 @@ export class RoomInstance extends Disposable implements IRoomInstance { this._model = new RoomObjectModel(); } - protected onDispose(): void { + protected override onDispose(): void { this.removeAllManagers(); this.destroyRenderer(); diff --git a/libs/renderer/src/room/RoomManager.ts b/libs/renderer/src/room/RoomManager.ts index 0a17376..b25ab0a 100644 --- a/libs/renderer/src/room/RoomManager.ts +++ b/libs/renderer/src/room/RoomManager.ts @@ -66,7 +66,7 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst this.events.addEventListener(RoomContentLoadedEvent.RCLE_CANCEL, this.onRoomContentLoadedEvent); } - public onInit(): void { + public override onInit(): void { if (this._state >= RoomManager.ROOM_MANAGER_INITIALIZING || !this._contentLoader) return; const mandatoryLibraries = RoomContentLoader.MANDATORY_LIBRARIES; @@ -360,7 +360,7 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst return this._rooms; } - public get disposed(): boolean { + public override get disposed(): boolean { return this._disposed; } } diff --git a/libs/renderer/src/room/object/RoomObject.ts b/libs/renderer/src/room/object/RoomObject.ts index 8a0b1ef..eca60fd 100644 --- a/libs/renderer/src/room/object/RoomObject.ts +++ b/libs/renderer/src/room/object/RoomObject.ts @@ -58,7 +58,7 @@ export class RoomObject extends Disposable implements IRoomObjectController { } } - protected onDispose(): void { + protected override onDispose(): void { this._pendingLogicMessages = []; this.setVisualization(null); diff --git a/libs/renderer/src/room/object/logic/RoomObjectLogicBase.ts b/libs/renderer/src/room/object/logic/RoomObjectLogicBase.ts index 5dcbcf4..794e1db 100644 --- a/libs/renderer/src/room/object/logic/RoomObjectLogicBase.ts +++ b/libs/renderer/src/room/object/logic/RoomObjectLogicBase.ts @@ -21,7 +21,7 @@ export class RoomObjectLogicBase extends Disposable implements IRoomObjectEventH return; } - protected onDispose(): void { + protected override onDispose(): void { this._object = null; } diff --git a/libs/renderer/src/room/renderer/RoomRenderer.ts b/libs/renderer/src/room/renderer/RoomRenderer.ts index 25265c8..7687328 100644 --- a/libs/renderer/src/room/renderer/RoomRenderer.ts +++ b/libs/renderer/src/room/renderer/RoomRenderer.ts @@ -107,7 +107,7 @@ export class RoomRenderer implements IRoomRenderer, IRoomSpriteCanvasContainer { const canvas = this.createSpriteCanvas(id, width, height, scale); - if (!canvas) return; + if (!canvas) return null; this._canvases.set(id, canvas); diff --git a/libs/renderer/src/room/renderer/utils/ExtendedSprite.ts b/libs/renderer/src/room/renderer/utils/ExtendedSprite.ts index 7713ce4..a6af543 100644 --- a/libs/renderer/src/room/renderer/utils/ExtendedSprite.ts +++ b/libs/renderer/src/room/renderer/utils/ExtendedSprite.ts @@ -40,7 +40,7 @@ export class ExtendedSprite extends Sprite { return true; } - public calculateVertices(): void { + public override calculateVertices(): void { if (!this.texture.orig) return; super.calculateVertices(); @@ -59,7 +59,7 @@ export class ExtendedSprite extends Sprite { this.texture = texture; } - public containsPoint(point: Point): boolean { + public override containsPoint(point: Point): boolean { return ExtendedSprite.containsPoint(this, point); } @@ -68,7 +68,7 @@ export class ExtendedSprite extends Sprite { if (!(sprite instanceof Sprite)) return false; - if (sprite.texture === Texture.EMPTY || sprite.blendMode !== BLEND_MODES.NORMAL) return; + if (sprite.texture === Texture.EMPTY || sprite.blendMode !== BLEND_MODES.NORMAL) return false; const texture = sprite.texture; const baseTexture = texture.baseTexture; diff --git a/package-lock.json b/package-lock.json index 2d60d4a..5e5da24 100644 --- a/package-lock.json +++ b/package-lock.json @@ -41,6 +41,7 @@ "@pixi/ticker": "~6.5.0", "@pixi/tilemap": "^3.2.2", "@pixi/utils": "~6.5.0", + "@swc/helpers": "~0.4.11", "@tanstack/react-virtual": "^3.0.0-alpha.0", "gifuct-js": "^2.1.2", "howler": "^2.2.3", @@ -62,6 +63,8 @@ "@nrwl/react": "15.8.6", "@nrwl/vite": "15.8.6", "@nrwl/workspace": "15.8.6", + "@swc/cli": "~0.1.55", + "@swc/core": "^1.2.173", "@testing-library/react": "14.0.0", "@trivago/prettier-plugin-sort-imports": "^4.1.1", "@types/howler": "^2.2.7", @@ -2167,6 +2170,25 @@ "@jridgewell/sourcemap-codec": "1.4.14" } }, + "node_modules/@mole-inc/bin-wrapper": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@mole-inc/bin-wrapper/-/bin-wrapper-8.0.1.tgz", + "integrity": "sha512-sTGoeZnjI8N4KS+sW2AN95gDBErhAguvkw/tWdCjeM8bvxpz5lqrnd0vOJABA1A+Ic3zED7PYoLP/RANLgVotA==", + "dev": true, + "dependencies": { + "bin-check": "^4.1.0", + "bin-version-check": "^5.0.0", + "content-disposition": "^0.5.4", + "ext-name": "^5.0.0", + "file-type": "^17.1.6", + "filenamify": "^5.0.2", + "got": "^11.8.5", + "os-filter-obj": "^2.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -2510,19 +2532,6 @@ "@pixi/utils": "6.5.9" } }, - "node_modules/@pixi/compressed-textures": { - "version": "6.5.9", - "resolved": "https://registry.npmjs.org/@pixi/compressed-textures/-/compressed-textures-6.5.9.tgz", - "integrity": "sha512-7FbgA6fVjhhoWrIHjEkTTZBZIr4FlQ7bWQzpSy3i8J0lGFTFp1p6n17i0t8xxqrJ1SWAJud8WOESsiAHWUHLDQ==", - "peer": true, - "peerDependencies": { - "@pixi/constants": "6.5.9", - "@pixi/core": "6.5.9", - "@pixi/loaders": "6.5.9", - "@pixi/settings": "6.5.9", - "@pixi/utils": "6.5.9" - } - }, "node_modules/@pixi/constants": { "version": "6.5.9", "resolved": "https://registry.npmjs.org/@pixi/constants/-/constants-6.5.9.tgz", @@ -2873,6 +2882,100 @@ "node": ">= 8.0.0" } }, + "node_modules/@sindresorhus/is": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", + "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/is?sponsor=1" + } + }, + "node_modules/@swc/cli": { + "version": "0.1.62", + "resolved": "https://registry.npmjs.org/@swc/cli/-/cli-0.1.62.tgz", + "integrity": "sha512-kOFLjKY3XH1DWLfXL1/B5MizeNorHR8wHKEi92S/Zi9Md/AK17KSqR8MgyRJ6C1fhKHvbBCl8wboyKAFXStkYw==", + "dev": true, + "dependencies": { + "@mole-inc/bin-wrapper": "^8.0.1", + "commander": "^7.1.0", + "fast-glob": "^3.2.5", + "semver": "^7.3.8", + "slash": "3.0.0", + "source-map": "^0.7.3" + }, + "bin": { + "spack": "bin/spack.js", + "swc": "bin/swc.js", + "swcx": "bin/swcx.js" + }, + "engines": { + "node": ">= 12.13" + }, + "peerDependencies": { + "@swc/core": "^1.2.66", + "chokidar": "^3.5.1" + }, + "peerDependenciesMeta": { + "chokidar": { + "optional": true + } + } + }, + "node_modules/@swc/cli/node_modules/commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "dev": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/@swc/cli/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@swc/cli/node_modules/semver": { + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@swc/cli/node_modules/source-map": { + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", + "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@swc/cli/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/@swc/core": { "version": "1.3.40", "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.3.40.tgz", @@ -3067,6 +3170,18 @@ "tslib": "^2.4.0" } }, + "node_modules/@szmarczak/http-timer": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz", + "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==", + "dev": true, + "dependencies": { + "defer-to-connect": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@tanstack/react-virtual": { "version": "3.0.0-alpha.0", "resolved": "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.0.0-alpha.0.tgz", @@ -3123,6 +3238,12 @@ "react-dom": "^18.0.0" } }, + "node_modules/@tokenizer/token": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz", + "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==", + "dev": true + }, "node_modules/@tootallnate/once": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", @@ -3218,6 +3339,18 @@ "integrity": "sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==", "dev": true }, + "node_modules/@types/cacheable-request": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz", + "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==", + "dev": true, + "dependencies": { + "@types/http-cache-semantics": "*", + "@types/keyv": "^3.1.4", + "@types/node": "*", + "@types/responselike": "^1.0.0" + } + }, "node_modules/@types/chai": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.4.tgz", @@ -3260,6 +3393,12 @@ "integrity": "sha512-PEZldwZqJJw1PWRTpupyC7ajVTZA8aHd8nB/Y0n6zRZi5u8ktYDntsHj13ltEiBRqWwF06pASxBEvCTxniG8eA==", "dev": true }, + "node_modules/@types/http-cache-semantics": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz", + "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==", + "dev": true + }, "node_modules/@types/istanbul-lib-coverage": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", @@ -3278,6 +3417,15 @@ "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", "dev": true }, + "node_modules/@types/keyv": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz", + "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/node": { "version": "18.14.2", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.2.tgz", @@ -3333,6 +3481,15 @@ "@types/react": "*" } }, + "node_modules/@types/responselike": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz", + "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/scheduler": { "version": "0.16.2", "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz", @@ -4254,6 +4411,246 @@ "tweetnacl": "^0.14.3" } }, + "node_modules/bin-check": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bin-check/-/bin-check-4.1.0.tgz", + "integrity": "sha512-b6weQyEUKsDGFlACWSIOfveEnImkJyK/FGW6FAG42loyoquvjdtOIqO6yBFzHyqyVVhNgNkQxxx09SFLK28YnA==", + "dev": true, + "dependencies": { + "execa": "^0.7.0", + "executable": "^4.1.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/bin-check/node_modules/cross-spawn": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==", + "dev": true, + "dependencies": { + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "node_modules/bin-check/node_modules/execa": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha512-RztN09XglpYI7aBBrJCPW95jEH7YF1UEPOoX9yDhUTPdp7mK+CQvnLTuD10BNXZ3byLTu2uehZ8EcKT/4CGiFw==", + "dev": true, + "dependencies": { + "cross-spawn": "^5.0.1", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/bin-check/node_modules/get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/bin-check/node_modules/is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/bin-check/node_modules/lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "dev": true, + "dependencies": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + }, + "node_modules/bin-check/node_modules/npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==", + "dev": true, + "dependencies": { + "path-key": "^2.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/bin-check/node_modules/path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/bin-check/node_modules/shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==", + "dev": true, + "dependencies": { + "shebang-regex": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/bin-check/node_modules/shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/bin-check/node_modules/which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "which": "bin/which" + } + }, + "node_modules/bin-check/node_modules/yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==", + "dev": true + }, + "node_modules/bin-version": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/bin-version/-/bin-version-6.0.0.tgz", + "integrity": "sha512-nk5wEsP4RiKjG+vF+uG8lFsEn4d7Y6FVDamzzftSunXOoOcOOkzcWdKVlGgFFwlUQCj63SgnUkLLGF8v7lufhw==", + "dev": true, + "dependencies": { + "execa": "^5.0.0", + "find-versions": "^5.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/bin-version-check": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/bin-version-check/-/bin-version-check-5.0.0.tgz", + "integrity": "sha512-Q3FMQnS5eZmrBGqmDXLs4dbAn/f+52voP6ykJYmweSA60t6DyH4UTSwZhtbK5UH+LBoWvDljILUQMLRUtsynsA==", + "dev": true, + "dependencies": { + "bin-version": "^6.0.0", + "semver": "^7.3.5", + "semver-truncate": "^2.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/bin-version-check/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/bin-version-check/node_modules/semver": { + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/bin-version-check/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, + "node_modules/bin-version/node_modules/execa": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/bin-version/node_modules/get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/bin-version/node_modules/human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "dev": true, + "engines": { + "node": ">=10.17.0" + } + }, "node_modules/binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", @@ -4428,6 +4825,33 @@ "node": ">=10" } }, + "node_modules/cacheable-lookup": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz", + "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==", + "dev": true, + "engines": { + "node": ">=10.6.0" + } + }, + "node_modules/cacheable-request": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz", + "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==", + "dev": true, + "dependencies": { + "clone-response": "^1.0.2", + "get-stream": "^5.1.0", + "http-cache-semantics": "^4.0.0", + "keyv": "^4.0.0", + "lowercase-keys": "^2.0.0", + "normalize-url": "^6.0.1", + "responselike": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/cachedir": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz", @@ -4655,6 +5079,18 @@ "wrap-ansi": "^7.0.0" } }, + "node_modules/clone-response": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz", + "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==", + "dev": true, + "dependencies": { + "mimic-response": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -4721,6 +5157,18 @@ "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==", "dev": true }, + "node_modules/content-disposition": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "dev": true, + "dependencies": { + "safe-buffer": "5.2.1" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/convert-source-map": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", @@ -4965,6 +5413,33 @@ "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==", "dev": true }, + "node_modules/decompress-response": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", + "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", + "dev": true, + "dependencies": { + "mimic-response": "^3.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/decompress-response/node_modules/mimic-response": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", + "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/deep-eql": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz", @@ -5011,6 +5486,15 @@ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", "dev": true }, + "node_modules/defer-to-connect": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", + "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", + "dev": true, + "engines": { + "node": ">=10" + } + }, "node_modules/define-lazy-prop": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", @@ -6062,6 +6546,31 @@ "node": ">=4" } }, + "node_modules/ext-list": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz", + "integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==", + "dev": true, + "dependencies": { + "mime-db": "^1.28.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ext-name": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz", + "integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==", + "dev": true, + "dependencies": { + "ext-list": "^2.0.0", + "sort-keys-length": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", @@ -6175,6 +6684,23 @@ "node": "^10.12.0 || >=12.0.0" } }, + "node_modules/file-type": { + "version": "17.1.6", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-17.1.6.tgz", + "integrity": "sha512-hlDw5Ev+9e883s0pwUsuuYNu4tD7GgpUnOvykjv1Gya0ZIjuKumthDRua90VUn6/nlRKAjcxLUnHNTIUWwWIiw==", + "dev": true, + "dependencies": { + "readable-web-to-node-stream": "^3.0.2", + "strtok3": "^7.0.0-alpha.9", + "token-types": "^5.0.0-alpha.2" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sindresorhus/file-type?sponsor=1" + } + }, "node_modules/filelist": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", @@ -6205,6 +6731,35 @@ "node": ">=10" } }, + "node_modules/filename-reserved-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-3.0.0.tgz", + "integrity": "sha512-hn4cQfU6GOT/7cFHXBqeBg2TbrMBgdD0kcjLhvSQYYwm3s4B6cjvBfb7nBALJLAXqmU5xajSa7X2NnUud/VCdw==", + "dev": true, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/filenamify": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-5.1.1.tgz", + "integrity": "sha512-M45CbrJLGACfrPOkrTp3j2EcO9OBkKUYME0eiqOCa7i2poaklU0jhlIaMlr8ijLorT0uLAzrn3qXOp5684CkfA==", + "dev": true, + "dependencies": { + "filename-reserved-regex": "^3.0.0", + "strip-outer": "^2.0.0", + "trim-repeated": "^2.0.0" + }, + "engines": { + "node": ">=12.20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -6233,6 +6788,21 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/find-versions": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-5.1.0.tgz", + "integrity": "sha512-+iwzCJ7C5v5KgcBuueqVoNiHVoQpwiUK5XFLjf0affFTep+Wcw93tPvmb8tqujDNmzhBDPddnWV/qgWSXgq+Hg==", + "dev": true, + "dependencies": { + "semver-regex": "^4.0.5" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/flat": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", @@ -6611,6 +7181,31 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/got": { + "version": "11.8.6", + "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz", + "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==", + "dev": true, + "dependencies": { + "@sindresorhus/is": "^4.0.0", + "@szmarczak/http-timer": "^4.0.5", + "@types/cacheable-request": "^6.0.1", + "@types/responselike": "^1.0.0", + "cacheable-lookup": "^5.0.3", + "cacheable-request": "^7.0.2", + "decompress-response": "^6.0.0", + "http2-wrapper": "^1.0.0-beta.5.2", + "lowercase-keys": "^2.0.0", + "p-cancelable": "^2.0.0", + "responselike": "^2.0.0" + }, + "engines": { + "node": ">=10.19.0" + }, + "funding": { + "url": "https://github.com/sindresorhus/got?sponsor=1" + } + }, "node_modules/graceful-fs": { "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", @@ -6727,6 +7322,12 @@ "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", "dev": true }, + "node_modules/http-cache-semantics": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", + "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==", + "dev": true + }, "node_modules/http-proxy-agent": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", @@ -6755,6 +7356,19 @@ "node": ">=0.10" } }, + "node_modules/http2-wrapper": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz", + "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==", + "dev": true, + "dependencies": { + "quick-lru": "^5.1.1", + "resolve-alpn": "^1.0.0" + }, + "engines": { + "node": ">=10.19.0" + } + }, "node_modules/https-proxy-agent": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", @@ -7147,6 +7761,15 @@ "node": ">=8" } }, + "node_modules/is-plain-obj": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", + "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/is-potential-custom-element-name": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", @@ -7502,6 +8125,12 @@ "node": ">=4" } }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true + }, "node_modules/json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", @@ -7590,6 +8219,15 @@ "node": ">=4.0" } }, + "node_modules/keyv": { + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz", + "integrity": "sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==", + "dev": true, + "dependencies": { + "json-buffer": "3.0.1" + } + }, "node_modules/language-subtag-registry": { "version": "0.3.22", "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz", @@ -7813,6 +8451,15 @@ "get-func-name": "^2.0.0" } }, + "node_modules/lowercase-keys": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", + "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/lru-cache": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", @@ -7913,6 +8560,15 @@ "node": ">=6" } }, + "node_modules/mimic-response": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", + "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", + "dev": true, + "engines": { + "node": ">=4" + } + }, "node_modules/minimatch": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz", @@ -8005,6 +8661,18 @@ "node": ">=0.10.0" } }, + "node_modules/normalize-url": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", + "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/npm-run-path": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", @@ -8272,12 +8940,42 @@ "node": ">= 0.8.0" } }, + "node_modules/os-filter-obj": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/os-filter-obj/-/os-filter-obj-2.0.0.tgz", + "integrity": "sha512-uksVLsqG3pVdzzPvmAHpBK0wKxYItuzZr7SziusRPoz67tGV8rL1szZ6IdeUrbqLjGDwApBtN29eEE3IqGHOjg==", + "dev": true, + "dependencies": { + "arch": "^2.1.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/ospath": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz", "integrity": "sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==", "dev": true }, + "node_modules/p-cancelable": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz", + "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==", + "dev": true, + "engines": { + "node": ">=4" + } + }, "node_modules/p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -8427,6 +9125,19 @@ "node": "*" } }, + "node_modules/peek-readable": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-5.0.0.tgz", + "integrity": "sha512-YtCKvLUOvwtMGmrniQPdO7MwPjgkFBtFIrmfSbYmYuq3tKDV/mcfAhBth1+C3ru7uXIZasc/pHnb+YDYNkkj4A==", + "dev": true, + "engines": { + "node": ">=14.16" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Borewit" + } + }, "node_modules/pend": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", @@ -8595,6 +9306,12 @@ "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", "dev": true }, + "node_modules/pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==", + "dev": true + }, "node_modules/psl": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", @@ -8670,6 +9387,18 @@ } ] }, + "node_modules/quick-lru": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", + "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/react": { "version": "18.2.0", "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", @@ -8839,6 +9568,22 @@ "node": ">= 6" } }, + "node_modules/readable-web-to-node-stream": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz", + "integrity": "sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==", + "dev": true, + "dependencies": { + "readable-stream": "^3.6.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Borewit" + } + }, "node_modules/readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -8991,6 +9736,12 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/resolve-alpn": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz", + "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==", + "dev": true + }, "node_modules/resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", @@ -9000,6 +9751,18 @@ "node": ">=4" } }, + "node_modules/responselike": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz", + "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==", + "dev": true, + "dependencies": { + "lowercase-keys": "^2.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/restore-cursor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", @@ -9193,6 +9956,39 @@ "node": ">=10" } }, + "node_modules/semver-regex": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-4.0.5.tgz", + "integrity": "sha512-hunMQrEy1T6Jr2uEVjrAIqjwWcQTgOAcIM52C8MY1EZSD3DDNft04XzvYKPqjED65bNVVko0YI38nYeEHCX3yw==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/semver-truncate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/semver-truncate/-/semver-truncate-2.0.0.tgz", + "integrity": "sha512-Rh266MLDYNeML5h90ttdMwfXe1+Nc4LAWd9X1KdJe8pPHP4kFmvLZALtsMNHNdvTyQygbEC0D59sIz47DIaq8w==", + "dev": true, + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/semver-truncate/node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/semver/node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -9294,6 +10090,30 @@ "node": ">=8" } }, + "node_modules/sort-keys": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz", + "integrity": "sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg==", + "dev": true, + "dependencies": { + "is-plain-obj": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/sort-keys-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz", + "integrity": "sha512-GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw==", + "dev": true, + "dependencies": { + "sort-keys": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -9473,6 +10293,15 @@ "node": ">=4" } }, + "node_modules/strip-eof": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/strip-final-newline": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", @@ -9506,6 +10335,18 @@ "url": "https://github.com/sponsors/antfu" } }, + "node_modules/strip-outer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-2.0.0.tgz", + "integrity": "sha512-A21Xsm1XzUkK0qK1ZrytDUvqsQWict2Cykhvi0fBQntGG5JSprESasEyV1EZ/4CiR5WB5KjzLTrP/bO37B0wPg==", + "dev": true, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/strong-log-transformer": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz", @@ -9523,6 +10364,23 @@ "node": ">=4" } }, + "node_modules/strtok3": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-7.0.0.tgz", + "integrity": "sha512-pQ+V+nYQdC5H3Q7qBZAz/MO6lwGhoC2gOAjuouGf/VO0m7vQRh8QNMl2Uf6SwAtzZ9bOw3UIeBukEGNJl5dtXQ==", + "dev": true, + "dependencies": { + "@tokenizer/token": "^0.3.0", + "peek-readable": "^5.0.0" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Borewit" + } + }, "node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -9658,6 +10516,23 @@ "node": ">=8.0" } }, + "node_modules/token-types": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/token-types/-/token-types-5.0.1.tgz", + "integrity": "sha512-Y2fmSnZjQdDb9W4w4r1tswlMHylzWIeOKpx0aZH9BgGtACHhrk3OkT52AzwcuqTRBZtvvnTjDBh8eynMulu8Vg==", + "dev": true, + "dependencies": { + "@tokenizer/token": "^0.3.0", + "ieee754": "^1.2.1" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Borewit" + } + }, "node_modules/totalist": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.0.tgz", @@ -9701,6 +10576,30 @@ "tree-kill": "cli.js" } }, + "node_modules/trim-repeated": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-2.0.0.tgz", + "integrity": "sha512-QUHBFTJGdOwmp0tbOG505xAgOp/YliZP/6UgafFXYZ26WT1bvQmSMJUvkeVSASuJJHbqsFbynTvkd5W8RBTipg==", + "dev": true, + "dependencies": { + "escape-string-regexp": "^5.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/trim-repeated/node_modules/escape-string-regexp": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz", + "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/tsconfck": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-2.1.0.tgz", @@ -11981,6 +12880,22 @@ "@jridgewell/sourcemap-codec": "1.4.14" } }, + "@mole-inc/bin-wrapper": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@mole-inc/bin-wrapper/-/bin-wrapper-8.0.1.tgz", + "integrity": "sha512-sTGoeZnjI8N4KS+sW2AN95gDBErhAguvkw/tWdCjeM8bvxpz5lqrnd0vOJABA1A+Ic3zED7PYoLP/RANLgVotA==", + "dev": true, + "requires": { + "bin-check": "^4.1.0", + "bin-version-check": "^5.0.0", + "content-disposition": "^0.5.4", + "ext-name": "^5.0.0", + "file-type": "^17.1.6", + "filenamify": "^5.0.2", + "got": "^11.8.5", + "os-filter-obj": "^2.0.0" + } + }, "@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -12199,39 +13114,27 @@ "@pixi/app": { "version": "6.5.9", "resolved": "https://registry.npmjs.org/@pixi/app/-/app-6.5.9.tgz", - "integrity": "sha512-RDFR8ea86eykTmxlQPb1PMdXqYaeLmf1BKprcEKOOr6vmNLykzn+UEaal4OJtmpgtAsHt6hkpW7nUeZ8idbWZA==", - "requires": {} + "integrity": "sha512-RDFR8ea86eykTmxlQPb1PMdXqYaeLmf1BKprcEKOOr6vmNLykzn+UEaal4OJtmpgtAsHt6hkpW7nUeZ8idbWZA==" }, "@pixi/basis": { "version": "6.5.9", "resolved": "https://registry.npmjs.org/@pixi/basis/-/basis-6.5.9.tgz", - "integrity": "sha512-mWuqq3ZmNo2eZw6rapOAQdafd+LaHLOBaa/Iy/PqfmuB8aFYaBgzEyF4FjnHGK1TYn+2PKO85G3ptIoAh9c67g==", - "requires": {} + "integrity": "sha512-mWuqq3ZmNo2eZw6rapOAQdafd+LaHLOBaa/Iy/PqfmuB8aFYaBgzEyF4FjnHGK1TYn+2PKO85G3ptIoAh9c67g==" }, "@pixi/canvas-display": { "version": "6.5.9", "resolved": "https://registry.npmjs.org/@pixi/canvas-display/-/canvas-display-6.5.9.tgz", - "integrity": "sha512-ZxVBkyqDOPJKTkF9onGbGtwToICQEVcx/PTHh03LU6lkJ4/fenCd25f4265tdXarIFuu3k03liFKVCCy9sRU0g==", - "requires": {} + "integrity": "sha512-ZxVBkyqDOPJKTkF9onGbGtwToICQEVcx/PTHh03LU6lkJ4/fenCd25f4265tdXarIFuu3k03liFKVCCy9sRU0g==" }, "@pixi/canvas-extract": { "version": "6.5.9", "resolved": "https://registry.npmjs.org/@pixi/canvas-extract/-/canvas-extract-6.5.9.tgz", - "integrity": "sha512-EpOc1nHOhG4Ph6JsliXT0ZHxXzXicUezpXf/xuxjz0Td9A01pkzljI1gKI6qc5n/viD8Y2uaCKDnUSftdhiRsA==", - "requires": {} + "integrity": "sha512-EpOc1nHOhG4Ph6JsliXT0ZHxXzXicUezpXf/xuxjz0Td9A01pkzljI1gKI6qc5n/viD8Y2uaCKDnUSftdhiRsA==" }, "@pixi/canvas-renderer": { "version": "6.5.9", "resolved": "https://registry.npmjs.org/@pixi/canvas-renderer/-/canvas-renderer-6.5.9.tgz", - "integrity": "sha512-bs97ub6ZfEopGqKXBpNntuONmSsWs1UEJ06yWfFUfkLzhXrWNsaFtF5CbaELDzB8AMqH0HY5QgNNWylj8VQ0tQ==", - "requires": {} - }, - "@pixi/compressed-textures": { - "version": "6.5.9", - "resolved": "https://registry.npmjs.org/@pixi/compressed-textures/-/compressed-textures-6.5.9.tgz", - "integrity": "sha512-7FbgA6fVjhhoWrIHjEkTTZBZIr4FlQ7bWQzpSy3i8J0lGFTFp1p6n17i0t8xxqrJ1SWAJud8WOESsiAHWUHLDQ==", - "peer": true, - "requires": {} + "integrity": "sha512-bs97ub6ZfEopGqKXBpNntuONmSsWs1UEJ06yWfFUfkLzhXrWNsaFtF5CbaELDzB8AMqH0HY5QgNNWylj8VQ0tQ==" }, "@pixi/constants": { "version": "6.5.9", @@ -12249,14 +13152,12 @@ "@pixi/display": { "version": "6.5.9", "resolved": "https://registry.npmjs.org/@pixi/display/-/display-6.5.9.tgz", - "integrity": "sha512-85eODYWsOM/kIt2N/L51lsAl3DLJA+1Eed+Nl6ZeF/pEvQnXf7jDZzGwVmUKJurpPWhjkA5OnzWabFw3De2qZg==", - "requires": {} + "integrity": "sha512-85eODYWsOM/kIt2N/L51lsAl3DLJA+1Eed+Nl6ZeF/pEvQnXf7jDZzGwVmUKJurpPWhjkA5OnzWabFw3De2qZg==" }, "@pixi/events": { "version": "6.5.9", "resolved": "https://registry.npmjs.org/@pixi/events/-/events-6.5.9.tgz", - "integrity": "sha512-f5hiyy0nZtgIKrarbeO+DsZI441WvGz1W823D9G3g+FKDHXIoX72orXT5FvSIGJNNtuoS5LZKszKUQGNqJh/kQ==", - "requires": {} + "integrity": "sha512-f5hiyy0nZtgIKrarbeO+DsZI441WvGz1W823D9G3g+FKDHXIoX72orXT5FvSIGJNNtuoS5LZKszKUQGNqJh/kQ==" }, "@pixi/extensions": { "version": "6.5.9", @@ -12266,44 +13167,37 @@ "@pixi/extract": { "version": "6.5.9", "resolved": "https://registry.npmjs.org/@pixi/extract/-/extract-6.5.9.tgz", - "integrity": "sha512-fqnGfJFC6OJ63Js+lkt2YjTCLpzMnCETB3YTpty/DUM9K/0WzqZGHbWVyNmLo4XDHlG3qqgkXW2hmZQdY9BQAw==", - "requires": {} + "integrity": "sha512-fqnGfJFC6OJ63Js+lkt2YjTCLpzMnCETB3YTpty/DUM9K/0WzqZGHbWVyNmLo4XDHlG3qqgkXW2hmZQdY9BQAw==" }, "@pixi/filter-alpha": { "version": "6.5.9", "resolved": "https://registry.npmjs.org/@pixi/filter-alpha/-/filter-alpha-6.5.9.tgz", - "integrity": "sha512-p87mGgMXX64CKUmTSadIOUzA7Q7MxybmsYPZbxFIFWsH2ML07RZChEaZWL2Bzql2CwgfejzxJPkCTXB/Qn5IRQ==", - "requires": {} + "integrity": "sha512-p87mGgMXX64CKUmTSadIOUzA7Q7MxybmsYPZbxFIFWsH2ML07RZChEaZWL2Bzql2CwgfejzxJPkCTXB/Qn5IRQ==" }, "@pixi/filter-color-matrix": { "version": "6.5.9", "resolved": "https://registry.npmjs.org/@pixi/filter-color-matrix/-/filter-color-matrix-6.5.9.tgz", - "integrity": "sha512-ycx1SO3USLLbGHkqwo+3RwtvxnlffKinFuKQR59LrhuvULhrwLD9GVdB6e7wKgx7CrMtJe5kcED9ZTitLL7QbA==", - "requires": {} + "integrity": "sha512-ycx1SO3USLLbGHkqwo+3RwtvxnlffKinFuKQR59LrhuvULhrwLD9GVdB6e7wKgx7CrMtJe5kcED9ZTitLL7QbA==" }, "@pixi/graphics": { "version": "6.5.9", "resolved": "https://registry.npmjs.org/@pixi/graphics/-/graphics-6.5.9.tgz", - "integrity": "sha512-+b7Ke6MkngftcRq2WweqsEWtV4ttRRurCiiPYeOhM5kGuAwDoyWGhXnWltiBQUHAE026uEep8wFi3vmlAzlXTQ==", - "requires": {} + "integrity": "sha512-+b7Ke6MkngftcRq2WweqsEWtV4ttRRurCiiPYeOhM5kGuAwDoyWGhXnWltiBQUHAE026uEep8wFi3vmlAzlXTQ==" }, "@pixi/graphics-extras": { "version": "6.5.9", "resolved": "https://registry.npmjs.org/@pixi/graphics-extras/-/graphics-extras-6.5.9.tgz", - "integrity": "sha512-MP5zAC1glGw6iIb3yfDH5IULbvgifgK6To0QiJ7EjRif8p/hjI7vgu1C0TLFqN3Zuhp9QbJVYrHCmmxEmXzFXw==", - "requires": {} + "integrity": "sha512-MP5zAC1glGw6iIb3yfDH5IULbvgifgK6To0QiJ7EjRif8p/hjI7vgu1C0TLFqN3Zuhp9QbJVYrHCmmxEmXzFXw==" }, "@pixi/interaction": { "version": "6.5.9", "resolved": "https://registry.npmjs.org/@pixi/interaction/-/interaction-6.5.9.tgz", - "integrity": "sha512-PXWPPpOBwZdf/VtrstYaKqtUfJcJR57oRGdSXZ0mtvN8jEhsWUe0GlmlHEp6PxTwtn5ECKDy8+i9V0CcqLKgug==", - "requires": {} + "integrity": "sha512-PXWPPpOBwZdf/VtrstYaKqtUfJcJR57oRGdSXZ0mtvN8jEhsWUe0GlmlHEp6PxTwtn5ECKDy8+i9V0CcqLKgug==" }, "@pixi/loaders": { "version": "6.5.9", "resolved": "https://registry.npmjs.org/@pixi/loaders/-/loaders-6.5.9.tgz", - "integrity": "sha512-wHza2gnDEkfz1xmlLrsrxBzkEIWOufS4DFR/i1gl9lyzDJs5be1UB6zLbp8r7gxAYhNXHTbqU+CODYaJq/1TAQ==", - "requires": {} + "integrity": "sha512-wHza2gnDEkfz1xmlLrsrxBzkEIWOufS4DFR/i1gl9lyzDJs5be1UB6zLbp8r7gxAYhNXHTbqU+CODYaJq/1TAQ==" }, "@pixi/math": { "version": "6.5.9", @@ -12313,26 +13207,22 @@ "@pixi/math-extras": { "version": "6.5.9", "resolved": "https://registry.npmjs.org/@pixi/math-extras/-/math-extras-6.5.9.tgz", - "integrity": "sha512-ObwX1u6AWpp2qQpun7xychY5dFkhoHi4/lXhqyOF0BKOeN61fuIcP6Ro5W9jWTcTRgJJZYRC18RH3QoM5NqtGQ==", - "requires": {} + "integrity": "sha512-ObwX1u6AWpp2qQpun7xychY5dFkhoHi4/lXhqyOF0BKOeN61fuIcP6Ro5W9jWTcTRgJJZYRC18RH3QoM5NqtGQ==" }, "@pixi/mixin-cache-as-bitmap": { "version": "6.5.9", "resolved": "https://registry.npmjs.org/@pixi/mixin-cache-as-bitmap/-/mixin-cache-as-bitmap-6.5.9.tgz", - "integrity": "sha512-nhBRLp5f4bxnf/q+3DrVWD4MNWn8kymi6V7AFr+ItDROnCurAg96fefOZlUcxOs9hXWKM6QXkR9XQSHeXKNq+Q==", - "requires": {} + "integrity": "sha512-nhBRLp5f4bxnf/q+3DrVWD4MNWn8kymi6V7AFr+ItDROnCurAg96fefOZlUcxOs9hXWKM6QXkR9XQSHeXKNq+Q==" }, "@pixi/mixin-get-child-by-name": { "version": "6.5.9", "resolved": "https://registry.npmjs.org/@pixi/mixin-get-child-by-name/-/mixin-get-child-by-name-6.5.9.tgz", - "integrity": "sha512-Co1exHIPACW3dURze2KKDi7TnBa7CwyhI1SuEflynopN2CkMEhJ9VQJDCvd5FNzkhmc14lIdIEqtN19w9EEOYw==", - "requires": {} + "integrity": "sha512-Co1exHIPACW3dURze2KKDi7TnBa7CwyhI1SuEflynopN2CkMEhJ9VQJDCvd5FNzkhmc14lIdIEqtN19w9EEOYw==" }, "@pixi/mixin-get-global-position": { "version": "6.5.9", "resolved": "https://registry.npmjs.org/@pixi/mixin-get-global-position/-/mixin-get-global-position-6.5.9.tgz", - "integrity": "sha512-lwwbI4qVwlrknZjE8cVdgqsiIHdDyV4MdCL2wO7+zw5aW4EofPlyRb2av7za5onPagaFL/Jgj4WkUlZta40WaQ==", - "requires": {} + "integrity": "sha512-lwwbI4qVwlrknZjE8cVdgqsiIHdDyV4MdCL2wO7+zw5aW4EofPlyRb2av7za5onPagaFL/Jgj4WkUlZta40WaQ==" }, "@pixi/polyfill": { "version": "6.5.9", @@ -12351,44 +13241,37 @@ "@pixi/settings": { "version": "6.5.9", "resolved": "https://registry.npmjs.org/@pixi/settings/-/settings-6.5.9.tgz", - "integrity": "sha512-cOODlDuToO3uixgDRHlsxGbzlgZKNyZn+AeZKHyo6z8JpLh5mYrC4wEgLyHoKSOX0VgNzlSY6VNLthmgpu2gAg==", - "requires": {} + "integrity": "sha512-cOODlDuToO3uixgDRHlsxGbzlgZKNyZn+AeZKHyo6z8JpLh5mYrC4wEgLyHoKSOX0VgNzlSY6VNLthmgpu2gAg==" }, "@pixi/sprite": { "version": "6.5.9", "resolved": "https://registry.npmjs.org/@pixi/sprite/-/sprite-6.5.9.tgz", - "integrity": "sha512-pgYHrIES9vZ1HfcFVpvDpdI8sMwzNRhInDkfRCfJX0K3NaAW8AWzu1DPPsn+eYzIF14gpi9JZXS3lT8JtD8lug==", - "requires": {} + "integrity": "sha512-pgYHrIES9vZ1HfcFVpvDpdI8sMwzNRhInDkfRCfJX0K3NaAW8AWzu1DPPsn+eYzIF14gpi9JZXS3lT8JtD8lug==" }, "@pixi/sprite-tiling": { "version": "6.5.9", "resolved": "https://registry.npmjs.org/@pixi/sprite-tiling/-/sprite-tiling-6.5.9.tgz", - "integrity": "sha512-+I7iQfp/xhosyNCGx0JmOk+QGIPHC1kjq/QEhzaMwvFnw7rsoUdhy4B13fF38DMPdzrFpGuyWfdZW5xezRA3Ww==", - "requires": {} + "integrity": "sha512-+I7iQfp/xhosyNCGx0JmOk+QGIPHC1kjq/QEhzaMwvFnw7rsoUdhy4B13fF38DMPdzrFpGuyWfdZW5xezRA3Ww==" }, "@pixi/spritesheet": { "version": "6.5.9", "resolved": "https://registry.npmjs.org/@pixi/spritesheet/-/spritesheet-6.5.9.tgz", - "integrity": "sha512-jf27xXl1/v2kA+Vr8E4/xLAMMO3xxNOk/blZCVr/RwKILS9T3R1Y7f4FICW2Gv4jLreBLvWwYM41NPon9/N3/g==", - "requires": {} + "integrity": "sha512-jf27xXl1/v2kA+Vr8E4/xLAMMO3xxNOk/blZCVr/RwKILS9T3R1Y7f4FICW2Gv4jLreBLvWwYM41NPon9/N3/g==" }, "@pixi/text": { "version": "6.5.9", "resolved": "https://registry.npmjs.org/@pixi/text/-/text-6.5.9.tgz", - "integrity": "sha512-nhIQTplpO9e4bjw32/A0mGYtx9yMV7TeL5PQ+pXKUJjvMKxNiqzK4ULLNvGd8bZm/RED1FpFtxGhuw5x4r+0qQ==", - "requires": {} + "integrity": "sha512-nhIQTplpO9e4bjw32/A0mGYtx9yMV7TeL5PQ+pXKUJjvMKxNiqzK4ULLNvGd8bZm/RED1FpFtxGhuw5x4r+0qQ==" }, "@pixi/ticker": { "version": "6.5.9", "resolved": "https://registry.npmjs.org/@pixi/ticker/-/ticker-6.5.9.tgz", - "integrity": "sha512-y7bpdSXc+UkfH2HPvOCV7XBk1eFsmoexsvVGqlRNd9r0sb/OXqcYLvnW4+BEyt5xKp7TpQibNBEKJCNih4dcMQ==", - "requires": {} + "integrity": "sha512-y7bpdSXc+UkfH2HPvOCV7XBk1eFsmoexsvVGqlRNd9r0sb/OXqcYLvnW4+BEyt5xKp7TpQibNBEKJCNih4dcMQ==" }, "@pixi/tilemap": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/@pixi/tilemap/-/tilemap-3.2.2.tgz", - "integrity": "sha512-svdmMyJP63vdae3t66tCmE8IWeO/6lD1xXU+5gzfxqxJS5seTp2bm8mQok2c8PF0O6l/NYlLz6BRklOuEuHboQ==", - "requires": {} + "integrity": "sha512-svdmMyJP63vdae3t66tCmE8IWeO/6lD1xXU+5gzfxqxJS5seTp2bm8mQok2c8PF0O6l/NYlLz6BRklOuEuHboQ==" }, "@pixi/utils": { "version": "6.5.9", @@ -12459,6 +13342,64 @@ "picomatch": "^2.2.2" } }, + "@sindresorhus/is": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", + "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==", + "dev": true + }, + "@swc/cli": { + "version": "0.1.62", + "resolved": "https://registry.npmjs.org/@swc/cli/-/cli-0.1.62.tgz", + "integrity": "sha512-kOFLjKY3XH1DWLfXL1/B5MizeNorHR8wHKEi92S/Zi9Md/AK17KSqR8MgyRJ6C1fhKHvbBCl8wboyKAFXStkYw==", + "dev": true, + "requires": { + "@mole-inc/bin-wrapper": "^8.0.1", + "commander": "^7.1.0", + "fast-glob": "^3.2.5", + "semver": "^7.3.8", + "slash": "3.0.0", + "source-map": "^0.7.3" + }, + "dependencies": { + "commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "dev": true + }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, + "semver": { + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + }, + "source-map": { + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", + "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==", + "dev": true + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + } + } + }, "@swc/core": { "version": "1.3.40", "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.3.40.tgz", @@ -12555,6 +13496,15 @@ "tslib": "^2.4.0" } }, + "@szmarczak/http-timer": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz", + "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==", + "dev": true, + "requires": { + "defer-to-connect": "^2.0.0" + } + }, "@tanstack/react-virtual": { "version": "3.0.0-alpha.0", "resolved": "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.0.0-alpha.0.tgz", @@ -12591,6 +13541,12 @@ "@types/react-dom": "^18.0.0" } }, + "@tokenizer/token": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz", + "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==", + "dev": true + }, "@tootallnate/once": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", @@ -12664,6 +13620,18 @@ "integrity": "sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==", "dev": true }, + "@types/cacheable-request": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz", + "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==", + "dev": true, + "requires": { + "@types/http-cache-semantics": "*", + "@types/keyv": "^3.1.4", + "@types/node": "*", + "@types/responselike": "^1.0.0" + } + }, "@types/chai": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.4.tgz", @@ -12706,6 +13674,12 @@ "integrity": "sha512-PEZldwZqJJw1PWRTpupyC7ajVTZA8aHd8nB/Y0n6zRZi5u8ktYDntsHj13ltEiBRqWwF06pASxBEvCTxniG8eA==", "dev": true }, + "@types/http-cache-semantics": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz", + "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==", + "dev": true + }, "@types/istanbul-lib-coverage": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", @@ -12724,6 +13698,15 @@ "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", "dev": true }, + "@types/keyv": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz", + "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, "@types/node": { "version": "18.14.2", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.2.tgz", @@ -12779,6 +13762,15 @@ "@types/react": "*" } }, + "@types/responselike": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz", + "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, "@types/scheduler": { "version": "0.16.2", "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz", @@ -13094,8 +14086,7 @@ "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true, - "requires": {} + "dev": true }, "acorn-walk": { "version": "8.2.0", @@ -13446,6 +14437,189 @@ "tweetnacl": "^0.14.3" } }, + "bin-check": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bin-check/-/bin-check-4.1.0.tgz", + "integrity": "sha512-b6weQyEUKsDGFlACWSIOfveEnImkJyK/FGW6FAG42loyoquvjdtOIqO6yBFzHyqyVVhNgNkQxxx09SFLK28YnA==", + "dev": true, + "requires": { + "execa": "^0.7.0", + "executable": "^4.1.0" + }, + "dependencies": { + "cross-spawn": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==", + "dev": true, + "requires": { + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "execa": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha512-RztN09XglpYI7aBBrJCPW95jEH7YF1UEPOoX9yDhUTPdp7mK+CQvnLTuD10BNXZ3byLTu2uehZ8EcKT/4CGiFw==", + "dev": true, + "requires": { + "cross-spawn": "^5.0.1", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + } + }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==", + "dev": true + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==", + "dev": true + }, + "lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "dev": true, + "requires": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + }, + "npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==", + "dev": true, + "requires": { + "path-key": "^2.0.0" + } + }, + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==", + "dev": true + }, + "shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==", + "dev": true, + "requires": { + "shebang-regex": "^1.0.0" + } + }, + "shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==", + "dev": true + }, + "which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + }, + "yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==", + "dev": true + } + } + }, + "bin-version": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/bin-version/-/bin-version-6.0.0.tgz", + "integrity": "sha512-nk5wEsP4RiKjG+vF+uG8lFsEn4d7Y6FVDamzzftSunXOoOcOOkzcWdKVlGgFFwlUQCj63SgnUkLLGF8v7lufhw==", + "dev": true, + "requires": { + "execa": "^5.0.0", + "find-versions": "^5.0.0" + }, + "dependencies": { + "execa": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "dev": true, + "requires": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + } + }, + "get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "dev": true + }, + "human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "dev": true + } + } + }, + "bin-version-check": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/bin-version-check/-/bin-version-check-5.0.0.tgz", + "integrity": "sha512-Q3FMQnS5eZmrBGqmDXLs4dbAn/f+52voP6ykJYmweSA60t6DyH4UTSwZhtbK5UH+LBoWvDljILUQMLRUtsynsA==", + "dev": true, + "requires": { + "bin-version": "^6.0.0", + "semver": "^7.3.5", + "semver-truncate": "^2.0.0" + }, + "dependencies": { + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, + "semver": { + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + } + } + }, "binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", @@ -13571,6 +14745,27 @@ } } }, + "cacheable-lookup": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz", + "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==", + "dev": true + }, + "cacheable-request": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz", + "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==", + "dev": true, + "requires": { + "clone-response": "^1.0.2", + "get-stream": "^5.1.0", + "http-cache-semantics": "^4.0.0", + "keyv": "^4.0.0", + "lowercase-keys": "^2.0.0", + "normalize-url": "^6.0.1", + "responselike": "^2.0.0" + } + }, "cachedir": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz", @@ -13721,6 +14916,15 @@ "wrap-ansi": "^7.0.0" } }, + "clone-response": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz", + "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==", + "dev": true, + "requires": { + "mimic-response": "^1.0.0" + } + }, "color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -13775,6 +14979,15 @@ "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==", "dev": true }, + "content-disposition": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "dev": true, + "requires": { + "safe-buffer": "5.2.1" + } + }, "convert-source-map": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", @@ -13980,6 +15193,23 @@ "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==", "dev": true }, + "decompress-response": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", + "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", + "dev": true, + "requires": { + "mimic-response": "^3.1.0" + }, + "dependencies": { + "mimic-response": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", + "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", + "dev": true + } + } + }, "deep-eql": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz", @@ -14020,6 +15250,12 @@ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", "dev": true }, + "defer-to-connect": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", + "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", + "dev": true + }, "define-lazy-prop": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", @@ -14454,8 +15690,7 @@ "version": "8.1.0", "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.1.0.tgz", "integrity": "sha512-oKMhGv3ihGbCIimCAjqkdzx2Q+jthoqnXSP+d86M9tptwugycmTFdVR4IpLgq2c4SHifbwO90z2fQ8/Aio73yw==", - "dev": true, - "requires": {} + "dev": true }, "eslint-import-resolver-node": { "version": "0.3.7", @@ -14698,8 +15933,7 @@ "version": "4.6.0", "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz", "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==", - "dev": true, - "requires": {} + "dev": true }, "eslint-scope": { "version": "5.1.1", @@ -14832,6 +16066,25 @@ "pify": "^2.2.0" } }, + "ext-list": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz", + "integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==", + "dev": true, + "requires": { + "mime-db": "^1.28.0" + } + }, + "ext-name": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz", + "integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==", + "dev": true, + "requires": { + "ext-list": "^2.0.0", + "sort-keys-length": "^1.0.0" + } + }, "extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", @@ -14922,6 +16175,17 @@ "flat-cache": "^3.0.4" } }, + "file-type": { + "version": "17.1.6", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-17.1.6.tgz", + "integrity": "sha512-hlDw5Ev+9e883s0pwUsuuYNu4tD7GgpUnOvykjv1Gya0ZIjuKumthDRua90VUn6/nlRKAjcxLUnHNTIUWwWIiw==", + "dev": true, + "requires": { + "readable-web-to-node-stream": "^3.0.2", + "strtok3": "^7.0.0-alpha.9", + "token-types": "^5.0.0-alpha.2" + } + }, "filelist": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", @@ -14951,6 +16215,23 @@ } } }, + "filename-reserved-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-3.0.0.tgz", + "integrity": "sha512-hn4cQfU6GOT/7cFHXBqeBg2TbrMBgdD0kcjLhvSQYYwm3s4B6cjvBfb7nBALJLAXqmU5xajSa7X2NnUud/VCdw==", + "dev": true + }, + "filenamify": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-5.1.1.tgz", + "integrity": "sha512-M45CbrJLGACfrPOkrTp3j2EcO9OBkKUYME0eiqOCa7i2poaklU0jhlIaMlr8ijLorT0uLAzrn3qXOp5684CkfA==", + "dev": true, + "requires": { + "filename-reserved-regex": "^3.0.0", + "strip-outer": "^2.0.0", + "trim-repeated": "^2.0.0" + } + }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -14970,6 +16251,15 @@ "path-exists": "^4.0.0" } }, + "find-versions": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-5.1.0.tgz", + "integrity": "sha512-+iwzCJ7C5v5KgcBuueqVoNiHVoQpwiUK5XFLjf0affFTep+Wcw93tPvmb8tqujDNmzhBDPddnWV/qgWSXgq+Hg==", + "dev": true, + "requires": { + "semver-regex": "^4.0.5" + } + }, "flat": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", @@ -15252,6 +16542,25 @@ "get-intrinsic": "^1.1.3" } }, + "got": { + "version": "11.8.6", + "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz", + "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==", + "dev": true, + "requires": { + "@sindresorhus/is": "^4.0.0", + "@szmarczak/http-timer": "^4.0.5", + "@types/cacheable-request": "^6.0.1", + "@types/responselike": "^1.0.0", + "cacheable-lookup": "^5.0.3", + "cacheable-request": "^7.0.2", + "decompress-response": "^6.0.0", + "http2-wrapper": "^1.0.0-beta.5.2", + "lowercase-keys": "^2.0.0", + "p-cancelable": "^2.0.0", + "responselike": "^2.0.0" + } + }, "graceful-fs": { "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", @@ -15335,6 +16644,12 @@ "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", "dev": true }, + "http-cache-semantics": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", + "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==", + "dev": true + }, "http-proxy-agent": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", @@ -15357,6 +16672,16 @@ "sshpk": "^1.14.1" } }, + "http2-wrapper": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz", + "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==", + "dev": true, + "requires": { + "quick-lru": "^5.1.1", + "resolve-alpn": "^1.0.0" + } + }, "https-proxy-agent": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", @@ -15621,6 +16946,12 @@ "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", "dev": true }, + "is-plain-obj": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", + "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==", + "dev": true + }, "is-potential-custom-element-name": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", @@ -15883,6 +17214,12 @@ "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", "dev": true }, + "json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true + }, "json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", @@ -15957,6 +17294,15 @@ "object.assign": "^4.1.3" } }, + "keyv": { + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz", + "integrity": "sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==", + "dev": true, + "requires": { + "json-buffer": "3.0.1" + } + }, "language-subtag-registry": { "version": "0.3.22", "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz", @@ -16128,6 +17474,12 @@ "get-func-name": "^2.0.0" } }, + "lowercase-keys": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", + "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", + "dev": true + }, "lru-cache": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", @@ -16203,6 +17555,12 @@ "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", "dev": true }, + "mimic-response": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", + "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", + "dev": true + }, "minimatch": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz", @@ -16272,6 +17630,12 @@ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true }, + "normalize-url": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", + "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", + "dev": true + }, "npm-run-path": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", @@ -16464,12 +17828,33 @@ "word-wrap": "^1.2.3" } }, + "os-filter-obj": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/os-filter-obj/-/os-filter-obj-2.0.0.tgz", + "integrity": "sha512-uksVLsqG3pVdzzPvmAHpBK0wKxYItuzZr7SziusRPoz67tGV8rL1szZ6IdeUrbqLjGDwApBtN29eEE3IqGHOjg==", + "dev": true, + "requires": { + "arch": "^2.1.0" + } + }, "ospath": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz", "integrity": "sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==", "dev": true }, + "p-cancelable": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz", + "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==", + "dev": true + }, + "p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==", + "dev": true + }, "p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -16576,6 +17961,12 @@ "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", "dev": true }, + "peek-readable": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-5.0.0.tgz", + "integrity": "sha512-YtCKvLUOvwtMGmrniQPdO7MwPjgkFBtFIrmfSbYmYuq3tKDV/mcfAhBth1+C3ru7uXIZasc/pHnb+YDYNkkj4A==", + "dev": true + }, "pend": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", @@ -16698,6 +18089,12 @@ "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", "dev": true }, + "pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==", + "dev": true + }, "psl": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", @@ -16746,6 +18143,12 @@ "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", "dev": true }, + "quick-lru": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", + "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", + "dev": true + }, "react": { "version": "18.2.0", "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", @@ -16785,14 +18188,12 @@ "react-fps-stats": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/react-fps-stats/-/react-fps-stats-0.3.1.tgz", - "integrity": "sha512-SwjJd8eK6XQseXF0DjOv0PotfzSkIm9yhqsggEaJHhPgKq0P7QcL5xuLy/UlOFGjFbRMHRp1w8b8wJfoWNR3uA==", - "requires": {} + "integrity": "sha512-SwjJd8eK6XQseXF0DjOv0PotfzSkIm9yhqsggEaJHhPgKq0P7QcL5xuLy/UlOFGjFbRMHRp1w8b8wJfoWNR3uA==" }, "react-icons": { "version": "4.8.0", "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.8.0.tgz", - "integrity": "sha512-N6+kOLcihDiAnj5Czu637waJqSnwlMNROzVZMhfX68V/9bu9qHaMIJC4UdozWoOk57gahFCNHwVvWzm0MTzRjg==", - "requires": {} + "integrity": "sha512-N6+kOLcihDiAnj5Czu637waJqSnwlMNROzVZMhfX68V/9bu9qHaMIJC4UdozWoOk57gahFCNHwVvWzm0MTzRjg==" }, "react-is": { "version": "17.0.2", @@ -16874,6 +18275,15 @@ "util-deprecate": "^1.0.1" } }, + "readable-web-to-node-stream": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz", + "integrity": "sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==", + "dev": true, + "requires": { + "readable-stream": "^3.6.0" + } + }, "readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -16992,12 +18402,27 @@ "supports-preserve-symlinks-flag": "^1.0.0" } }, + "resolve-alpn": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz", + "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==", + "dev": true + }, "resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", "dev": true }, + "responselike": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz", + "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==", + "dev": true, + "requires": { + "lowercase-keys": "^2.0.0" + } + }, "restore-cursor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", @@ -17141,6 +18566,29 @@ } } }, + "semver-regex": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-4.0.5.tgz", + "integrity": "sha512-hunMQrEy1T6Jr2uEVjrAIqjwWcQTgOAcIM52C8MY1EZSD3DDNft04XzvYKPqjED65bNVVko0YI38nYeEHCX3yw==", + "dev": true + }, + "semver-truncate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/semver-truncate/-/semver-truncate-2.0.0.tgz", + "integrity": "sha512-Rh266MLDYNeML5h90ttdMwfXe1+Nc4LAWd9X1KdJe8pPHP4kFmvLZALtsMNHNdvTyQygbEC0D59sIz47DIaq8w==", + "dev": true, + "requires": { + "semver": "^6.0.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } + } + }, "shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -17206,6 +18654,24 @@ "is-fullwidth-code-point": "^3.0.0" } }, + "sort-keys": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz", + "integrity": "sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg==", + "dev": true, + "requires": { + "is-plain-obj": "^1.0.0" + } + }, + "sort-keys-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz", + "integrity": "sha512-GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw==", + "dev": true, + "requires": { + "sort-keys": "^1.0.0" + } + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -17344,6 +18810,12 @@ "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", "dev": true }, + "strip-eof": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==", + "dev": true + }, "strip-final-newline": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", @@ -17365,6 +18837,12 @@ "acorn": "^8.8.2" } }, + "strip-outer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-2.0.0.tgz", + "integrity": "sha512-A21Xsm1XzUkK0qK1ZrytDUvqsQWict2Cykhvi0fBQntGG5JSprESasEyV1EZ/4CiR5WB5KjzLTrP/bO37B0wPg==", + "dev": true + }, "strong-log-transformer": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz", @@ -17376,6 +18854,16 @@ "through": "^2.3.4" } }, + "strtok3": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-7.0.0.tgz", + "integrity": "sha512-pQ+V+nYQdC5H3Q7qBZAz/MO6lwGhoC2gOAjuouGf/VO0m7vQRh8QNMl2Uf6SwAtzZ9bOw3UIeBukEGNJl5dtXQ==", + "dev": true, + "requires": { + "@tokenizer/token": "^0.3.0", + "peek-readable": "^5.0.0" + } + }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -17481,6 +18969,16 @@ "is-number": "^7.0.0" } }, + "token-types": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/token-types/-/token-types-5.0.1.tgz", + "integrity": "sha512-Y2fmSnZjQdDb9W4w4r1tswlMHylzWIeOKpx0aZH9BgGtACHhrk3OkT52AzwcuqTRBZtvvnTjDBh8eynMulu8Vg==", + "dev": true, + "requires": { + "@tokenizer/token": "^0.3.0", + "ieee754": "^1.2.1" + } + }, "totalist": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.0.tgz", @@ -17512,12 +19010,28 @@ "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==", "dev": true }, + "trim-repeated": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-2.0.0.tgz", + "integrity": "sha512-QUHBFTJGdOwmp0tbOG505xAgOp/YliZP/6UgafFXYZ26WT1bvQmSMJUvkeVSASuJJHbqsFbynTvkd5W8RBTipg==", + "dev": true, + "requires": { + "escape-string-regexp": "^5.0.0" + }, + "dependencies": { + "escape-string-regexp": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz", + "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==", + "dev": true + } + } + }, "tsconfck": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-2.1.0.tgz", "integrity": "sha512-lztI9ohwclQHISVWrM/hlcgsRpphsii94DV9AQtAw2XJSVNiv+3ppdEsrL5J+xc5oTeHXe1qDqlOAGw8VSa9+Q==", - "dev": true, - "requires": {} + "dev": true }, "tsconfig-paths": { "version": "4.1.2", @@ -17716,8 +19230,7 @@ "use-between": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/use-between/-/use-between-1.3.5.tgz", - "integrity": "sha512-IP9eJfszZr0aah/6i/pzaM7n/QgMPwWKJ+mnWqT5O0qFhLnztPbkVC6L7zI6ygeBIMJHfmUGvsw0b28pyrEGSA==", - "requires": {} + "integrity": "sha512-IP9eJfszZr0aah/6i/pzaM7n/QgMPwWKJ+mnWqT5O0qFhLnztPbkVC6L7zI6ygeBIMJHfmUGvsw0b28pyrEGSA==" }, "util-deprecate": { "version": "1.0.2", @@ -17950,8 +19463,7 @@ "version": "8.13.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", - "dev": true, - "requires": {} + "dev": true }, "xml-name-validator": { "version": "4.0.0", diff --git a/package.json b/package.json index 3bbeae5..e576b92 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "@pixi/ticker": "~6.5.0", "@pixi/tilemap": "^3.2.2", "@pixi/utils": "~6.5.0", + "@swc/helpers": "~0.4.11", "@tanstack/react-virtual": "^3.0.0-alpha.0", "gifuct-js": "^2.1.2", "howler": "^2.2.3", @@ -58,6 +59,8 @@ "@nrwl/react": "15.8.6", "@nrwl/vite": "15.8.6", "@nrwl/workspace": "15.8.6", + "@swc/cli": "~0.1.55", + "@swc/core": "^1.2.173", "@testing-library/react": "14.0.0", "@trivago/prettier-plugin-sort-imports": "^4.1.1", "@types/howler": "^2.2.7", diff --git a/tsconfig.base.json b/tsconfig.base.json index f2f9273..079782a 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -16,8 +16,7 @@ "allowJs": true, "esModuleInterop": true, "allowSyntheticDefaultImports": true, - "strict": false, - "noFallthroughCasesInSwitch": false, + "strictNullChecks": false, "baseUrl": ".", "paths": { "@nitro/renderer": ["libs/renderer/src/index.ts"]