diff --git a/src/app/components/SourcePanel.tsx b/src/app/components/SourcePanel.tsx index d8eb012a..9c65fb4f 100644 --- a/src/app/components/SourcePanel.tsx +++ b/src/app/components/SourcePanel.tsx @@ -4,24 +4,27 @@ import { useEffect, useRef } from 'preact/hooks' import { useModel } from '../hooks' import { locale } from '../Locales' import { transformOutput } from '../schema/transformOutput' +import type { BlockStateRegistry } from '../Schemas' type SourcePanelProps = { lang: string, name: string, model: DataModel | null, + blockStates: BlockStateRegistry | null, doCopy?: number, doDownload?: number, doImport?: number, onError: (message: string) => unknown, } -export function SourcePanel({ lang, name, model, doCopy, doDownload, doImport, onError }: SourcePanelProps) { +export function SourcePanel({ lang, name, model, blockStates, doCopy, doDownload, doImport, onError }: SourcePanelProps) { const loc = locale.bind(null, lang) const source = useRef(null) const download = useRef(null) useModel(model, model => { try { - const data = model.schema.hook(transformOutput, new ModelPath(model), model.data) + const props = { blockStates: blockStates ?? {} } + const data = model.schema.hook(transformOutput, new ModelPath(model), model.data, props) source.current.value = JSON.stringify(data, null, 2) + '\n' } catch (e) { onError(`Error getting JSON output: ${e.message}`) diff --git a/src/app/components/Tree.tsx b/src/app/components/Tree.tsx index 27137f74..e2ed0e4a 100644 --- a/src/app/components/Tree.tsx +++ b/src/app/components/Tree.tsx @@ -5,24 +5,25 @@ import { useModel } from '../hooks' import { locale } from '../Locales' import { Mounter } from '../schema/Mounter' import { renderHtml } from '../schema/renderHtml' -import type { VersionId } from '../Schemas' +import type { BlockStateRegistry, VersionId } from '../Schemas' type TreePanelProps = { lang: string, - model: DataModel | null, version: VersionId, + model: DataModel | null, + blockStates: BlockStateRegistry | null, onError: (message: string) => unknown, } -export function Tree({ lang, model, version, onError }: TreePanelProps) { +export function Tree({ lang, model, version, blockStates, onError }: TreePanelProps) { const tree = useRef(null) const redraw = useRef() useEffect(() => { redraw.current = () => { - if (!model) return + if (!model || !blockStates) return try { const mounter = new Mounter() - const props = { loc: locale.bind(null, lang), version, mounter } + const props = { loc: locale.bind(null, lang), version, mounter, blockStates } const path = new ModelPath(model) const rendered = model.schema.hook(renderHtml, path, model.data, props) const category = model.schema.category(path) @@ -30,7 +31,7 @@ export function Tree({ lang, model, version, onError }: TreePanelProps) { let html = rendered[2] if (rendered[1]) { html = `
-
${rendered[1]}
+
${rendered[0]}${rendered[1]}
${rendered[2]}
` } @@ -50,7 +51,7 @@ export function Tree({ lang, model, version, onError }: TreePanelProps) { useEffect(() => { redraw.current() - }, [lang]) + }, [lang, model, blockStates]) return
} diff --git a/src/app/pages/Generator.tsx b/src/app/pages/Generator.tsx index b667dc98..2119c8c8 100644 --- a/src/app/pages/Generator.tsx +++ b/src/app/pages/Generator.tsx @@ -5,8 +5,8 @@ import { Analytics } from '../Analytics' import { Ad, Btn, BtnInput, BtnMenu, ErrorPanel, HasPreview, Octicon, PreviewPanel, SourcePanel, Tree } from '../components' import { fetchPreset } from '../DataFetcher' import { locale } from '../Locales' -import type { VersionId } from '../Schemas' -import { checkVersion, getCollections, getModel } from '../Schemas' +import type { BlockStateRegistry, VersionId } from '../Schemas' +import { checkVersion, getBlockStates, getCollections, getModel } from '../Schemas' type GeneratorProps = { lang: string, @@ -40,8 +40,11 @@ export function Generator({ lang, changeTitle, version, onChangeVersion, categor changeTitle(loc('title.generator', loc(id)), allowedVersions) const [model, setModel] = useState(null) + const [blockStates, setBlockStates] = useState(null) useEffect(() => { setModel(null) + getBlockStates(version) + .then(b => setBlockStates(b)) getModel(version, id) .then(m => setModel(m)) .catch(e => setError(e.message)) @@ -165,7 +168,7 @@ export function Generator({ lang, changeTitle, version, onChangeVersion, categor {error && } - +
@@ -185,7 +188,7 @@ export function Generator({ lang, changeTitle, version, onChangeVersion, categor
- +
} diff --git a/src/app/schema/renderHtml.ts b/src/app/schema/renderHtml.ts index ae103059..9347a987 100644 --- a/src/app/schema/renderHtml.ts +++ b/src/app/schema/renderHtml.ts @@ -1,7 +1,7 @@ import type { EnumOption, Hook, ValidationOption } from '@mcschema/core' -import { DataModel, MapNode, ModelPath, Path, StringNode } from '@mcschema/core' +import { DataModel, MapNode, ModelPath, ObjectNode, Path, relativePath, StringNode } from '@mcschema/core' import type { Localize } from '../Locales' -import type { VersionId } from '../Schemas' +import type { BlockStateRegistry, VersionId } from '../Schemas' import { hexId, htmlEncode } from '../Utils' import type { Mounter } from './Mounter' import { Octicon } from './Octicon' @@ -10,12 +10,13 @@ export type TreeProps = { loc: Localize, mounter: Mounter, version: VersionId, + blockStates: BlockStateRegistry, } const selectRegistries = ['loot_table.type', 'loot_entry.type', 'function.function', 'condition.condition', 'criterion.trigger', 'dimension.generator.type', 'dimension.generator.biome_source.type', 'carver.type', 'feature.type', 'decorator.type', 'feature.tree.minimum_size.type', 'block_state_provider.type', 'trunk_placer.type', 'foliage_placer.type', 'tree_decorator.type', 'int_provider.type', 'float_provider.type', 'height_provider.type', 'structure_feature.type', 'surface_builder.type', 'processor.processor_type', 'rule_test.predicate_type', 'pos_rule_test.predicate_type', 'template_element.element_type', 'block_placer.type'] const hiddenFields = ['number_provider.type', 'score_provider.type', 'nbt_provider.type', 'int_provider.type', 'float_provider.type', 'height_provider.type'] const flattenedFields = ['feature.config', 'decorator.config', 'int_provider.value', 'float_provider.value', 'block_state_provider.simple_state_provider.state', 'block_state_provider.rotated_block_provider.state', 'block_state_provider.weighted_state_provider.entries.entry.data', 'rule_test.block_state', 'structure_feature.config', 'surface_builder.config', 'template_pool.elements.entry.element'] -const inlineFields = ['loot_entry.type', 'function.function', 'condition.condition', 'criterion.trigger', 'dimension.generator.type', 'dimension.generator.biome_source.type', 'feature.type', 'decorator.type', 'block_state_provider.type', 'feature.tree.minimum_size.type', 'trunk_placer.type', 'feature.tree.foliage_placer', 'tree_decorator.type', 'block_placer.type', 'rule_test.predicate_type', 'processor.processor_type', 'template_element.element_type'] +const inlineFields = ['loot_entry.type', 'function.function', 'condition.condition', 'criterion.trigger', 'dimension.generator.type', 'dimension.generator.biome_source.type', 'feature.type', 'decorator.type', 'block_state_provider.type', 'feature.tree.minimum_size.type', 'trunk_placer.type', 'foliage_placer.type', 'tree_decorator.type', 'block_placer.type', 'rule_test.predicate_type', 'processor.processor_type', 'template_element.element_type'] /** * Secondary model used to remember the keys of a map @@ -34,30 +35,30 @@ export const renderHtml: Hook<[any, TreeProps], [string, string, string]> = { return ['', '', ''] }, - boolean({ node }, path, value, { loc, mounter }) { - const onFalse = mounter.onClick(() => { + boolean({ node }, path, value, props) { + const onFalse = props.mounter.onClick(() => { path.model.set(path, node.optional() && value === false ? undefined : false) }) - const onTrue = mounter.onClick(() => { + const onTrue = props.mounter.onClick(() => { path.model.set(path, node.optional() && value === true ? undefined : true) }) return ['', `${htmlEncode(loc('false'))} + data-id="${onFalse}">${htmlEncode(props.loc('false'))} ${htmlEncode(loc('true'))}`, ''] + data-id="${onTrue}">${htmlEncode(props.loc('true'))}`, ''] }, - choice({ choices, config, switchNode }, path, value, { loc, mounter, version }) { + choice({ choices, config, switchNode }, path, value, props) { const choice = switchNode.activeCase(path, true) const pathWithContext = (config?.context) ? new ModelPath(path.getModel(), new Path(path.getArray(), [config.context])) : path const pathWithChoiceContext = config?.choiceContext ? new Path([], [config.choiceContext]) : config?.context ? new Path([], [config.context]) : path - const [prefix, suffix, body] = choice.node.hook(this, pathWithContext, value, { loc, mounter, version }) + const [prefix, suffix, body] = choice.node.hook(this, pathWithContext, value, props) if (choices.length === 1) { return [prefix, suffix, body] } - const inputId = mounter.register(el => { + const inputId = props.mounter.register(el => { (el as HTMLSelectElement).value = choice.type el.addEventListener('change', () => { const c = choices.find(c => c.type === (el as HTMLSelectElement).value) ?? choice @@ -66,39 +67,39 @@ export const renderHtml: Hook<[any, TreeProps], [string, string, string]> = { }) const inject = `` return [prefix, inject + suffix, body] }, - list({ children }, path, value, { loc, mounter, version }) { - const onAdd = mounter.onClick(() => { + list({ children }, path, value, props) { + const onAdd = props.mounter.onClick(() => { if (!Array.isArray(value)) value = [] path.model.set(path, [children.default(), ...value]) }) - const onAddBottom = mounter.onClick(() => { + const onAddBottom = props.mounter.onClick(() => { if (!Array.isArray(value)) value = [] path.model.set(path, [...value, children.default()]) }) - const suffix = `` + const suffix = `` let body = '' if (Array.isArray(value)) { body = value.map((childValue, index) => { - const removeId = mounter.onClick(() => path.model.set(path.push(index), undefined)) + const removeId = props.mounter.onClick(() => path.model.set(path.push(index), undefined)) const childPath = path.push(index).contextPush('entry') const category = children.category(childPath) - const [cPrefix, cSuffix, cBody] = children.hook(this, childPath, childValue, { loc, mounter, version }) + const [cPrefix, cSuffix, cBody] = children.hook(this, childPath, childValue, props) return `
- ${error(loc, childPath, mounter)} - ${help(loc, childPath, mounter)} - + ${error(props.loc, childPath, props.mounter)} + ${help(props.loc, childPath, props.mounter)} + ${cPrefix} -
@@ -109,7 +110,7 @@ export const renderHtml: Hook<[any, TreeProps], [string, string, string]> = { if (value.length > 2) { body += `
- +
` } @@ -117,29 +118,52 @@ export const renderHtml: Hook<[any, TreeProps], [string, string, string]> = { return ['', suffix, body] }, - map({ children, keys }, path, value, { loc, mounter, version }) { + map({ children, keys, config }, path, value, props) { const keyPath = new ModelPath(keysModel, new Path([hashString(path.toString())])) - const onAdd = mounter.onClick(() => { + const onAdd = props.mounter.onClick(() => { const key = keyPath.get() path.model.set(path.push(key), children.default()) }) - const keyRendered = keys.hook(this, keyPath, keyPath.get() ?? '', { loc, mounter, version }) - const suffix = keyRendered[1] + `` + const blockState = config.validation?.validator === 'block_state_map'? props.blockStates?.[relativePath(path, config.validation.params.id).get()] : null + const keysSchema = blockState?.properties + ? StringNode(null!, { enum: Object.keys(blockState.properties ?? {}) }) + : keys + const keyRendered = keysSchema.hook(this, keyPath, keyPath.get() ?? '', props) + const suffix = keyRendered[1] + `` + if (blockState && path.last() === 'Properties') { + if (typeof value !== 'object') value = {} + const properties = Object.entries(blockState.properties) + .map(([key, values]) => [key, StringNode(null!, { enum: values })]) + Object.entries(blockState.properties).forEach(([key, values]) => { + if (typeof value[key] !== 'string') { + path.model.errors.add(path.push(key), 'error.expected_string') + } else if (!values.includes(value[key])) { + path.model.errors.add(path.push(key), 'error.invalid_enum_option', value[key]) + } + }) + return ObjectNode(Object.fromEntries(properties)).hook(this, path, value, props) + } let body = '' if (typeof value === 'object' && value !== undefined) { body = Object.keys(value) .map(key => { - const onRemove = mounter.onClick(() => path.model.set(path.push(key), undefined)) + const onRemove = props.mounter.onClick(() => path.model.set(path.push(key), undefined)) const childPath = path.modelPush(key) const category = children.category(childPath) - const [cPrefix, cSuffix, cBody] = children.hook(this, childPath, value[key], { loc, mounter, version }) + const childrenSchema = blockState + ? StringNode(null!, { enum: blockState.properties[key] ?? [] }) + : children + if (blockState?.properties[key] && !blockState.properties[key].includes(value[key])) { + path.model.errors.add(childPath, 'error.invalid_enum_option', value[key]) + } + const [cPrefix, cSuffix, cBody] = childrenSchema.hook(this, childPath, value[key], props) return `
- ${error(loc, childPath, mounter)} - ${help(loc, childPath, mounter)} - + ${error(props.loc, childPath, props.mounter)} + ${help(props.loc, childPath, props.mounter)} + ${cPrefix} -