Fix #196 Reimplement placed feature preview

This commit is contained in:
Misode
2022-01-18 23:41:11 +01:00
parent c6c52ca41a
commit 2fe120895c
8 changed files with 140 additions and 12 deletions

View File

@@ -3,9 +3,10 @@ import { Path } from '@mcschema/core'
import { useState } from 'preact/hooks'
import { useModel } from '../../hooks'
import type { VersionId } from '../../services'
import { checkVersion } from '../../services'
import { BiomeSourcePreview, DecoratorPreview, NoisePreview, NoiseSettingsPreview } from '../previews'
export const HasPreview = ['dimension', 'worldgen/noise', 'worldgen/noise_settings', 'worldgen/configured_feature']
export const HasPreview = ['dimension', 'worldgen/noise', 'worldgen/noise_settings', 'worldgen/configured_feature', 'worldgen/placed_feature']
type PreviewPanelProps = {
model: DataModel | null,
@@ -21,22 +22,24 @@ export function PreviewPanel({ model, version, id, shown }: PreviewPanelProps) {
setCount(count => count + 1)
})
if (id === 'dimension' && model?.get(new Path(['generator', 'type']))?.endsWith('noise')) {
if (!model) return <></>
if (id === 'dimension' && model.get(new Path(['generator', 'type']))?.endsWith('noise')) {
const data = model.get(new Path(['generator', 'biome_source']))
if (data) return <BiomeSourcePreview {...{ model, version, shown, data }} />
}
if (id === 'worldgen/noise' && model) {
if (id === 'worldgen/noise') {
const data = model.get(new Path([]))
if (data) return <NoisePreview {...{ model, version, shown, data }} />
}
if (id === 'worldgen/noise_settings' && model) {
if (id === 'worldgen/noise_settings') {
const data = model.get(new Path([]))
if (data) return <NoiseSettingsPreview {...{ model, version, shown, data }} />
}
if (id === 'worldgen/configured_feature' && model) {
if ((id === 'worldgen/placed_feature' || (id === 'worldgen/configured_feature' && checkVersion(version, '1.16', '1.17')))) {
const data = model.get(new Path([]))
if (data) return <DecoratorPreview {...{ model, version, shown, data }} />
}

View File

@@ -74,7 +74,7 @@ export const BiomeSourcePreview = ({ model, data, shown, version }: PreviewProps
}
return <>
<div class="controls">
<div class="controls preview-controls">
{focused && <Btn label={focused} class="no-pointer" />}
{type === 'multi_noise' &&
<BtnMenu icon="stack" tooltip={locale('configure_layers')}>

View File

@@ -28,7 +28,7 @@ export const DecoratorPreview = ({ data, version, shown }: PreviewProps) => {
}, [state, scale, seed, shown])
return <>
<div class="controls">
<div class="controls preview-controls">
<Btn icon="dash" tooltip={locale('zoom_out')}
onClick={() => setScale(Math.min(16, scale + 1))} />
<Btn icon="plus" tooltip={locale('zoom_in')}

View File

@@ -41,7 +41,7 @@ export const NoisePreview = ({ data, shown, version }: PreviewProps) => {
}
return <>
<div class="controls">
<div class="controls preview-controls">
<Btn icon="dash" tooltip={locale('zoom_out')}
onClick={() => changeScale(scale * 1.5)} />
<Btn icon="plus" tooltip={locale('zoom_in')}

View File

@@ -45,7 +45,7 @@ export const NoiseSettingsPreview = ({ data, shown, version }: PreviewProps) =>
}, [state, seed, shown])
return <>
<div class="controls">
<div class="controls preview-controls">
{focused && <Btn label={`Y = ${focused}`} class="no-pointer" />}
{checkVersion(version, undefined, '1.17') &&
<BtnMenu icon="gear" tooltip={locale('terrain_settings')}>