@spyglassmc/java-edition 0.3.45 → 0.3.47

package/lib/binder/index.d.ts

@@ -17,7 +17,7 @@ export declare function dissectUri(uri: string, ctx: UriBinderContext): {
     namespace: string;
     identifier: string;
     path: string;
-    category: "function" | "advancement" | "banner_pattern" | "cat_variant" | "chat_type" | "chicken_variant" | "cow_variant" | "damage_type" | "dialog" | "dimension" | "dimension_type" | "enchantment" | "enchantment_provider" | "frog_variant" | "instrument" | "item_modifier" | "jukebox_song" | "loot_table" | "painting_variant" | "pig_variant" | "predicate" | "recipe" | "structure" | "test_environment" | "test_instance" | "trial_spawner" | "trim_material" | "trim_pattern" | "wolf_sound_variant" | "wolf_variant" | "tag/function" | "tag/activity" | "tag/armor_material" | "tag/attribute" | "tag/block" | "tag/block_entity_type" | "tag/block_predicate_type" | "tag/block_type" | "tag/chunk_status" | "tag/command_argument_type" | "tag/consume_effect_type" | "tag/creative_mode_tab" | "tag/custom_stat" | "tag/data_component_predicate_type" | "tag/data_component_type" | "tag/decorated_pot_pattern" | "tag/decorated_pot_patterns" | "tag/dialog_action_type" | "tag/dialog_body_type" | "tag/dialog_type" | "tag/enchantment_effect_component_type" | "tag/enchantment_entity_effect_type" | "tag/enchantment_level_based_value_type" | "tag/enchantment_location_based_effect_type" | "tag/enchantment_provider_type" | "tag/enchantment_value_effect_type" | "tag/entity_sub_predicate_type" | "tag/entity_type" | "tag/float_provider_type" | "tag/fluid" | "tag/game_event" | "tag/height_provider_type" | "tag/input_control_type" | "tag/instrument" | "tag/int_provider_type" | "tag/item" | "tag/item_sub_predicate_type" | "tag/loot_condition_type" | "tag/loot_function_type" | "tag/loot_nbt_provider_type" | "tag/loot_number_provider_type" | "tag/loot_pool_entry_type" | "tag/loot_score_provider_type" | "tag/map_decoration_type" | "tag/memory_module_type" | "tag/menu" | "tag/mob_effect" | "tag/motive" | "tag/number_format_type" | "tag/particle_type" | "tag/point_of_interest_type" | "tag/pos_rule_test" | "tag/position_source_type" | "tag/potion" | "tag/recipe_book_category" | "tag/recipe_display" | "tag/recipe_serializer" | "tag/recipe_type" | "tag/rule_block_entity_modifier" | "tag/rule_test" | "tag/schedule" | "tag/sensor_type" | "tag/slot_display" | "tag/sound_event" | "tag/spawn_condition_type" | "tag/stat_type" | "tag/test_environment_definition_type" | "tag/test_function" | "tag/test_instance_type" | "tag/trigger_type" | "tag/ticket_type" | "tag/villager_profession" | "tag/villager_type" | "tag/worldgen/biome_source" | "tag/worldgen/block_placer_type" | "tag/worldgen/block_state_provider_type" | "tag/worldgen/carver" | "tag/worldgen/chunk_generator" | "tag/worldgen/decorator" | "tag/worldgen/density_function_type" | "tag/worldgen/feature" | "tag/worldgen/feature_size_type" | "tag/worldgen/foliage_placer_type" | "tag/worldgen/material_condition" | "tag/worldgen/material_rule" | "tag/worldgen/placement_modifier_type" | "tag/worldgen/pool_alias_binding" | "tag/worldgen/root_placer_type" | "tag/worldgen/structure_feature" | "tag/worldgen/structure_piece" | "tag/worldgen/structure_placement" | "tag/worldgen/structure_pool_element" | "tag/worldgen/structure_processor" | "tag/worldgen/structure_type" | "tag/worldgen/surface_builder" | "tag/worldgen/tree_decorator_type" | "tag/worldgen/trunk_placer_type" | "tag/advancement" | "tag/banner_pattern" | "tag/cat_variant" | "tag/chat_type" | "tag/chicken_variant" | "tag/cow_variant" | "tag/damage_type" | "tag/dialog" | "tag/dimension" | "tag/dimension_type" | "tag/enchantment" | "tag/enchantment_provider" | "tag/frog_variant" | "tag/item_modifier" | "tag/jukebox_song" | "tag/loot_table" | "tag/painting_variant" | "tag/pig_variant" | "tag/predicate" | "tag/recipe" | "tag/structure" | "tag/test_environment" | "tag/test_instance" | "tag/trial_spawner" | "tag/trim_material" | "tag/trim_pattern" | "tag/wolf_sound_variant" | "tag/wolf_variant" | "tag/worldgen/biome" | "tag/worldgen/configured_carver" | "tag/worldgen/configured_feature" | "tag/worldgen/configured_structure_feature" | "tag/worldgen/configured_surface_builder" | "tag/worldgen/density_function" | "tag/worldgen/flat_level_generator_preset" | "tag/worldgen/multi_noise_biome_source_parameter_list" | "tag/worldgen/noise" | "tag/worldgen/noise_settings" | "tag/worldgen/placed_feature" | "tag/worldgen/processor_list" | "tag/worldgen/structure" | "tag/worldgen/structure_set" | "tag/worldgen/template_pool" | "tag/worldgen/world_preset" | "worldgen/biome" | "worldgen/configured_carver" | "worldgen/configured_feature" | "worldgen/configured_structure_feature" | "worldgen/configured_surface_builder" | "worldgen/density_function" | "worldgen/flat_level_generator_preset" | "worldgen/multi_noise_biome_source_parameter_list" | "worldgen/noise" | "worldgen/noise_settings" | "worldgen/placed_feature" | "worldgen/processor_list" | "worldgen/structure" | "worldgen/structure_set" | "worldgen/template_pool" | "worldgen/world_preset" | "atlas" | "block_definition" | "equipment" | "font" | "font/ttf" | "font/otf" | "font/unihex" | "gpu_warnlist" | "item_definition" | "lang" | "lang/deprecated" | "model" | "particle" | "post_effect" | "regional_compliancies" | "shader" | "shader/fragment" | "shader/vertex" | "sound" | "sounds" | "texture" | "texture_meta" | "waypoint_style";
+    category: "function" | "advancement" | "banner_pattern" | "cat_variant" | "chat_type" | "chicken_variant" | "cow_variant" | "damage_type" | "dialog" | "dimension" | "dimension_type" | "enchantment" | "enchantment_provider" | "frog_variant" | "instrument" | "item_modifier" | "jukebox_song" | "loot_table" | "painting_variant" | "pig_variant" | "predicate" | "recipe" | "structure" | "test_environment" | "test_instance" | "trial_spawner" | "trim_material" | "trim_pattern" | "wolf_sound_variant" | "wolf_variant" | "tag/function" | "tag/activity" | "tag/armor_material" | "tag/attribute" | "tag/block" | "tag/block_entity_type" | "tag/block_predicate_type" | "tag/block_type" | "tag/chunk_status" | "tag/command_argument_type" | "tag/consume_effect_type" | "tag/creative_mode_tab" | "tag/custom_stat" | "tag/data_component_predicate_type" | "tag/data_component_type" | "tag/debug_subscription" | "tag/decorated_pot_pattern" | "tag/decorated_pot_patterns" | "tag/dialog_action_type" | "tag/dialog_body_type" | "tag/dialog_type" | "tag/enchantment_effect_component_type" | "tag/enchantment_entity_effect_type" | "tag/enchantment_level_based_value_type" | "tag/enchantment_location_based_effect_type" | "tag/enchantment_provider_type" | "tag/enchantment_value_effect_type" | "tag/entity_sub_predicate_type" | "tag/entity_type" | "tag/float_provider_type" | "tag/fluid" | "tag/game_event" | "tag/height_provider_type" | "tag/incoming_rpc_methods" | "tag/input_control_type" | "tag/instrument" | "tag/int_provider_type" | "tag/item" | "tag/item_sub_predicate_type" | "tag/loot_condition_type" | "tag/loot_function_type" | "tag/loot_nbt_provider_type" | "tag/loot_number_provider_type" | "tag/loot_pool_entry_type" | "tag/loot_score_provider_type" | "tag/map_decoration_type" | "tag/memory_module_type" | "tag/menu" | "tag/mob_effect" | "tag/motive" | "tag/number_format_type" | "tag/outgoing_rpc_methods" | "tag/particle_type" | "tag/permission_check_type" | "tag/permission_type" | "tag/point_of_interest_type" | "tag/pos_rule_test" | "tag/position_source_type" | "tag/potion" | "tag/recipe_book_category" | "tag/recipe_display" | "tag/recipe_serializer" | "tag/recipe_type" | "tag/rule_block_entity_modifier" | "tag/rule_test" | "tag/schedule" | "tag/sensor_type" | "tag/slot_display" | "tag/sound_event" | "tag/spawn_condition_type" | "tag/stat_type" | "tag/test_environment_definition_type" | "tag/test_function" | "tag/test_instance_type" | "tag/trigger_type" | "tag/ticket_type" | "tag/villager_profession" | "tag/villager_type" | "tag/worldgen/biome_source" | "tag/worldgen/block_placer_type" | "tag/worldgen/block_state_provider_type" | "tag/worldgen/carver" | "tag/worldgen/chunk_generator" | "tag/worldgen/decorator" | "tag/worldgen/density_function_type" | "tag/worldgen/feature" | "tag/worldgen/feature_size_type" | "tag/worldgen/foliage_placer_type" | "tag/worldgen/material_condition" | "tag/worldgen/material_rule" | "tag/worldgen/placement_modifier_type" | "tag/worldgen/pool_alias_binding" | "tag/worldgen/root_placer_type" | "tag/worldgen/structure_feature" | "tag/worldgen/structure_piece" | "tag/worldgen/structure_placement" | "tag/worldgen/structure_pool_element" | "tag/worldgen/structure_processor" | "tag/worldgen/structure_type" | "tag/worldgen/surface_builder" | "tag/worldgen/tree_decorator_type" | "tag/worldgen/trunk_placer_type" | "tag/advancement" | "tag/banner_pattern" | "tag/cat_variant" | "tag/chat_type" | "tag/chicken_variant" | "tag/cow_variant" | "tag/damage_type" | "tag/dialog" | "tag/dimension" | "tag/dimension_type" | "tag/enchantment" | "tag/enchantment_provider" | "tag/frog_variant" | "tag/item_modifier" | "tag/jukebox_song" | "tag/loot_table" | "tag/painting_variant" | "tag/pig_variant" | "tag/predicate" | "tag/recipe" | "tag/structure" | "tag/test_environment" | "tag/test_instance" | "tag/trial_spawner" | "tag/trim_material" | "tag/trim_pattern" | "tag/wolf_sound_variant" | "tag/wolf_variant" | "tag/worldgen/biome" | "tag/worldgen/configured_carver" | "tag/worldgen/configured_feature" | "tag/worldgen/configured_structure_feature" | "tag/worldgen/configured_surface_builder" | "tag/worldgen/density_function" | "tag/worldgen/flat_level_generator_preset" | "tag/worldgen/multi_noise_biome_source_parameter_list" | "tag/worldgen/noise" | "tag/worldgen/noise_settings" | "tag/worldgen/placed_feature" | "tag/worldgen/processor_list" | "tag/worldgen/structure" | "tag/worldgen/structure_set" | "tag/worldgen/template_pool" | "tag/worldgen/world_preset" | "worldgen/biome" | "worldgen/configured_carver" | "worldgen/configured_feature" | "worldgen/configured_structure_feature" | "worldgen/configured_surface_builder" | "worldgen/density_function" | "worldgen/flat_level_generator_preset" | "worldgen/multi_noise_biome_source_parameter_list" | "worldgen/noise" | "worldgen/noise_settings" | "worldgen/placed_feature" | "worldgen/processor_list" | "worldgen/structure" | "worldgen/structure_set" | "worldgen/template_pool" | "worldgen/world_preset" | "atlas" | "block_definition" | "equipment" | "font" | "font/ttf" | "font/otf" | "font/unihex" | "gpu_warnlist" | "item_definition" | "lang" | "lang/deprecated" | "model" | "particle" | "post_effect" | "regional_compliancies" | "shader" | "shader/fragment" | "shader/vertex" | "sound" | "sounds" | "texture" | "texture_meta" | "waypoint_style";
     ext: `.${string}`;
     pack: "assets" | "data";
     since?: `1.${number}` | undefined;

package/lib/dependency/common.d.ts

@@ -18,7 +18,6 @@ export interface VersionInfo {
     release: ReleaseVersion;
     id: string;
     name: string;
-    isLatest: boolean;
 }
 export declare namespace PackMcmeta {
     function readPackFormat(data: any): number;

package/lib/dependency/common.js

@@ -7,7 +7,12 @@ export var ReleaseVersion;
      * * `1` if `a` is newer than `b`.
      */
     function cmp(a, b) {
-        return Math.sign(Number(a.slice(2)) - Number(b.slice(2)));
+        const [minorA, patchA = 0] = a.slice(2).split('.');
+        const [minorB, patchB = 0] = b.slice(2).split('.');
+        if (minorA !== minorB) {
+            return Math.sign(Number(minorA) - Number(minorB));
+        }
+        return Math.sign(Number(patchA) - Number(patchB));
     }
     ReleaseVersion.cmp = cmp;
     /**
@@ -22,6 +27,13 @@ export var ReleaseVersion;
 export var PackMcmeta;
 (function (PackMcmeta) {
     function readPackFormat(data) {
+        const max = data?.pack?.max_format;
+        if (Array.isArray(max) && max.length >= 1 && typeof max[0] === 'number') {
+            return max[0]; // only return major pack format
+        }
+        if (typeof max === 'number') {
+            return max;
+        }
         const supported = data?.pack?.supported_formats;
         if (Array.isArray(supported) && supported.length === 2 && typeof supported[1] === 'number') {
             return supported[1];
@@ -33,7 +45,7 @@ export var PackMcmeta;
         if (typeof format === 'number') {
             return format;
         }
-        throw new Error('“pack.pack_format” is not a number');
+        throw new Error('No pack format found');
     }
     PackMcmeta.readPackFormat = readPackFormat;
     async function getType(packRoot, externals) {

package/lib/dependency/index.d.ts

@@ -7,7 +7,7 @@ import type { McmetaSummary, McmetaVersions } from './mcmeta.js';
  *
  * [versions.json]: https://github.com/misode/mcmeta/blob/summary/versions/data.json
  */
-export declare function getVersions(externals: core.Externals, downloader: core.Downloader): Promise<McmetaVersions | undefined>;
+export declare function getVersions(externals: core.Externals, logger: core.Logger): Promise<McmetaVersions | undefined>;
 interface GetMcmetaSummaryResult extends Partial<McmetaSummary> {
     checksum: string | undefined;
 }
@@ -16,29 +16,17 @@ interface GetMcmetaSummaryResult extends Partial<McmetaSummary> {
  *
  * @throws Network/file system errors.
  */
-export declare function getMcmetaSummary(externals: core.Externals, downloader: core.Downloader, logger: core.Logger, version: string, isLatest: boolean, source: string, overridePaths?: core.EnvConfig['mcmetaSummaryOverrides']): Promise<GetMcmetaSummaryResult>;
+export declare function getMcmetaSummary(externals: core.Externals, logger: core.Logger, version: string, overridePaths?: core.EnvConfig['mcmetaSummaryOverrides']): Promise<GetMcmetaSummaryResult>;
 /**
  * @throws Network/file system errors.
- *
- * @returns
- * 	- `startDepth`: The amount of level to skip when unzipping the tarball.
- * 	- `uri`: URI to the `.tar.gz` file.
  */
-export declare function getVanillaDatapack(downloader: core.Downloader, version: string, isLatest: boolean): Promise<core.Dependency>;
+export declare function getVanillaDatapack(externals: core.Externals, logger: core.Logger, version: string): Promise<core.Dependency>;
 /**
  * @throws Network/file system errors.
- *
- * @returns
- * 	- `startDepth`: The amount of level to skip when unzipping the tarball.
- * 	- `uri`: URI to the `.tar.gz` file.
  */
-export declare function getVanillaResourcepack(downloader: core.Downloader, version: string, isLatest: boolean): Promise<core.Dependency>;
+export declare function getVanillaResourcepack(externals: core.Externals, logger: core.Logger, version: string): Promise<core.Dependency>;
 /**
  * @throws Network/file system errors.
- *
- * @returns
- * 	- `startDepth`: The amount of level to skip when unzipping the tarball.
- * 	- `uri`: URI to the `.tar.gz` file.
  */
-export declare function getVanillaMcdoc(downloader: core.Downloader): Promise<core.Dependency>;
+export declare function getVanillaMcdoc(externals: core.Externals, logger: core.Logger): Promise<core.Dependency>;
 //# sourceMappingURL=index.d.ts.map

package/lib/dependency/index.js

@@ -1,23 +1,16 @@
 export * from './common.js';
 export * from './mcmeta.js';
 import * as core from '@spyglassmc/core';
-import { Fluids, getMcmetaSummaryUris } from './mcmeta.js';
-// Memory cache TTL in milliseconds
-const DownloaderTtl = 15_000;
+import { Fluids } from './mcmeta.js';
 /* istanbul ignore next */
 /**
  * Return the deserialized [`versions.json`][versions.json].
  *
  * [versions.json]: https://github.com/misode/mcmeta/blob/summary/versions/data.json
  */
-export async function getVersions(externals, downloader) {
-    return downloader.download({
-        id: 'mc-je/versions.json.gz',
-        uri: 'https://raw.githubusercontent.com/misode/mcmeta/summary/versions/data.json.gz',
-        transformer: (buffer) => core.parseGzippedJson(externals, buffer),
-        cache: getCacheOptionsBasedOnGitHubCommitSha('misode', 'mcmeta', 'refs/heads/summary'),
-        ttl: DownloaderTtl,
-    });
+export async function getVersions(externals, logger) {
+    return (await core.fetchWithCache(externals, logger, 'https://api.spyglassmc.com/mcje/versions'))
+        .json();
 }
 /* istanbul ignore next */
 /**
@@ -25,15 +18,7 @@ export async function getVersions(externals, downloader) {
  *
  * @throws Network/file system errors.
  */
-export async function getMcmetaSummary(externals, downloader, logger, version, isLatest, source, overridePaths = {}) {
-    const ref = getGitRef({
-        defaultBranch: 'summary',
-        getTag: (v) => `${v}-summary`,
-        isLatest,
-        version,
-    });
-    const uris = getMcmetaSummaryUris(version, isLatest, source);
-    let checksum;
+export async function getMcmetaSummary(externals, logger, version, overridePaths = {}) {
     async function handleOverride(currentValue, overrideConfig) {
         if (overrideConfig) {
             try {
@@ -52,135 +37,62 @@ export async function getMcmetaSummary(externals, downloader, logger, version, i
         return currentValue;
     }
     const getResource = async (type, overrideConfig) => {
-        const out = {};
-        const data = await downloader.download({
-            id: `mc-je/${version}/${type}.json.gz`,
-            uri: uris[type],
-            transformer: (buffer) => core.parseGzippedJson(externals, buffer),
-            cache: getCacheOptionsBasedOnGitHubCommitSha('misode', 'mcmeta', ref),
-            ttl: DownloaderTtl,
-        }, out);
-        checksum ||= out.checksum;
-        return handleOverride(data, overrideConfig);
+        const response = await core.fetchWithCache(externals, logger, `https://api.spyglassmc.com/mcje/versions/${encodeURIComponent(version)}/${type}`);
+        return {
+            data: await handleOverride(await response.json(), overrideConfig),
+            checksum: response.headers.get('etag') ?? '',
+        };
     };
     const [blocks, commands, fluids, registries] = [
-        await getResource('blocks', overridePaths.blocks),
+        await getResource('block_states', overridePaths.blocks),
         await getResource('commands', overridePaths.commands),
-        await handleOverride(Fluids, overridePaths.fluids),
+        {
+            data: await handleOverride(Fluids, overridePaths.fluids),
+            checksum: 'v1',
+        },
         await getResource('registries', overridePaths.registries),
     ];
-    return { blocks, commands, fluids, registries, checksum };
-}
-function getGitRef({ defaultBranch, getTag, isLatest, version }) {
-    return isLatest ? `refs/heads/${defaultBranch}` : `refs/tags/${getTag(version)}`;
-}
-const GitHubApiDownloadOptions = {
-    headers: { Accept: 'application/vnd.github.v3+json', 'User-Agent': 'SpyglassMC' },
-};
-function getCacheOptionsBasedOnGitHubCommitSha(owner, repo, ref) {
     return {
-        checksumExtension: '.commit-sha',
-        checksumJob: {
-            uri: `https://api.github.com/repos/${owner}/${repo}/git/${ref}`,
-            transformer: (buffer) => {
-                const response = JSON.parse(core.bufferToString(buffer));
-                if (Array.isArray(response)) {
-                    return response[0].object.sha;
-                }
-                else if (response.message === undefined) {
-                    return response.object.sha;
-                }
-                else {
-                    throw new Error(response.message);
-                }
-            },
-            options: GitHubApiDownloadOptions,
-            ttl: DownloaderTtl,
-        },
+        blocks: blocks.data,
+        commands: commands.data,
+        fluids: fluids.data,
+        registries: registries.data,
+        checksum: `${blocks.checksum}-${commands.checksum}-${fluids.checksum}-${registries.checksum}`,
     };
 }
-/**
- * Download data from a GitHub repository with tags corresponding to Minecraft versions.
- * The downloaded data will be cached based on the commit SHA of the respective tag.
- *
- * If `isLatest` if `true`, instead of finding the tag corresponding to the given version, the default branch will be used.
- *
- * @returns The URI to the `.tar.gz` file.
- */
-async function downloadGitHubRepo({ defaultBranch, downloader, getTag, repo, isLatest, owner, version, suffix }) {
-    const ref = getGitRef({ defaultBranch, getTag, isLatest, version });
-    const out = {};
-    await downloader.download({
-        id: `mc-je/${version}/${repo}${suffix ?? ''}.tar.gz`,
-        uri: `https://api.github.com/repos/${owner}/${repo}/tarball/${ref}`,
-        transformer: (b) => b,
-        cache: getCacheOptionsBasedOnGitHubCommitSha(owner, repo, ref),
-        options: GitHubApiDownloadOptions,
-        ttl: DownloaderTtl,
-    }, out);
-    return out.cacheUri;
-}
 /* istanbul ignore next */
 /**
  * @throws Network/file system errors.
- *
- * @returns
- * 	- `startDepth`: The amount of level to skip when unzipping the tarball.
- * 	- `uri`: URI to the `.tar.gz` file.
  */
-export async function getVanillaDatapack(downloader, version, isLatest) {
-    const uri = await downloadGitHubRepo({
-        defaultBranch: 'data',
-        downloader,
-        getTag: (v) => `${v}-data`,
-        owner: 'misode',
-        repo: 'mcmeta',
-        isLatest,
-        version,
-    });
-    return { info: { startDepth: 1 }, uri };
+export async function getVanillaDatapack(externals, logger, version) {
+    return {
+        type: 'tarball-ram',
+        name: 'vanilla-datapack',
+        data: new Uint8Array(await (await core.fetchWithCache(externals, logger, `https://api.spyglassmc.com/mcje/versions/${encodeURIComponent(version)}/vanilla-data/tarball`)).arrayBuffer()),
+        stripLevel: 0,
+    };
 }
 /* istanbul ignore next */
 /**
  * @throws Network/file system errors.
- *
- * @returns
- * 	- `startDepth`: The amount of level to skip when unzipping the tarball.
- * 	- `uri`: URI to the `.tar.gz` file.
  */
-export async function getVanillaResourcepack(downloader, version, isLatest) {
-    const uri = await downloadGitHubRepo({
-        defaultBranch: 'assets-tiny',
-        downloader,
-        getTag: (v) => `${v}-assets-tiny`,
-        owner: 'misode',
-        repo: 'mcmeta',
-        isLatest,
-        version,
-        suffix: '-assets',
-    });
-    return { info: { startDepth: 1 }, uri };
+export async function getVanillaResourcepack(externals, logger, version) {
+    return {
+        type: 'tarball-ram',
+        name: 'vanilla-assets-tiny',
+        data: new Uint8Array(await (await core.fetchWithCache(externals, logger, `https://api.spyglassmc.com/mcje/versions/${encodeURIComponent(version)}/vanilla-assets-tiny/tarball`)).arrayBuffer()),
+        stripLevel: 0,
+    };
 }
 /**
  * @throws Network/file system errors.
- *
- * @returns
- * 	- `startDepth`: The amount of level to skip when unzipping the tarball.
- * 	- `uri`: URI to the `.tar.gz` file.
  */
-export async function getVanillaMcdoc(downloader) {
-    const owner = 'SpyglassMC';
-    const repo = 'vanilla-mcdoc';
-    const ref = 'refs/heads/main';
-    const out = {};
-    await downloader.download({
-        id: 'mc-je/vanilla-mcdoc.tar.gz',
-        uri: `https://api.github.com/repos/${owner}/${repo}/tarball/${ref}`,
-        transformer: (b) => b,
-        cache: getCacheOptionsBasedOnGitHubCommitSha(owner, repo, ref),
-        options: GitHubApiDownloadOptions,
-        ttl: DownloaderTtl,
-    }, out);
-    return { info: { startDepth: 1 }, uri: out.cacheUri };
+export async function getVanillaMcdoc(externals, logger) {
+    return {
+        type: 'tarball-ram',
+        name: 'vanilla-mcdoc',
+        data: new Uint8Array(await (await core.fetchWithCache(externals, logger, `https://api.spyglassmc.com/vanilla-mcdoc/tarball`)).arrayBuffer()),
+        stripLevel: 0,
+    };
 }
 //# sourceMappingURL=index.js.map

package/lib/dependency/mcmeta.d.ts

@@ -1,16 +1,11 @@
 import * as core from '@spyglassmc/core';
 import type { PackInfo, VersionInfo } from './common.js';
 import { ReleaseVersion } from './common.js';
-export declare const NEXT_RELEASE_VERSION = "1.21.9";
+export declare const NEXT_RELEASE_VERSION = "1.21.11";
 /**
  * @param inputVersion {@link core.Config.env.gameVersion}
  */
 export declare function resolveConfiguredVersion(inputVersion: string, versions: McmetaVersions, packs: PackInfo[], logger: core.Logger): VersionInfo;
-export declare function getMcmetaSummaryUris(version: string, isLatest: boolean, source: string): {
-    blocks: core.RemoteUriString;
-    commands: core.RemoteUriString;
-    registries: core.RemoteUriString;
-};
 export declare function symbolRegistrar(summary: McmetaSummary, release: ReleaseVersion): core.SymbolRegistrar;
 export declare const Fluids: McmetaStates;
 export interface McmetaVersion {

package/lib/dependency/mcmeta.js

@@ -1,7 +1,7 @@
 import * as core from '@spyglassmc/core';
 import { ReleaseVersion } from './common.js';
 // DOCS: Update this when a new snapshot cycle begins
-export const NEXT_RELEASE_VERSION = '1.21.9';
+export const NEXT_RELEASE_VERSION = '1.21.11';
 /**
  * @param inputVersion {@link core.Config.env.gameVersion}
  */
@@ -27,7 +27,6 @@ export function resolveConfiguredVersion(inputVersion, versions, packs, logger)
             id: version.id,
             name: version.name,
             release: findReleaseTarget(version),
-            isLatest: version === versions[0],
         };
     }
     if (versions.length === 0) {
@@ -90,27 +89,6 @@ export function resolveConfiguredVersion(inputVersion, versions, packs, logger)
     logger.info(`[resolveConfiguredVersion] Using config "${inputVersion}", selecting version ${configVersion?.id}`);
     return toVersionInfo(configVersion);
 }
-const DataSources = {
-    fastly: 'https://fastly.jsdelivr.net/gh/${user}/${repo}@${tag}/${path}',
-    github: 'https://raw.githubusercontent.com/${user}/${repo}/${tag}/${path}',
-    jsdelivr: 'https://cdn.jsdelivr.net/gh/${user}/${repo}@${tag}/${path}',
-};
-export function getMcmetaSummaryUris(version, isLatest, source) {
-    const tag = isLatest ? 'summary' : `${version}-summary`;
-    function getUri(path) {
-        const template = DataSources[source.toLowerCase()] ?? source;
-        const ans = template.replace(/\${user}/g, 'misode').replace(/\${repo}/g, 'mcmeta').replace(/\${tag}/g, tag).replace(/\${path}/g, path);
-        if (!core.RemoteUriString.is(ans)) {
-            throw new Error(`Expected a remote URI from data source template but got ${ans}`);
-        }
-        return ans;
-    }
-    return {
-        blocks: getUri('blocks/data.json.gz'),
-        commands: getUri('commands/data.json.gz'),
-        registries: getUri('registries/data.json.gz'),
-    };
-}
 export function symbolRegistrar(summary, release) {
     const McmetaSummaryUri = 'mcmeta://summary/registries.json';
     /**

package/lib/index.js

@@ -13,7 +13,7 @@ export * as json from './json/index.js';
 export * from './mcdocAttributes.js';
 export * as mcf from './mcfunction/index.js';
 export const initialize = async (ctx) => {
-    const { config, downloader, externals, logger, meta, projectRoots } = ctx;
+    const { config, externals, logger, meta, projectRoots } = ctx;
     async function readPackFormat(uri) {
         try {
             const data = await core.fileUtil.readJson(externals, uri);
@@ -54,7 +54,7 @@ export const initialize = async (ctx) => {
     meta.registerUriBinder(uriBinder);
     registerUriBuilders(meta);
     const [versions, packs] = await Promise.all([
-        getVersions(ctx.externals, ctx.downloader),
+        getVersions(externals, logger),
         findPackMcmetas(),
     ]);
     if (!versions) {
@@ -63,16 +63,16 @@ export const initialize = async (ctx) => {
     }
     const version = resolveConfiguredVersion(config.env.gameVersion, versions, packs, logger);
     const release = version.release;
-    meta.registerDependencyProvider('@vanilla-datapack', () => getVanillaDatapack(downloader, version.id, version.isLatest));
-    meta.registerDependencyProvider('@vanilla-resourcepack', () => getVanillaResourcepack(downloader, version.id, version.isLatest));
-    meta.registerDependencyProvider('@vanilla-mcdoc', () => getVanillaMcdoc(downloader));
-    const summary = await getMcmetaSummary(ctx.externals, downloader, logger, version.id, version.isLatest, config.env.dataSource, config.env.mcmetaSummaryOverrides);
+    meta.registerDependencyProvider('@vanilla-datapack', () => getVanillaDatapack(externals, logger, version.id));
+    meta.registerDependencyProvider('@vanilla-resourcepack', () => getVanillaResourcepack(externals, logger, version.id));
+    meta.registerDependencyProvider('@vanilla-mcdoc', () => getVanillaMcdoc(externals, logger));
+    const summary = await getMcmetaSummary(ctx.externals, logger, version.id, config.env.mcmetaSummaryOverrides);
     if (!summary.blocks || !summary.commands || !summary.fluids || !summary.registries) {
         ctx.logger.error('[je-initialize] Failed loading mcmeta summaries. Expect everything to be broken.');
         return;
     }
     meta.registerSymbolRegistrar('mcmeta-summary', {
-        checksum: `${summary.checksum}_v3`,
+        checksum: `${summary.checksum}-v4`,
         registrar: symbolRegistrar(summary, release),
     });
     meta.registerLinter('nameOfNbtKey', {

package/lib/mcfunction/checker/index.js

@@ -268,7 +268,7 @@ function nbtPathChecker(dispatchedBy) {
 const particle = (node, ctx) => {
     const id = core.ResourceLocationNode.toString(node.id, 'short');
     const release = ctx.project['loadedVersion'];
-    if (release && ReleaseVersion.cmp(release, '1.20.5') < 0) {
+    if (!release || ReleaseVersion.cmp(release, '1.20.5') < 0) {
         return;
     }
     const options = node.children?.find(nbt.NbtCompoundNode.is);
@@ -277,7 +277,7 @@ const particle = (node, ctx) => {
         // run the type checker anyways to allow an empty compound
         nbt.checker.index('minecraft:particle', core.ResourceLocation.lengthen(id))(options, ctx);
     }
-    else if (ParticleNode.requiresOptions(id)) {
+    else if (ParticleNode.requiresOptions(id, release)) {
         ctx.err.report(localize('expected', localize('nbt.node.compound')), core.Range.create(node.id.range.end, node.id.range.end + 1));
     }
 };

package/lib/mcfunction/node/argument.d.ts

@@ -1,5 +1,6 @@
 import * as core from '@spyglassmc/core';
 import type * as nbt from '@spyglassmc/nbt';
+import { ReleaseVersion } from '../../dependency/common.js';
 import type { NbtParserProperties } from '../tree/argument.js';
 export interface BlockStatesNode extends core.RecordBaseNode<core.StringNode, core.StringNode> {
     type: 'mcfunction:block/states';
@@ -86,7 +87,7 @@ export interface EntitySelectorNode extends core.AstNode {
 export declare namespace EntitySelectorNode {
     function is<T extends core.DeepReadonly<core.AstNode> | undefined>(node: T): node is core.InheritReadonly<EntitySelectorNode, T>;
     function mock(range: core.RangeLike, options: core.LiteralOptions): EntitySelectorNode;
-    const ArgumentKeys: Set<"tag" | "team" | "predicate" | "type" | "level" | "sort" | "advancements" | "nbt" | "distance" | "gamemode" | "limit" | "name" | "scores" | "x" | "y" | "z" | "dx" | "dy" | "dz" | "x_rotation" | "y_rotation">;
+    const ArgumentKeys: Set<"tag" | "team" | "predicate" | "type" | "level" | "name" | "sort" | "advancements" | "nbt" | "distance" | "gamemode" | "limit" | "scores" | "x" | "y" | "z" | "dx" | "dy" | "dz" | "x_rotation" | "y_rotation">;
     type ArgumentKey = typeof ArgumentKeys extends Set<infer T> ? T : undefined;
     const enum Result {
         Ok = 0,
@@ -252,7 +253,7 @@ export interface ObjectiveCriteriaNode extends core.AstNode {
 }
 export declare namespace ObjectiveCriteriaNode {
     const SimpleValues: string[];
-    const ComplexCategories: Map<string, "block" | "fluid" | "instrument" | "activity" | "armor_material" | "attribute" | "block_entity_type" | "block_predicate_type" | "block_type" | "chunk_status" | "command_argument_type" | "consume_effect_type" | "creative_mode_tab" | "custom_stat" | "data_component_predicate_type" | "data_component_type" | "decorated_pot_pattern" | "decorated_pot_patterns" | "dialog_action_type" | "dialog_body_type" | "dialog_type" | "enchantment_effect_component_type" | "enchantment_entity_effect_type" | "enchantment_level_based_value_type" | "enchantment_location_based_effect_type" | "enchantment_provider_type" | "enchantment_value_effect_type" | "entity_sub_predicate_type" | "entity_type" | "float_provider_type" | "game_event" | "height_provider_type" | "input_control_type" | "int_provider_type" | "item" | "item_sub_predicate_type" | "loot_condition_type" | "loot_function_type" | "loot_nbt_provider_type" | "loot_number_provider_type" | "loot_pool_entry_type" | "loot_score_provider_type" | "map_decoration_type" | "memory_module_type" | "menu" | "mob_effect" | "motive" | "number_format_type" | "particle_type" | "point_of_interest_type" | "pos_rule_test" | "position_source_type" | "potion" | "recipe_book_category" | "recipe_display" | "recipe_serializer" | "recipe_type" | "rule_block_entity_modifier" | "rule_test" | "schedule" | "sensor_type" | "slot_display" | "sound_event" | "spawn_condition_type" | "stat_type" | "test_environment_definition_type" | "test_function" | "test_instance_type" | "trigger_type" | "ticket_type" | "villager_profession" | "villager_type" | "worldgen/biome_source" | "worldgen/block_placer_type" | "worldgen/block_state_provider_type" | "worldgen/carver" | "worldgen/chunk_generator" | "worldgen/decorator" | "worldgen/density_function_type" | "worldgen/feature" | "worldgen/feature_size_type" | "worldgen/foliage_placer_type" | "worldgen/material_condition" | "worldgen/material_rule" | "worldgen/placement_modifier_type" | "worldgen/pool_alias_binding" | "worldgen/root_placer_type" | "worldgen/structure_feature" | "worldgen/structure_piece" | "worldgen/structure_placement" | "worldgen/structure_pool_element" | "worldgen/structure_processor" | "worldgen/structure_type" | "worldgen/surface_builder" | "worldgen/tree_decorator_type" | "worldgen/trunk_placer_type">;
+    const ComplexCategories: Map<string, "block" | "fluid" | "instrument" | "activity" | "armor_material" | "attribute" | "block_entity_type" | "block_predicate_type" | "block_type" | "chunk_status" | "command_argument_type" | "consume_effect_type" | "creative_mode_tab" | "custom_stat" | "data_component_predicate_type" | "data_component_type" | "debug_subscription" | "decorated_pot_pattern" | "decorated_pot_patterns" | "dialog_action_type" | "dialog_body_type" | "dialog_type" | "enchantment_effect_component_type" | "enchantment_entity_effect_type" | "enchantment_level_based_value_type" | "enchantment_location_based_effect_type" | "enchantment_provider_type" | "enchantment_value_effect_type" | "entity_sub_predicate_type" | "entity_type" | "float_provider_type" | "game_event" | "height_provider_type" | "incoming_rpc_methods" | "input_control_type" | "int_provider_type" | "item" | "item_sub_predicate_type" | "loot_condition_type" | "loot_function_type" | "loot_nbt_provider_type" | "loot_number_provider_type" | "loot_pool_entry_type" | "loot_score_provider_type" | "map_decoration_type" | "memory_module_type" | "menu" | "mob_effect" | "motive" | "number_format_type" | "outgoing_rpc_methods" | "particle_type" | "permission_check_type" | "permission_type" | "point_of_interest_type" | "pos_rule_test" | "position_source_type" | "potion" | "recipe_book_category" | "recipe_display" | "recipe_serializer" | "recipe_type" | "rule_block_entity_modifier" | "rule_test" | "schedule" | "sensor_type" | "slot_display" | "sound_event" | "spawn_condition_type" | "stat_type" | "test_environment_definition_type" | "test_function" | "test_instance_type" | "trigger_type" | "ticket_type" | "villager_profession" | "villager_type" | "worldgen/biome_source" | "worldgen/block_placer_type" | "worldgen/block_state_provider_type" | "worldgen/carver" | "worldgen/chunk_generator" | "worldgen/decorator" | "worldgen/density_function_type" | "worldgen/feature" | "worldgen/feature_size_type" | "worldgen/foliage_placer_type" | "worldgen/material_condition" | "worldgen/material_rule" | "worldgen/placement_modifier_type" | "worldgen/pool_alias_binding" | "worldgen/root_placer_type" | "worldgen/structure_feature" | "worldgen/structure_piece" | "worldgen/structure_placement" | "worldgen/structure_pool_element" | "worldgen/structure_processor" | "worldgen/structure_type" | "worldgen/surface_builder" | "worldgen/tree_decorator_type" | "worldgen/trunk_placer_type">;
     const ComplexSep = ":";
     function mock(range: core.RangeLike): ObjectiveCriteriaNode;
 }
@@ -266,7 +267,7 @@ export declare namespace ParticleNode {
     export type SpecialType = typeof SpecialTypes extends Set<infer T> ? T : undefined;
     export function isSpecialType(type: string | undefined): type is SpecialType;
     export type OptionType = typeof SpecialTypes extends Set<infer T> ? T : undefined;
-    export function requiresOptions(type: string | undefined): type is OptionType;
+    export function requiresOptions(type: string | undefined, release: ReleaseVersion): type is OptionType;
     export function is(node: core.AstNode | undefined): node is ParticleNode;
     export function mock(range: core.RangeLike): ParticleNode;
     export {};

package/lib/mcfunction/node/argument.js

@@ -346,7 +346,10 @@ export var ParticleNode;
         'entity_effect',
         'trail',
     ]);
-    function requiresOptions(type) {
+    function requiresOptions(type, release) {
+        if (type === 'flash' && ReleaseVersion.cmp(release, '1.21.9') >= 0) {
+            return true;
+        }
         return OptionTypes.has(type);
     }
     ParticleNode.requiresOptions = requiresOptions;

package/lib/mcfunction/tree/patch.js

@@ -194,6 +194,23 @@ export function getPatch(release) {
                     unless: ExecuteCondition,
                 },
             },
+            ...(ReleaseVersion.cmp(release, '1.21.9') >= 0
+                ? {
+                    fetchprofile: {
+                        children: {
+                            id: {
+                                children: {
+                                    id: {
+                                        properties: {
+                                            category: 'player_uuid',
+                                        },
+                                    },
+                                },
+                            },
+                        },
+                    },
+                }
+                : {}),
             function: {
                 children: {
                     name: {
@@ -637,6 +654,11 @@ export function getPatch(release) {
                             neutral: Sound,
                             player: Sound,
                             record: Sound,
+                            ...(ReleaseVersion.cmp(release, '1.21.9') >= 0
+                                ? {
+                                    ui: Sound,
+                                }
+                                : {}),
                             voice: Sound,
                             weather: Sound,
                         },
@@ -731,6 +753,24 @@ export function getPatch(release) {
             tell: {
                 permission: 0,
             },
+            ...(ReleaseVersion.cmp(release, '1.21.5') >= 0
+                ? {
+                    test: {
+                        children: {
+                            create: {
+                                children: {
+                                    id: {
+                                        properties: {
+                                            category: 'test_instance',
+                                            allowUnknown: true,
+                                        },
+                                    },
+                                },
+                            },
+                        },
+                    },
+                }
+                : {}),
             ...(ReleaseVersion.cmp(release, '1.20.3') >= 0
                 ? {
                     // Added in 23w43a (1.20.3, pack format 22)
@@ -764,6 +804,35 @@ export function getPatch(release) {
             w: {
                 permission: 0,
             },
+            ...(ReleaseVersion.cmp(release, '1.21.6') >= 0
+                ? {
+                    waypoint: {
+                        children: {
+                            modify: {
+                                children: {
+                                    waypoint: {
+                                        children: {
+                                            style: {
+                                                children: {
+                                                    set: {
+                                                        children: {
+                                                            style: {
+                                                                properties: {
+                                                                    category: 'waypoint_style',
+                                                                },
+                                                            },
+                                                        },
+                                                    },
+                                                },
+                                            },
+                                        },
+                                    },
+                                },
+                            },
+                        },
+                    },
+                }
+                : {}),
             whitelist: {
                 permission: 3,
             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/java-edition",
-  "version": "0.3.45",
+  "version": "0.3.47",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -17,12 +17,12 @@
     "release:dry": "npm publish --dry-run"
   },
   "dependencies": {
-    "@spyglassmc/core": "0.4.34",
-    "@spyglassmc/json": "0.3.38",
-    "@spyglassmc/locales": "0.3.18",
-    "@spyglassmc/mcfunction": "0.2.37",
-    "@spyglassmc/mcdoc": "0.3.38",
-    "@spyglassmc/nbt": "0.3.39"
+    "@spyglassmc/core": "0.4.36",
+    "@spyglassmc/json": "0.3.40",
+    "@spyglassmc/locales": "0.3.19",
+    "@spyglassmc/mcfunction": "0.2.39",
+    "@spyglassmc/mcdoc": "0.3.40",
+    "@spyglassmc/nbt": "0.3.41"
   },
   "devDependencies": {},
   "publishConfig": {