@spyglassmc/java-edition 0.3.18 → 0.3.20

package/lib/binder/index.d.ts

@@ -5,8 +5,9 @@ export declare function dissectUri(uri: string, ctx: UriBinderContext): {
     identifier: string;
     expected: string | undefined;
     path: string;
-    category: "function" | "advancement" | "banner_pattern" | "chat_type" | "damage_type" | "dimension" | "dimension_type" | "enchantment" | "enchantment_provider" | "instrument" | "item_modifier" | "jukebox_song" | "loot_table" | "painting_variant" | "predicate" | "recipe" | "structure" | "trial_spawner" | "trim_material" | "trim_pattern" | "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/cat_variant" | "tag/chunk_status" | "tag/command_argument_type" | "tag/creative_mode_tab" | "tag/custom_stat" | "tag/data_component_type" | "tag/decorated_pot_pattern" | "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/frog_variant" | "tag/game_event" | "tag/height_provider_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_serializer" | "tag/recipe_type" | "tag/rule_block_entity_modifier" | "tag/rule_test" | "tag/schedule" | "tag/sensor_type" | "tag/sound_event" | "tag/stat_type" | "tag/trigger_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/chat_type" | "tag/damage_type" | "tag/dimension" | "tag/dimension_type" | "tag/enchantment" | "tag/enchantment_provider" | "tag/item_modifier" | "tag/jukebox_song" | "tag/loot_table" | "tag/painting_variant" | "tag/predicate" | "tag/recipe" | "tag/structure" | "tag/trial_spawner" | "tag/trim_material" | "tag/trim_pattern" | "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";
+    category: "function" | "advancement" | "banner_pattern" | "chat_type" | "damage_type" | "dimension" | "dimension_type" | "enchantment" | "enchantment_provider" | "instrument" | "item_modifier" | "jukebox_song" | "loot_table" | "painting_variant" | "predicate" | "recipe" | "structure" | "trial_spawner" | "trim_material" | "trim_pattern" | "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/cat_variant" | "tag/chunk_status" | "tag/command_argument_type" | "tag/consume_effect_type" | "tag/creative_mode_tab" | "tag/custom_stat" | "tag/data_component_type" | "tag/decorated_pot_pattern" | "tag/decorated_pot_patterns" | "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/frog_variant" | "tag/game_event" | "tag/height_provider_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/stat_type" | "tag/trigger_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/chat_type" | "tag/damage_type" | "tag/dimension" | "tag/dimension_type" | "tag/enchantment" | "tag/enchantment_provider" | "tag/item_modifier" | "tag/jukebox_song" | "tag/loot_table" | "tag/painting_variant" | "tag/predicate" | "tag/recipe" | "tag/structure" | "tag/trial_spawner" | "tag/trim_material" | "tag/trim_pattern" | "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" | "item_definition" | "lang" | "model" | "particle" | "post_effect" | "shader" | "shader/fragment" | "shader/vertex" | "sound" | "texture";
     ext: `.${string}`;
+    pack: "assets" | "data";
     since?: `1.${number}` | undefined;
     until?: `1.${number}` | undefined;
     ok: boolean;

package/lib/binder/index.js

@@ -3,12 +3,17 @@ import { localeQuote, localize } from '@spyglassmc/locales';
 import { ReleaseVersion } from '../dependency/index.js';
 const Resources = new Map();
 function resource(path, resource = {}) {
-    Resources.set(path, {
-        path,
-        category: resource.category ?? path,
-        ext: resource.ext ?? '.json',
-        ...resource,
-    });
+    const previous = Resources.get(path) ?? [];
+    Resources.set(path, [
+        ...previous,
+        {
+            path,
+            category: resource.category ?? path,
+            ext: resource.ext ?? '.json',
+            pack: resource.pack ?? 'data',
+            ...resource,
+        },
+    ]);
 }
 // Pre-1.21 data pack plurals
 resource('advancements', { category: 'advancement', until: '1.21' });
@@ -88,11 +93,36 @@ for (const registry of TaggableResourceLocationCategories) {
     }
     resource(`tags/${registry}`, { category: `tag/${registry}`, since: '1.18' });
 }
