diff --git a/package-lock.json b/package-lock.json index f18f6576..3ff38014 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,13 +9,13 @@ "version": "1.0.0", "license": "MIT", "dependencies": { - "@mcschema/core": "^0.12.27", + "@mcschema/core": "^0.12.28", "@mcschema/java-1.15": "^0.2.3", "@mcschema/java-1.16": "^0.6.6", "@mcschema/java-1.17": "^0.2.25", "@mcschema/java-1.18": "^0.2.15", - "@mcschema/java-1.18.2": "npm:@mcschema/java-1.18@^0.3.0-beta.5", - "@mcschema/locales": "^0.1.45", + "@mcschema/java-1.18.2": "npm:@mcschema/java-1.18@^0.3.0-beta.7", + "@mcschema/locales": "^0.1.46", "brace": "^0.11.1", "buffer": "^6.0.3", "comment-json": "^4.1.1", @@ -379,9 +379,9 @@ } }, "node_modules/@mcschema/core": { - "version": "0.12.27", - "resolved": "https://registry.npmjs.org/@mcschema/core/-/core-0.12.27.tgz", - "integrity": "sha512-xB3GKs5mysuSzgVBKvXcQ839MAJj02fRB9QzxIwAhgc5jKNTk9RpnkmlL1s/bDjA34rVJ+P/zfluIczMfPSk4g==" + "version": "0.12.28", + "resolved": "https://registry.npmjs.org/@mcschema/core/-/core-0.12.28.tgz", + "integrity": "sha512-rEIpqU2ytXH5bOp2vKIEYk3MgJVolFB4XziBTwBHyGe7OqrKr2H3tGlxUjFihw/l1E05mVVxYPC6YavUXF7ySA==" }, "node_modules/@mcschema/java-1.15": { "version": "0.2.3", @@ -417,17 +417,17 @@ }, "node_modules/@mcschema/java-1.18.2": { "name": "@mcschema/java-1.18", - "version": "0.3.0-beta.5", - "resolved": "https://registry.npmjs.org/@mcschema/java-1.18/-/java-1.18-0.3.0-beta.5.tgz", - "integrity": "sha512-51MZYoXFas+6MV5VSHS1baE8Q2AErL86R31ELpuBL/xtUIb4HrTR0FRxwmgJLkc2FHfHMFvbSGSQcSz44olqqA==", + "version": "0.3.0-beta.7", + "resolved": "https://registry.npmjs.org/@mcschema/java-1.18/-/java-1.18-0.3.0-beta.7.tgz", + "integrity": "sha512-eqq7QgqcdkGVfnRgD1MfT9sstWcU+Unpi2mqga/y/VVyM8lbJq936n9ZKTns6G37w9sI5TGtrLiRO88macLfFA==", "dependencies": { "@mcschema/core": "^0.12.22" } }, "node_modules/@mcschema/locales": { - "version": "0.1.45", - "resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.45.tgz", - "integrity": "sha512-VsPDBHOWVpju4Z6f8p2G87TK6LKrmuAf+M2cLw6rZVjgB0n76Vv6jvVWzAN388vwMJMx3EkMRDjkRLGFds50Kw==" + "version": "0.1.46", + "resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.46.tgz", + "integrity": "sha512-2v2ydZ92kuK9izpG4gGcuf+Pdq3icNkc/ouHUA8x0rLykr7O1HDZHhCdvEwnPWTx4bhv5izOZdhY+RjApwPj0w==" }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", @@ -4706,9 +4706,9 @@ } }, "@mcschema/core": { - "version": "0.12.27", - "resolved": "https://registry.npmjs.org/@mcschema/core/-/core-0.12.27.tgz", - "integrity": "sha512-xB3GKs5mysuSzgVBKvXcQ839MAJj02fRB9QzxIwAhgc5jKNTk9RpnkmlL1s/bDjA34rVJ+P/zfluIczMfPSk4g==" + "version": "0.12.28", + "resolved": "https://registry.npmjs.org/@mcschema/core/-/core-0.12.28.tgz", + "integrity": "sha512-rEIpqU2ytXH5bOp2vKIEYk3MgJVolFB4XziBTwBHyGe7OqrKr2H3tGlxUjFihw/l1E05mVVxYPC6YavUXF7ySA==" }, "@mcschema/java-1.15": { "version": "0.2.3", @@ -4743,17 +4743,17 @@ } }, "@mcschema/java-1.18.2": { - "version": "npm:@mcschema/java-1.18@0.3.0-beta.5", - "resolved": "https://registry.npmjs.org/@mcschema/java-1.18/-/java-1.18-0.3.0-beta.5.tgz", - "integrity": "sha512-51MZYoXFas+6MV5VSHS1baE8Q2AErL86R31ELpuBL/xtUIb4HrTR0FRxwmgJLkc2FHfHMFvbSGSQcSz44olqqA==", + "version": "npm:@mcschema/java-1.18@0.3.0-beta.7", + "resolved": "https://registry.npmjs.org/@mcschema/java-1.18/-/java-1.18-0.3.0-beta.7.tgz", + "integrity": "sha512-eqq7QgqcdkGVfnRgD1MfT9sstWcU+Unpi2mqga/y/VVyM8lbJq936n9ZKTns6G37w9sI5TGtrLiRO88macLfFA==", "requires": { "@mcschema/core": "^0.12.22" } }, "@mcschema/locales": { - "version": "0.1.45", - "resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.45.tgz", - "integrity": "sha512-VsPDBHOWVpju4Z6f8p2G87TK6LKrmuAf+M2cLw6rZVjgB0n76Vv6jvVWzAN388vwMJMx3EkMRDjkRLGFds50Kw==" + "version": "0.1.46", + "resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.46.tgz", + "integrity": "sha512-2v2ydZ92kuK9izpG4gGcuf+Pdq3icNkc/ouHUA8x0rLykr7O1HDZHhCdvEwnPWTx4bhv5izOZdhY+RjApwPj0w==" }, "@nodelib/fs.scandir": { "version": "2.1.5", diff --git a/package.json b/package.json index 6b67d9ca..3ce08968 100644 --- a/package.json +++ b/package.json @@ -15,13 +15,13 @@ "author": "Misode", "license": "MIT", "dependencies": { - "@mcschema/core": "^0.12.27", + "@mcschema/core": "^0.12.28", "@mcschema/java-1.15": "^0.2.3", "@mcschema/java-1.16": "^0.6.6", "@mcschema/java-1.17": "^0.2.25", "@mcschema/java-1.18": "^0.2.15", - "@mcschema/java-1.18.2": "npm:@mcschema/java-1.18@^0.3.0-beta.5", - "@mcschema/locales": "^0.1.45", + "@mcschema/java-1.18.2": "npm:@mcschema/java-1.18@^0.3.0-beta.7", + "@mcschema/locales": "^0.1.46", "brace": "^0.11.1", "buffer": "^6.0.3", "comment-json": "^4.1.1", diff --git a/src/app/Store.ts b/src/app/Store.ts index b56cf877..3f52b634 100644 --- a/src/app/Store.ts +++ b/src/app/Store.ts @@ -25,6 +25,7 @@ export namespace Store { if (version && VersionIds.includes(version as VersionId)) { return version as VersionId } + if (version === 'latest') return '1.18.2' // Upgrade path, remove in the future return '1.18' } diff --git a/src/app/pages/Generator.tsx b/src/app/pages/Generator.tsx index a56803a4..a6739948 100644 --- a/src/app/pages/Generator.tsx +++ b/src/app/pages/Generator.tsx @@ -262,9 +262,9 @@ export function Generator({}: Props) { - + {allowedVersions.reverse().map(v => - changeVersion(v)} /> + changeVersion(v)} /> )} diff --git a/src/app/schema/renderHtml.tsx b/src/app/schema/renderHtml.tsx index 78697f3d..1b237750 100644 --- a/src/app/schema/renderHtml.tsx +++ b/src/app/schema/renderHtml.tsx @@ -12,7 +12,7 @@ import { CachedDecorator, CachedFeature } from '../services' import { deepClone, deepEqual, hexId, isObject, newSeed } from '../Utils' import { ModelWrapper } from './ModelWrapper' -const selectRegistries = ['loot_table.type', 'loot_entry.type', 'function.function', 'condition.condition', 'criterion.trigger', 'recipe.type', 'dimension.generator.type', 'dimension.generator.biome_source.type', 'dimension.generator.biome_source.preset', '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', 'block_predicate.type', 'material_rule.type', 'material_condition.type', 'generator_structure.type'] +const selectRegistries = ['loot_table.type', 'loot_entry.type', 'function.function', 'condition.condition', 'criterion.trigger', 'recipe.type', 'dimension.generator.type', 'dimension.generator.biome_source.type', 'dimension.generator.biome_source.preset', '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', 'block_predicate.type', 'material_rule.type', 'material_condition.type', 'structure_placement.type', 'density_function.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', 'decorator.block_survives_filter.state', 'material_rule.block.result_state'] 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', 'nbt_operation.op', 'number_provider.value', 'score_provider.name', 'score_provider.target', 'nbt_provider.source', 'nbt_provider.target', 'generator_biome.biome', 'block_predicate.type', 'material_rule.type', 'material_condition.type'] diff --git a/src/app/services/Schemas.ts b/src/app/services/Schemas.ts index cb9faa36..b9e3cd34 100644 --- a/src/app/services/Schemas.ts +++ b/src/app/services/Schemas.ts @@ -4,12 +4,12 @@ import * as java15 from '@mcschema/java-1.15' import * as java16 from '@mcschema/java-1.16' import * as java17 from '@mcschema/java-1.17' import * as java18 from '@mcschema/java-1.18' -import * as latest from '@mcschema/java-1.18.2' +import * as java182 from '@mcschema/java-1.18.2' import config from '../../config.json' import { message } from '../Utils' import { fetchData } from './DataFetcher' -export const VersionIds = ['1.15', '1.16', '1.17', '1.18', 'latest'] as const +export const VersionIds = ['1.15', '1.16', '1.17', '1.18', '1.18.2'] as const export type VersionId = typeof VersionIds[number] export type BlockStateRegistry = { @@ -46,7 +46,7 @@ const versionGetter: { 1.16: java16, 1.17: java17, 1.18: java18, - latest: latest, + '1.18.2': java182, } export let CachedDecorator: INode diff --git a/src/config.json b/src/config.json index 0607fb48..3a58a566 100644 --- a/src/config.json +++ b/src/config.json @@ -64,7 +64,7 @@ "ref": "1.18.1" }, { - "id": "latest", + "id": "1.18.2", "dynamic": true } ], @@ -142,6 +142,13 @@ "schema": "configured_feature", "minVersion": "1.16" }, + { + "id": "worldgen/density_function", + "url": "worldgen/density-function", + "category": "worldgen", + "schema": "density_function", + "minVersion": "1.18.2" + }, { "id": "worldgen/placed_feature", "url": "worldgen/placed-feature", @@ -170,6 +177,13 @@ "schema": "configured_structure_feature", "minVersion": "1.16" }, + { + "id": "worldgen/structure_set", + "url": "worldgen/structure-set", + "category": "worldgen", + "schema": "structure_set", + "minVersion": "1.18.2" + }, { "id": "worldgen/configured_surface_builder", "url": "worldgen/surface-builder", diff --git a/src/locales/en.json b/src/locales/en.json index 0f44bd6b..b94879b3 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -41,7 +41,6 @@ "indentation.tabs": "Tabs", "item_modifier": "Item Modifier", "language": "Language", - "latest": "Latest", "layer.biomes": "Biomes", "layer.temperature": "Temperature", "layer.humidity": "Humidity", @@ -122,11 +121,13 @@ "worldgen/biome": "Biome", "worldgen/configured_carver": "Carver", "worldgen/configured_feature": "Feature", + "worldgen/density_function": "Density Function", "worldgen/placed_feature": "Placed Feature", "worldgen/noise": "Noise", "worldgen/noise_settings": "Noise Settings", "worldgen/processor_list": "Processor List", "worldgen/configured_structure_feature": "Structure Feature", + "worldgen/structure_set": "Structure Set", "worldgen/configured_surface_builder": "Surface Builder", "worldgen/template_pool": "Template Pool", "zoom_in": "Zoom in",