diff --git a/package-lock.json b/package-lock.json index 8acbb9f4..5845af04 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,12 +10,12 @@ "license": "MIT", "dependencies": { "@giscus/react": "^2.2.3", - "@spyglassmc/core": "^0.4.17", - "@spyglassmc/java-edition": "^0.3.23", - "@spyglassmc/json": "^0.3.20", - "@spyglassmc/locales": "^0.3.10", - "@spyglassmc/mcdoc": "^0.3.21", - "@spyglassmc/nbt": "^0.3.21", + "@spyglassmc/core": "^0.4.22", + "@spyglassmc/java-edition": "^0.3.28", + "@spyglassmc/json": "^0.3.25", + "@spyglassmc/locales": "^0.3.12", + "@spyglassmc/mcdoc": "^0.3.26", + "@spyglassmc/nbt": "^0.3.26", "@zip.js/zip.js": "^2.4.5", "brace": "^0.11.1", "buffer": "^6.0.3", @@ -742,77 +742,88 @@ } }, "node_modules/@spyglassmc/core": { - "version": "0.4.17", - "resolved": "https://registry.npmjs.org/@spyglassmc/core/-/core-0.4.17.tgz", - "integrity": "sha512-9i+TBilUGv00H3kdRd5C7cVTv4qPXuVo3TH4TKPELqEn1sKNu4HPZQXT83Ux6bSOpD3YOqGXoFX0XqnBIa/soQ==", + "version": "0.4.22", + "resolved": "https://registry.npmjs.org/@spyglassmc/core/-/core-0.4.22.tgz", + "integrity": "sha512-ewcI69vrNkx5qPBGJFFH8A88cAjYeDiP8IMD5Q0NaNLt+FJDyAB2+3eMbYOA2UXHs4KzDK9PgXKssJsS+sCL2Q==", "dependencies": { - "@spyglassmc/locales": "0.3.10", + "@spyglassmc/locales": "0.3.12", "base64-arraybuffer": "^1.0.2", "binary-search": "^1.3.6", "chokidar": "^3.5.2", "decompress": "^4.2.1", "follow-redirects": "^1.14.8", - "ignore": "^5.3.1", "pako": "^2.0.4", + "picomatch": "^4.0.2", "rfdc": "^1.3.0", "vscode-languageserver-textdocument": "^1.0.4", "whatwg-url": "^14.0.0" } }, + "node_modules/@spyglassmc/core/node_modules/picomatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/@spyglassmc/java-edition": { - "version": "0.3.23", - "resolved": "https://registry.npmjs.org/@spyglassmc/java-edition/-/java-edition-0.3.23.tgz", - "integrity": "sha512-yhkuMT7nMJjQbStNgDp7rAd1BoJj5dJwWQIsvklwpk67Upqd5lyu0H50uewCd3PfN7iG62V11hPpV9yOJ3wANA==", + "version": "0.3.28", + "resolved": "https://registry.npmjs.org/@spyglassmc/java-edition/-/java-edition-0.3.28.tgz", + "integrity": "sha512-WPDoWSiASp9imToBT4tN8kWDw5tyeHIubzl64fLwVeQiSWJVuHnGfO348lRT9eboWyJYaAJ6OQgkCdI1NuOG6g==", "dependencies": { - "@spyglassmc/core": "0.4.17", - "@spyglassmc/json": "0.3.20", - "@spyglassmc/locales": "0.3.10", - "@spyglassmc/mcdoc": "0.3.21", - "@spyglassmc/mcfunction": "0.2.19", - "@spyglassmc/nbt": "0.3.21" + "@spyglassmc/core": "0.4.22", + "@spyglassmc/json": "0.3.25", + "@spyglassmc/locales": "0.3.12", + "@spyglassmc/mcdoc": "0.3.26", + "@spyglassmc/mcfunction": "0.2.24", + "@spyglassmc/nbt": "0.3.26" } }, "node_modules/@spyglassmc/json": { - "version": "0.3.20", - "resolved": "https://registry.npmjs.org/@spyglassmc/json/-/json-0.3.20.tgz", - "integrity": "sha512-vbu6hic7sYnvDpmM2yb1yyA9rMZku2CCl+DC9zrWFfd2WSB/PGiBGY4d+L9azbbX+VhVf+Fg9y9//cZ/ttQM0Q==", + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@spyglassmc/json/-/json-0.3.25.tgz", + "integrity": "sha512-aJ09t8S/1tqA0oNVKzIcUnz5nIcbd3A4MI4kPs0uh13GFeAWXtKrOf1O5F3HFRHhVOUGvAGcF3sIRTUqoB8tmg==", "dependencies": { - "@spyglassmc/core": "0.4.17", - "@spyglassmc/locales": "0.3.10", - "@spyglassmc/mcdoc": "0.3.21" + "@spyglassmc/core": "0.4.22", + "@spyglassmc/locales": "0.3.12", + "@spyglassmc/mcdoc": "0.3.26" } }, "node_modules/@spyglassmc/locales": { - "version": "0.3.10", - "resolved": "https://registry.npmjs.org/@spyglassmc/locales/-/locales-0.3.10.tgz", - "integrity": "sha512-FzwmnX9+/OXsgD+EhsTBsloOKAYoaKYR3vVlEReNXtJuxtP08dufkSvDJBSSssgsd4iqi3/cA5ODJy6bUgj4+w==" + "version": "0.3.12", + "resolved": "https://registry.npmjs.org/@spyglassmc/locales/-/locales-0.3.12.tgz", + "integrity": "sha512-NPWzpzJp40yEcr3oe++B/hP7StT1ikUdXWMs+XH52EcLijUaNomD7JcvAFvH7KLq9IsMhpxBGNbs3xLnM/hq4Q==" }, "node_modules/@spyglassmc/mcdoc": { - "version": "0.3.21", - "resolved": "https://registry.npmjs.org/@spyglassmc/mcdoc/-/mcdoc-0.3.21.tgz", - "integrity": "sha512-9BiM8RKgk9gMFvIef+TA7exCd/VTcF5CuQq5ZB9ufWlRZqEWUvjtdn3O06MPOZ3uASgS/owDgGK5XF+etsww+g==", + "version": "0.3.26", + "resolved": "https://registry.npmjs.org/@spyglassmc/mcdoc/-/mcdoc-0.3.26.tgz", + "integrity": "sha512-Ihufa6CmSNZUr5SWpZDdLbOhYtE4PhxJFOrMUw5vf7qlXj8HYclu1pKxwal/PmLNjtcHcSDME0cOR4kEMpbaCQ==", "dependencies": { - "@spyglassmc/core": "0.4.17", - "@spyglassmc/locales": "0.3.10" + "@spyglassmc/core": "0.4.22", + "@spyglassmc/locales": "0.3.12" } }, "node_modules/@spyglassmc/mcfunction": { - "version": "0.2.19", - "resolved": "https://registry.npmjs.org/@spyglassmc/mcfunction/-/mcfunction-0.2.19.tgz", - "integrity": "sha512-bq+Xa/tPZqhOR83aHQeMqo2YSzbVGP5eyBaLTEtUdbwTSRy61bbO1sz5wC1ODTqSvv9vw0dw/1wl5o4mu/5haQ==", + "version": "0.2.24", + "resolved": "https://registry.npmjs.org/@spyglassmc/mcfunction/-/mcfunction-0.2.24.tgz", + "integrity": "sha512-sZHTxoJsqBf4wpCGWeLX+O+H424SaibM6vYlpR4q0eP22PUjnLMBBfzat0JnODuvBkoFgQUPJdQfjyCyB04LPA==", "dependencies": { - "@spyglassmc/core": "0.4.17", - "@spyglassmc/locales": "0.3.10" + "@spyglassmc/core": "0.4.22", + "@spyglassmc/locales": "0.3.12" } }, "node_modules/@spyglassmc/nbt": { - "version": "0.3.21", - "resolved": "https://registry.npmjs.org/@spyglassmc/nbt/-/nbt-0.3.21.tgz", - "integrity": "sha512-ImYlk7vyyJ1M4g9r4WHytUVoDmxvIUcawa6vc8bvfItqiOCvBkfc9BA4uE1pug7oNFM9+Z+TSAF5uNV41B4qAw==", + "version": "0.3.26", + "resolved": "https://registry.npmjs.org/@spyglassmc/nbt/-/nbt-0.3.26.tgz", + "integrity": "sha512-PkIyzcsBd/HaVAA+MXPOjW0U83r5e0JchKU/itMdf/XzxosVpR6t7wQSpl5JoSuREPBr77TaIpxaAYpP1pb0SQ==", "dependencies": { - "@spyglassmc/core": "0.4.17", - "@spyglassmc/locales": "0.3.10", - "@spyglassmc/mcdoc": "0.3.21" + "@spyglassmc/core": "0.4.22", + "@spyglassmc/locales": "0.3.12", + "@spyglassmc/mcdoc": "0.3.26" } }, "node_modules/@types/diff": { @@ -2868,6 +2879,7 @@ "version": "5.3.2", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, "engines": { "node": ">= 4" } @@ -3280,9 +3292,9 @@ } }, "node_modules/nanoid": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", - "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", "dev": true, "funding": [ { @@ -5185,77 +5197,84 @@ } }, "@spyglassmc/core": { - "version": "0.4.17", - "resolved": "https://registry.npmjs.org/@spyglassmc/core/-/core-0.4.17.tgz", - "integrity": "sha512-9i+TBilUGv00H3kdRd5C7cVTv4qPXuVo3TH4TKPELqEn1sKNu4HPZQXT83Ux6bSOpD3YOqGXoFX0XqnBIa/soQ==", + "version": "0.4.22", + "resolved": "https://registry.npmjs.org/@spyglassmc/core/-/core-0.4.22.tgz", + "integrity": "sha512-ewcI69vrNkx5qPBGJFFH8A88cAjYeDiP8IMD5Q0NaNLt+FJDyAB2+3eMbYOA2UXHs4KzDK9PgXKssJsS+sCL2Q==", "requires": { - "@spyglassmc/locales": "0.3.10", + "@spyglassmc/locales": "0.3.12", "base64-arraybuffer": "^1.0.2", "binary-search": "^1.3.6", "chokidar": "^3.5.2", "decompress": "^4.2.1", "follow-redirects": "^1.14.8", - "ignore": "^5.3.1", "pako": "^2.0.4", + "picomatch": "^4.0.2", "rfdc": "^1.3.0", "vscode-languageserver-textdocument": "^1.0.4", "whatwg-url": "^14.0.0" + }, + "dependencies": { + "picomatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==" + } } }, "@spyglassmc/java-edition": { - "version": "0.3.23", - "resolved": "https://registry.npmjs.org/@spyglassmc/java-edition/-/java-edition-0.3.23.tgz", - "integrity": "sha512-yhkuMT7nMJjQbStNgDp7rAd1BoJj5dJwWQIsvklwpk67Upqd5lyu0H50uewCd3PfN7iG62V11hPpV9yOJ3wANA==", + "version": "0.3.28", + "resolved": "https://registry.npmjs.org/@spyglassmc/java-edition/-/java-edition-0.3.28.tgz", + "integrity": "sha512-WPDoWSiASp9imToBT4tN8kWDw5tyeHIubzl64fLwVeQiSWJVuHnGfO348lRT9eboWyJYaAJ6OQgkCdI1NuOG6g==", "requires": { - "@spyglassmc/core": "0.4.17", - "@spyglassmc/json": "0.3.20", - "@spyglassmc/locales": "0.3.10", - "@spyglassmc/mcdoc": "0.3.21", - "@spyglassmc/mcfunction": "0.2.19", - "@spyglassmc/nbt": "0.3.21" + "@spyglassmc/core": "0.4.22", + "@spyglassmc/json": "0.3.25", + "@spyglassmc/locales": "0.3.12", + "@spyglassmc/mcdoc": "0.3.26", + "@spyglassmc/mcfunction": "0.2.24", + "@spyglassmc/nbt": "0.3.26" } }, "@spyglassmc/json": { - "version": "0.3.20", - "resolved": "https://registry.npmjs.org/@spyglassmc/json/-/json-0.3.20.tgz", - "integrity": "sha512-vbu6hic7sYnvDpmM2yb1yyA9rMZku2CCl+DC9zrWFfd2WSB/PGiBGY4d+L9azbbX+VhVf+Fg9y9//cZ/ttQM0Q==", + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@spyglassmc/json/-/json-0.3.25.tgz", + "integrity": "sha512-aJ09t8S/1tqA0oNVKzIcUnz5nIcbd3A4MI4kPs0uh13GFeAWXtKrOf1O5F3HFRHhVOUGvAGcF3sIRTUqoB8tmg==", "requires": { - "@spyglassmc/core": "0.4.17", - "@spyglassmc/locales": "0.3.10", - "@spyglassmc/mcdoc": "0.3.21" + "@spyglassmc/core": "0.4.22", + "@spyglassmc/locales": "0.3.12", + "@spyglassmc/mcdoc": "0.3.26" } }, "@spyglassmc/locales": { - "version": "0.3.10", - "resolved": "https://registry.npmjs.org/@spyglassmc/locales/-/locales-0.3.10.tgz", - "integrity": "sha512-FzwmnX9+/OXsgD+EhsTBsloOKAYoaKYR3vVlEReNXtJuxtP08dufkSvDJBSSssgsd4iqi3/cA5ODJy6bUgj4+w==" + "version": "0.3.12", + "resolved": "https://registry.npmjs.org/@spyglassmc/locales/-/locales-0.3.12.tgz", + "integrity": "sha512-NPWzpzJp40yEcr3oe++B/hP7StT1ikUdXWMs+XH52EcLijUaNomD7JcvAFvH7KLq9IsMhpxBGNbs3xLnM/hq4Q==" }, "@spyglassmc/mcdoc": { - "version": "0.3.21", - "resolved": "https://registry.npmjs.org/@spyglassmc/mcdoc/-/mcdoc-0.3.21.tgz", - "integrity": "sha512-9BiM8RKgk9gMFvIef+TA7exCd/VTcF5CuQq5ZB9ufWlRZqEWUvjtdn3O06MPOZ3uASgS/owDgGK5XF+etsww+g==", + "version": "0.3.26", + "resolved": "https://registry.npmjs.org/@spyglassmc/mcdoc/-/mcdoc-0.3.26.tgz", + "integrity": "sha512-Ihufa6CmSNZUr5SWpZDdLbOhYtE4PhxJFOrMUw5vf7qlXj8HYclu1pKxwal/PmLNjtcHcSDME0cOR4kEMpbaCQ==", "requires": { - "@spyglassmc/core": "0.4.17", - "@spyglassmc/locales": "0.3.10" + "@spyglassmc/core": "0.4.22", + "@spyglassmc/locales": "0.3.12" } }, "@spyglassmc/mcfunction": { - "version": "0.2.19", - "resolved": "https://registry.npmjs.org/@spyglassmc/mcfunction/-/mcfunction-0.2.19.tgz", - "integrity": "sha512-bq+Xa/tPZqhOR83aHQeMqo2YSzbVGP5eyBaLTEtUdbwTSRy61bbO1sz5wC1ODTqSvv9vw0dw/1wl5o4mu/5haQ==", + "version": "0.2.24", + "resolved": "https://registry.npmjs.org/@spyglassmc/mcfunction/-/mcfunction-0.2.24.tgz", + "integrity": "sha512-sZHTxoJsqBf4wpCGWeLX+O+H424SaibM6vYlpR4q0eP22PUjnLMBBfzat0JnODuvBkoFgQUPJdQfjyCyB04LPA==", "requires": { - "@spyglassmc/core": "0.4.17", - "@spyglassmc/locales": "0.3.10" + "@spyglassmc/core": "0.4.22", + "@spyglassmc/locales": "0.3.12" } }, "@spyglassmc/nbt": { - "version": "0.3.21", - "resolved": "https://registry.npmjs.org/@spyglassmc/nbt/-/nbt-0.3.21.tgz", - "integrity": "sha512-ImYlk7vyyJ1M4g9r4WHytUVoDmxvIUcawa6vc8bvfItqiOCvBkfc9BA4uE1pug7oNFM9+Z+TSAF5uNV41B4qAw==", + "version": "0.3.26", + "resolved": "https://registry.npmjs.org/@spyglassmc/nbt/-/nbt-0.3.26.tgz", + "integrity": "sha512-PkIyzcsBd/HaVAA+MXPOjW0U83r5e0JchKU/itMdf/XzxosVpR6t7wQSpl5JoSuREPBr77TaIpxaAYpP1pb0SQ==", "requires": { - "@spyglassmc/core": "0.4.17", - "@spyglassmc/locales": "0.3.10", - "@spyglassmc/mcdoc": "0.3.21" + "@spyglassmc/core": "0.4.22", + "@spyglassmc/locales": "0.3.12", + "@spyglassmc/mcdoc": "0.3.26" } }, "@types/diff": { @@ -6629,7 +6648,8 @@ "ignore": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", - "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==" + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true }, "import-fresh": { "version": "3.3.0", @@ -6946,9 +6966,9 @@ } }, "nanoid": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", - "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", "dev": true }, "natural-compare": { diff --git a/package.json b/package.json index 1ae4d4d4..9532656e 100644 --- a/package.json +++ b/package.json @@ -16,12 +16,12 @@ "license": "MIT", "dependencies": { "@giscus/react": "^2.2.3", - "@spyglassmc/core": "^0.4.17", - "@spyglassmc/java-edition": "^0.3.23", - "@spyglassmc/json": "^0.3.20", - "@spyglassmc/locales": "^0.3.10", - "@spyglassmc/mcdoc": "^0.3.21", - "@spyglassmc/nbt": "^0.3.21", + "@spyglassmc/core": "^0.4.22", + "@spyglassmc/java-edition": "^0.3.28", + "@spyglassmc/json": "^0.3.25", + "@spyglassmc/locales": "^0.3.12", + "@spyglassmc/mcdoc": "^0.3.26", + "@spyglassmc/nbt": "^0.3.26", "@zip.js/zip.js": "^2.4.5", "brace": "^0.11.1", "buffer": "^6.0.3", diff --git a/src/app/services/Versions.ts b/src/app/services/Versions.ts index f1ccf137..8117624b 100644 --- a/src/app/services/Versions.ts +++ b/src/app/services/Versions.ts @@ -1,9 +1,9 @@ import config from '../Config.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', '1.21.2', '1.21.4'] 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', '1.21.4', '1.21.5'] as const export type VersionId = typeof VersionIds[number] -export const DEFAULT_VERSION: VersionId = '1.21.2' +export const DEFAULT_VERSION: VersionId = '1.21.4' export function checkVersion(versionId: string, minVersionId: string | undefined, maxVersionId?: string) { const version = config.versions.findIndex(v => v.id === versionId) diff --git a/src/config.json b/src/config.json index f2a51627..8287b371 100644 --- a/src/config.json +++ b/src/config.json @@ -165,10 +165,17 @@ }, { "id": "1.21.4", - "dynamic": true, + "ref": "1.21.4", "name": "1.21.4", "pack_format": 61, "show": true + }, + { + "id": "1.21.5", + "dynamic": true, + "name": "1.21.5", + "pack_format": 62, + "show": true } ], "generators": [ @@ -264,6 +271,11 @@ "url": "trial-spawner", "minVersion": "1.21.2" }, + { + "id": "pig_variant", + "url": "pig-variant", + "minVersion": "1.21.5" + }, { "id": "text_component", "url": "text-component", diff --git a/src/locales/en.json b/src/locales/en.json index c63c847c..c4ebe4dc 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -99,6 +99,7 @@ "generator.sky_aesthetics:sky": "Custom Sky", "generator.pack_mcmeta": "pack.mcmeta", "generator.painting_variant": "Painting Variant", + "generator.pig_variant": "Pig Variant", "generator.post_effect": "Post Effect", "generator.predicate": "Predicate", "generator.recipe": "Recipe",