diff --git a/package-lock.json b/package-lock.json index b230f3d8..163afc1f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,6 +24,7 @@ "@mcschema/java-1.20.3": "^0.0.13", "@mcschema/java-1.20.5": "^0.0.37", "@mcschema/java-1.21": "^0.0.22", + "@mcschema/java-1.21.2": "^0.0.3", "@mcschema/locales": "^0.1.104", "@zip.js/zip.js": "^2.4.5", "brace": "^0.11.1", @@ -734,6 +735,14 @@ "@mcschema/core": "^0.13.0" } }, + "node_modules/@mcschema/java-1.21.2": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/@mcschema/java-1.21.2/-/java-1.21.2-0.0.3.tgz", + "integrity": "sha512-+YLkEkRv4oscj+d5fR6gMVmvDVhcrg+3sJ0axH4wtnuMEpMUVcoN4p88tak1sknBCWTtQpkuogsO7B9A9yH+SQ==", + "dependencies": { + "@mcschema/core": "^0.13.0" + } + }, "node_modules/@mcschema/locales": { "version": "0.1.104", "resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.104.tgz", @@ -4847,6 +4856,14 @@ "@mcschema/core": "^0.13.0" } }, + "@mcschema/java-1.21.2": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/@mcschema/java-1.21.2/-/java-1.21.2-0.0.3.tgz", + "integrity": "sha512-+YLkEkRv4oscj+d5fR6gMVmvDVhcrg+3sJ0axH4wtnuMEpMUVcoN4p88tak1sknBCWTtQpkuogsO7B9A9yH+SQ==", + "requires": { + "@mcschema/core": "^0.13.0" + } + }, "@mcschema/locales": { "version": "0.1.104", "resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.104.tgz", diff --git a/package.json b/package.json index 19953049..7a82a53a 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "@mcschema/java-1.20.3": "^0.0.13", "@mcschema/java-1.20.5": "^0.0.37", "@mcschema/java-1.21": "^0.0.22", + "@mcschema/java-1.21.2": "^0.0.3", "@mcschema/locales": "^0.1.104", "@zip.js/zip.js": "^2.4.5", "brace": "^0.11.1", diff --git a/src/app/services/Schemas.ts b/src/app/services/Schemas.ts index 886f76b4..f56ae22c 100644 --- a/src/app/services/Schemas.ts +++ b/src/app/services/Schemas.ts @@ -1,11 +1,11 @@ import type { CollectionRegistry, INode, SchemaRegistry } from '@mcschema/core' import { ChoiceNode, DataModel, Reference, StringNode } from '@mcschema/core' import config from '../Config.js' -import { message } from '../Utils.js' import { initPartners } from '../partners/index.js' +import { message } from '../Utils.js' import { fetchData } from './DataFetcher.js' -export const VersionIds = ['1.15', '1.16', '1.17', '1.18', '1.18.2', '1.19', '1.19.3', '1.19.4', '1.20', '1.20.2', '1.20.3', '1.20.5', '1.21'] as const +export const VersionIds = ['1.15', '1.16', '1.17', '1.18', '1.18.2', '1.19', '1.19.3', '1.19.4', '1.20', '1.20.2', '1.20.3', '1.20.5', '1.21', '1.21.2'] as const export type VersionId = typeof VersionIds[number] export const DEFAULT_VERSION: VersionId = '1.21' @@ -53,6 +53,7 @@ const versionGetter: { '1.20.3': () => import('@mcschema/java-1.20.3'), '1.20.5': () => import('@mcschema/java-1.20.5'), 1.21: () => import('@mcschema/java-1.21'), + '1.21.2': () => import('@mcschema/java-1.21.2'), } export let CachedDecorator: INode diff --git a/src/config.json b/src/config.json index 60e0095c..7e2177e3 100644 --- a/src/config.json +++ b/src/config.json @@ -154,10 +154,17 @@ }, { "id": "1.21", - "ref": "1.21", - "name": "1.21", + "ref": "1.21.1", + "name": "1.21 — 1.21.1", "pack_format": 48, "show": true + }, + { + "id": "1.21.2", + "dynamic": true, + "name": "1.21.2", + "pack_format": 49, + "show": true } ], "generators": [ @@ -265,6 +272,12 @@ "minVersion": "1.21", "wiki": "https://minecraft.wiki/w/Jukebox_song_definition" }, + { + "id": "instrument", + "url": "instrument", + "schema": "instrument", + "minVersion": "1.21.2" + }, { "id": "pack_mcmeta", "url": "pack-mcmeta", diff --git a/src/locales/en.json b/src/locales/en.json index 63f2eb93..44e61f94 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -68,6 +68,7 @@ "generator.error_min_version": "The minimum version for this generator is %0%", "generator.font": "Font", "generator.immersive_weathering.block_growth": "Block Growth", + "generator.instrument": "Instrument", "generator.item_modifier": "Item Modifier", "generator.jukebox_song": "Jukebox Song", "generator.lithostitched.worldgen_modifier": "Worldgen Modifier",