@spyglassmc/java-edition 0.3.18 → 0.3.19

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): 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) {
     function findReleaseTarget(version) {
         if (version.release_target) {
             return version.release_target;
@@ -16,16 +19,16 @@ 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) {
@@ -35,39 +38,45 @@ export async function resolveConfiguredVersion(inputVersion, versions, getPackMc
     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 +99,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 +130,52 @@ export function symbolRegistrar(summary) {
                 });
             });
         }
+        symbols.query(McmetaSummaryUri, 'mcdoc/dispatcher', 'mcdoc:block_states').enter({
+            usage: { type: 'declaration' },
+        }).onEach(Object.entries(summary.blocks), ([id, [properties]], blockQuery) => {
+            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 },
+                            })),
+                        },
+                    })),
+                },
+            };
+            blockQuery.member(id, (stateQuery) => {
+                stateQuery.enter({
+                    data: { data },
+                    usage: { type: 'declaration' },
+                });
+            });
+        });
+        symbols.query(McmetaSummaryUri, 'mcdoc/dispatcher', 'mcdoc:block_state_keys').enter({
+            usage: { type: 'declaration' },
+        }).onEach(Object.entries(summary.blocks), ([id, [properties]], blockQuery) => {
+            const data = {
+                typeDef: {
+                    kind: 'union',
+                    members: Object.keys(properties).map(propKey => ({
+                        kind: 'literal',
+                        value: { kind: 'string', value: propKey },
+                    })),
+                },
+            };
+            blockQuery.member(id, (stateQuery) => {
+                stateQuery.enter({
+                    data: { data },
+                    usage: { type: 'declaration' },
+                });
+            });
+        });
     }
     function addRegistriesSymbols(registries, symbols) {
         function isCategory(str) {
@@ -137,7 +192,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.js

@@ -1,11 +1,11 @@
 import * as core from '@spyglassmc/core';
 import * as json from '@spyglassmc/json';
-import { localize } from '@spyglassmc/locales';
 import * as mcdoc from '@spyglassmc/mcdoc';
 import * as nbt from '@spyglassmc/nbt';
 import { uriBinder } from './binder/index.js';
-import { getMcmetaSummary, getVanillaDatapack, getVanillaMcdoc, getVersions, PackMcmeta, ReleaseVersion, resolveConfiguredVersion, symbolRegistrar, } from './dependency/index.js';
+import { getMcmetaSummary, getVanillaDatapack, getVanillaMcdoc, getVanillaResourcepack, getVersions, PackMcmeta, resolveConfiguredVersion, symbolRegistrar, } from './dependency/index.js';
 import * as jeJson from './json/index.js';
+import { registerMcdocAttributes, registerPackFormatAttribute } from './mcdocAttributes.js';
 import * as jeMcf from './mcfunction/index.js';
 export * as binder from './binder/index.js';
 export * as dependency from './dependency/index.js';
@@ -27,26 +27,28 @@ export const initialize = async (ctx) => {
         }
         return undefined;
     }
-    async function findPackMcmeta() {
-        const searched = new Set();
+    async function findPackMcmetas(versions) {
+        const searchedUris = new Set();
+        const packs = [];
         for (let depth = 0; depth <= 2; depth += 1) {
             for (const projectRoot of projectRoots) {
                 const files = await core.fileUtil.getAllFiles(externals, projectRoot, depth + 1);
                 for (const uri of files.filter(uri => uri.endsWith('/pack.mcmeta'))) {
-                    if (searched.has(uri)) {
+                    if (searchedUris.has(uri)) {
                         continue;
                     }
-                    searched.add(uri);
-                    const data = await readPackMcmeta(uri);
-                    if (data) {
-                        logger.info(`[je.initialize] Found a valid pack.mcmeta ${uri} with pack_format ${data.pack.pack_format}`);
-                        return data;
-                    }
+                    searchedUris.add(uri);
+                    const packRoot = core.fileUtil.dirname(uri);
+                    const [packMcmeta, type] = await Promise.all([
+                        readPackMcmeta(uri),
+                        PackMcmeta.getType(packRoot, externals),
+                    ]);
+                    const versionInfo = resolveConfiguredVersion(config.env.gameVersion, versions, packMcmeta, type);
+                    packs.push({ type, packRoot, packMcmeta, versionInfo });
                 }
             }
         }
-        logger.warn('[je.initialize] Failed finding a valid pack.mcmeta');
-        return undefined;
+        return packs;
     }
     meta.registerUriBinder(uriBinder);
     const versions = await getVersions(ctx.externals, ctx.downloader);
@@ -54,9 +56,32 @@ export const initialize = async (ctx) => {
         ctx.logger.error('[je-initialize] Failed loading game version list. Expect everything to be broken.');
         return;
     }
-    const version = await resolveConfiguredVersion(config.env.gameVersion, versions, findPackMcmeta);
+    const packs = await findPackMcmetas(versions);
+    function selectVersionInfo(packs, versions) {
+        // Select the first valid pack.mcmeta, prioritizing data packs
+        const pack = packs.find(p => p.packMcmeta !== undefined && p.type === 'data')
+            ?? packs.find(p => p.packMcmeta !== undefined && p.type === 'assets');
+        const version = pack === undefined
+            ? resolveConfiguredVersion(config.env.gameVersion, versions, undefined, undefined)
+            : pack.versionInfo;
+        const packMessage = pack === undefined
+            ? 'Failed finding a valid pack.mcmeta'
+            : `Found a valid pack.mcmeta ${pack.packRoot}/pack.mcmeta`;
+        const reasonMessage = pack && version.reason === 'auto'
+            ? `using ${pack.type} pack format ${pack.packMcmeta?.pack.pack_format} to select`
+            : version.reason === 'config'
+                ? `but using config override "${config.env.gameVersion}" to select`
+                : version.reason === 'fallback'
+                    ? 'using fallback'
+                    : 'impossible'; // should never occur
+        const versionMessage = `version ${version.release}${version.id === version.release ? '' : ` (${version.id})`}`;
+        ctx.logger.info(`[je.initialize] ${packMessage}, ${reasonMessage} ${versionMessage}`);
+        return version;
+    }
+    const version = selectVersionInfo(packs, versions);
     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);
     if (!summary.blocks || !summary.commands || !summary.fluids || !summary.registries) {
@@ -64,8 +89,8 @@ export const initialize = async (ctx) => {
         return;
     }
     meta.registerSymbolRegistrar('mcmeta-summary', {
-        checksum: summary.checksum,
-        registrar: symbolRegistrar(summary),
+        checksum: `${summary.checksum}_v2`,
+        registrar: symbolRegistrar(summary, release),
     });
     meta.registerLinter('nameOfNbtKey', {
         configValidator: core.linter.configValidator.nameConvention,
@@ -82,70 +107,15 @@ export const initialize = async (ctx) => {
                 && mcdoc.StructKeyNode.is(n)
                 && !n.symbol?.path[0]?.startsWith('::minecraft')),
     });
-    mcdoc.runtime.registerAttribute(meta, 'since', mcdoc.runtime.attribute.validator.string, {
-        filterElement: (config, ctx) => {
-            if (!config.startsWith('1.')) {
-                ctx.logger.warn(`Invalid mcdoc attribute for "since": ${config}`);
-                return true;
-            }
-            return ReleaseVersion.cmp(release, config) >= 0;
-        },
-    });
-    mcdoc.runtime.registerAttribute(meta, 'until', mcdoc.runtime.attribute.validator.string, {
-        filterElement: (config, ctx) => {
-            if (!config.startsWith('1.')) {
-                ctx.logger.warn(`Invalid mcdoc attribute for "until": ${config}`);
-                return true;
-            }
-            return ReleaseVersion.cmp(release, config) < 0;
-        },
-    });
-    mcdoc.runtime.registerAttribute(meta, 'deprecated', mcdoc.runtime.attribute.validator.optional(mcdoc.runtime.attribute.validator.string), {
-        mapField: (config, field, ctx) => {
-            if (config === undefined) {
-                return { ...field, deprecated: true };
-            }
-            if (!config.startsWith('1.')) {
-                ctx.logger.warn(`Invalid mcdoc attribute for "deprecated": ${config}`);
-                return field;
-            }
-            if (ReleaseVersion.cmp(release, config) >= 0) {
-                return { ...field, deprecated: true };
-            }
-            return field;
-        },
-    });
-    const packFormats = new Map();
-    for (const version of versions) {
-        if (version.type === 'release' && !packFormats.has(version.data_pack_version)) {
-            packFormats.set(version.data_pack_version, version);
-        }
-    }
-    mcdoc.runtime.registerAttribute(meta, 'pack_format', () => undefined, {
-        checker: (_, typeDef) => {
-            if (typeDef.kind !== 'literal' || typeof typeDef.value.value !== 'number') {
-                return undefined;
-            }
-            const target = typeDef.value.value;
-            return (node, ctx) => {
-                const targetVersion = packFormats.get(target);
-                if (!targetVersion) {
-                    ctx.err.report(localize('java-edition.pack-format.unsupported', target), node, 2 /* core.ErrorSeverity.Warning */);
-                }
-                else if (targetVersion.id !== release) {
-                    ctx.err.report(localize('java-edition.pack-format.not-loaded', target, release), node, 2 /* core.ErrorSeverity.Warning */);
-                }
-            };
-        },
-        numericCompleter: (_, ctx) => {
-            return [...packFormats.values()].map((v, i) => ({
-                range: core.Range.create(ctx.offset),
-                label: `${v.data_pack_version}`,
-                labelSuffix: ` (${v.id})`,
-                sortText: `${i}`.padStart(4, '0'),
-            }));
-        },
-    });
+    registerMcdocAttributes(meta, release);
+    registerPackFormatAttribute(meta, release, versions, packs);
+    meta.registerLanguage('zip', { extensions: ['.zip'] });
+    meta.registerLanguage('png', { extensions: ['.png'] });
+    meta.registerLanguage('ogg', { extensions: ['.ogg'] });
+    meta.registerLanguage('ttf', { extensions: ['.ttf'] });
+    meta.registerLanguage('otf', { extensions: ['.otf'] });
+    meta.registerLanguage('fsh', { extensions: ['.fsh'] });
+    meta.registerLanguage('vsh', { extensions: ['.vsh'] });
     json.initialize(ctx);
     jeJson.initialize(ctx);
     jeMcf.initialize(ctx, summary.commands, release);

package/lib/mcdocAttributes.d.ts

@@ -0,0 +1,6 @@
+import * as core from '@spyglassmc/core';
+import type { McmetaVersions, PackInfo } from './dependency';
+import { ReleaseVersion } from './dependency';
+export declare function registerMcdocAttributes(meta: core.MetaRegistry, release: ReleaseVersion): void;
+export declare function registerPackFormatAttribute(meta: core.MetaRegistry, release: ReleaseVersion, versions: McmetaVersions, packs: PackInfo[]): void;
+//# sourceMappingURL=mcdocAttributes.d.ts.map

package/lib/mcdocAttributes.js

@@ -0,0 +1,89 @@
+import * as core from '@spyglassmc/core';
+import { localize } from '@spyglassmc/locales';
+import * as mcdoc from '@spyglassmc/mcdoc';
+import { NEXT_RELEASE_VERSION, ReleaseVersion } from './dependency';
+export function registerMcdocAttributes(meta, release) {
+    mcdoc.runtime.registerAttribute(meta, 'since', mcdoc.runtime.attribute.validator.string, {
+        filterElement: (config, ctx) => {
+            if (!config.startsWith('1.')) {
+                ctx.logger.warn(`Invalid mcdoc attribute for "since": ${config}`);
+                return true;
+            }
+            return ReleaseVersion.cmp(release, config) >= 0;
+        },
+    });
+    mcdoc.runtime.registerAttribute(meta, 'until', mcdoc.runtime.attribute.validator.string, {
+        filterElement: (config, ctx) => {
+            if (!config.startsWith('1.')) {
+                ctx.logger.warn(`Invalid mcdoc attribute for "until": ${config}`);
+                return true;
+            }
+            return ReleaseVersion.cmp(release, config) < 0;
+        },
+    });
+    mcdoc.runtime.registerAttribute(meta, 'deprecated', mcdoc.runtime.attribute.validator.optional(mcdoc.runtime.attribute.validator.string), {
+        mapField: (config, field, ctx) => {
+            if (config === undefined) {
+                return { ...field, deprecated: true };
+            }
+            if (!config.startsWith('1.')) {
+                ctx.logger.warn(`Invalid mcdoc attribute for "deprecated": ${config}`);
+                return field;
+            }
+            if (ReleaseVersion.cmp(release, config) >= 0) {
+                return { ...field, deprecated: true };
+            }
+            return field;
+        },
+    });
+}
+export function registerPackFormatAttribute(meta, release, versions, packs) {
+    const dataFormats = new Map();
+    const assetsFormats = new Map();
+    if (versions[0]?.type !== 'release') {
+        dataFormats.set(versions[0].data_pack_version, [NEXT_RELEASE_VERSION]);
+        assetsFormats.set(versions[0].resource_pack_version, [NEXT_RELEASE_VERSION]);
+    }
+    for (const version of versions) {
+        if (version.type === 'release') {
+            dataFormats.set(version.data_pack_version, [
+                ...dataFormats.get(version.data_pack_version) ?? [],
+                version.id,
+            ]);
+            assetsFormats.set(version.resource_pack_version, [
+                ...assetsFormats.get(version.resource_pack_version) ?? [],
+                version.id,
+            ]);
+        }
+    }
+    function getFormats(packMcmetaUri) {
+        const thisPack = packs.find(p => core.fileUtil.isSubUriOf(packMcmetaUri, p.packRoot));
+        return thisPack?.type === 'assets' ? assetsFormats : dataFormats;
+    }
+    mcdoc.runtime.registerAttribute(meta, 'pack_format', () => undefined, {
+        checker: (_, typeDef) => {
+            if (typeDef.kind !== 'literal' || typeof typeDef.value.value !== 'number') {
+                return undefined;
+            }
+            const target = typeDef.value.value;
+            return (node, ctx) => {
+                const targetVersions = getFormats(ctx.doc.uri).get(target);
+                if (!targetVersions) {
+                    ctx.err.report(localize('java-edition.pack-format.unsupported', target), node, 2 /* core.ErrorSeverity.Warning */);
+                }
+                else if (!targetVersions.some(v => v === release)) {
+                    ctx.err.report(localize('java-edition.pack-format.not-loaded', target, release), node, 2 /* core.ErrorSeverity.Warning */);
+                }
+            };
+        },
+        numericCompleter: (_, ctx) => {
+            return [...getFormats(ctx.doc.uri).entries()].map(([k, v], i) => ({
+                range: core.Range.create(ctx.offset),
+                label: `${k}`,
+                labelSuffix: ` (${v[0]})`,
+                sortText: `${i}`.padStart(4, '0'),
+            }));
+        },
+    });
+}
+//# sourceMappingURL=mcdocAttributes.js.map

package/lib/mcfunction/checker/index.js

@@ -131,17 +131,17 @@ const itemStack = (node, ctx) => {
         return;
     }
     const groupedComponents = new Map();
-    for (const pair of node.components.children) {
-        if (!pair.key) {
+    for (const child of node.components.children) {
+        if (!child.key) {
             continue;
         }
-        const componentId = core.ResourceLocationNode.toString(pair.key, 'full');
+        const componentId = core.ResourceLocationNode.toString(child.key, 'full');
         if (!groupedComponents.has(componentId)) {
             groupedComponents.set(componentId, []);
         }
-        groupedComponents.get(componentId).push(pair.key);
-        if (pair.value) {
-            nbt.checker.index('minecraft:data_component', componentId)(pair.value, ctx);
+        groupedComponents.get(componentId).push(child.key);
+        if (child.type === 'mcfunction:component' && child.value) {
+            nbt.checker.index('minecraft:data_component', componentId)(child.value, ctx);
         }
     }
     for (const [_, group] of groupedComponents) {

package/lib/mcfunction/completer/argument.js

@@ -1,4 +1,4 @@
-import { AstNode, BooleanNode, BrigadierStringOptions, completer, CompletionItem, FloatNode, getStates, InsertTextBuilder, IntegerNode, LiteralNode, Range, ResourceLocation, ResourceLocationNode, StringNode, SymbolNode, } from '@spyglassmc/core';
+import { AstNode, binarySearch, BooleanNode, BrigadierStringOptions, completer, CompletionItem, FloatNode, getStates, InsertTextBuilder, IntegerNode, LiteralNode, Range, ResourceLocation, ResourceLocationNode, StringNode, SymbolNode, } from '@spyglassmc/core';
 import * as json from '@spyglassmc/json';
 import { localeQuote, localize } from '@spyglassmc/locales';
 import { getTagValues } from '../../common/index.js';
@@ -183,19 +183,32 @@ const blockStates = (node, ctx) => {
     })(node, ctx);
 };
 const componentList = (node, ctx) => {
-    return completer.record({
-        key: (_record, pair, ctx, range) => {
-            const id = pair?.key
-                ?? ResourceLocationNode.mock(pair?.key ?? range, { category: 'data_component_type' });
-            return completer.resourceLocation(id, ctx);
-        },
-        value: (_record, pair, ctx) => {
-            if (!pair.value) {
-                return [];
-            }
-            return completer.dispatch(pair.value, ctx);
-        },
-    })(node, ctx);
+    if (!Range.contains(Range.translate(node, 1, -1), ctx.offset, true)) {
+        return [];
+    }
+    const completeKey = (key) => {
+        const id = key
+            ?? ResourceLocationNode.mock(key ?? ctx.offset, { category: 'data_component_type' });
+        return completer.resourceLocation(id, ctx);
+    };
+    const index = binarySearch(node.children, ctx.offset, (n, o) => Range.compareOffset(n.range, o, true));
+    const child = index >= 0 ? node.children[index] : undefined;
+    if (!child) {
+        return [
+            ...completer.literal(LiteralNode.mock(ctx.offset, { pool: ['!'] }), ctx),
+            ...completeKey(undefined),
+        ];
+    }
+    if (child.type === 'mcfunction:component_removal') {
+        return completeKey(child.key);
+    }
+    if ((child.key && Range.contains(child.key, ctx.offset, true))) {
+        return completeKey(child.key);
+    }
+    if (child.value && Range.contains(child.value, ctx.offset, true)) {
+        return completer.dispatch(child.value, ctx);
+    }
+    return [];
 };
 const componentTests = (node, ctx) => {
     // TODO: improve this completer

package/lib/mcfunction/mcdocAttributes.js

@@ -57,7 +57,7 @@ export function registerMcdocAttributes(meta, rootTreeNode) {
         stringMocker: (_, __, ctx) => ScoreHolderNode.mock(ctx.offset),
     });
     mcdoc.runtime.registerAttribute(meta, 'tag', () => undefined, {
-        stringParser: () => parser.tag('definition'), // TODO: make this a config
+        stringParser: () => parser.tag('reference'),
         stringMocker: (_, __, ctx) => core.SymbolNode.mock(ctx.offset, { category: 'tag' }),
     });
     mcdoc.runtime.registerAttribute(meta, 'block_predicate', () => undefined, {

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

@@ -86,7 +86,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" | "advancements" | "nbt" | "sort" | "distance" | "gamemode" | "limit" | "name" | "scores" | "x" | "y" | "z" | "dx" | "dy" | "dz" | "x_rotation" | "y_rotation">;
+    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">;
     type ArgumentKey = typeof ArgumentKeys extends Set<infer T> ? T : undefined;
     const enum Result {
         Ok = 0,
@@ -123,11 +123,29 @@ export declare namespace ItemStackNode {
 }
 export interface ComponentListNode extends core.AstNode {
     type: 'mcfunction:component_list';
-    children: core.PairNode<core.ResourceLocationNode, nbt.NbtNode>[];
+    children: (ComponentNode | ComponentRemovalNode)[];
 }
 export declare namespace ComponentListNode {
     function is(node: core.AstNode): node is ComponentListNode;
 }
+export interface ComponentNode extends core.AstNode {
+    type: 'mcfunction:component';
+    children: (core.ResourceLocationNode | nbt.NbtNode)[];
+    key: core.ResourceLocationNode;
+    value?: nbt.NbtNode;
+}
+export declare namespace ComponentNode {
+    function is(node: core.AstNode): node is ComponentNode;
+}
+export interface ComponentRemovalNode extends core.AstNode {
+    type: 'mcfunction:component_removal';
+    children: (core.LiteralNode | core.ResourceLocationNode)[];
+    prefix: core.LiteralNode;
+    key: core.ResourceLocationNode;
+}
+export declare namespace ComponentRemovalNode {
+    function is(node: core.AstNode): node is ComponentRemovalNode;
+}
 export interface ItemPredicateNode extends core.AstNode {
     type: 'mcfunction:item_predicate';
     children: (core.ResourceLocationNode | core.LiteralNode | ComponentTestsNode | nbt.NbtCompoundNode)[];
@@ -233,7 +251,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" | "cat_variant" | "chunk_status" | "command_argument_type" | "creative_mode_tab" | "custom_stat" | "data_component_type" | "decorated_pot_pattern" | "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" | "frog_variant" | "game_event" | "height_provider_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_serializer" | "recipe_type" | "rule_block_entity_modifier" | "rule_test" | "schedule" | "sensor_type" | "sound_event" | "stat_type" | "trigger_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" | "cat_variant" | "chunk_status" | "command_argument_type" | "consume_effect_type" | "creative_mode_tab" | "custom_stat" | "data_component_type" | "decorated_pot_pattern" | "decorated_pot_patterns" | "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" | "frog_variant" | "game_event" | "height_provider_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" | "stat_type" | "trigger_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;
 }
@@ -254,9 +272,10 @@ export declare namespace ParticleNode {
 }
 export interface ScoreHolderNode extends core.AstNode {
     type: 'mcfunction:score_holder';
-    children: [core.SymbolNode | EntitySelectorNode];
+    children: [core.LiteralNode | core.SymbolNode | EntitySelectorNode];
     fakeName?: core.SymbolNode;
     selector?: EntitySelectorNode;
+    wildcard?: core.LiteralNode;
 }
 export declare namespace ScoreHolderNode {
     function mock(range: core.RangeLike): ScoreHolderNode;

package/lib/mcfunction/node/argument.js

@@ -181,6 +181,20 @@ export var ComponentListNode;
     }
     ComponentListNode.is = is;
 })(ComponentListNode || (ComponentListNode = {}));
+export var ComponentNode;
+(function (ComponentNode) {
+    function is(node) {
+        return node.type === 'mcfunction:component';
+    }
+    ComponentNode.is = is;
+})(ComponentNode || (ComponentNode = {}));
+export var ComponentRemovalNode;
+(function (ComponentRemovalNode) {
+    function is(node) {
+        return node.type === 'mcfunction:component_removal';
+    }
+    ComponentRemovalNode.is = is;
+})(ComponentRemovalNode || (ComponentRemovalNode = {}));
 export var ItemPredicateNode;
 (function (ItemPredicateNode) {
     function is(node) {

package/lib/mcfunction/parser/argument.js

@@ -883,9 +883,12 @@ export function scoreHolderFakeName(usageType) {
     return validateLength(symbol({ category: 'score_holder', usageType }), FakeNameMaxLength, 'mcfunction.parser.score_holder.fake-name.too-long');
 }
 export function scoreHolder(usageType, amount) {
-    return core.map(core.select([{ predicate: (src) => src.peek() === '@', parser: selector() }, {
-            parser: scoreHolderFakeName(usageType),
-        }]), (res, _src, ctx) => {
+    return core.map(core.select([
+        // Technically score holders can start with *, but this doesn't account for it
+        { prefix: '*', parser: core.literal('*') },
+        { prefix: '@', parser: selector() },
+        { parser: scoreHolderFakeName(usageType) },
+    ]), (res, _src, ctx) => {
         const ans = {
             type: 'mcfunction:score_holder',
             range: res.range,
@@ -894,9 +897,12 @@ export function scoreHolder(usageType, amount) {
         if (core.SymbolNode.is(res)) {
             ans.fakeName = res;
         }
-        else {
+        else if (EntitySelectorNode.is(res)) {
             ans.selector = res;
         }
+        else {
+            ans.wildcard = res;
+        }
         if (amount === 'single' && ans.selector && !ans.selector.single) {
             ctx.err.report(localize('mcfunction.parser.entity-selector.multiple-disallowed'), ans);
         }
@@ -1046,24 +1052,75 @@ function vector(options) {
         return ans;
     };
 }
-const components = core.map(core.record({
-    start: '[',
-    pair: {
-        key: core.resourceLocation({ category: 'data_component_type' }),
-        sep: '=',
-        value: nbt.parser.entry,
-        end: ',',
-        trailingEnd: true,
-    },
-    end: ']',
-}), (res) => {
+const components = (src, ctx) => {
+    const release = ctx.project['loadedVersion'];
+    const allowComponentRemoval = !release || ReleaseVersion.cmp(release, '1.21') >= 0;
     const ans = {
         type: 'mcfunction:component_list',
-        range: res.range,
-        children: res.children,
+        range: core.Range.create(src),
+        children: [],
     };
+    if (!src.trySkip('[')) {
+        return core.Failure;
+    }
+    src.skipWhitespace();
+    while (src.canRead() && src.peek() !== ']') {
+        const start = src.cursor;
+        if (allowComponentRemoval && src.tryPeek('!')) {
+            const prefix = core.literal('!')(src, ctx);
+            src.skipWhitespace();
+            const key = core.resourceLocation({ category: 'data_component_type' })(src, ctx);
+            ans.children.push({
+                type: 'mcfunction:component_removal',
+                range: core.Range.create(start, src),
+                children: [prefix, key],
+                prefix,
+                key,
+            });
+            src.skipWhitespace();
+        }
+        else {
+            const key = core.resourceLocation({ category: 'data_component_type' })(src, ctx);
+            src.skipWhitespace();
+            core.literal('=')(src, ctx);
+            src.skipWhitespace();
+            const value = nbt.parser.entry(src, ctx);
+            if (value === core.Failure) {
+                ctx.err.report(localize('expected', localize('parser.record.value')), core.Range.create(src, () => src.skipUntilOrEnd(',', ']', '\r', '\n')));
+                ans.children.push({
+                    type: 'mcfunction:component',
+                    range: core.Range.create(start, src),
+                    children: [key],
+                    key,
+                    value: undefined,
+                });
+            }
+            else {
+                ans.children.push({
+                    type: 'mcfunction:component',
+                    range: core.Range.create(start, src),
+                    children: [key, value],
+                    key,
+                    value,
+                });
+            }
+            src.skipWhitespace();
+        }
+        if (src.trySkip(',')) {
+            src.skipWhitespace();
+            if (src.peek() === ']') {
+                break;
+            }
+        }
+        else {
+            break;
+        }
+    }
+    src.skipWhitespace();
+    core.literal(']')(src, ctx);
+    ans.range.end = src.cursor;
     return ans;
-});
+};
 const componentTest = (src, ctx) => {
     const start = src.cursor;
     src.skipWhitespace();
@@ -1076,6 +1133,7 @@ const componentTest = (src, ctx) => {
         key.options.pool = ['minecraft:count'];
     }
     if (src.trySkip('=')) {
+        src.skipWhitespace();
         const ans = {
             type: 'mcfunction:component_test_exact',
             range: core.Range.create(start, src),
@@ -1097,6 +1155,7 @@ const componentTest = (src, ctx) => {
         return ans;
     }
     if (src.trySkip('~')) {
+        src.skipWhitespace();
         if (key.options.category !== undefined) {
             key.options.category = 'item_sub_predicate_type';
         }

package/lib/mcfunction/tree/patch.js

@@ -23,16 +23,25 @@ export function getPatch(release) {
                                                 children: {
                                                     add: {
                                                         children: {
+                                                            id: {
+                                                                properties: {
+                                                                    category: 'attribute_modifier',
+                                                                },
+                                                            },
                                                             uuid: {
                                                                 properties: {
                                                                     category: 'attribute_modifier_uuid',
-                                                                    usageType: 'definition',
                                                                 },
                                                             },
                                                         },
                                                     },
                                                     remove: {
                                                         children: {
+                                                            id: {
+                                                                properties: {
+                                                                    category: 'attribute_modifier',
+                                                                },
+                                                            },
                                                             uuid: {
                                                                 properties: {
                                                                     category: 'attribute_modifier_uuid',
@@ -44,6 +53,11 @@ export function getPatch(release) {
                                                         children: {
                                                             get: {
                                                                 children: {
+                                                                    id: {
+                                                                        properties: {
+                                                                            category: 'attribute_modifier',
+                                                                        },
+                                                                    },
                                                                     uuid: {
                                                                         properties: {
                                                                             category: 'attribute_modifier_uuid',
@@ -635,9 +649,6 @@ export function getPatch(release) {
                                 children: {
                                     name: {
                                         parser: 'spyglassmc:tag',
-                                        properties: {
-                                            usageType: 'definition',
-                                        },
                                     },
                                 },
                             },
@@ -937,6 +948,22 @@ const ExecuteStoreTarget = Object.freeze({
                 },
             },
         },
+        score: {
+            children: {
+                targets: {
+                    properties: {
+                        usageType: 'definition',
+                    },
+                    children: {
+                        objective: {
+                            properties: {
+                                accessType: 1 /* SymbolAccessType.Write */,
+                            },
+                        },
+                    },
+                },
+            },
+        },
     },
 });
 const LootSource = Object.freeze({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/java-edition",
-  "version": "0.3.18",
+  "version": "0.3.19",
   "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.14",
-    "@spyglassmc/json": "0.3.16",
-    "@spyglassmc/locales": "0.3.8",
-    "@spyglassmc/mcfunction": "0.2.16",
-    "@spyglassmc/mcdoc": "0.3.17",
-    "@spyglassmc/nbt": "0.3.17"
+    "@spyglassmc/core": "0.4.15",
+    "@spyglassmc/json": "0.3.17",
+    "@spyglassmc/locales": "0.3.9",
+    "@spyglassmc/mcfunction": "0.2.17",
+    "@spyglassmc/mcdoc": "0.3.18",
+    "@spyglassmc/nbt": "0.3.18"
   },
   "devDependencies": {
     "fast-glob": "^3.2.5"