@spyglassmc/java-edition 0.3.22 → 0.3.24

package/lib/binder/index.d.ts

@@ -5,7 +5,7 @@ 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/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";
+    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" | "gpu_warnlist" | "item_definition" | "lang" | "lang/deprecated" | "model" | "particle" | "post_effect" | "regional_compliancies" | "shader" | "shader/fragment" | "shader/vertex" | "sound" | "sounds" | "texture" | "texture_meta";
     ext: `.${string}`;
     pack: "assets" | "data";
     since?: `1.${number}` | undefined;

package/lib/binder/index.js

@@ -96,13 +96,13 @@ for (const registry of TaggableResourceLocationCategories) {
 // 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('equipment', { pack: 'assets', since: '1.21.4' });
+resource('font', { pack: 'assets', 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('lang', { pack: 'assets' });
 resource('models', { pack: 'assets', category: 'model' });
 resource('models/equipment', {
     pack: 'assets',
@@ -118,6 +118,15 @@ 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' });
+resource('textures', { pack: 'assets', category: 'texture_meta', ext: '.png.mcmeta' });
+resource('lang', { pack: 'assets', category: 'lang/deprecated', identifier: 'deprecated' });
+resource('', { pack: 'assets', category: 'sounds', identifier: 'sounds' });
+resource('', {
+    pack: 'assets',
+    category: 'regional_compliancies',
+    identifier: 'regional_compliancies',
+});
+resource('', { pack: 'assets', category: 'gpu_warnlist', identifier: 'gpu_warnlist' });
 export function* getRels(uri, rootUris) {
     yield* fileUtil.getRels(uri, rootUris);
     const parts = uri.split('/');
@@ -136,7 +145,7 @@ export function dissectUri(uri, ctx) {
     }
     for (const rel of rels) {
         const parts = rel.split('/');
-        if (parts.length < 4) {
+        if (parts.length < 3) {
             continue;
         }
         const [pack, namespace, ...rest] = parts;
@@ -144,6 +153,23 @@ export function dissectUri(uri, ctx) {
             continue;
         }
         const candidateResources = [];
+        if (rest.length === 1) {
+            const resources = Resources.get('');
+            for (const res of resources ?? []) {
+                if (res.pack !== pack) {
+                    continue;
+                }
+                let identifier = rest[0];
+                if (!identifier.endsWith(res.ext)) {
+                    continue;
+                }
+                identifier = identifier.slice(0, -res.ext.length);
+                if (res.identifier && identifier !== res.identifier) {
+                    continue;
+                }
+                candidateResources.push([res, identifier]);
+            }
+        }
         for (let i = 1; i < rest.length; i += 1) {
             const resources = Resources.get(rest.slice(0, i).join('/'));
             for (const res of resources ?? []) {
@@ -155,6 +181,9 @@ export function dissectUri(uri, ctx) {
                     continue;
                 }
                 identifier = identifier.slice(0, -res.ext.length);
+                if (res.identifier && identifier !== res.identifier) {
+                    continue;
+                }
                 candidateResources.push([res, identifier]);
             }
         }
@@ -196,9 +225,7 @@ export const uriBinder = (uris, ctx) => {
 };
 export function registerCustomResources(config) {
     for (const [path, res] of Object.entries(config.env.customResources)) {
-        if (res.pack === undefined || res.pack === 'data') {
-            resource(path, { ...res, category: res.category });
-        }
+        resource(path, { ...res, category: res.category });
     }
 }
 function matchVersion(target, since, until) {

package/lib/dependency/mcmeta.js

@@ -207,8 +207,10 @@ export function symbolRegistrar(summary, release) {
         }
         symbols.query(McmetaSummaryUri, 'model', 'minecraft:builtin/generated')
             .enter({ usage: { type: 'declaration' } });
-        symbols.query(McmetaSummaryUri, 'model', 'minecraft:builtin/entity')
-            .enter({ usage: { type: 'declaration' } });
+        if (ReleaseVersion.cmp(release, '1.21.4') < 0) {
+            symbols.query(McmetaSummaryUri, 'model', 'minecraft:builtin/entity')
+                .enter({ usage: { type: 'declaration' } });
+        }
     }
     return (symbols) => {
         addRegistriesSymbols(summary.registries, symbols);

package/lib/json/binder/index.d.ts

@@ -0,0 +1,3 @@
+import * as core from '@spyglassmc/core';
+export declare function register(meta: core.MetaRegistry): void;
+//# sourceMappingURL=index.d.ts.map

package/lib/json/binder/index.js

@@ -0,0 +1,47 @@
+import * as core from '@spyglassmc/core';
+import * as json from '@spyglassmc/json';
+function bindDeprecated(node, ctx) {
+    const renamed = node.children.find(p => p.key?.value === 'renamed')?.value;
+    if (json.JsonObjectNode.is(renamed)) {
+        for (const pair of renamed.children) {
+            if (json.JsonStringNode.is(pair.value)) {
+                const range = core.Range.translate(pair.value.range, 1, -1);
+                ctx.symbols.query(ctx.doc, 'translation_key', pair.value.value)
+                    .enter({
+                    usage: { type: 'definition', range, fullRange: pair },
+                });
+            }
+        }
+    }
+}
+function bindLanguage(node, ctx) {
+    const isEnglish = ctx.doc.uri.endsWith('/en_us.json');
+    for (const pair of node.children) {
+        if (pair.key) {
+            const desc = json.JsonStringNode.is(pair.value) ? pair.value.value : undefined;
+            const range = core.Range.translate(pair.key.range, 1, -1);
+            ctx.symbols.query(ctx.doc, 'translation_key', pair.key.value)
+                .enter({
+                data: { desc: isEnglish ? desc : undefined },
+                usage: { type: 'definition', range, fullRange: pair },
+            });
+        }
+    }
+}
+const file = (node, ctx) => {
+    if (ctx.doc.uri.match(/\/lang\/[a-z_]+.json$/)) {
+        const child = node.children[0];
+        if (json.JsonObjectNode.is(child)) {
+            if (ctx.doc.uri.endsWith('/deprecated.json')) {
+                bindDeprecated(child, ctx);
+            }
+            else {
+                bindLanguage(child, ctx);
+            }
+        }
+    }
+};
+export function register(meta) {
+    meta.registerBinder('json:file', file);
+}
+//# sourceMappingURL=index.js.map

package/lib/json/checker/index.js

@@ -22,7 +22,7 @@ export const file = (node, ctx) => {
     }
     const parts = dissectUri(ctx.doc.uri, ctx);
     if (parts?.ok) {
-        if (parts?.category.startsWith('tag/')) {
+        if (parts.category.startsWith('tag/')) {
             const type = createTagDefinition(parts.category.slice(4));
             return json.checker.index(type)(child, ctx);
         }

package/lib/json/completer/index.d.ts

@@ -0,0 +1,3 @@
+import * as core from '@spyglassmc/core';
+export declare function register(meta: core.MetaRegistry): void;
+//# sourceMappingURL=index.d.ts.map

package/lib/json/completer/index.js

@@ -0,0 +1,25 @@
+import * as core from '@spyglassmc/core';
+const textureSlot = (node, ctx) => {
+    const slot = node.slot ?? core.SymbolNode.mock(node, {
+        category: 'texture_slot',
+        usageType: node.kind === 'definition' ? 'definition' : 'reference',
+    });
+    const slotItems = core.completer.symbol(slot, ctx);
+    if (node.kind === 'definition') {
+        return slotItems;
+    }
+    if (node.kind === 'reference') {
+        return slotItems.map(item => ({
+            ...item,
+            range: node.range,
+            label: '#' + item.label,
+            insertText: '#' + (item.insertText ?? item.label),
+        }));
+    }
+    const id = node.id ?? core.ResourceLocationNode.mock(node, { category: 'texture' });
+    return core.completer.resourceLocation(id, ctx);
+};
+export function register(meta) {
+    meta.registerCompleter('java_edition:texture_slot', textureSlot);
+}
+//# sourceMappingURL=index.js.map

package/lib/json/index.js

@@ -1,8 +1,12 @@
 /* istanbul ignore file */
+import * as binder from './binder/index.js';
 import * as checker from './checker/index.js';
+import * as completer from './completer/index.js';
 import { registerMcdocAttributes } from './mcdocAttributes.js';
 export const initialize = (ctx) => {
     registerMcdocAttributes(ctx.meta);
+    binder.register(ctx.meta);
     checker.register(ctx.meta);
+    completer.register(ctx.meta);
 };
 //# sourceMappingURL=index.js.map

package/lib/json/mcdocAttributes.js

@@ -1,10 +1,17 @@
 import * as core from '@spyglassmc/core';
 import * as mcdoc from '@spyglassmc/mcdoc';
 import { dissectUri } from '../binder/index.js';
+import { textureSlotParser, translationValueParser } from './parser/index.js';
 const validator = mcdoc.runtime.attribute.validator;
 const criterionValidator = validator.alternatives(validator.tree({
     definition: validator.boolean,
 }), () => ({ definition: false }));
+const textureSlotValidator = validator.alternatives(validator.tree({
+    kind: validator.options('definition', 'value', 'reference'),
+}), () => ({ kind: 'value' }));
+const translationKeyValidator = validator.alternatives(validator.tree({
+    definition: validator.boolean,
+}), () => ({ definition: false }));
 export function registerMcdocAttributes(meta) {
     mcdoc.runtime.registerAttribute(meta, 'criterion', criterionValidator, {
         stringParser: (config, _, ctx) => {
@@ -31,5 +38,35 @@ export function registerMcdocAttributes(meta) {
             });
         },
     });
+    mcdoc.runtime.registerAttribute(meta, 'texture_slot', textureSlotValidator, {
+        stringParser: (config, _, ctx) => {
+            return textureSlotParser(config.kind);
+        },
+        stringMocker: (config, _, ctx) => {
+            return {
+                type: 'java_edition:texture_slot',
+                range: core.Range.create(ctx.offset),
+                kind: config.kind,
+                children: [],
+            };
+        },
+    });
+    mcdoc.runtime.registerAttribute(meta, 'translation_key', translationKeyValidator, {
+        stringParser: (config, _, ctx) => {
+            return core.symbol({
+                category: 'translation_key',
+                usageType: config.definition ? 'definition' : 'reference',
+            });
+        },
+        stringMocker: (config, _, ctx) => {
+            return core.SymbolNode.mock(ctx.offset, {
+                category: 'translation_key',
+                usageType: config.definition ? 'definition' : 'reference',
+            });
+        },
+    });
+    mcdoc.runtime.registerAttribute(meta, 'translation_value', () => undefined, {
+        stringParser: () => translationValueParser,
+    });
 }
 //# sourceMappingURL=mcdocAttributes.js.map

package/lib/json/node/index.d.ts

@@ -0,0 +1,21 @@
+import type * as core from '@spyglassmc/core';
+export type TextureSlotKind = 'definition' | 'value' | 'reference';
+export interface TextureSlotNode extends core.AstNode {
+    type: 'java_edition:texture_slot';
+    kind: TextureSlotKind;
+    children: (core.LiteralNode | core.SymbolNode | core.ResourceLocationNode)[];
+    slot?: core.SymbolNode;
+    id?: core.ResourceLocationNode;
+}
+export declare namespace TextureSlotNode {
+    function is(node: core.AstNode): node is TextureSlotNode;
+}
+export interface TranslationValueNode extends core.AstNode {
+    type: 'java_edition:translation_value';
+    children: core.LiteralNode[];
+    value: string;
+}
+export declare namespace TranslationValueNode {
+    function is(node: core.AstNode): node is TranslationValueNode;
+}
+//# sourceMappingURL=index.d.ts.map

package/lib/json/node/index.js

@@ -0,0 +1,15 @@
+export var TextureSlotNode;
+(function (TextureSlotNode) {
+    function is(node) {
+        return node?.type === 'java_edition:texture_slot';
+    }
+    TextureSlotNode.is = is;
+})(TextureSlotNode || (TextureSlotNode = {}));
+export var TranslationValueNode;
+(function (TranslationValueNode) {
+    function is(node) {
+        return node?.type === 'java_edition:translation_value';
+    }
+    TranslationValueNode.is = is;
+})(TranslationValueNode || (TranslationValueNode = {}));
+//# sourceMappingURL=index.js.map

package/lib/json/parser/index.d.ts

@@ -0,0 +1,5 @@
+import * as core from '@spyglassmc/core';
+import type { TextureSlotKind, TextureSlotNode, TranslationValueNode } from '../node/index.js';
+export declare function textureSlotParser(kind: TextureSlotKind): core.InfallibleParser<TextureSlotNode>;
+export declare const translationValueParser: core.InfallibleParser<TranslationValueNode>;
+//# sourceMappingURL=index.d.ts.map

package/lib/json/parser/index.js

@@ -0,0 +1,81 @@
+import * as core from '@spyglassmc/core';
+import { localeQuote, localize } from '@spyglassmc/locales';
+export function textureSlotParser(kind) {
+    return (src, ctx) => {
+        const start = src.cursor;
+        const ans = {
+            type: 'java_edition:texture_slot',
+            range: core.Range.create(start),
+            kind,
+            children: [],
+        };
+        if (kind === 'definition') {
+            const slot = core.symbol({ category: 'texture_slot', usageType: 'definition' })(src, ctx);
+            ans.children.push(slot);
+            ans.slot = slot;
+        }
+        else if (src.tryPeek('#')) {
+            ans.children.push(core.literal('#')(src, ctx));
+            const slot = core.symbol({ category: 'texture_slot', usageType: 'reference' })(src, ctx);
+            ans.children.push(slot);
+            ans.slot = slot;
+        }
+        else if (kind === 'reference') {
+            ctx.err.report(localize('expected', localeQuote('#')), src);
+        }
+        else {
+            const id = core.resourceLocation({ category: 'texture', usageType: 'reference' })(src, ctx);
+            ans.children.push(id);
+            ans.id = id;
+        }
+        ans.range = core.Range.create(start, src);
+        return ans;
+    };
+}
+export const translationValueParser = (src, ctx) => {
+    const start = src.cursor;
+    const ans = {
+        type: 'java_edition:translation_value',
+        range: core.Range.create(start),
+        children: [],
+        value: '',
+    };
+    while (src.canRead()) {
+        src.skipUntilOrEnd('%');
+        const argStart = src.cursor;
+        if (src.trySkip('%')) {
+            if (src.trySkip('%')) {
+                const token = src.sliceToCursor(argStart);
+                ans.children.push({
+                    type: 'literal',
+                    range: core.Range.create(argStart, src),
+                    options: { pool: [token], colorTokenType: 'escape' },
+                    value: token,
+                });
+                continue;
+            }
+            let hasInteger = false;
+            while (src.canRead() && core.Source.isDigit(src.peek())) {
+                src.skip();
+                hasInteger = true;
+            }
+            if (hasInteger && !src.trySkip('$')) {
+                ctx.err.report(localize('expected', localeQuote('$')), src);
+            }
+            if (!src.trySkip('s')) {
+                ctx.err.report(localize('expected', localeQuote('s')), src);
+            }
+            const token = src.sliceToCursor(argStart);
+            ans.children.push({
+                type: 'literal',
+                range: core.Range.create(argStart, src),
+                options: { pool: [token] },
+                value: token,
+            });
+        }
+    }
+    ans.value = src.sliceToCursor(start);
+    ans.range = core.Range.create(start, src);
+    return ans;
+};
+//# sourceMappingURL=index.js.map

package/lib/mcfunction/completer/argument.js

@@ -318,7 +318,7 @@ const scoreHolder = (node, ctx) => {
     }
     else {
         ans = completer.symbol(node.fakeName ?? SymbolNode.mock(node, { category: 'score_holder' }), ctx);
-        ans.push(...selector(EntitySelectorNode.mock(node, { pool: EntitySelectorAtVariable.filterAvailable(ctx) }), ctx));
+        ans.push(...completer.literal(LiteralNode.mock(node, { pool: ['*'] }), ctx), ...selector(EntitySelectorNode.mock(node, { pool: EntitySelectorAtVariable.filterAvailable(ctx) }), ctx));
     }
     return ans;
 };

package/lib/mcfunction/mcdocAttributes.js

@@ -71,7 +71,7 @@ export function registerMcdocAttributes(meta, rootTreeNode) {
         }),
     });
     mcdoc.runtime.registerAttribute(meta, 'item_slots', () => undefined, {
-        stringParser: () => parser.itemSlots,
+        stringParser: (_, __, ctx) => core.literal({ pool: getItemSlotsArgumentValues(ctx) }),
         stringMocker: (_, __, ctx) => core.LiteralNode.mock(ctx.offset, { pool: getItemSlotsArgumentValues(ctx) }),
     });
     mcdoc.runtime.registerAttribute(meta, 'uuid', () => undefined, {

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

@@ -61,14 +61,14 @@ export type EntitySelectorVariable = typeof EntitySelectorVariables[number];
 export declare namespace EntitySelectorVariable {
     function is(value: string): value is EntitySelectorVariable;
 }
-declare const EntitySelectorAtVariables: ("@a" | "@e" | "@p" | "@r" | "@s" | "@n")[];
+declare const EntitySelectorAtVariables: ("@s" | "@a" | "@e" | "@p" | "@r" | "@n")[];
 export type EntitySelectorAtVariable = typeof EntitySelectorAtVariables[number];
 export declare namespace EntitySelectorAtVariable {
     function is(value: string): value is EntitySelectorAtVariable;
     /**
      * Should be used to get a list of available selectors for the current version.
      */
-    function filterAvailable(ctx: core.ContextBase): ("@a" | "@e" | "@p" | "@r" | "@s" | "@n")[];
+    function filterAvailable(ctx: core.ContextBase): ("@s" | "@a" | "@e" | "@p" | "@r" | "@n")[];
 }
 export interface EntitySelectorNode extends core.AstNode {
     type: 'mcfunction:entity_selector';

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

@@ -11,7 +11,6 @@ export declare const argument: mcf.ArgumentParserGetter;
 export declare const blockPredicate: core.InfallibleParser<BlockNode>;
 export declare function criterion(advancement: core.FullResourceLocation, usageType?: core.SymbolUsageType, terminators?: string[]): core.InfallibleParser<core.SymbolNode>;
 export declare function entity(amount: 'multiple' | 'single', type: 'entities' | 'players'): core.Parser<EntityNode>;
-export declare const itemSlots: core.InfallibleParser<core.LiteralNode>;
 export declare function jsonParser(typeRef: `::${string}::${string}`): core.Parser<json.TypedJsonNode>;
 export declare const particle: core.InfallibleParser<ParticleNode>;
 /**

package/lib/mcfunction/parser/argument.js

@@ -78,7 +78,7 @@ export const argument = (rawTreeNode, prevNodes) => {
         case 'minecraft:block_state':
             return wrap(blockState);
         case 'minecraft:color':
-            return wrap(core.map(core.literal(...ColorArgumentValues), (res) => ({
+            return wrap(core.map(commandLiteral({ pool: ColorArgumentValues }), (res) => ({
                 ...res,
                 color: core.Color.NamedColors.has(res.value)
                     ? core.Color.fromCompositeRGB(core.Color.NamedColors.get(res.value))
@@ -93,7 +93,7 @@ export const argument = (rawTreeNode, prevNodes) => {
         case 'minecraft:entity':
             return wrap(entity(treeNode.properties.amount, treeNode.properties.type));
         case 'minecraft:entity_anchor':
-            return wrap(core.literal(...EntityAnchorArgumentValues));
+            return wrap(commandLiteral({ pool: EntityAnchorArgumentValues }));
         case 'minecraft:entity_summon':
             return wrap(core.resourceLocation({ category: 'entity_type' }));
         case 'minecraft:float_range':
@@ -101,11 +101,11 @@ export const argument = (rawTreeNode, prevNodes) => {
         case 'minecraft:function':
             return wrap(core.resourceLocation({ category: 'function', allowTag: true }));
         case 'minecraft:gamemode':
-            return wrap(core.literal(...GamemodeArgumentValues));
+            return wrap(commandLiteral({ pool: GamemodeArgumentValues }));
         case 'minecraft:game_profile':
             return wrap(entity('multiple', 'players'));
         case 'minecraft:heightmap':
-            return wrap(core.literal(...HeightmapValues));
+            return wrap(commandLiteral({ pool: HeightmapValues }));
         case 'minecraft:int_range':
             return wrap(range('integer', treeNode.properties?.min, treeNode.properties?.max, treeNode.properties?.minSpan, treeNode.properties?.maxSpan));
         case 'minecraft:item_enchantment':
@@ -113,9 +113,13 @@ export const argument = (rawTreeNode, prevNodes) => {
         case 'minecraft:item_predicate':
             return wrap(itemPredicate);
         case 'minecraft:item_slot':
-            return wrap(itemSlot);
+            return wrap((src, ctx) => {
+                return commandLiteral({ pool: getItemSlotArgumentValues(ctx) })(src, ctx);
+            });
         case 'minecraft:item_slots':
-            return wrap(itemSlots);
+            return wrap((src, ctx) => {
+                return commandLiteral({ pool: getItemSlotsArgumentValues(ctx) })(src, ctx);
+            });
         case 'minecraft:item_stack':
             return wrap(itemStack);
         case 'minecraft:loot_modifier':
@@ -141,7 +145,7 @@ export const argument = (rawTreeNode, prevNodes) => {
         case 'minecraft:objective_criteria':
             return wrap(objectiveCriteria);
         case 'minecraft:operation':
-            return wrap(core.literal({ pool: OperationArgumentValues, colorTokenType: 'operator' }));
+            return wrap(commandLiteral({ pool: OperationArgumentValues, colorTokenType: 'operator' }));
         case 'minecraft:particle':
             return wrap(particle);
         case 'minecraft:resource':
@@ -164,20 +168,20 @@ export const argument = (rawTreeNode, prevNodes) => {
             // `BELOWNAME` and `sidebar.team.r--.+++e----__d` are also legal slots.
             // But I do not want to spend time supporting them.
             return wrap((src, ctx) => {
-                return core.literal(...getScoreboardSlotArgumentValues(ctx))(src, ctx);
+                return commandLiteral({ pool: getScoreboardSlotArgumentValues(ctx) })(src, ctx);
             });
         case 'minecraft:style':
             return wrap(jsonParser('::java::server::util::text::TextStyle'));
         case 'minecraft:swizzle':
-            return wrap(core.literal(...SwizzleArgumentValues));
+            return wrap(commandLiteral({ pool: SwizzleArgumentValues }));
         case 'minecraft:team':
             return wrap(team(core.SymbolUsageType.is(treeNode.properties?.usageType)
                 ? treeNode.properties?.usageType
                 : undefined));
         case 'minecraft:template_mirror':
-            return wrap(core.literal(...MirrorValues));
+            return wrap(commandLiteral({ pool: MirrorValues }));
         case 'minecraft:template_rotation':
-            return wrap(core.literal(...RotationValues));
+            return wrap(commandLiteral({ pool: RotationValues }));
         case 'minecraft:time':
             return wrap(time);
         case 'minecraft:uuid':
@@ -310,12 +314,6 @@ export function entity(amount, type) {
 const greedyString = core.string({
     unquotable: { blockList: new Set(['\n', '\r']) },
 });
-const itemSlot = (src, ctx) => {
-    return core.literal(...getItemSlotArgumentValues(ctx))(src, ctx);
-};
-export const itemSlots = (src, ctx) => {
-    return core.literal(...getItemSlotsArgumentValues(ctx))(src, ctx);
-};
 const itemStack = (src, ctx) => {
     const oldFormat = shouldUseOldItemStackFormat(ctx);
     return core.map(core.sequence([
@@ -368,6 +366,16 @@ export function jsonParser(typeRef) {
         targetType: { kind: 'reference', path: typeRef },
     }));
 }
+function commandLiteral(options) {
+    return (src, ctx) => {
+        const ans = core.literal(options)(src, ctx);
+        if (ans.value.length === 0) {
+            ans.value = src.readUntil(...core.Whitespaces);
+            ans.range = core.Range.create(ans.range.start, src);
+        }
+        return ans;
+    };
+}
 const message = (src, ctx) => {
     const ans = {
         type: 'mcfunction:message',
@@ -895,8 +903,11 @@ export function scoreHolderFakeName(usageType) {
 }
 export function scoreHolder(usageType, amount) {
     return core.map(core.select([
-        // Technically score holders can start with *, but this doesn't account for it
-        { prefix: '*', parser: core.literal('*') },
+        {
+            predicate: (src) => src.peek() === '*'
+                && (!src.canRead(2) || src.matchPattern(/^\s/, 1)),
+            parser: core.literal('*'),
+        },
         { prefix: '@', parser: selector() },
         { parser: scoreHolderFakeName(usageType) },
     ]), (res, _src, ctx) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/java-edition",
-  "version": "0.3.22",
+  "version": "0.3.24",
   "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.16",
-    "@spyglassmc/json": "0.3.19",
+    "@spyglassmc/core": "0.4.18",
+    "@spyglassmc/json": "0.3.21",
     "@spyglassmc/locales": "0.3.10",
-    "@spyglassmc/mcfunction": "0.2.18",
-    "@spyglassmc/mcdoc": "0.3.20",
-    "@spyglassmc/nbt": "0.3.20"
+    "@spyglassmc/mcfunction": "0.2.20",
+    "@spyglassmc/mcdoc": "0.3.22",
+    "@spyglassmc/nbt": "0.3.22"
   },
   "devDependencies": {
     "fast-glob": "^3.2.5"