🔥 Nuke all mcschema related code

src/app/components/previews/BiomeSourcePreview.tsx

@@ -1,8 +1,7 @@
-import { DataModel } from '@mcschema/core'
 import { clampedMap } from 'deepslate'
 import { mat3 } from 'gl-matrix'
 import { useCallback, useRef, useState } from 'preact/hooks'
-import { getProjectData, useLocale, useProject, useStore } from '../../contexts/index.js'
+import { getProjectData, useLocale, useProject, useStore, useVersion } from '../../contexts/index.js'
 import { useAsync } from '../../hooks/index.js'
 import { checkVersion } from '../../services/Schemas.js'
 import { Store } from '../../Store.js'
@@ -21,8 +20,9 @@ type Layer = typeof LAYERS[number]
 const DETAIL_DELAY = 300
 const DETAIL_SCALE = 2
 
-export const BiomeSourcePreview = ({ data, shown, version }: PreviewProps) => {
+export const BiomeSourcePreview = ({ model, shown }: PreviewProps) => {
 	const { locale } = useLocale()
+	const { version } = useVersion()
 	const { project } = useProject()
 	const { biomeColors } = useStore()
 	const [seed, setSeed] = useState(randomSeed())
@@ -31,13 +31,13 @@ export const BiomeSourcePreview = ({ data, shown, version }: PreviewProps) => {
 	const [focused, setFocused] = useState<string[]>([])
 	const [focused2, setFocused2] = useState<string[]>([])
 
-	const state = JSON.stringify(data)
-	const type: string = data?.generator?.biome_source?.type?.replace(/^minecraft:/, '') ?? ''
+	const state = JSON.stringify(model.data)
+	const type: string = model.data?.generator?.biome_source?.type?.replace(/^minecraft:/, '') ?? ''
 	const hasRandomness = type === 'multi_noise' || type === 'the_end'
 
 	const { value } = useAsync(async function loadBiomeSource() {
 		await DEEPSLATE.loadVersion(version, getProjectData(project))
-		await DEEPSLATE.loadChunkGenerator(DataModel.unwrapLists(data?.generator?.settings), DataModel.unwrapLists(data?.generator?.biome_source), seed)
+		await DEEPSLATE.loadChunkGenerator(model.data?.generator?.settings, model.data?.generator?.biome_source, seed)
 		return {
 			biomeSource: { loaded: true },
 			noiseRouter: checkVersion(version, '1.19') ? DEEPSLATE.getNoiseRouter() : undefined,

src/app/components/previews/BlockStatePreview.tsx

@@ -1,4 +1,3 @@
-import { DataModel } from '@mcschema/core'
 import { BlockDefinition, Identifier, Structure, StructureRenderer } from 'deepslate/render'
 import type { mat4 } from 'gl-matrix'
 import { useCallback, useRef } from 'preact/hooks'
@@ -11,14 +10,14 @@ import { InteractiveCanvas3D } from './InteractiveCanvas3D.jsx'
 
 const PREVIEW_ID = Identifier.parse('misode:preview')
 
-export const BlockStatePreview = ({ data, shown }: PreviewProps) => {
+export const BlockStatePreview = ({ model, shown }: PreviewProps) => {
 	const { version } = useVersion()
-	const serializedData = JSON.stringify(data)
+	const serializedData = JSON.stringify(model.data)
 
 	const { value: resources } = useAsync(async () => {
 		if (!shown) return AsyncCancel
 		const resources = await getResources(version)
-		const definition = BlockDefinition.fromJson(DataModel.unwrapLists(data))
+		const definition = BlockDefinition.fromJson(model.data)
 		const wrapper = new ResourceWrapper(resources, {
 			getBlockDefinition(id) {
 				if (id.equals(PREVIEW_ID)) return definition

src/app/components/previews/Decorator.ts

@@ -1,9 +1,8 @@
-import { DataModel } from '@mcschema/core'
 import type { BlockPos, ChunkPos, PerlinNoise, Random } from 'deepslate/worldgen'
-import type { Color } from '../../Utils.js'
-import { clamp, isObject, stringToColor } from '../../Utils.js'
 import type { VersionId } from '../../services/index.js'
 import { checkVersion } from '../../services/index.js'
+import type { Color } from '../../Utils.js'
+import { clamp, isObject, stringToColor } from '../../Utils.js'
 
 export type Placement = [BlockPos, number]
 
@@ -38,9 +37,9 @@ export const featureColors: Color[] = [
 
 export function decorateChunk(pos: ChunkPos, state: any, ctx: PlacementContext): PlacedFeature[] {
 	if (checkVersion(ctx.version, undefined, '1.17')) {
-		getPlacements([pos[0] * 16, 0, pos[1] * 16], DataModel.unwrapLists(state), ctx)
+		getPlacements([pos[0] * 16, 0, pos[1] * 16], state, ctx)
 	} else {
-		modifyPlacement([pos[0] * 16, 0, pos[1] * 16], DataModel.unwrapLists(state.placement), ctx)
+		modifyPlacement([pos[0] * 16, 0, pos[1] * 16], state.placement, ctx)
 	}
 
 	return ctx.placements.map(([pos, i]) => {

src/app/components/previews/DecoratorPreview.tsx

@@ -1,7 +1,7 @@
 import { BlockPos, ChunkPos, LegacyRandom, PerlinNoise } from 'deepslate'
 import type { mat3 } from 'gl-matrix'
 import { useCallback, useMemo, useRef, useState } from 'preact/hooks'
-import { useLocale } from '../../contexts/index.js'
+import { useLocale, useVersion } from '../../contexts/index.js'
 import { computeIfAbsent, iterateWorld2D, randomSeed } from '../../Utils.js'
 import { Btn } from '../index.js'
 import type { PlacedFeature, PlacementContext } from './Decorator.js'
@@ -9,10 +9,11 @@ import { decorateChunk } from './Decorator.js'
 import type { PreviewProps } from './index.js'
 import { InteractiveCanvas2D } from './InteractiveCanvas2D.jsx'
 
-export const DecoratorPreview = ({ data, version, shown }: PreviewProps) => {
+export const DecoratorPreview = ({ model, shown }: PreviewProps) => {
 	const { locale } = useLocale()
+	const { version } = useVersion()
 	const [seed, setSeed] = useState(randomSeed())
-	const state = JSON.stringify(data)
+	const state = JSON.stringify(model.data)
 
 	const { context, chunkFeatures } = useMemo(() => {
 		const random = new LegacyRandom(seed)
@@ -51,7 +52,7 @@ export const DecoratorPreview = ({ data, version, shown }: PreviewProps) => {
 
 		iterateWorld2D(imageData.current, transform, (x, y) => {
 			const pos = ChunkPos.create(Math.floor(x / 16), Math.floor(-y / 16))
-			const features = computeIfAbsent(chunkFeatures, `${pos[0]} ${pos[1]}`, () => decorateChunk(pos, data, context))
+			const features = computeIfAbsent(chunkFeatures, `${pos[0]} ${pos[1]}`, () => decorateChunk(pos, model.data, context))
 			return features.find(f => f.pos[0] === x && f.pos[2] == -y) ?? { pos: BlockPos.create(x, 0, -y) }
 		}, (feature) => {
 			if ('color' in feature) {

src/app/components/previews/DensityFunctionPreview.tsx

@@ -1,4 +1,3 @@
-import { DataModel } from '@mcschema/core'
 import type { Voxel } from 'deepslate/render'
 import { clampedMap, VoxelRenderer } from 'deepslate/render'
 import type { mat3, mat4 } from 'gl-matrix'
@@ -19,7 +18,7 @@ import { InteractiveCanvas3D } from './InteractiveCanvas3D.jsx'
 
 const MODES = ['side', 'top', '3d'] as const
 
-export const DensityFunctionPreview = ({ data, shown }: PreviewProps) => {
+export const DensityFunctionPreview = ({ model, shown }: PreviewProps) => {
 	const { locale } = useLocale()
 	const { project } = useProject()
 	const { version } = useVersion()
@@ -29,11 +28,11 @@ export const DensityFunctionPreview = ({ data, shown }: PreviewProps) => {
 	const [seed, setSeed] = useState(randomSeed())
 	const [minY] = useState(0)
 	const [height] = useState(256)
-	const serializedData = JSON.stringify(data)
+	const serializedData = JSON.stringify(model.data)
 
 	const { value: df } = useAsync(async () => {
 		await DEEPSLATE.loadVersion(version, getProjectData(project))
-		const df = DEEPSLATE.loadDensityFunction(DataModel.unwrapLists(data), minY, height, seed)
+		const df = DEEPSLATE.loadDensityFunction(model.data, minY, height, seed)
 		return df
 	}, [version, project, minY, height, seed, serializedData])
 

src/app/components/previews/LootTablePreview.tsx

@@ -1,4 +1,3 @@
-import { DataModel } from '@mcschema/core'
 import { Identifier } from 'deepslate'
 import { useMemo, useRef, useState } from 'preact/hooks'
 import { useLocale, useVersion } from '../../contexts/index.js'
@@ -12,7 +11,7 @@ import type { PreviewProps } from './index.js'
 import { generateLootTable } from './LootTable.js'
 import { generateLootTable as generateLootTable1204 } from './LootTable1204.js'
 
-export const LootTablePreview = ({ data }: PreviewProps) => {
+export const LootTablePreview = ({ model }: PreviewProps) => {
 	const { locale } = useLocale()
 	const { version } = useVersion()
 	const use1204 = !checkVersion(version, '1.20.5')
@@ -35,7 +34,7 @@ export const LootTablePreview = ({ data }: PreviewProps) => {
 		])
 	}, [version])
 
-	const table = DataModel.unwrapLists(data)
+	const table = model.data
 	const state = JSON.stringify(table)
 	const items = useMemo(() => {
 		if (dependencies === undefined || loading) {

src/app/components/previews/ModelPreview.tsx

@@ -1,4 +1,3 @@
-import { DataModel } from '@mcschema/core'
 import { BlockDefinition, BlockModel, Identifier, Structure, StructureRenderer } from 'deepslate/render'
 import type { mat4 } from 'gl-matrix'
 import { useCallback, useRef } from 'preact/hooks'
@@ -12,22 +11,22 @@ import { InteractiveCanvas3D } from './InteractiveCanvas3D.jsx'
 const PREVIEW_ID = Identifier.parse('misode:preview')
 const PREVIEW_DEFINITION = new BlockDefinition({ '': { model: PREVIEW_ID.toString() }}, undefined)
 
-export const ModelPreview = ({ data, shown }: PreviewProps) => {
+export const ModelPreview = ({ model, shown }: PreviewProps) => {
 	const { version } = useVersion()
-	const serializedData = JSON.stringify(data)
+	const serializedData = JSON.stringify(model.data)
 
 	const { value: resources } = useAsync(async () => {
 		if (!shown) return AsyncCancel
 		const resources = await getResources(version)
-		const model = BlockModel.fromJson(DataModel.unwrapLists(data))
-		model.flatten(resources)
+		const blockModel = BlockModel.fromJson(model.data)
+		blockModel.flatten(resources)
 		const wrapper = new ResourceWrapper(resources, {
 			getBlockDefinition(id) {
 				if (id.equals(PREVIEW_ID)) return PREVIEW_DEFINITION
 				return null
 			},
 			getBlockModel(id) {
-				if (id.equals(PREVIEW_ID)) return model
+				if (id.equals(PREVIEW_ID)) return blockModel
 				return null
 			},
 		})

src/app/components/previews/NoisePreview.tsx

@@ -1,4 +1,3 @@
-import { DataModel } from '@mcschema/core'
 import { clampedMap, NoiseParameters, NormalNoise, XoroshiroRandom } from 'deepslate'
 import type { mat3 } from 'gl-matrix'
 import { useCallback, useMemo, useRef, useState } from 'preact/hooks'
@@ -12,14 +11,14 @@ import { ColormapSelector } from './ColormapSelector.jsx'
 import type { PreviewProps } from './index.js'
 import { InteractiveCanvas2D } from './InteractiveCanvas2D.jsx'
 
-export const NoisePreview = ({ data, shown }: PreviewProps) => {
+export const NoisePreview = ({ model, shown }: PreviewProps) => {
 	const { locale } = useLocale()
 	const [seed, setSeed] = useState(randomSeed())
-	const state = JSON.stringify(data)
+	const state = JSON.stringify(model.data)
 
 	const noise = useMemo(() => {
 		const random = XoroshiroRandom.create(seed)
-		const params = NoiseParameters.fromJson(DataModel.unwrapLists(data))
+		const params = NoiseParameters.fromJson(model.data)
 		return new NormalNoise(random, params)
 	}, [state, seed])
 

src/app/components/previews/NoiseSettingsPreview.tsx

@@ -1,31 +1,31 @@
-import { DataModel } from '@mcschema/core'
 import { clampedMap } from 'deepslate'
 import type { mat3 } from 'gl-matrix'
 import { vec2 } from 'gl-matrix'
-import { useCallback, useMemo, useRef, useState } from 'preact/hooks'
+import { useCallback, useRef, useState } from 'preact/hooks'
+import { getProjectData, useLocale, useProject, useVersion } from '../../contexts/index.js'
+import { useAsync } from '../../hooks/index.js'
+import { fetchRegistries } from '../../services/index.js'
 import { Store } from '../../Store.js'
 import { iterateWorld2D, randomSeed } from '../../Utils.js'
-import { getProjectData, useLocale, useProject } from '../../contexts/index.js'
-import { useAsync } from '../../hooks/index.js'
-import { CachedCollections } from '../../services/index.js'
 import { Btn, BtnInput, BtnMenu, ErrorPanel } from '../index.js'
 import type { ColormapType } from './Colormap.js'
 import { getColormap } from './Colormap.js'
 import { ColormapSelector } from './ColormapSelector.jsx'
 import { DEEPSLATE } from './Deepslate.js'
-import { InteractiveCanvas2D } from './InteractiveCanvas2D.jsx'
 import type { PreviewProps } from './index.js'
+import { InteractiveCanvas2D } from './InteractiveCanvas2D.jsx'
 
-export const NoiseSettingsPreview = ({ data, shown, version }: PreviewProps) => {
+export const NoiseSettingsPreview = ({ model, shown }: PreviewProps) => {
 	const { locale } = useLocale()
+	const { version } = useVersion()
 	const { project } = useProject()
 	const [seed, setSeed] = useState(randomSeed())
 	const [biome, setBiome] = useState('minecraft:plains')
 	const [layer, setLayer] = useState('terrain')
-	const state = JSON.stringify(data)
+	const state = JSON.stringify(model.data)
 
 	const { value, error } = useAsync(async () => {
-		const unwrapped = DataModel.unwrapLists(data)
+		const unwrapped = model.data
 		await DEEPSLATE.loadVersion(version, getProjectData(project))
 		const biomeSource = { type: 'fixed', biome }
 		await DEEPSLATE.loadChunkGenerator(unwrapped, biomeSource, seed)
@@ -86,7 +86,10 @@ export const NoiseSettingsPreview = ({ data, shown, version }: PreviewProps) =>
 		}
 	}, [noiseSettings, finalDensity])
 
-	const allBiomes = useMemo(() => CachedCollections?.get('worldgen/biome') ?? [], [version])
+	const { value: allBiomes } = useAsync(async () => {
+		const registries = await fetchRegistries(version)
+		return registries.get('worldgen/biome')
+	}, [version])
 
 	if (error) {
 		return <ErrorPanel error={error} prefix="Failed to initialize preview: " />

src/app/components/previews/RecipePreview.tsx

@@ -1,7 +1,6 @@
-import { DataModel } from '@mcschema/core'
 import { Identifier, ItemStack } from 'deepslate'
 import { useEffect, useMemo, useRef, useState } from 'preact/hooks'
-import { useLocale } from '../../contexts/index.js'
+import { useLocale, useVersion } from '../../contexts/index.js'
 import { useAsync } from '../../hooks/useAsync.js'
 import type { VersionId } from '../../services/index.js'
 import { checkVersion, fetchAllPresets } from '../../services/index.js'
@@ -12,8 +11,9 @@ import type { PreviewProps } from './index.js'
 
 const ANIMATION_TIME = 1000
 
-export const RecipePreview = ({ data, version }: PreviewProps) => {
+export const RecipePreview = ({ model }: PreviewProps) => {
 	const { locale } = useLocale()
+	const { version } = useVersion()
 	const [advancedTooltips, setAdvancedTooltips] = useState(true)
 	const [animation, setAnimation] = useState(0)
 	const overlay = useRef<HTMLDivElement>(null)
@@ -29,7 +29,7 @@ export const RecipePreview = ({ data, version }: PreviewProps) => {
 		return () => clearInterval(interval)
 	}, [])
 
-	const recipe = DataModel.unwrapLists(data)
+	const recipe = model.data
 	const state = JSON.stringify(recipe)
 	const items = useMemo<Map<Slot, ItemStack>>(() => {
 		return placeItems(version, recipe, animation, itemTags ?? new Map())

src/app/components/previews/StructureSetPreview.tsx

@@ -1,26 +1,26 @@
-import { DataModel } from '@mcschema/core'
 import type { Identifier } from 'deepslate'
 import { ChunkPos } from 'deepslate'
 import type { mat3 } from 'gl-matrix'
 import { useCallback, useMemo, useRef, useState } from 'preact/hooks'
+import { useLocale, useVersion } from '../../contexts/index.js'
+import { useAsync } from '../../hooks/useAsync.js'
 import type { Color } from '../../Utils.js'
 import { computeIfAbsent, iterateWorld2D, randomSeed, stringToColor } from '../../Utils.js'
-import { useLocale } from '../../contexts/index.js'
-import { useAsync } from '../../hooks/useAsync.js'
 import { Btn } from '../index.js'
 import { featureColors } from './Decorator.js'
 import { DEEPSLATE } from './Deepslate.js'
-import { InteractiveCanvas2D } from './InteractiveCanvas2D.jsx'
 import type { PreviewProps } from './index.js'
+import { InteractiveCanvas2D } from './InteractiveCanvas2D.jsx'
 
-export const StructureSetPreview = ({ data, version, shown }: PreviewProps) => {
+export const StructureSetPreview = ({ model, shown }: PreviewProps) => {
 	const { locale } = useLocale()
+	const { version } = useVersion()
 	const [seed, setSeed] = useState(randomSeed())
-	const state = JSON.stringify(data)
+	const state = JSON.stringify(model.data)
 
 	const { value: structureSet } = useAsync(async () => {
 		await DEEPSLATE.loadVersion(version)
-		const structureSet = DEEPSLATE.loadStructureSet(DataModel.unwrapLists(data), seed)
+		const structureSet = DEEPSLATE.loadStructureSet(model.data, seed)
 		return structureSet
 	}, [state, version, seed])
 

src/app/components/previews/index.ts

@@ -1,5 +1,4 @@
-import type { DataModel } from '@mcschema/core'
-import type { VersionId } from '../../services/index.js'
+import type { FileModel } from '../../services/index.js'
 
 export * from './BiomeSourcePreview.js'
 export * from './BlockStatePreview.jsx'
@@ -12,9 +11,7 @@ export * from './NoiseSettingsPreview.js'
 export * from './RecipePreview.jsx'
 export * from './StructureSetPreview.jsx'
 
-export type PreviewProps = {
-	model: DataModel,
-	data: any,
-	shown: boolean,
-	version: VersionId,
+export interface PreviewProps {
+	model: FileModel
+	shown: boolean
 }