From f656ab2ee8df21bd65c00df9a3c32a0c7c30203f Mon Sep 17 00:00:00 2001 From: Misode Date: Thu, 16 Jan 2025 01:10:54 +0100 Subject: [PATCH] 25w03a --- package-lock.json | 126 +++++++++---------- package.json | 10 +- src/app/components/generator/McdocHelpers.ts | 2 + src/config.json | 10 ++ src/locales/en.json | 2 + 5 files changed, 82 insertions(+), 68 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5845af04..7c56f6bb 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.22", - "@spyglassmc/java-edition": "^0.3.28", - "@spyglassmc/json": "^0.3.25", + "@spyglassmc/core": "^0.4.23", + "@spyglassmc/java-edition": "^0.3.29", + "@spyglassmc/json": "^0.3.26", "@spyglassmc/locales": "^0.3.12", - "@spyglassmc/mcdoc": "^0.3.26", - "@spyglassmc/nbt": "^0.3.26", + "@spyglassmc/mcdoc": "^0.3.27", + "@spyglassmc/nbt": "^0.3.27", "@zip.js/zip.js": "^2.4.5", "brace": "^0.11.1", "buffer": "^6.0.3", @@ -742,9 +742,9 @@ } }, "node_modules/@spyglassmc/core": { - "version": "0.4.22", - "resolved": "https://registry.npmjs.org/@spyglassmc/core/-/core-0.4.22.tgz", - "integrity": "sha512-ewcI69vrNkx5qPBGJFFH8A88cAjYeDiP8IMD5Q0NaNLt+FJDyAB2+3eMbYOA2UXHs4KzDK9PgXKssJsS+sCL2Q==", + "version": "0.4.23", + "resolved": "https://registry.npmjs.org/@spyglassmc/core/-/core-0.4.23.tgz", + "integrity": "sha512-HhTrVgYuJBGhO01oOThLI5zaUOifbBZxwLqpgBQOT/q0KVzXrSqZpa4XSB3368XhcsEnYRnyE0NpL+s9KNIsOA==", "dependencies": { "@spyglassmc/locales": "0.3.12", "base64-arraybuffer": "^1.0.2", @@ -771,26 +771,26 @@ } }, "node_modules/@spyglassmc/java-edition": { - "version": "0.3.28", - "resolved": "https://registry.npmjs.org/@spyglassmc/java-edition/-/java-edition-0.3.28.tgz", - "integrity": "sha512-WPDoWSiASp9imToBT4tN8kWDw5tyeHIubzl64fLwVeQiSWJVuHnGfO348lRT9eboWyJYaAJ6OQgkCdI1NuOG6g==", + "version": "0.3.29", + "resolved": "https://registry.npmjs.org/@spyglassmc/java-edition/-/java-edition-0.3.29.tgz", + "integrity": "sha512-vgveZctI5UaUcZVlWZXFn+aEm9mf+8lhLepYHH1GZJPAh9j16zMtvRDxR2aZjVppiiCxBLNBI+0p8rCpmRPE3g==", "dependencies": { - "@spyglassmc/core": "0.4.22", - "@spyglassmc/json": "0.3.25", + "@spyglassmc/core": "0.4.23", + "@spyglassmc/json": "0.3.26", "@spyglassmc/locales": "0.3.12", - "@spyglassmc/mcdoc": "0.3.26", - "@spyglassmc/mcfunction": "0.2.24", - "@spyglassmc/nbt": "0.3.26" + "@spyglassmc/mcdoc": "0.3.27", + "@spyglassmc/mcfunction": "0.2.25", + "@spyglassmc/nbt": "0.3.27" } }, "node_modules/@spyglassmc/json": { - "version": "0.3.25", - "resolved": "https://registry.npmjs.org/@spyglassmc/json/-/json-0.3.25.tgz", - "integrity": "sha512-aJ09t8S/1tqA0oNVKzIcUnz5nIcbd3A4MI4kPs0uh13GFeAWXtKrOf1O5F3HFRHhVOUGvAGcF3sIRTUqoB8tmg==", + "version": "0.3.26", + "resolved": "https://registry.npmjs.org/@spyglassmc/json/-/json-0.3.26.tgz", + "integrity": "sha512-G9iHMX7veMisFDFmcFWR/RpMyFmsdSwKhrpdz3x9e8yF8cncfzxVrUoOG+/4S23Nfanhzv808hCeeQjPFD5Nyg==", "dependencies": { - "@spyglassmc/core": "0.4.22", + "@spyglassmc/core": "0.4.23", "@spyglassmc/locales": "0.3.12", - "@spyglassmc/mcdoc": "0.3.26" + "@spyglassmc/mcdoc": "0.3.27" } }, "node_modules/@spyglassmc/locales": { @@ -799,31 +799,31 @@ "integrity": "sha512-NPWzpzJp40yEcr3oe++B/hP7StT1ikUdXWMs+XH52EcLijUaNomD7JcvAFvH7KLq9IsMhpxBGNbs3xLnM/hq4Q==" }, "node_modules/@spyglassmc/mcdoc": { - "version": "0.3.26", - "resolved": "https://registry.npmjs.org/@spyglassmc/mcdoc/-/mcdoc-0.3.26.tgz", - "integrity": "sha512-Ihufa6CmSNZUr5SWpZDdLbOhYtE4PhxJFOrMUw5vf7qlXj8HYclu1pKxwal/PmLNjtcHcSDME0cOR4kEMpbaCQ==", + "version": "0.3.27", + "resolved": "https://registry.npmjs.org/@spyglassmc/mcdoc/-/mcdoc-0.3.27.tgz", + "integrity": "sha512-0VJ9LpBjKdLnFf9ndDtYdXBKEeZyfZzPxCtezVeWIES+oeQVenxbPjhyT8KrJwg7bbgNCldyWvWyuYvu/bzy/Q==", "dependencies": { - "@spyglassmc/core": "0.4.22", + "@spyglassmc/core": "0.4.23", "@spyglassmc/locales": "0.3.12" } }, "node_modules/@spyglassmc/mcfunction": { - "version": "0.2.24", - "resolved": "https://registry.npmjs.org/@spyglassmc/mcfunction/-/mcfunction-0.2.24.tgz", - "integrity": "sha512-sZHTxoJsqBf4wpCGWeLX+O+H424SaibM6vYlpR4q0eP22PUjnLMBBfzat0JnODuvBkoFgQUPJdQfjyCyB04LPA==", + "version": "0.2.25", + "resolved": "https://registry.npmjs.org/@spyglassmc/mcfunction/-/mcfunction-0.2.25.tgz", + "integrity": "sha512-MmjjiztPWDCFrdgyXdx5bY8SP9A2Tf3tfqkoC01eDtQNfa5D5BaSuKRynNc61dB/m12/HQM8ZGP5wtnqrKp/Ew==", "dependencies": { - "@spyglassmc/core": "0.4.22", + "@spyglassmc/core": "0.4.23", "@spyglassmc/locales": "0.3.12" } }, "node_modules/@spyglassmc/nbt": { - "version": "0.3.26", - "resolved": "https://registry.npmjs.org/@spyglassmc/nbt/-/nbt-0.3.26.tgz", - "integrity": "sha512-PkIyzcsBd/HaVAA+MXPOjW0U83r5e0JchKU/itMdf/XzxosVpR6t7wQSpl5JoSuREPBr77TaIpxaAYpP1pb0SQ==", + "version": "0.3.27", + "resolved": "https://registry.npmjs.org/@spyglassmc/nbt/-/nbt-0.3.27.tgz", + "integrity": "sha512-YEiu/YEZiBHoq6y3z8qnT1Uc+RExlSJCRbd9mvEF2XSlzm1i0IQp5fKLykZloDDTsbH1FN8jUuR2opST5xGi6g==", "dependencies": { - "@spyglassmc/core": "0.4.22", + "@spyglassmc/core": "0.4.23", "@spyglassmc/locales": "0.3.12", - "@spyglassmc/mcdoc": "0.3.26" + "@spyglassmc/mcdoc": "0.3.27" } }, "node_modules/@types/diff": { @@ -5197,9 +5197,9 @@ } }, "@spyglassmc/core": { - "version": "0.4.22", - "resolved": "https://registry.npmjs.org/@spyglassmc/core/-/core-0.4.22.tgz", - "integrity": "sha512-ewcI69vrNkx5qPBGJFFH8A88cAjYeDiP8IMD5Q0NaNLt+FJDyAB2+3eMbYOA2UXHs4KzDK9PgXKssJsS+sCL2Q==", + "version": "0.4.23", + "resolved": "https://registry.npmjs.org/@spyglassmc/core/-/core-0.4.23.tgz", + "integrity": "sha512-HhTrVgYuJBGhO01oOThLI5zaUOifbBZxwLqpgBQOT/q0KVzXrSqZpa4XSB3368XhcsEnYRnyE0NpL+s9KNIsOA==", "requires": { "@spyglassmc/locales": "0.3.12", "base64-arraybuffer": "^1.0.2", @@ -5222,26 +5222,26 @@ } }, "@spyglassmc/java-edition": { - "version": "0.3.28", - "resolved": "https://registry.npmjs.org/@spyglassmc/java-edition/-/java-edition-0.3.28.tgz", - "integrity": "sha512-WPDoWSiASp9imToBT4tN8kWDw5tyeHIubzl64fLwVeQiSWJVuHnGfO348lRT9eboWyJYaAJ6OQgkCdI1NuOG6g==", + "version": "0.3.29", + "resolved": "https://registry.npmjs.org/@spyglassmc/java-edition/-/java-edition-0.3.29.tgz", + "integrity": "sha512-vgveZctI5UaUcZVlWZXFn+aEm9mf+8lhLepYHH1GZJPAh9j16zMtvRDxR2aZjVppiiCxBLNBI+0p8rCpmRPE3g==", "requires": { - "@spyglassmc/core": "0.4.22", - "@spyglassmc/json": "0.3.25", + "@spyglassmc/core": "0.4.23", + "@spyglassmc/json": "0.3.26", "@spyglassmc/locales": "0.3.12", - "@spyglassmc/mcdoc": "0.3.26", - "@spyglassmc/mcfunction": "0.2.24", - "@spyglassmc/nbt": "0.3.26" + "@spyglassmc/mcdoc": "0.3.27", + "@spyglassmc/mcfunction": "0.2.25", + "@spyglassmc/nbt": "0.3.27" } }, "@spyglassmc/json": { - "version": "0.3.25", - "resolved": "https://registry.npmjs.org/@spyglassmc/json/-/json-0.3.25.tgz", - "integrity": "sha512-aJ09t8S/1tqA0oNVKzIcUnz5nIcbd3A4MI4kPs0uh13GFeAWXtKrOf1O5F3HFRHhVOUGvAGcF3sIRTUqoB8tmg==", + "version": "0.3.26", + "resolved": "https://registry.npmjs.org/@spyglassmc/json/-/json-0.3.26.tgz", + "integrity": "sha512-G9iHMX7veMisFDFmcFWR/RpMyFmsdSwKhrpdz3x9e8yF8cncfzxVrUoOG+/4S23Nfanhzv808hCeeQjPFD5Nyg==", "requires": { - "@spyglassmc/core": "0.4.22", + "@spyglassmc/core": "0.4.23", "@spyglassmc/locales": "0.3.12", - "@spyglassmc/mcdoc": "0.3.26" + "@spyglassmc/mcdoc": "0.3.27" } }, "@spyglassmc/locales": { @@ -5250,31 +5250,31 @@ "integrity": "sha512-NPWzpzJp40yEcr3oe++B/hP7StT1ikUdXWMs+XH52EcLijUaNomD7JcvAFvH7KLq9IsMhpxBGNbs3xLnM/hq4Q==" }, "@spyglassmc/mcdoc": { - "version": "0.3.26", - "resolved": "https://registry.npmjs.org/@spyglassmc/mcdoc/-/mcdoc-0.3.26.tgz", - "integrity": "sha512-Ihufa6CmSNZUr5SWpZDdLbOhYtE4PhxJFOrMUw5vf7qlXj8HYclu1pKxwal/PmLNjtcHcSDME0cOR4kEMpbaCQ==", + "version": "0.3.27", + "resolved": "https://registry.npmjs.org/@spyglassmc/mcdoc/-/mcdoc-0.3.27.tgz", + "integrity": "sha512-0VJ9LpBjKdLnFf9ndDtYdXBKEeZyfZzPxCtezVeWIES+oeQVenxbPjhyT8KrJwg7bbgNCldyWvWyuYvu/bzy/Q==", "requires": { - "@spyglassmc/core": "0.4.22", + "@spyglassmc/core": "0.4.23", "@spyglassmc/locales": "0.3.12" } }, "@spyglassmc/mcfunction": { - "version": "0.2.24", - "resolved": "https://registry.npmjs.org/@spyglassmc/mcfunction/-/mcfunction-0.2.24.tgz", - "integrity": "sha512-sZHTxoJsqBf4wpCGWeLX+O+H424SaibM6vYlpR4q0eP22PUjnLMBBfzat0JnODuvBkoFgQUPJdQfjyCyB04LPA==", + "version": "0.2.25", + "resolved": "https://registry.npmjs.org/@spyglassmc/mcfunction/-/mcfunction-0.2.25.tgz", + "integrity": "sha512-MmjjiztPWDCFrdgyXdx5bY8SP9A2Tf3tfqkoC01eDtQNfa5D5BaSuKRynNc61dB/m12/HQM8ZGP5wtnqrKp/Ew==", "requires": { - "@spyglassmc/core": "0.4.22", + "@spyglassmc/core": "0.4.23", "@spyglassmc/locales": "0.3.12" } }, "@spyglassmc/nbt": { - "version": "0.3.26", - "resolved": "https://registry.npmjs.org/@spyglassmc/nbt/-/nbt-0.3.26.tgz", - "integrity": "sha512-PkIyzcsBd/HaVAA+MXPOjW0U83r5e0JchKU/itMdf/XzxosVpR6t7wQSpl5JoSuREPBr77TaIpxaAYpP1pb0SQ==", + "version": "0.3.27", + "resolved": "https://registry.npmjs.org/@spyglassmc/nbt/-/nbt-0.3.27.tgz", + "integrity": "sha512-YEiu/YEZiBHoq6y3z8qnT1Uc+RExlSJCRbd9mvEF2XSlzm1i0IQp5fKLykZloDDTsbH1FN8jUuR2opST5xGi6g==", "requires": { - "@spyglassmc/core": "0.4.22", + "@spyglassmc/core": "0.4.23", "@spyglassmc/locales": "0.3.12", - "@spyglassmc/mcdoc": "0.3.26" + "@spyglassmc/mcdoc": "0.3.27" } }, "@types/diff": { diff --git a/package.json b/package.json index 9532656e..ef46cceb 100644 --- a/package.json +++ b/package.json @@ -16,12 +16,12 @@ "license": "MIT", "dependencies": { "@giscus/react": "^2.2.3", - "@spyglassmc/core": "^0.4.22", - "@spyglassmc/java-edition": "^0.3.28", - "@spyglassmc/json": "^0.3.25", + "@spyglassmc/core": "^0.4.23", + "@spyglassmc/java-edition": "^0.3.29", + "@spyglassmc/json": "^0.3.26", "@spyglassmc/locales": "^0.3.12", - "@spyglassmc/mcdoc": "^0.3.26", - "@spyglassmc/nbt": "^0.3.26", + "@spyglassmc/mcdoc": "^0.3.27", + "@spyglassmc/nbt": "^0.3.27", "@zip.js/zip.js": "^2.4.5", "brace": "^0.11.1", "buffer": "^6.0.3", diff --git a/src/app/components/generator/McdocHelpers.ts b/src/app/components/generator/McdocHelpers.ts index bb2c319a..50abb30a 100644 --- a/src/app/components/generator/McdocHelpers.ts +++ b/src/app/components/generator/McdocHelpers.ts @@ -355,6 +355,8 @@ const selectRegistries = new Set([ 'rule_test', 'slot_display', 'stat_type', + 'test_instance_type', + 'test_environment_definition_type', 'trigger_type', 'worldgen/biome_source', 'worldgen/block_state_provider_type', diff --git a/src/config.json b/src/config.json index 8287b371..9b3f3c1a 100644 --- a/src/config.json +++ b/src/config.json @@ -276,6 +276,16 @@ "url": "pig-variant", "minVersion": "1.21.5" }, + { + "id": "test_instance", + "url": "test-instance", + "minVersion": "1.21.5" + }, + { + "id": "test_environment", + "url": "test-environment", + "minVersion": "1.21.5" + }, { "id": "text_component", "url": "text-component", diff --git a/src/locales/en.json b/src/locales/en.json index c4ebe4dc..bf9e6094 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -121,6 +121,8 @@ "generator.tag/worldgen/structure": "Structure Tag", "generator.tag/worldgen/structure_set": "Structure Set Tag", "generator.tag/worldgen/world_preset": "World Preset Tag", + "generator.test_instance": "Test Instance", + "generator.test_environment": "Test Environment", "generator.text_component": "Text Component", "generator.trial_spawner": "Trial Spawner", "generator.trim_material": "Trim Material",