+// Resource pack
+resource('atlases', { pack: 'assets', category: 'atlas', since: '1.19.3' });
+resource('blockstates', { pack: 'assets', category: 'block_definition' });
+resource('equipment', { pack: 'assets', category: 'equipment', since: '1.21.4' });
+resource('font', { pack: 'assets', category: 'font', since: '1.16' });
+resource('font', { pack: 'assets', category: 'font/ttf', since: '1.16', ext: '.ttf' });
+resource('font', { pack: 'assets', category: 'font/otf', since: '1.16', ext: '.otf' });
+resource('font', { pack: 'assets', category: 'font/unihex', since: '1.20', ext: '.zip' });
+resource('items', { pack: 'assets', category: 'item_definition', since: '1.21.4' });
+resource('lang', { pack: 'assets', category: 'lang' });
+resource('models', { pack: 'assets', category: 'model' });
+resource('models/equipment', {
+    pack: 'assets',
+    category: 'equipment',
+    since: '1.21.2',
+    until: '1.21.4',
+});
+resource('particles', { pack: 'assets', category: 'particle' });
+resource('post_effect', { pack: 'assets', since: '1.21.2' });
+resource('shaders/post', { pack: 'assets', category: 'post_effect', until: '1.21.2' });
+resource('shaders', { pack: 'assets', category: 'shader' });
+resource('shaders', { pack: 'assets', category: 'shader/fragment', ext: '.fsh' });
+resource('shaders', { pack: 'assets', category: 'shader/vertex', ext: '.vsh' });
+resource('sounds', { pack: 'assets', category: 'sound', ext: '.ogg' });
+resource('textures', { pack: 'assets', category: 'texture', ext: '.png' });
 export function* getRels(uri, rootUris) {
     yield* fileUtil.getRels(uri, rootUris);
     const parts = uri.split('/');
     for (let i = parts.length - 2; i >= 0; i--) {
-        if (parts[i] === 'data') { // TODO: support assets
+        if (parts[i] === 'data' || parts[i] === 'assets') {
             yield parts.slice(i).join('/');
         }
     }
@@ -110,30 +140,38 @@ export function dissectUri(uri, ctx) {
             continue;
         }
         const [pack, namespace, ...rest] = parts;
-        if (pack !== 'data') {
-            continue; // TODO: support assets
+        if (pack !== 'data' && pack !== 'assets') {
+            continue;
         }
-        let resource = undefined;
-        let matchIndex = 0;
+        const candidateResources = [];
         for (let i = 1; i < rest.length; i += 1) {
-            const res = Resources.get(rest.slice(0, i).join('/'));
-            if (res) {
-                resource = res;
-                matchIndex = i;
+            const resources = Resources.get(rest.slice(0, i).join('/'));
+            for (const res of resources ?? []) {
+                if (res.pack !== pack) {
+                    continue;
+                }
+                let identifier = rest.slice(i).join('/');
+                if (!identifier.endsWith(res.ext)) {
+                    continue;
+                }
+                identifier = identifier.slice(0, -res.ext.length);
+                candidateResources.push([res, identifier]);
             }
         }
-        if (!resource) {
+        if (candidateResources.length === 0) {
             continue;
         }
-        let identifier = rest.slice(matchIndex).join('/');
-        if (!identifier.endsWith(resource.ext)) {
-            continue;
+        // Finding the last, because that will be the deepest match
+        let res = candidateResources.findLast(([res]) => matchVersion(release, res.since, res.until));
+        if (res !== undefined) {
+            return { ok: true, ...res[0], namespace, identifier: res[1], expected: undefined };
         }
-        identifier = identifier.slice(0, -resource.ext.length);
-        if (!matchVersion(release, resource.since, resource.until)) {
-            let expected = undefined;
-            for (const [path, other] of Resources) {
-                if (other.category !== resource.category) {
+        // Try to find the expected path that matches the current version
+        res = candidateResources[candidateResources.length - 1];
+        let expected = undefined;
+        for (const [path, others] of Resources) {
+            for (const other of others) {
+                if (other.category !== res[0].category) {
                     continue;
                 }
                 if (matchVersion(release, other.since, other.until)) {
@@ -141,9 +179,8 @@ export function dissectUri(uri, ctx) {
                     break;
                 }
             }
-            return { ok: false, ...resource, namespace, identifier, expected };
         }
-        return { ok: true, ...resource, namespace, identifier, expected: undefined };
+        return { ok: false, ...res[0], namespace, identifier: res[1], expected };
     }
     return undefined;
 }

package/lib/dependency/common.d.ts

@@ -1,3 +1,4 @@
+import type * as core from '@spyglassmc/core';
 export type ReleaseVersion = `1.${number}`;
 export declare namespace ReleaseVersion {
     /**
@@ -13,11 +14,13 @@ export declare namespace ReleaseVersion {
      */
     function isBetween(version: ReleaseVersion, since: ReleaseVersion, until: ReleaseVersion): boolean;
 }
+export type VersionInfoReason = 'auto' | 'config' | 'fallback';
 export interface VersionInfo {
     release: ReleaseVersion;
     id: string;
     name: string;
     isLatest: boolean;
+    reason: VersionInfoReason;
 }
 export interface PackMcmeta {
     pack: {
@@ -26,5 +29,12 @@ export interface PackMcmeta {
 }
 export declare namespace PackMcmeta {
     function assert(data: any): asserts data is PackMcmeta;
+    function getType(packRoot: string, externals: core.Externals): Promise<"assets" | "data">;
+}
+export interface PackInfo {
+    type: 'data' | 'assets';
+    packRoot: string;
+    packMcmeta: PackMcmeta | undefined;
+    versionInfo: VersionInfo;
 }
 //# sourceMappingURL=common.d.ts.map

package/lib/dependency/common.js

@@ -28,5 +28,12 @@ export var PackMcmeta;
         }
     }
     PackMcmeta.assert = assert;
+    async function getType(packRoot, externals) {
+        const dir = await externals.fs.readdir(packRoot);
+        const isResourcePack = dir.some(e => e.isDirectory() && e.name === 'assets')
+            && !dir.some(e => e.isDirectory() && e.name === 'data');
+        return isResourcePack ? 'assets' : 'data';
+    }
+    PackMcmeta.getType = getType;
 })(PackMcmeta || (PackMcmeta = {}));
 //# sourceMappingURL=common.js.map

package/lib/dependency/index.d.ts

@@ -25,6 +25,14 @@ export declare function getMcmetaSummary(externals: core.Externals, downloader:
  * 	- `uri`: URI to the `.tar.gz` file.
  */
 export declare function getVanillaDatapack(downloader: core.Downloader, version: string, isLatest: boolean): 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>;
 /**
  * @throws Network/file system errors.
  *

package/lib/dependency/index.js

@@ -107,11 +107,11 @@ function getCacheOptionsBasedOnGitHubCommitSha(owner, repo, ref) {
  *
  * @returns The URI to the `.tar.gz` file.
  */
-async function downloadGitHubRepo({ defaultBranch, downloader, getTag, repo, isLatest, owner, version }) {
+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}.tar.gz`,
+        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),
@@ -140,6 +140,27 @@ export async function getVanillaDatapack(downloader, version, isLatest) {
     });
     return { info: { startDepth: 1 }, uri };
 }
+/* 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 };
+}
 /**
  * @throws Network/file system errors.
  *

package/lib/dependency/mcmeta.d.ts

@@ -1,15 +1,17 @@
 import * as core from '@spyglassmc/core';
 import type { PackMcmeta, VersionInfo } from './common.js';
+import { ReleaseVersion } from './common.js';
+export declare const NEXT_RELEASE_VERSION = "1.21.4";
 /**
  * @param inputVersion {@link core.Config.env.gameVersion}
  */
-export declare function resolveConfiguredVersion(inputVersion: string, versions: McmetaVersions, getPackMcmeta: () => Promise<PackMcmeta | undefined>): Promise<VersionInfo>;
+export declare function resolveConfiguredVersion(inputVersion: string, versions: McmetaVersions, packMcmeta: PackMcmeta | undefined, packType: 'assets' | 'data' | undefined, 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): core.SymbolRegistrar;
+export declare function symbolRegistrar(summary: McmetaSummary, release: ReleaseVersion): core.SymbolRegistrar;
 export declare const Fluids: McmetaStates;
 export interface McmetaVersion {
     id: string;

package/lib/dependency/mcmeta.js

@@ -1,8 +1,11 @@
 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.4';
 /**
  * @param inputVersion {@link core.Config.env.gameVersion}
  */
-export async function resolveConfiguredVersion(inputVersion, versions, getPackMcmeta) {
+export function resolveConfiguredVersion(inputVersion, versions, packMcmeta, packType, logger) {
     function findReleaseTarget(version) {
         if (version.release_target) {
             return version.release_target;
@@ -16,58 +19,70 @@ export async function resolveConfiguredVersion(inputVersion, versions, getPackMc
                 return versions[i].id;
             }
         }
-        // DOCS: Update this when a new snapshot cycle begins
-        return '1.21.4';
+        return NEXT_RELEASE_VERSION;
     }
-    function toVersionInfo(version) {
+    function toVersionInfo(version, reason) {
         version = version ?? versions[0];
         return {
             id: version.id,
             name: version.name,
             release: findReleaseTarget(version),
             isLatest: version === versions[0],
+            reason,
         };
     }
     if (versions.length === 0) {
         throw new Error('mcmeta version list is empty');
     }
+    // This should never happen, but for some reason happens sometimes
+    // https://github.com/SpyglassMC/Spyglass/issues/1621
+    if (inputVersion === undefined) {
+        logger.warn('[resolveConfiguredVersion] Input version was undefined! Falling back to "auto"');
+        inputVersion = 'auto';
+    }
     inputVersion = inputVersion.toLowerCase();
     versions = versions.sort((a, b) => b.data_version - a.data_version);
     const latestRelease = versions.find((v) => v.type === 'release');
     if (inputVersion === 'auto') {
-        const packMcmeta = await getPackMcmeta();
-        if (packMcmeta && latestRelease) {
+        const packFormat = packMcmeta?.pack.pack_format;
+        if (packFormat && latestRelease) {
             // If the pack format is larger than the latest release, use the latest snapshot
-            if (packMcmeta.pack.pack_format > latestRelease.data_pack_version) {
-                return toVersionInfo(versions[0]);
+            if (packFormat > (packType === 'assets'
+                ? latestRelease.resource_pack_version
+                : latestRelease.data_pack_version)) {
+                return toVersionInfo(versions[0], 'auto');
             }
             // Look for versions from recent to oldest, picking the most recent release that matches
             let oldestRelease = undefined;
             for (const version of versions) {
                 if (version.type === 'release') {
                     // If we already passed the pack format, use the oldest release so far
-                    if (packMcmeta.pack.pack_format > version.data_pack_version) {
-                        return toVersionInfo(oldestRelease);
+                    if (packFormat > (packType === 'assets'
+                        ? version.resource_pack_version
+                        : version.data_pack_version)) {
+                        return toVersionInfo(oldestRelease, 'auto');
                     }
-                    if (packMcmeta.pack.pack_format === version.data_pack_version) {
-                        return toVersionInfo(version);
+                    if (packFormat === (packType === 'assets'
+                        ? version.resource_pack_version
+                        : version.data_pack_version)) {
+                        return toVersionInfo(version, 'auto');
                     }
                     oldestRelease = version;
                 }
             }
             // If the pack format is still lower, use the oldest known release version
-            return toVersionInfo(oldestRelease);
+            return toVersionInfo(oldestRelease, 'auto');
         }
         // Fall back to the latest release if pack mcmeta is not available
-        return toVersionInfo(latestRelease);
+        return toVersionInfo(latestRelease, 'fallback');
     }
     else if (inputVersion === 'latest release') {
-        return toVersionInfo(latestRelease);
+        return toVersionInfo(latestRelease, 'config');
     }
     else if (inputVersion === 'latest snapshot') {
-        return toVersionInfo(versions[0]);
+        return toVersionInfo(versions[0], 'config');
     }
-    return toVersionInfo(versions.find((v) => inputVersion === v.id.toLowerCase() || inputVersion === v.name.toLowerCase()));
+    return toVersionInfo(versions.find((v) => inputVersion === v.id.toLowerCase() || inputVersion === v.name.toLowerCase()), 'config');
 }
 const DataSources = {
     fastly: 'https://fastly.jsdelivr.net/gh/${user}/${repo}@${tag}/${path}',
@@ -90,7 +105,7 @@ export function getMcmetaSummaryUris(version, isLatest, source) {
         registries: getUri('registries/data.json.gz'),
     };
 }
-export function symbolRegistrar(summary) {
+export function symbolRegistrar(summary, release) {
     const McmetaSummaryUri = 'mcmeta://summary/registries.json';
     /**
      * Add states of blocks or fluids to the symbol table.
@@ -121,6 +136,55 @@ export function symbolRegistrar(summary) {
                 });
             });
         }
+        const stateTypes = { block: summary.blocks, fluid: summary.fluids };
+        for (const [type, states] of Object.entries(stateTypes)) {
+            symbols.query(McmetaSummaryUri, 'mcdoc/dispatcher', `mcdoc:${type}_states`)
+                .enter({ usage: { type: 'declaration' } })
+                .onEach(Object.entries(states), ([id, [properties]], query) => {
+                const data = {
+                    typeDef: {
+                        kind: 'struct',
+                        fields: Object.entries(properties).map(([propKey, propValues]) => ({
+                            kind: 'pair',
+                            key: propKey,
+                            optional: true,
+                            type: {
+                                kind: 'union',
+                                members: propValues.map(value => ({
+                                    kind: 'literal',
+                                    value: { kind: 'string', value },
+                                })),
+                            },
+                        })),
+                    },
+                };
+                query.member(id, (stateQuery) => {
+                    stateQuery.enter({
+                        data: { data },
+                        usage: { type: 'declaration' },
+                    });
+                });
+            });
+            symbols.query(McmetaSummaryUri, 'mcdoc/dispatcher', `mcdoc:${type}_state_keys`)
+                .enter({ usage: { type: 'declaration' } })
+                .onEach(Object.entries(states), ([id, [properties]], query) => {
+                const data = {
+                    typeDef: {
+                        kind: 'union',
+                        members: Object.keys(properties).map(propKey => ({
+                            kind: 'literal',
+                            value: { kind: 'string', value: propKey },
+                        })),
+                    },
+                };
+                query.member(id, (stateQuery) => {
+                    stateQuery.enter({
+                        data: { data },
+                        usage: { type: 'declaration' },
+                    });
+                });
+            });
+        }
     }
     function addRegistriesSymbols(registries, symbols) {
         function isCategory(str) {
@@ -137,7 +201,13 @@ export function symbolRegistrar(summary) {
         }
     }
     function addBuiltinSymbols(symbols) {
-        symbols.query(McmetaSummaryUri, 'loot_table', 'minecraft:empty')
+        if (ReleaseVersion.cmp(release, '1.21.2') < 0) {
+            symbols.query(McmetaSummaryUri, 'loot_table', 'minecraft:empty')
+                .enter({ usage: { type: 'declaration' } });
+        }
+        symbols.query(McmetaSummaryUri, 'model', 'minecraft:builtin/generated')
+            .enter({ usage: { type: 'declaration' } });
+        symbols.query(McmetaSummaryUri, 'model', 'minecraft:builtin/entity')
             .enter({ usage: { type: 'declaration' } });
     }
     return (symbols) => {

package/lib/index.d.ts

@@ -2,6 +2,7 @@ import * as core from '@spyglassmc/core';
 export * as binder from './binder/index.js';
 export * as dependency from './dependency/index.js';
 export * as json from './json/index.js';
+export * from './mcdocAttributes.js';
 export * as mcf from './mcfunction/index.js';
 export declare const initialize: core.ProjectInitializer;
 //# sourceMappingURL=index.d.ts.map