From 10b604cf43bc1ed5c266c45b598bebf674c11031 Mon Sep 17 00:00:00 2001 From: Misode Date: Wed, 17 Dec 2025 21:23:43 +0100 Subject: [PATCH] Add support for 26.1 snapshots --- package-lock.json | 325 +++++++++++++---------- package.json | 12 +- src/app/components/previews/LootTable.ts | 16 +- src/app/pages/Transformation.tsx | 48 ++-- src/app/services/Versions.ts | 4 +- src/config.json | 38 ++- src/locales/en.json | 4 + 7 files changed, 265 insertions(+), 182 deletions(-) diff --git a/package-lock.json b/package-lock.json index 86d22939..e5ad5d5d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,16 +10,16 @@ "license": "MIT", "dependencies": { "@giscus/react": "^2.2.3", - "@spyglassmc/core": "^0.4.39", - "@spyglassmc/java-edition": "^0.3.51", - "@spyglassmc/json": "^0.3.43", - "@spyglassmc/locales": "^0.3.19", + "@spyglassmc/core": "^0.4.42", + "@spyglassmc/java-edition": "^0.3.54", + "@spyglassmc/json": "^0.3.46", + "@spyglassmc/locales": "^0.3.21", "@spyglassmc/mcdoc": "^0.3.43", - "@spyglassmc/nbt": "^0.3.45", + "@spyglassmc/nbt": "^0.3.48", "@zip.js/zip.js": "^2.4.5", "brace": "^0.11.1", "buffer": "^6.0.3", - "deepslate": "^0.23.6", + "deepslate": "^0.24.0", "deepslate-1.18": "npm:deepslate@0.9.0-beta.9", "deepslate-1.18.2": "npm:deepslate@0.9.0", "deepslate-1.20.4": "npm:deepslate@0.20.1", @@ -114,6 +114,7 @@ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.7.tgz", "integrity": "sha512-SRijHmF0PSPgLIBYlWnG0hyeJLwXE2CgpsXaMOrtt2yp9/86ALw6oUlj9KYuZ0JN07T4eBMVIW4li/9S1j2BGA==", "dev": true, + "peer": true, "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.26.2", @@ -813,10 +814,11 @@ } }, "node_modules/@eslint/eslintrc/node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", + "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", "dev": true, + "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -1293,11 +1295,12 @@ ] }, "node_modules/@spyglassmc/core": { - "version": "0.4.39", - "resolved": "https://registry.npmjs.org/@spyglassmc/core/-/core-0.4.39.tgz", - "integrity": "sha512-Z7A8x9phc6LAQNABjTsEqE5ab6tEU9Egk9XIjE0kX0Ma7i4ZuFMAodoM8dlF8NKeO5gd//wdMvXiW29TVMU1BQ==", + "version": "0.4.42", + "resolved": "https://registry.npmjs.org/@spyglassmc/core/-/core-0.4.42.tgz", + "integrity": "sha512-I5vgRqu+78XksGMVgczZXA1b/kRcQOIyX75Quh9+JR9AEZfp6qKakANw9/fHWAjg4zrzeDf6XPnyUH29Um7T/A==", + "license": "MIT", "dependencies": { - "@spyglassmc/locales": "0.3.19", + "@spyglassmc/locales": "0.3.21", "base64-arraybuffer": "^1.0.2", "binary-search": "^1.3.6", "chokidar": "^3.5.2", @@ -1322,59 +1325,65 @@ } }, "node_modules/@spyglassmc/java-edition": { - "version": "0.3.51", - "resolved": "https://registry.npmjs.org/@spyglassmc/java-edition/-/java-edition-0.3.51.tgz", - "integrity": "sha512-G1mc15hYQxRKcppIk8o/NXmmoOf6Ot1ZOVNKLfO/YC2asGihRfcdlLnArsIrt82neq45IUS800Ki7ghi8rgw4g==", + "version": "0.3.54", + "resolved": "https://registry.npmjs.org/@spyglassmc/java-edition/-/java-edition-0.3.54.tgz", + "integrity": "sha512-qLmhbT/JvO0hFGy/eV9jEhPVS+Gt7/SELKWr1T4CUtc0xI8bxm8Ez18rbzhv0jMuwfLKgCZjkD3g09VJk0nhxQ==", + "license": "MIT", "dependencies": { - "@spyglassmc/core": "0.4.39", - "@spyglassmc/json": "0.3.43", - "@spyglassmc/locales": "0.3.19", - "@spyglassmc/mcdoc": "0.3.43", - "@spyglassmc/mcfunction": "0.2.42", - "@spyglassmc/nbt": "0.3.45" + "@spyglassmc/core": "0.4.42", + "@spyglassmc/json": "0.3.46", + "@spyglassmc/locales": "0.3.21", + "@spyglassmc/mcdoc": "0.3.46", + "@spyglassmc/mcfunction": "0.2.45", + "@spyglassmc/nbt": "0.3.48" } }, "node_modules/@spyglassmc/json": { - "version": "0.3.43", - "resolved": "https://registry.npmjs.org/@spyglassmc/json/-/json-0.3.43.tgz", - "integrity": "sha512-Hu/cyhkYs5KslTk51m+OLZUrIgRLvSWSPPdI4WmB8eKe5j8QpIrZ6zAyeAoyXtZ9S+wMX088yCtite2Q0SVmnA==", + "version": "0.3.46", + "resolved": "https://registry.npmjs.org/@spyglassmc/json/-/json-0.3.46.tgz", + "integrity": "sha512-eVqko1OyIPUFgoDTWMPXM8nPvyABSLbdubqzFf9jSNe7K0WbZWiAeHRsBmsGPZuKpgGnXjuW0cFhbopPfvMj/Q==", + "license": "MIT", "dependencies": { - "@spyglassmc/core": "0.4.39", - "@spyglassmc/locales": "0.3.19", - "@spyglassmc/mcdoc": "0.3.43" + "@spyglassmc/core": "0.4.42", + "@spyglassmc/locales": "0.3.21", + "@spyglassmc/mcdoc": "0.3.46" } }, "node_modules/@spyglassmc/locales": { - "version": "0.3.19", - "resolved": "https://registry.npmjs.org/@spyglassmc/locales/-/locales-0.3.19.tgz", - "integrity": "sha512-6n/O3G9INueV5L10g3nCuNBiMHGhCZ0g0q00sc9EJOYodejg01mzaz+w1rOLEYpiZ31Ri3f25faq5h8uI9AisA==" + "version": "0.3.21", + "resolved": "https://registry.npmjs.org/@spyglassmc/locales/-/locales-0.3.21.tgz", + "integrity": "sha512-WLm5YPTWXuw10qAqJ2DAzGX5rNiBAiL1l6vHATVRXbVnC2EFfn5wuhF//fpMePpaZKiXKiXiP5rKnpVbJzlMtQ==", + "license": "MIT" }, "node_modules/@spyglassmc/mcdoc": { - "version": "0.3.43", - "resolved": "https://registry.npmjs.org/@spyglassmc/mcdoc/-/mcdoc-0.3.43.tgz", - "integrity": "sha512-2r+byjd9mPCNjO/fCYnChX0hXSLNMmKxwaZ9/ttcEePmJgjPi3rIR7SY75P5/lQNRn9RIWgcAhVfiK0GG8N6tw==", + "version": "0.3.46", + "resolved": "https://registry.npmjs.org/@spyglassmc/mcdoc/-/mcdoc-0.3.46.tgz", + "integrity": "sha512-oosto7Wp63N2ZHTK/BrQSBYWKZav7iJWj7/HcS4xorinQaLsYOKH0t5Ru109KbYIdC8B6SbERZK2jXWT0fcXUg==", + "license": "MIT", "dependencies": { - "@spyglassmc/core": "0.4.39", - "@spyglassmc/locales": "0.3.19" + "@spyglassmc/core": "0.4.42", + "@spyglassmc/locales": "0.3.21" } }, "node_modules/@spyglassmc/mcfunction": { - "version": "0.2.42", - "resolved": "https://registry.npmjs.org/@spyglassmc/mcfunction/-/mcfunction-0.2.42.tgz", - "integrity": "sha512-cEljMbcQIbebmV8Es37AdpQTXWHxrgNOj/8i0llgiAULR378Wlmj0pI0E0SVHwuxZ7Q5UUWqW0LozS9MVQL+7g==", + "version": "0.2.45", + "resolved": "https://registry.npmjs.org/@spyglassmc/mcfunction/-/mcfunction-0.2.45.tgz", + "integrity": "sha512-dtKtrLK4yXDDgzOZcYWSJgIPYq9BDU3HGzFV1mYGJqbfMNfA9RN8y2rYZMqqyvmp5j9lgiBMwKgtmdzlxDpGAA==", + "license": "MIT", "dependencies": { - "@spyglassmc/core": "0.4.39", - "@spyglassmc/locales": "0.3.19" + "@spyglassmc/core": "0.4.42", + "@spyglassmc/locales": "0.3.21" } }, "node_modules/@spyglassmc/nbt": { - "version": "0.3.45", - "resolved": "https://registry.npmjs.org/@spyglassmc/nbt/-/nbt-0.3.45.tgz", - "integrity": "sha512-NnBBVM4gwpr5cNiThFs63fZjUf0/fJZcRi25dOwFfeACq8/dJv0buqih63RsZKWsP7zAdP97j8N32sR4/q9dDA==", + "version": "0.3.48", + "resolved": "https://registry.npmjs.org/@spyglassmc/nbt/-/nbt-0.3.48.tgz", + "integrity": "sha512-Y05BH2Tg9QWGDd/PzNmAn17Ve2guJPbqu3F5v6BjTYkK9YIHDsJ8TF45kADzdCI5m3HBPO/N9nfrHdyZwWUeDQ==", + "license": "MIT", "dependencies": { - "@spyglassmc/core": "0.4.39", - "@spyglassmc/locales": "0.3.19", - "@spyglassmc/mcdoc": "0.3.43" + "@spyglassmc/core": "0.4.42", + "@spyglassmc/locales": "0.3.21", + "@spyglassmc/mcdoc": "0.3.46" } }, "node_modules/@types/diff": { @@ -1499,6 +1508,7 @@ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.28.0.tgz", "integrity": "sha512-ekqoNRNK1lAcKhZESN/PdpVsWbP9jtiNqzFWkp/yAUdZvJalw2heCYuqRmM5eUJSIYEkgq5sGOjq+ZqsLMjtRA==", "dev": true, + "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "5.28.0", "@typescript-eslint/types": "5.28.0", @@ -1667,6 +1677,7 @@ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz", "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==", "dev": true, + "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -1901,6 +1912,7 @@ "url": "https://github.com/sponsors/ai" } ], + "peer": true, "dependencies": { "caniuse-lite": "^1.0.30001688", "electron-to-chromium": "^1.5.73", @@ -2248,9 +2260,10 @@ "dev": true }, "node_modules/deepslate": { - "version": "0.23.6", - "resolved": "https://registry.npmjs.org/deepslate/-/deepslate-0.23.6.tgz", - "integrity": "sha512-tBo9sE7++3hlSmkyn79qhU6XdIzVX0rVc2nZCzLqV8+OmAZ5mjexUm1k4MwJC8rP9xhhtlbIb+zrKWil30mwsw==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/deepslate/-/deepslate-0.24.0.tgz", + "integrity": "sha512-j0Ej3N06dJ0zhY8UW3KtTRFadpGmk1eHNCY57tX4FKutFVzQGcieljeNiJ/slUdZBeh1HZxtJzGMbC9+RIN0Tg==", + "license": "MIT", "dependencies": { "gl-matrix": "^3.3.0", "md5": "^2.3.0", @@ -2493,6 +2506,7 @@ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.17.0.tgz", "integrity": "sha512-gq0m0BTJfci60Fz4nczYxNAlED+sMcihltndR8t9t1evnU/azx53x3t2UHXC/uRjcbvRw/XctpaNygSTcQD+Iw==", "dev": true, + "peer": true, "dependencies": { "@eslint/eslintrc": "^1.3.0", "@humanwhocodes/config-array": "^0.9.2", @@ -2715,10 +2729,11 @@ } }, "node_modules/eslint/node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", + "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", "dev": true, + "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -3341,26 +3356,16 @@ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, - "node_modules/jiti": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.4.2.tgz", - "integrity": "sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==", - "dev": true, - "optional": true, - "peer": true, - "bin": { - "jiti": "lib/jiti-cli.mjs" - } - }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, "node_modules/js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "version": "3.14.2", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz", + "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==", + "license": "MIT", "dependencies": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -3488,7 +3493,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "peer": true, "dependencies": { "js-tokens": "^3.0.0 || ^4.0.0" }, @@ -3741,6 +3745,19 @@ "node": ">= 0.8.0" } }, + "node_modules/p-map": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.4.tgz", + "integrity": "sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/pako": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/pako/-/pako-2.0.4.tgz", @@ -3868,6 +3885,7 @@ "url": "https://github.com/sponsors/ai" } ], + "peer": true, "dependencies": { "nanoid": "^3.3.8", "picocolors": "^1.1.1", @@ -3985,6 +4003,7 @@ "resolved": "https://registry.npmjs.org/preact/-/preact-10.8.0.tgz", "integrity": "sha512-2yXIS/h/UP5go0rBKesZqx0LuScqjECtH5pq8SQu3t6X2XNUWjCY4pcViUttDu3qX6NMxGiA/RuxOZd00QLCzg==", "dev": true, + "peer": true, "funding": { "type": "opencollective", "url": "https://opencollective.com/preact" @@ -4248,7 +4267,6 @@ "version": "0.20.2", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz", "integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==", - "peer": true, "dependencies": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1" @@ -4622,6 +4640,7 @@ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", "dev": true, + "peer": true, "engines": { "node": ">=12" }, @@ -4712,6 +4731,7 @@ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.3.tgz", "integrity": "sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==", "dev": true, + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -4812,10 +4832,12 @@ "dev": true }, "node_modules/vite": { - "version": "6.3.5", - "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz", - "integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.1.tgz", + "integrity": "sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==", "dev": true, + "license": "MIT", + "peer": true, "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.4.4", @@ -4886,14 +4908,16 @@ } }, "node_modules/vite-plugin-static-copy": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/vite-plugin-static-copy/-/vite-plugin-static-copy-2.2.0.tgz", - "integrity": "sha512-ytMrKdR9iWEYHbUxs6x53m+MRl4SJsOSoMu1U1+Pfg0DjPeMlsRVx3RR5jvoonineDquIue83Oq69JvNsFSU5w==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/vite-plugin-static-copy/-/vite-plugin-static-copy-2.3.2.tgz", + "integrity": "sha512-iwrrf+JupY4b9stBttRWzGHzZbeMjAHBhkrn67MNACXJVjEMRpCI10Q3AkxdBkl45IHaTfw/CNVevzQhP7yTwg==", "dev": true, + "license": "MIT", "dependencies": { "chokidar": "^3.5.3", "fast-glob": "^3.2.11", "fs-extra": "^11.1.0", + "p-map": "^7.0.3", "picocolors": "^1.0.0" }, "engines": { @@ -4935,6 +4959,7 @@ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", "dev": true, + "peer": true, "engines": { "node": ">=12" }, @@ -5196,6 +5221,7 @@ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.7.tgz", "integrity": "sha512-SRijHmF0PSPgLIBYlWnG0hyeJLwXE2CgpsXaMOrtt2yp9/86ALw6oUlj9KYuZ0JN07T4eBMVIW4li/9S1j2BGA==", "dev": true, + "peer": true, "requires": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.26.2", @@ -5588,9 +5614,9 @@ } }, "js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", + "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", "dev": true, "requires": { "argparse": "^2.0.1" @@ -5899,11 +5925,11 @@ "optional": true }, "@spyglassmc/core": { - "version": "0.4.39", - "resolved": "https://registry.npmjs.org/@spyglassmc/core/-/core-0.4.39.tgz", - "integrity": "sha512-Z7A8x9phc6LAQNABjTsEqE5ab6tEU9Egk9XIjE0kX0Ma7i4ZuFMAodoM8dlF8NKeO5gd//wdMvXiW29TVMU1BQ==", + "version": "0.4.42", + "resolved": "https://registry.npmjs.org/@spyglassmc/core/-/core-0.4.42.tgz", + "integrity": "sha512-I5vgRqu+78XksGMVgczZXA1b/kRcQOIyX75Quh9+JR9AEZfp6qKakANw9/fHWAjg4zrzeDf6XPnyUH29Um7T/A==", "requires": { - "@spyglassmc/locales": "0.3.19", + "@spyglassmc/locales": "0.3.21", "base64-arraybuffer": "^1.0.2", "binary-search": "^1.3.6", "chokidar": "^3.5.2", @@ -5924,59 +5950,59 @@ } }, "@spyglassmc/java-edition": { - "version": "0.3.51", - "resolved": "https://registry.npmjs.org/@spyglassmc/java-edition/-/java-edition-0.3.51.tgz", - "integrity": "sha512-G1mc15hYQxRKcppIk8o/NXmmoOf6Ot1ZOVNKLfO/YC2asGihRfcdlLnArsIrt82neq45IUS800Ki7ghi8rgw4g==", + "version": "0.3.54", + "resolved": "https://registry.npmjs.org/@spyglassmc/java-edition/-/java-edition-0.3.54.tgz", + "integrity": "sha512-qLmhbT/JvO0hFGy/eV9jEhPVS+Gt7/SELKWr1T4CUtc0xI8bxm8Ez18rbzhv0jMuwfLKgCZjkD3g09VJk0nhxQ==", "requires": { - "@spyglassmc/core": "0.4.39", - "@spyglassmc/json": "0.3.43", - "@spyglassmc/locales": "0.3.19", - "@spyglassmc/mcdoc": "0.3.43", - "@spyglassmc/mcfunction": "0.2.42", - "@spyglassmc/nbt": "0.3.45" + "@spyglassmc/core": "0.4.42", + "@spyglassmc/json": "0.3.46", + "@spyglassmc/locales": "0.3.21", + "@spyglassmc/mcdoc": "0.3.46", + "@spyglassmc/mcfunction": "0.2.45", + "@spyglassmc/nbt": "0.3.48" } }, "@spyglassmc/json": { - "version": "0.3.43", - "resolved": "https://registry.npmjs.org/@spyglassmc/json/-/json-0.3.43.tgz", - "integrity": "sha512-Hu/cyhkYs5KslTk51m+OLZUrIgRLvSWSPPdI4WmB8eKe5j8QpIrZ6zAyeAoyXtZ9S+wMX088yCtite2Q0SVmnA==", + "version": "0.3.46", + "resolved": "https://registry.npmjs.org/@spyglassmc/json/-/json-0.3.46.tgz", + "integrity": "sha512-eVqko1OyIPUFgoDTWMPXM8nPvyABSLbdubqzFf9jSNe7K0WbZWiAeHRsBmsGPZuKpgGnXjuW0cFhbopPfvMj/Q==", "requires": { - "@spyglassmc/core": "0.4.39", - "@spyglassmc/locales": "0.3.19", - "@spyglassmc/mcdoc": "0.3.43" + "@spyglassmc/core": "0.4.42", + "@spyglassmc/locales": "0.3.21", + "@spyglassmc/mcdoc": "0.3.46" } }, "@spyglassmc/locales": { - "version": "0.3.19", - "resolved": "https://registry.npmjs.org/@spyglassmc/locales/-/locales-0.3.19.tgz", - "integrity": "sha512-6n/O3G9INueV5L10g3nCuNBiMHGhCZ0g0q00sc9EJOYodejg01mzaz+w1rOLEYpiZ31Ri3f25faq5h8uI9AisA==" + "version": "0.3.21", + "resolved": "https://registry.npmjs.org/@spyglassmc/locales/-/locales-0.3.21.tgz", + "integrity": "sha512-WLm5YPTWXuw10qAqJ2DAzGX5rNiBAiL1l6vHATVRXbVnC2EFfn5wuhF//fpMePpaZKiXKiXiP5rKnpVbJzlMtQ==" }, "@spyglassmc/mcdoc": { - "version": "0.3.43", - "resolved": "https://registry.npmjs.org/@spyglassmc/mcdoc/-/mcdoc-0.3.43.tgz", - "integrity": "sha512-2r+byjd9mPCNjO/fCYnChX0hXSLNMmKxwaZ9/ttcEePmJgjPi3rIR7SY75P5/lQNRn9RIWgcAhVfiK0GG8N6tw==", + "version": "0.3.46", + "resolved": "https://registry.npmjs.org/@spyglassmc/mcdoc/-/mcdoc-0.3.46.tgz", + "integrity": "sha512-oosto7Wp63N2ZHTK/BrQSBYWKZav7iJWj7/HcS4xorinQaLsYOKH0t5Ru109KbYIdC8B6SbERZK2jXWT0fcXUg==", "requires": { - "@spyglassmc/core": "0.4.39", - "@spyglassmc/locales": "0.3.19" + "@spyglassmc/core": "0.4.42", + "@spyglassmc/locales": "0.3.21" } }, "@spyglassmc/mcfunction": { - "version": "0.2.42", - "resolved": "https://registry.npmjs.org/@spyglassmc/mcfunction/-/mcfunction-0.2.42.tgz", - "integrity": "sha512-cEljMbcQIbebmV8Es37AdpQTXWHxrgNOj/8i0llgiAULR378Wlmj0pI0E0SVHwuxZ7Q5UUWqW0LozS9MVQL+7g==", + "version": "0.2.45", + "resolved": "https://registry.npmjs.org/@spyglassmc/mcfunction/-/mcfunction-0.2.45.tgz", + "integrity": "sha512-dtKtrLK4yXDDgzOZcYWSJgIPYq9BDU3HGzFV1mYGJqbfMNfA9RN8y2rYZMqqyvmp5j9lgiBMwKgtmdzlxDpGAA==", "requires": { - "@spyglassmc/core": "0.4.39", - "@spyglassmc/locales": "0.3.19" + "@spyglassmc/core": "0.4.42", + "@spyglassmc/locales": "0.3.21" } }, "@spyglassmc/nbt": { - "version": "0.3.45", - "resolved": "https://registry.npmjs.org/@spyglassmc/nbt/-/nbt-0.3.45.tgz", - "integrity": "sha512-NnBBVM4gwpr5cNiThFs63fZjUf0/fJZcRi25dOwFfeACq8/dJv0buqih63RsZKWsP7zAdP97j8N32sR4/q9dDA==", + "version": "0.3.48", + "resolved": "https://registry.npmjs.org/@spyglassmc/nbt/-/nbt-0.3.48.tgz", + "integrity": "sha512-Y05BH2Tg9QWGDd/PzNmAn17Ve2guJPbqu3F5v6BjTYkK9YIHDsJ8TF45kADzdCI5m3HBPO/N9nfrHdyZwWUeDQ==", "requires": { - "@spyglassmc/core": "0.4.39", - "@spyglassmc/locales": "0.3.19", - "@spyglassmc/mcdoc": "0.3.43" + "@spyglassmc/core": "0.4.42", + "@spyglassmc/locales": "0.3.21", + "@spyglassmc/mcdoc": "0.3.46" } }, "@types/diff": { @@ -6080,6 +6106,7 @@ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.28.0.tgz", "integrity": "sha512-ekqoNRNK1lAcKhZESN/PdpVsWbP9jtiNqzFWkp/yAUdZvJalw2heCYuqRmM5eUJSIYEkgq5sGOjq+ZqsLMjtRA==", "dev": true, + "peer": true, "requires": { "@typescript-eslint/scope-manager": "5.28.0", "@typescript-eslint/types": "5.28.0", @@ -6170,7 +6197,8 @@ "version": "8.7.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz", "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==", - "dev": true + "dev": true, + "peer": true }, "acorn-jsx": { "version": "5.3.2", @@ -6322,6 +6350,7 @@ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz", "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==", "dev": true, + "peer": true, "requires": { "caniuse-lite": "^1.0.30001688", "electron-to-chromium": "^1.5.73", @@ -6563,9 +6592,9 @@ "dev": true }, "deepslate": { - "version": "0.23.6", - "resolved": "https://registry.npmjs.org/deepslate/-/deepslate-0.23.6.tgz", - "integrity": "sha512-tBo9sE7++3hlSmkyn79qhU6XdIzVX0rVc2nZCzLqV8+OmAZ5mjexUm1k4MwJC8rP9xhhtlbIb+zrKWil30mwsw==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/deepslate/-/deepslate-0.24.0.tgz", + "integrity": "sha512-j0Ej3N06dJ0zhY8UW3KtTRFadpGmk1eHNCY57tX4FKutFVzQGcieljeNiJ/slUdZBeh1HZxtJzGMbC9+RIN0Tg==", "requires": { "gl-matrix": "^3.3.0", "md5": "^2.3.0", @@ -6758,6 +6787,7 @@ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.17.0.tgz", "integrity": "sha512-gq0m0BTJfci60Fz4nczYxNAlED+sMcihltndR8t9t1evnU/azx53x3t2UHXC/uRjcbvRw/XctpaNygSTcQD+Iw==", "dev": true, + "peer": true, "requires": { "@eslint/eslintrc": "^1.3.0", "@humanwhocodes/config-array": "^0.9.2", @@ -6883,9 +6913,9 @@ "dev": true }, "js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", + "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", "dev": true, "requires": { "argparse": "^2.0.1" @@ -7370,23 +7400,15 @@ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, - "jiti": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.4.2.tgz", - "integrity": "sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==", - "dev": true, - "optional": true, - "peer": true - }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, "js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "version": "3.14.2", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz", + "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==", "requires": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -7491,7 +7513,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "peer": true, "requires": { "js-tokens": "^3.0.0 || ^4.0.0" } @@ -7683,6 +7704,12 @@ "word-wrap": "^1.2.3" } }, + "p-map": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.4.tgz", + "integrity": "sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ==", + "dev": true + }, "pako": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/pako/-/pako-2.0.4.tgz", @@ -7766,6 +7793,7 @@ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz", "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==", "dev": true, + "peer": true, "requires": { "nanoid": "^3.3.8", "picocolors": "^1.1.1", @@ -7831,7 +7859,8 @@ "version": "10.8.0", "resolved": "https://registry.npmjs.org/preact/-/preact-10.8.0.tgz", "integrity": "sha512-2yXIS/h/UP5go0rBKesZqx0LuScqjECtH5pq8SQu3t6X2XNUWjCY4pcViUttDu3qX6NMxGiA/RuxOZd00QLCzg==", - "dev": true + "dev": true, + "peer": true }, "preact-router": { "version": "3.2.1", @@ -8003,7 +8032,6 @@ "version": "0.20.2", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz", "integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==", - "peer": true, "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1" @@ -8293,7 +8321,8 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", - "dev": true + "dev": true, + "peer": true } } }, @@ -8358,7 +8387,8 @@ "version": "4.7.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.3.tgz", "integrity": "sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==", - "dev": true + "dev": true, + "peer": true }, "unbzip2-stream": { "version": "1.4.3", @@ -8417,10 +8447,11 @@ "dev": true }, "vite": { - "version": "6.3.5", - "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz", - "integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.1.tgz", + "integrity": "sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==", "dev": true, + "peer": true, "requires": { "esbuild": "^0.25.0", "fdir": "^6.4.4", @@ -8442,7 +8473,8 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", - "dev": true + "dev": true, + "peer": true }, "rollup": { "version": "4.45.0", @@ -8477,14 +8509,15 @@ } }, "vite-plugin-static-copy": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/vite-plugin-static-copy/-/vite-plugin-static-copy-2.2.0.tgz", - "integrity": "sha512-ytMrKdR9iWEYHbUxs6x53m+MRl4SJsOSoMu1U1+Pfg0DjPeMlsRVx3RR5jvoonineDquIue83Oq69JvNsFSU5w==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/vite-plugin-static-copy/-/vite-plugin-static-copy-2.3.2.tgz", + "integrity": "sha512-iwrrf+JupY4b9stBttRWzGHzZbeMjAHBhkrn67MNACXJVjEMRpCI10Q3AkxdBkl45IHaTfw/CNVevzQhP7yTwg==", "dev": true, "requires": { "chokidar": "^3.5.3", "fast-glob": "^3.2.11", "fs-extra": "^11.1.0", + "p-map": "^7.0.3", "picocolors": "^1.0.0" } }, diff --git a/package.json b/package.json index 73c8534a..e9ea753e 100644 --- a/package.json +++ b/package.json @@ -16,16 +16,16 @@ "license": "MIT", "dependencies": { "@giscus/react": "^2.2.3", - "@spyglassmc/core": "^0.4.39", - "@spyglassmc/java-edition": "^0.3.51", - "@spyglassmc/json": "^0.3.43", - "@spyglassmc/locales": "^0.3.19", + "@spyglassmc/core": "^0.4.42", + "@spyglassmc/java-edition": "^0.3.54", + "@spyglassmc/json": "^0.3.46", + "@spyglassmc/locales": "^0.3.21", "@spyglassmc/mcdoc": "^0.3.43", - "@spyglassmc/nbt": "^0.3.45", + "@spyglassmc/nbt": "^0.3.48", "@zip.js/zip.js": "^2.4.5", "brace": "^0.11.1", "buffer": "^6.0.3", - "deepslate": "^0.23.6", + "deepslate": "^0.24.0", "deepslate-1.18": "npm:deepslate@0.9.0-beta.9", "deepslate-1.18.2": "npm:deepslate@0.9.0", "deepslate-1.20.4": "npm:deepslate@0.20.1", diff --git a/src/app/components/previews/LootTable.ts b/src/app/components/previews/LootTable.ts index 775c8bc5..51fc9791 100644 --- a/src/app/components/previews/LootTable.ts +++ b/src/app/components/previews/LootTable.ts @@ -646,7 +646,13 @@ function computeInt(provider: any, ctx: LootContext): number { result += 1 } } - return result + return result + case 'sum': + let sum = 0 + for (const summand of provider.summands ?? []) { + sum += computeInt(summand, ctx) + } + return sum } return 0 } @@ -672,7 +678,13 @@ function computeFloat(provider: any, ctx: LootContext): number { result += 1 } } - return result + return result + case 'sum': + let sum = 0 + for (const summand of provider.summands ?? []) { + sum += computeFloat(summand, ctx) + } + return sum } return 0 } diff --git a/src/app/pages/Transformation.tsx b/src/app/pages/Transformation.tsx index 6626c7c4..c43f0856 100644 --- a/src/app/pages/Transformation.tsx +++ b/src/app/pages/Transformation.tsx @@ -336,35 +336,35 @@ class MeshRenderer extends Renderer { this.mesh = new Mesh([ new Quad( // E - new Vertex(new Vector(1, 0, 0), [0, 0, 0], [0.25, 0.50], undefined, undefined), - new Vertex(new Vector(1, 1, 0), [0, 0, 0], [0.25, 0.25], undefined, undefined), - new Vertex(new Vector(1, 1, 1), [0, 0, 0], [0.00, 0.25], undefined, undefined), - new Vertex(new Vector(1, 0, 1), [0, 0, 0], [0.00, 0.50], undefined, undefined)), + new Vertex(new Vector(1, 0, 0), [0, 0, 0], [0.25, 0.50], undefined, undefined, undefined), + new Vertex(new Vector(1, 1, 0), [0, 0, 0], [0.25, 0.25], undefined, undefined, undefined), + new Vertex(new Vector(1, 1, 1), [0, 0, 0], [0.00, 0.25], undefined, undefined, undefined), + new Vertex(new Vector(1, 0, 1), [0, 0, 0], [0.00, 0.50], undefined, undefined, undefined)), new Quad( // W - new Vertex(new Vector(0, 0, 1), [0, 0, 0], [0.75, 0.50], undefined, undefined), - new Vertex(new Vector(0, 1, 1), [0, 0, 0], [0.75, 0.25], undefined, undefined), - new Vertex(new Vector(0, 1, 0), [0, 0, 0], [0.50, 0.25], undefined, undefined), - new Vertex(new Vector(0, 0, 0), [0, 0, 0], [0.50, 0.50], undefined, undefined)), + new Vertex(new Vector(0, 0, 1), [0, 0, 0], [0.75, 0.50], undefined, undefined, undefined), + new Vertex(new Vector(0, 1, 1), [0, 0, 0], [0.75, 0.25], undefined, undefined, undefined), + new Vertex(new Vector(0, 1, 0), [0, 0, 0], [0.50, 0.25], undefined, undefined, undefined), + new Vertex(new Vector(0, 0, 0), [0, 0, 0], [0.50, 0.50], undefined, undefined, undefined)), new Quad( // U - new Vertex(new Vector(0, 1, 1), [0, 0, 0], [0.25, 0.25], undefined, undefined), - new Vertex(new Vector(1, 1, 1), [0, 0, 0], [0.50, 0.25], undefined, undefined), - new Vertex(new Vector(1, 1, 0), [0, 0, 0], [0.50, 0.00], undefined, undefined), - new Vertex(new Vector(0, 1, 0), [0, 0, 0], [0.25, 0.00], undefined, undefined)), + new Vertex(new Vector(0, 1, 1), [0, 0, 0], [0.25, 0.25], undefined, undefined, undefined), + new Vertex(new Vector(1, 1, 1), [0, 0, 0], [0.50, 0.25], undefined, undefined, undefined), + new Vertex(new Vector(1, 1, 0), [0, 0, 0], [0.50, 0.00], undefined, undefined, undefined), + new Vertex(new Vector(0, 1, 0), [0, 0, 0], [0.25, 0.00], undefined, undefined, undefined)), new Quad( // D - new Vertex(new Vector(0, 0, 0), [0, 0, 0], [0.50, 0.25], undefined, undefined), - new Vertex(new Vector(1, 0, 0), [0, 0, 0], [0.75, 0.25], undefined, undefined), - new Vertex(new Vector(1, 0, 1), [0, 0, 0], [0.75, 0.00], undefined, undefined), - new Vertex(new Vector(0, 0, 1), [0, 0, 0], [0.50, 0.00], undefined, undefined)), + new Vertex(new Vector(0, 0, 0), [0, 0, 0], [0.50, 0.25], undefined, undefined, undefined), + new Vertex(new Vector(1, 0, 0), [0, 0, 0], [0.75, 0.25], undefined, undefined, undefined), + new Vertex(new Vector(1, 0, 1), [0, 0, 0], [0.75, 0.00], undefined, undefined, undefined), + new Vertex(new Vector(0, 0, 1), [0, 0, 0], [0.50, 0.00], undefined, undefined, undefined)), new Quad( // S - new Vertex(new Vector(0, 0, 1), [0, 0, 0], [0.25, 0.50], undefined, undefined), - new Vertex(new Vector(1, 0, 1), [0, 0, 0], [0.50, 0.50], undefined, undefined), - new Vertex(new Vector(1, 1, 1), [0, 0, 0], [0.50, 0.25], undefined, undefined), - new Vertex(new Vector(0, 1, 1), [0, 0, 0], [0.25, 0.25], undefined, undefined)), + new Vertex(new Vector(0, 0, 1), [0, 0, 0], [0.25, 0.50], undefined, undefined, undefined), + new Vertex(new Vector(1, 0, 1), [0, 0, 0], [0.50, 0.50], undefined, undefined, undefined), + new Vertex(new Vector(1, 1, 1), [0, 0, 0], [0.50, 0.25], undefined, undefined, undefined), + new Vertex(new Vector(0, 1, 1), [0, 0, 0], [0.25, 0.25], undefined, undefined, undefined)), new Quad( // N - new Vertex(new Vector(0, 1, 0), [0, 0, 0], [0.75, 0.50], undefined, undefined), - new Vertex(new Vector(1, 1, 0), [0, 0, 0], [1.00, 0.50], undefined, undefined), - new Vertex(new Vector(1, 0, 0), [0, 0, 0], [1.00, 0.25], undefined, undefined), - new Vertex(new Vector(0, 0, 0), [0, 0, 0], [0.75, 0.25], undefined, undefined)), + new Vertex(new Vector(0, 1, 0), [0, 0, 0], [0.75, 0.50], undefined, undefined, undefined), + new Vertex(new Vector(1, 1, 0), [0, 0, 0], [1.00, 0.50], undefined, undefined, undefined), + new Vertex(new Vector(1, 0, 0), [0, 0, 0], [1.00, 0.25], undefined, undefined, undefined), + new Vertex(new Vector(0, 0, 0), [0, 0, 0], [0.75, 0.25], undefined, undefined, undefined)), ]) for (const q of this.mesh.quads) { const normal = q.normal() diff --git a/src/app/services/Versions.ts b/src/app/services/Versions.ts index fc03440c..f4ec9ef5 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', '1.21.5', '1.21.6', '1.21.9', '1.21.11'] 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', '1.21.6', '1.21.9', '1.21.11', '26.1'] as const export type VersionId = typeof VersionIds[number] -export const DEFAULT_VERSION: VersionId = '1.21.9' +export const DEFAULT_VERSION: VersionId = '1.21.11' 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 518529d1..6288c9cf 100644 --- a/src/config.json +++ b/src/config.json @@ -205,9 +205,16 @@ }, { "id": "1.21.11", - "dynamic": true, + "ref": "1.21.11", "name": "1.21.11", - "pack_format": 90, + "pack_format": 94, + "show": true + }, + { + "id": "26.1", + "dynamic": true, + "name": "26.1 (dev)", + "pack_format": 95, "show": true } ], @@ -372,6 +379,17 @@ "url": "zombie-nautilus-variant", "minVersion": "1.21.11" }, + { + "id": "villager_trade", + "url": "villager-trade", + "minVersion": "26.1", + "wiki": "https://minecraft.wiki/w/Villager_trade_definition" + }, + { + "id": "trade_set", + "url": "trade-set", + "minVersion": "26.1" + }, { "id": "text_component", "url": "text-component", @@ -668,6 +686,22 @@ "minVersion": "1.21.11", "wiki": "https://minecraft.wiki/w/Tag_(Java_Edition)" }, + { + "id": "tag/villager_trade", + "url": "tags/villager-trade", + "tags": ["tags"], + "path": "tags/villager_trade", + "minVersion": "26.1", + "wiki": "https://minecraft.wiki/w/Tag_(Java_Edition)" + }, + { + "id": "tag/trade_set", + "url": "tags/trade-set", + "tags": ["tags"], + "path": "tags/trade_set", + "minVersion": "26.1", + "wiki": "https://minecraft.wiki/w/Tag_(Java_Edition)" + }, { "id": "block_definition", "url": "assets/blockstate", diff --git a/src/locales/en.json b/src/locales/en.json index 457ec79e..429875d5 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -131,6 +131,8 @@ "generator.tag/painting_variant": "Painting Variant Tag", "generator.tag/point_of_interest_type": "Point of Interest Type Tag", "generator.tag/timeline": "Timeline Tag", + "generator.tag/trade_set": "Trade Set Tag", + "generator.tag/villager_trade": "Villager Trade Tag", "generator.tag/worldgen/biome": "Biome Tag", "generator.tag/worldgen/flat_level_generator_preset": "Flat World Preset Tag", "generator.tag/worldgen/structure": "Structure Tag", @@ -157,9 +159,11 @@ "generator.pixelmon:pokedex": "Pokedex", "generator.pixelmon:pokedex_trigger": "Pokedex Trigger", "generator.pixelmon:pokedex_region": "Region", + "generator.trade_set": "Trade Set", "generator.trial_spawner": "Trial Spawner", "generator.trim_material": "Trim Material", "generator.trim_pattern": "Trim Pattern", + "generator.villager_trade": "Villager Trade", "generator.wolf_variant": "Wolf Variant", "generator.wolf_sound_variant": "Wolf Sound Variant", "generator.world": "World Settings",