diff --git a/package-lock.json b/package-lock.json index 9d3e42c4..c036895c 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.27", - "@spyglassmc/java-edition": "^0.3.36", - "@spyglassmc/json": "^0.3.31", - "@spyglassmc/locales": "^0.3.13", - "@spyglassmc/mcdoc": "^0.3.31", - "@spyglassmc/nbt": "^0.3.32", + "@spyglassmc/core": "^0.4.31", + "@spyglassmc/java-edition": "^0.3.41", + "@spyglassmc/json": "^0.3.35", + "@spyglassmc/locales": "^0.3.16", + "@spyglassmc/mcdoc": "^0.3.35", + "@spyglassmc/nbt": "^0.3.36", "@zip.js/zip.js": "^2.4.5", "brace": "^0.11.1", "buffer": "^6.0.3", @@ -1279,11 +1279,11 @@ ] }, "node_modules/@spyglassmc/core": { - "version": "0.4.27", - "resolved": "https://registry.npmjs.org/@spyglassmc/core/-/core-0.4.27.tgz", - "integrity": "sha512-WUXAJ+zqdrk4lZsnkjKHvPBas13z4hLK3g13fF8sKwEym60CMPu2MYmLsMaaU55EEZanvTJUP8J5d1dvR3eCoQ==", + "version": "0.4.31", + "resolved": "https://registry.npmjs.org/@spyglassmc/core/-/core-0.4.31.tgz", + "integrity": "sha512-ccMZ+IrdX5eai/gdK32Ffn7AjUVdKylMBJoLqZZeCrbtXg8uSYnrE1TOLR+kXaHkeR0B4UqTnOsp0+A8T3YNnA==", "dependencies": { - "@spyglassmc/locales": "0.3.13", + "@spyglassmc/locales": "0.3.16", "base64-arraybuffer": "^1.0.2", "binary-search": "^1.3.6", "chokidar": "^3.5.2", @@ -1308,59 +1308,59 @@ } }, "node_modules/@spyglassmc/java-edition": { - "version": "0.3.36", - "resolved": "https://registry.npmjs.org/@spyglassmc/java-edition/-/java-edition-0.3.36.tgz", - "integrity": "sha512-4WesJNoKHx/tVA3vqO5jKya7hMZ/SgrfMy21C++sl2G85wK7FdYJ1BsUk8ZpXxm+NjHLMguA93c+KwxxM5yDlw==", + "version": "0.3.41", + "resolved": "https://registry.npmjs.org/@spyglassmc/java-edition/-/java-edition-0.3.41.tgz", + "integrity": "sha512-DNCPBkI8kmqtWNxWNKlnkjm0ZWplX/hym2nshEi54/McOQjTzs3MqiaTQ2lou9Er9dpMXmV+wT4gHMlpNrq8Gw==", "dependencies": { - "@spyglassmc/core": "0.4.27", - "@spyglassmc/json": "0.3.31", - "@spyglassmc/locales": "0.3.13", - "@spyglassmc/mcdoc": "0.3.31", - "@spyglassmc/mcfunction": "0.2.29", - "@spyglassmc/nbt": "0.3.32" + "@spyglassmc/core": "0.4.31", + "@spyglassmc/json": "0.3.35", + "@spyglassmc/locales": "0.3.16", + "@spyglassmc/mcdoc": "0.3.35", + "@spyglassmc/mcfunction": "0.2.33", + "@spyglassmc/nbt": "0.3.36" } }, "node_modules/@spyglassmc/json": { - "version": "0.3.31", - "resolved": "https://registry.npmjs.org/@spyglassmc/json/-/json-0.3.31.tgz", - "integrity": "sha512-E/+xdsScjkV5zjqGmo3TlqTT6IBxds3Sri99wR9ygQWbbt+YX6Q31lzEf7hQYeF3M8OKooG6p+9KEREuEzLN5g==", + "version": "0.3.35", + "resolved": "https://registry.npmjs.org/@spyglassmc/json/-/json-0.3.35.tgz", + "integrity": "sha512-p6o9UyW4M5KSJQ96Sz0M6vNknMqc5Ip05IaYVg1n+XKZjE1wkbPzOa8zzviDJuw9oN1IEZUB7lv6N4dzT/wxOA==", "dependencies": { - "@spyglassmc/core": "0.4.27", - "@spyglassmc/locales": "0.3.13", - "@spyglassmc/mcdoc": "0.3.31" + "@spyglassmc/core": "0.4.31", + "@spyglassmc/locales": "0.3.16", + "@spyglassmc/mcdoc": "0.3.35" } }, "node_modules/@spyglassmc/locales": { - "version": "0.3.13", - "resolved": "https://registry.npmjs.org/@spyglassmc/locales/-/locales-0.3.13.tgz", - "integrity": "sha512-UWXRcoaV8e2Hw75Fd2T+4U9ZPMBBN/ppwRSkSRiBa26ZVw9hyZxyK+rdEK+YS0wwxGvICxNzYEICwHl5r6VA+A==" + "version": "0.3.16", + "resolved": "https://registry.npmjs.org/@spyglassmc/locales/-/locales-0.3.16.tgz", + "integrity": "sha512-l+NkdKpRFP00uWSY/V54N5Ae3pwebxvjPkHV8kodCyToWexAi9n7NKw6bFDzGs5r88jQVw8HNkoX99NOjMdk3A==" }, "node_modules/@spyglassmc/mcdoc": { - "version": "0.3.31", - "resolved": "https://registry.npmjs.org/@spyglassmc/mcdoc/-/mcdoc-0.3.31.tgz", - "integrity": "sha512-Rwzgzjka6L15dj/ukhnyRR8EpwzZ9K9qpBlgphWRAUtXR4V8AHQ2EqauKdPG7O4XMya+f4vLl4U4Vj+6/VUdRg==", + "version": "0.3.35", + "resolved": "https://registry.npmjs.org/@spyglassmc/mcdoc/-/mcdoc-0.3.35.tgz", + "integrity": "sha512-3mFc3/a/rfvvv6BJBfWZYXxPgMqDuXBAh/RiYyAX/+JMjObVDqd8nbYSknJL41Ee44j157sWy7lX/ZVCWd22uw==", "dependencies": { - "@spyglassmc/core": "0.4.27", - "@spyglassmc/locales": "0.3.13" + "@spyglassmc/core": "0.4.31", + "@spyglassmc/locales": "0.3.16" } }, "node_modules/@spyglassmc/mcfunction": { - "version": "0.2.29", - "resolved": "https://registry.npmjs.org/@spyglassmc/mcfunction/-/mcfunction-0.2.29.tgz", - "integrity": "sha512-hSJNVTeI72litqTRTznkJL+HNXklywKpO/x1cVaU4TjJW+TxLaYoUTjFTiiqj06ifdGPYGV0KKQHtkHYf0UmPw==", + "version": "0.2.33", + "resolved": "https://registry.npmjs.org/@spyglassmc/mcfunction/-/mcfunction-0.2.33.tgz", + "integrity": "sha512-JhLxm3HaVTwbinIboxGPMYkivN7jvWOtg1eTSaP81i3S6cyy4KjYX7yUlDvpiy2e63IIlo69JBkSPgnX/zrpGw==", "dependencies": { - "@spyglassmc/core": "0.4.27", - "@spyglassmc/locales": "0.3.13" + "@spyglassmc/core": "0.4.31", + "@spyglassmc/locales": "0.3.16" } }, "node_modules/@spyglassmc/nbt": { - "version": "0.3.32", - "resolved": "https://registry.npmjs.org/@spyglassmc/nbt/-/nbt-0.3.32.tgz", - "integrity": "sha512-i/oJpV42pAfXnAPr2vWmr4fXuZRlnPsKidQVxRH1cz7KijzZ+xBzrb6C3OWBUIjiCf5kacp1PXTJWdt+1Q4yVg==", + "version": "0.3.36", + "resolved": "https://registry.npmjs.org/@spyglassmc/nbt/-/nbt-0.3.36.tgz", + "integrity": "sha512-UEhS5L5Q8v/0Fu9YbzUo3Tc4gqQdN7LZQzz6aibsdJxfuXp7Ax9wl+BRryJmJp8AIxPy4OjQCLgB6LjdoL2LMQ==", "dependencies": { - "@spyglassmc/core": "0.4.27", - "@spyglassmc/locales": "0.3.13", - "@spyglassmc/mcdoc": "0.3.31" + "@spyglassmc/core": "0.4.31", + "@spyglassmc/locales": "0.3.16", + "@spyglassmc/mcdoc": "0.3.35" } }, "node_modules/@types/diff": { @@ -5798,11 +5798,11 @@ "optional": true }, "@spyglassmc/core": { - "version": "0.4.27", - "resolved": "https://registry.npmjs.org/@spyglassmc/core/-/core-0.4.27.tgz", - "integrity": "sha512-WUXAJ+zqdrk4lZsnkjKHvPBas13z4hLK3g13fF8sKwEym60CMPu2MYmLsMaaU55EEZanvTJUP8J5d1dvR3eCoQ==", + "version": "0.4.31", + "resolved": "https://registry.npmjs.org/@spyglassmc/core/-/core-0.4.31.tgz", + "integrity": "sha512-ccMZ+IrdX5eai/gdK32Ffn7AjUVdKylMBJoLqZZeCrbtXg8uSYnrE1TOLR+kXaHkeR0B4UqTnOsp0+A8T3YNnA==", "requires": { - "@spyglassmc/locales": "0.3.13", + "@spyglassmc/locales": "0.3.16", "base64-arraybuffer": "^1.0.2", "binary-search": "^1.3.6", "chokidar": "^3.5.2", @@ -5823,59 +5823,59 @@ } }, "@spyglassmc/java-edition": { - "version": "0.3.36", - "resolved": "https://registry.npmjs.org/@spyglassmc/java-edition/-/java-edition-0.3.36.tgz", - "integrity": "sha512-4WesJNoKHx/tVA3vqO5jKya7hMZ/SgrfMy21C++sl2G85wK7FdYJ1BsUk8ZpXxm+NjHLMguA93c+KwxxM5yDlw==", + "version": "0.3.41", + "resolved": "https://registry.npmjs.org/@spyglassmc/java-edition/-/java-edition-0.3.41.tgz", + "integrity": "sha512-DNCPBkI8kmqtWNxWNKlnkjm0ZWplX/hym2nshEi54/McOQjTzs3MqiaTQ2lou9Er9dpMXmV+wT4gHMlpNrq8Gw==", "requires": { - "@spyglassmc/core": "0.4.27", - "@spyglassmc/json": "0.3.31", - "@spyglassmc/locales": "0.3.13", - "@spyglassmc/mcdoc": "0.3.31", - "@spyglassmc/mcfunction": "0.2.29", - "@spyglassmc/nbt": "0.3.32" + "@spyglassmc/core": "0.4.31", + "@spyglassmc/json": "0.3.35", + "@spyglassmc/locales": "0.3.16", + "@spyglassmc/mcdoc": "0.3.35", + "@spyglassmc/mcfunction": "0.2.33", + "@spyglassmc/nbt": "0.3.36" } }, "@spyglassmc/json": { - "version": "0.3.31", - "resolved": "https://registry.npmjs.org/@spyglassmc/json/-/json-0.3.31.tgz", - "integrity": "sha512-E/+xdsScjkV5zjqGmo3TlqTT6IBxds3Sri99wR9ygQWbbt+YX6Q31lzEf7hQYeF3M8OKooG6p+9KEREuEzLN5g==", + "version": "0.3.35", + "resolved": "https://registry.npmjs.org/@spyglassmc/json/-/json-0.3.35.tgz", + "integrity": "sha512-p6o9UyW4M5KSJQ96Sz0M6vNknMqc5Ip05IaYVg1n+XKZjE1wkbPzOa8zzviDJuw9oN1IEZUB7lv6N4dzT/wxOA==", "requires": { - "@spyglassmc/core": "0.4.27", - "@spyglassmc/locales": "0.3.13", - "@spyglassmc/mcdoc": "0.3.31" + "@spyglassmc/core": "0.4.31", + "@spyglassmc/locales": "0.3.16", + "@spyglassmc/mcdoc": "0.3.35" } }, "@spyglassmc/locales": { - "version": "0.3.13", - "resolved": "https://registry.npmjs.org/@spyglassmc/locales/-/locales-0.3.13.tgz", - "integrity": "sha512-UWXRcoaV8e2Hw75Fd2T+4U9ZPMBBN/ppwRSkSRiBa26ZVw9hyZxyK+rdEK+YS0wwxGvICxNzYEICwHl5r6VA+A==" + "version": "0.3.16", + "resolved": "https://registry.npmjs.org/@spyglassmc/locales/-/locales-0.3.16.tgz", + "integrity": "sha512-l+NkdKpRFP00uWSY/V54N5Ae3pwebxvjPkHV8kodCyToWexAi9n7NKw6bFDzGs5r88jQVw8HNkoX99NOjMdk3A==" }, "@spyglassmc/mcdoc": { - "version": "0.3.31", - "resolved": "https://registry.npmjs.org/@spyglassmc/mcdoc/-/mcdoc-0.3.31.tgz", - "integrity": "sha512-Rwzgzjka6L15dj/ukhnyRR8EpwzZ9K9qpBlgphWRAUtXR4V8AHQ2EqauKdPG7O4XMya+f4vLl4U4Vj+6/VUdRg==", + "version": "0.3.35", + "resolved": "https://registry.npmjs.org/@spyglassmc/mcdoc/-/mcdoc-0.3.35.tgz", + "integrity": "sha512-3mFc3/a/rfvvv6BJBfWZYXxPgMqDuXBAh/RiYyAX/+JMjObVDqd8nbYSknJL41Ee44j157sWy7lX/ZVCWd22uw==", "requires": { - "@spyglassmc/core": "0.4.27", - "@spyglassmc/locales": "0.3.13" + "@spyglassmc/core": "0.4.31", + "@spyglassmc/locales": "0.3.16" } }, "@spyglassmc/mcfunction": { - "version": "0.2.29", - "resolved": "https://registry.npmjs.org/@spyglassmc/mcfunction/-/mcfunction-0.2.29.tgz", - "integrity": "sha512-hSJNVTeI72litqTRTznkJL+HNXklywKpO/x1cVaU4TjJW+TxLaYoUTjFTiiqj06ifdGPYGV0KKQHtkHYf0UmPw==", + "version": "0.2.33", + "resolved": "https://registry.npmjs.org/@spyglassmc/mcfunction/-/mcfunction-0.2.33.tgz", + "integrity": "sha512-JhLxm3HaVTwbinIboxGPMYkivN7jvWOtg1eTSaP81i3S6cyy4KjYX7yUlDvpiy2e63IIlo69JBkSPgnX/zrpGw==", "requires": { - "@spyglassmc/core": "0.4.27", - "@spyglassmc/locales": "0.3.13" + "@spyglassmc/core": "0.4.31", + "@spyglassmc/locales": "0.3.16" } }, "@spyglassmc/nbt": { - "version": "0.3.32", - "resolved": "https://registry.npmjs.org/@spyglassmc/nbt/-/nbt-0.3.32.tgz", - "integrity": "sha512-i/oJpV42pAfXnAPr2vWmr4fXuZRlnPsKidQVxRH1cz7KijzZ+xBzrb6C3OWBUIjiCf5kacp1PXTJWdt+1Q4yVg==", + "version": "0.3.36", + "resolved": "https://registry.npmjs.org/@spyglassmc/nbt/-/nbt-0.3.36.tgz", + "integrity": "sha512-UEhS5L5Q8v/0Fu9YbzUo3Tc4gqQdN7LZQzz6aibsdJxfuXp7Ax9wl+BRryJmJp8AIxPy4OjQCLgB6LjdoL2LMQ==", "requires": { - "@spyglassmc/core": "0.4.27", - "@spyglassmc/locales": "0.3.13", - "@spyglassmc/mcdoc": "0.3.31" + "@spyglassmc/core": "0.4.31", + "@spyglassmc/locales": "0.3.16", + "@spyglassmc/mcdoc": "0.3.35" } }, "@types/diff": { diff --git a/package.json b/package.json index df675cf4..8199fa94 100644 --- a/package.json +++ b/package.json @@ -16,12 +16,12 @@ "license": "MIT", "dependencies": { "@giscus/react": "^2.2.3", - "@spyglassmc/core": "^0.4.27", - "@spyglassmc/java-edition": "^0.3.36", - "@spyglassmc/json": "^0.3.31", - "@spyglassmc/locales": "^0.3.13", - "@spyglassmc/mcdoc": "^0.3.31", - "@spyglassmc/nbt": "^0.3.32", + "@spyglassmc/core": "^0.4.31", + "@spyglassmc/java-edition": "^0.3.41", + "@spyglassmc/json": "^0.3.35", + "@spyglassmc/locales": "^0.3.16", + "@spyglassmc/mcdoc": "^0.3.35", + "@spyglassmc/nbt": "^0.3.36", "@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 d92b270c..b202ebad 100644 --- a/src/app/components/generator/McdocHelpers.ts +++ b/src/app/components/generator/McdocHelpers.ts @@ -326,6 +326,8 @@ const selectRegistries = new Set([ 'creative_mode_tab', 'data_component_predicate_type', 'data_component_type', + 'dialog_body_type', + 'dialog_type', 'enchantment_effect_component_type', 'enchantment_entity_effect_type', 'enchantment_level_based_value_type', @@ -336,6 +338,7 @@ const selectRegistries = new Set([ 'float_provider_type', 'frog_variant', 'height_provider_type', + 'input_control_type', 'int_provider_type', 'item_sub_predicate_type', 'loot_condition_type', @@ -357,6 +360,7 @@ const selectRegistries = new Set([ 'slot_display', 'spawn_condition_type', 'stat_type', + 'submit_method_type', 'test_instance_type', 'test_environment_definition_type', 'trigger_type', diff --git a/src/app/services/Spyglass.ts b/src/app/services/Spyglass.ts index 7ecaf35c..d6b3e5d5 100644 --- a/src/app/services/Spyglass.ts +++ b/src/app/services/Spyglass.ts @@ -409,7 +409,7 @@ const initialize: core.ProjectInitializer = async (ctx) => { registerAttributes(meta, release, versions) - json.initialize(ctx) + json.getInitializer()(ctx) je.json.initialize(ctx) je.mcf.initialize(ctx, summary.commands, release) nbt.initialize(ctx) diff --git a/src/config.json b/src/config.json index 8fb178e2..d20b2002 100644 --- a/src/config.json +++ b/src/config.json @@ -183,7 +183,7 @@ "id": "1.21.6", "dynamic": true, "name": "1.21.6", - "pack_format": 72, + "pack_format": 77, "show": true } ], @@ -305,6 +305,11 @@ "url": "cow-variant", "minVersion": "1.21.5" }, + { + "id": "dialog", + "url": "dialog", + "minVersion": "1.21.6" + }, { "id": "test_instance", "url": "test-instance", diff --git a/src/locales/en.json b/src/locales/en.json index 9639cd69..14455373 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -70,6 +70,7 @@ "generator.chat_type": "Chat Type", "generator.cow_variant": "Cow Variant", "generator.damage_type": "Damage Type", + "generator.dialog": "Dialog", "generator.dimension": "Dimension", "generator.dimension_type": "Dimension Type", "generator.enchantment": "Enchantment",