From d8741a75b0d02d2ff637e2a5f977ec845f2bbf10 Mon Sep 17 00:00:00 2001 From: Bill Date: Wed, 9 Nov 2022 17:58:54 -0500 Subject: [PATCH 1/2] Update for asset manager --- src/components/floorplan-editor/common/FloorplanEditor.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/floorplan-editor/common/FloorplanEditor.ts b/src/components/floorplan-editor/common/FloorplanEditor.ts index 34008af5..50c2ce22 100644 --- a/src/components/floorplan-editor/common/FloorplanEditor.ts +++ b/src/components/floorplan-editor/common/FloorplanEditor.ts @@ -1,5 +1,4 @@ -import { IGraphicAssetCollection, NitroPoint, NitroTilemap, PixiApplicationProxy, PixiInteractionEventProxy, POINT_STRUCT_SIZE } from '@nitrots/nitro-renderer'; -import { GetNitroCore } from '../../../api'; +import { GetAssetManager, IGraphicAssetCollection, NitroPoint, NitroTilemap, PixiApplicationProxy, PixiInteractionEventProxy, POINT_STRUCT_SIZE } from '@nitrots/nitro-renderer'; import { ActionSettings } from './ActionSettings'; import { FloorAction, HEIGHT_SCHEME, MAX_NUM_TILE_PER_AXIS, TILE_SIZE } from './Constants'; import { Tile } from './Tile'; @@ -53,7 +52,7 @@ export class FloorplanEditor extends PixiApplicationProxy { if(this._isInitialized) return; - const collection = GetNitroCore().asset.getCollection('floor_editor'); + const collection = GetAssetManager().getCollection('floor_editor'); if(!collection) return; From 52befcdd7ce1863f424fbccdc3a7a57466fd1484 Mon Sep 17 00:00:00 2001 From: Bill Date: Wed, 9 Nov 2022 18:00:05 -0500 Subject: [PATCH 2/2] Another change --- src/App.tsx | 4 ++-- src/common/types/OverflowType.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index a4ffe39c..88685e09 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,4 +1,4 @@ -import { ConfigurationEvent, HabboWebTools, LegacyExternalInterface, Nitro, NitroCommunicationDemoEvent, NitroConfiguration, NitroEvent, NitroLocalizationEvent, NitroVersion, RoomEngineEvent, WebGL } from '@nitrots/nitro-renderer'; +import { ConfigurationEvent, GetAssetManager, HabboWebTools, LegacyExternalInterface, Nitro, NitroCommunicationDemoEvent, NitroConfiguration, NitroEvent, NitroLocalizationEvent, NitroVersion, RoomEngineEvent, WebGL } from '@nitrots/nitro-renderer'; import { FC, useCallback, useEffect, useState } from 'react'; import { DispatchUiEvent, GetCommunication, GetConfiguration, GetNitroInstance, GetUIVersion } from './api'; import { Base, TransitionAnimation, TransitionAnimationTypes } from './common'; @@ -88,7 +88,7 @@ export const App: FC<{}> = props => if(assetUrls && assetUrls.length) for(const url of assetUrls) urls.push(NitroConfiguration.interpolate(url)); - GetNitroInstance().core.asset.downloadAssets(urls, (status: boolean) => + GetAssetManager().downloadAssets(urls, (status: boolean) => { if(status) { diff --git a/src/common/types/OverflowType.ts b/src/common/types/OverflowType.ts index 7c9e3b15..9231ff9f 100644 --- a/src/common/types/OverflowType.ts +++ b/src/common/types/OverflowType.ts @@ -1 +1 @@ -export type OverflowType = 'auto' | 'hidden' | 'visible' | 'scroll' | 'unset'; +export type OverflowType = 'auto' | 'hidden' | 'visible' | 'scroll' | 'y-scroll' | 'unset';