From 4d91c4cb04dcd70748d545a21d5da3c8c341f898 Mon Sep 17 00:00:00 2001 From: Misode Date: Fri, 18 Mar 2022 02:14:37 +0100 Subject: [PATCH] 22w11a, first 1.19 version --- package-lock.json | 31 ++++++++++++++++++++++++------- package.json | 3 ++- src/app/services/Schemas.ts | 4 +++- src/config.json | 28 +++++++++++++++++++++++++++- src/locales/en.json | 3 +++ 5 files changed, 59 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index ef0d6537..e728850a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,12 +10,13 @@ "license": "MIT", "dependencies": { "@giscus/react": "^1.1.2", - "@mcschema/core": "^0.12.28", + "@mcschema/core": "^0.12.30", "@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.3.0", "@mcschema/java-1.18.2": "^0.1.4", + "@mcschema/java-1.19": "^0.1.4", "@mcschema/locales": "^0.1.51", "brace": "^0.11.1", "buffer": "^6.0.3", @@ -392,9 +393,9 @@ } }, "node_modules/@mcschema/core": { - "version": "0.12.29", - "resolved": "https://registry.npmjs.org/@mcschema/core/-/core-0.12.29.tgz", - "integrity": "sha512-wcBvB529S6+VhDFmFLelKr02kkmNFU7mgOarAz9Eva8pBBsCp0Pqz4FuBwInxdnnf8u1TybqtETZhM1BlfXXuw==" + "version": "0.12.31", + "resolved": "https://registry.npmjs.org/@mcschema/core/-/core-0.12.31.tgz", + "integrity": "sha512-dJOixNDZz+nKHQDQt521FlSHL4iD95ix0p85D+9ekRa6zgGxFKIyqiuKDR7MBFuY2KkeaXgCsm3oFZSeRIagzQ==" }, "node_modules/@mcschema/java-1.15": { "version": "0.2.3", @@ -436,6 +437,14 @@ "@mcschema/core": "^0.12.29" } }, + "node_modules/@mcschema/java-1.19": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/@mcschema/java-1.19/-/java-1.19-0.1.4.tgz", + "integrity": "sha512-Qjb0lJPwlF8psJjdYtYzUaO3gTvniPPP/Iu/hwavokeLE1GQhq95nB+++AifyaA3zbpw4JaOaa/bzjTAxFgpkg==", + "dependencies": { + "@mcschema/core": "^0.12.31" + } + }, "node_modules/@mcschema/locales": { "version": "0.1.51", "resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.51.tgz", @@ -4813,9 +4822,9 @@ "requires": {} }, "@mcschema/core": { - "version": "0.12.29", - "resolved": "https://registry.npmjs.org/@mcschema/core/-/core-0.12.29.tgz", - "integrity": "sha512-wcBvB529S6+VhDFmFLelKr02kkmNFU7mgOarAz9Eva8pBBsCp0Pqz4FuBwInxdnnf8u1TybqtETZhM1BlfXXuw==" + "version": "0.12.31", + "resolved": "https://registry.npmjs.org/@mcschema/core/-/core-0.12.31.tgz", + "integrity": "sha512-dJOixNDZz+nKHQDQt521FlSHL4iD95ix0p85D+9ekRa6zgGxFKIyqiuKDR7MBFuY2KkeaXgCsm3oFZSeRIagzQ==" }, "@mcschema/java-1.15": { "version": "0.2.3", @@ -4857,6 +4866,14 @@ "@mcschema/core": "^0.12.29" } }, + "@mcschema/java-1.19": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/@mcschema/java-1.19/-/java-1.19-0.1.4.tgz", + "integrity": "sha512-Qjb0lJPwlF8psJjdYtYzUaO3gTvniPPP/Iu/hwavokeLE1GQhq95nB+++AifyaA3zbpw4JaOaa/bzjTAxFgpkg==", + "requires": { + "@mcschema/core": "^0.12.31" + } + }, "@mcschema/locales": { "version": "0.1.51", "resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.51.tgz", diff --git a/package.json b/package.json index 23739f8c..3bb9205c 100644 --- a/package.json +++ b/package.json @@ -16,12 +16,13 @@ "license": "MIT", "dependencies": { "@giscus/react": "^1.1.2", - "@mcschema/core": "^0.12.28", + "@mcschema/core": "^0.12.30", "@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.3.0", "@mcschema/java-1.18.2": "^0.1.4", + "@mcschema/java-1.19": "^0.1.4", "@mcschema/locales": "^0.1.51", "brace": "^0.11.1", "buffer": "^6.0.3", diff --git a/src/app/services/Schemas.ts b/src/app/services/Schemas.ts index b9e3cd34..3aa8a175 100644 --- a/src/app/services/Schemas.ts +++ b/src/app/services/Schemas.ts @@ -5,11 +5,12 @@ 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 java182 from '@mcschema/java-1.18.2' +import * as java19 from '@mcschema/java-1.19' import config from '../../config.json' import { message } from '../Utils' import { fetchData } from './DataFetcher' -export const VersionIds = ['1.15', '1.16', '1.17', '1.18', '1.18.2'] as const +export const VersionIds = ['1.15', '1.16', '1.17', '1.18', '1.18.2', '1.19'] as const export type VersionId = typeof VersionIds[number] export type BlockStateRegistry = { @@ -47,6 +48,7 @@ const versionGetter: { 1.17: java17, 1.18: java18, '1.18.2': java182, + 1.19: java19, } export let CachedDecorator: INode diff --git a/src/config.json b/src/config.json index 921d6b33..ad7e645a 100644 --- a/src/config.json +++ b/src/config.json @@ -69,6 +69,10 @@ }, { "id": "1.18.2", + "ref": "1.18.1" + }, + { + "id": "1.19", "dynamic": true } ], @@ -179,7 +183,15 @@ "url": "worldgen/structure-feature", "category": "worldgen", "schema": "configured_structure_feature", - "minVersion": "1.16" + "minVersion": "1.16", + "maxVersion": "1.18.2" + }, + { + "id": "worldgen/structure", + "url": "worldgen/structure", + "category": "worldgen", + "schema": "structure", + "minVersion": "1.19" }, { "id": "worldgen/structure_set", @@ -210,6 +222,20 @@ "schema": "template_pool", "minVersion": "1.16" }, + { + "id": "worldgen/world_preset", + "url": "worldgen/world-preset", + "category": "worldgen", + "schema": "world_preset", + "minVersion": "1.19" + }, + { + "id": "worldgen/flat_level_generator_preset", + "url": "worldgen/flat-world-preset", + "category": "worldgen", + "schema": "flat_level_generator_preset", + "minVersion": "1.19" + }, { "id": "block_definition", "url": "assets/blockstate", diff --git a/src/locales/en.json b/src/locales/en.json index 5cd223bb..5a5b2337 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -145,9 +145,12 @@ "worldgen/noise_settings": "Noise Settings", "worldgen/processor_list": "Processor List", "worldgen/configured_structure_feature": "Structure Feature", + "worldgen/structure": "Structure", "worldgen/structure_set": "Structure Set", "worldgen/configured_surface_builder": "Surface Builder", "worldgen/template_pool": "Template Pool", + "worldgen/world_preset": "World Preset", + "worldgen/flat_level_generator_preset": "Flat World Preset", "zoom_in": "Zoom in", "zoom_out": "Zoom out" }