diff --git a/package-lock.json b/package-lock.json index 01419c68..b8a80770 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "brace": "^0.11.1", "buffer": "^6.0.3", "comment-json": "^4.1.1", - "deepslate": "^0.21.0", + "deepslate": "^0.22.0", "deepslate-1.18": "npm:deepslate@0.9.0-beta.9", "deepslate-1.18.2": "npm:deepslate@0.9.0", "deepslate-1.20.4": "npm:deepslate@0.20.1", @@ -1629,9 +1629,9 @@ "dev": true }, "node_modules/deepslate": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/deepslate/-/deepslate-0.21.0.tgz", - "integrity": "sha512-Km1JotTlko37L81N3fKfxEerHwVhF3+c+sCUMF3X6gxNHsiG0RSjRpNY63pxuRahxsmyuOyFjgQhQKH2hd2alg==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/deepslate/-/deepslate-0.22.0.tgz", + "integrity": "sha512-vxbwrWRhYrxRifGmzlVOAOYTYWFTpVLp4pmx9w0Cxryo2YDoIceb5AwjnxQO5eUuFri4tBY42KFiuzrnUA1V9g==", "dependencies": { "gl-matrix": "^3.3.0", "md5": "^2.3.0", @@ -5465,9 +5465,9 @@ "dev": true }, "deepslate": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/deepslate/-/deepslate-0.21.0.tgz", - "integrity": "sha512-Km1JotTlko37L81N3fKfxEerHwVhF3+c+sCUMF3X6gxNHsiG0RSjRpNY63pxuRahxsmyuOyFjgQhQKH2hd2alg==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/deepslate/-/deepslate-0.22.0.tgz", + "integrity": "sha512-vxbwrWRhYrxRifGmzlVOAOYTYWFTpVLp4pmx9w0Cxryo2YDoIceb5AwjnxQO5eUuFri4tBY42KFiuzrnUA1V9g==", "requires": { "gl-matrix": "^3.3.0", "md5": "^2.3.0", diff --git a/package.json b/package.json index 9b2decfb..634debe2 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "deepslate-1.18": "npm:deepslate@0.9.0-beta.9", "deepslate-1.18.2": "npm:deepslate@0.9.0", "deepslate-1.20.4": "npm:deepslate@0.20.1", - "deepslate": "^0.21.0", + "deepslate": "^0.22.0", "highlight.js": "^11.5.1", "howler": "^2.2.3", "js-yaml": "^3.14.1", diff --git a/src/app/components/previews/BlockStatePreview.tsx b/src/app/components/previews/BlockStatePreview.tsx index 7066b981..89575fb5 100644 --- a/src/app/components/previews/BlockStatePreview.tsx +++ b/src/app/components/previews/BlockStatePreview.tsx @@ -18,7 +18,7 @@ export const BlockStatePreview = ({ data, shown }: PreviewProps) => { const { value: resources } = useAsync(async () => { if (!shown) return AsyncCancel const resources = await getResources(version) - const definition = BlockDefinition.fromJson(PREVIEW_ID.toString(), DataModel.unwrapLists(data)) + const definition = BlockDefinition.fromJson(DataModel.unwrapLists(data)) const wrapper = new ResourceWrapper(resources, { getBlockDefinition(id) { if (id.equals(PREVIEW_ID)) return definition diff --git a/src/app/components/previews/ModelPreview.tsx b/src/app/components/previews/ModelPreview.tsx index d6baef21..9c440f32 100644 --- a/src/app/components/previews/ModelPreview.tsx +++ b/src/app/components/previews/ModelPreview.tsx @@ -10,7 +10,7 @@ import type { PreviewProps } from './index.js' import { InteractiveCanvas3D } from './InteractiveCanvas3D.jsx' const PREVIEW_ID = Identifier.parse('misode:preview') -const PREVIEW_DEFINITION = new BlockDefinition(PREVIEW_ID, { '': { model: PREVIEW_ID.toString() }}, undefined) +const PREVIEW_DEFINITION = new BlockDefinition({ '': { model: PREVIEW_ID.toString() }}, undefined) export const ModelPreview = ({ data, shown }: PreviewProps) => { const { version } = useVersion() @@ -19,7 +19,7 @@ export const ModelPreview = ({ data, shown }: PreviewProps) => { const { value: resources } = useAsync(async () => { if (!shown) return AsyncCancel const resources = await getResources(version) - const model = BlockModel.fromJson(PREVIEW_ID.toString(), DataModel.unwrapLists(data)) + const model = BlockModel.fromJson(DataModel.unwrapLists(data)) model.flatten(resources) const wrapper = new ResourceWrapper(resources, { getBlockDefinition(id) { diff --git a/src/app/services/Resources.ts b/src/app/services/Resources.ts index dc11db4e..adf8d89b 100644 --- a/src/app/services/Resources.ts +++ b/src/app/services/Resources.ts @@ -98,14 +98,14 @@ export class ResourceManager implements Resources { private loadBlockModels(models: Map) { [...models.entries()].forEach(([id, model]) => { - this.blockModels[Identifier.create(id).toString()] = BlockModel.fromJson(id, model) + this.blockModels[Identifier.create(id).toString()] = BlockModel.fromJson(model) }) Object.values(this.blockModels).forEach(m => m.flatten(this)) } private loadBlockDefinitions(definitions: Map) { [...definitions.entries()].forEach(([id, definition]) => { - this.blockDefinitions[Identifier.create(id).toString()] = BlockDefinition.fromJson(id, definition) + this.blockDefinitions[Identifier.create(id).toString()] = BlockDefinition.fromJson(definition) }) }