@spyglassmc/java-edition 0.3.35 → 0.3.37

package/lib/binder/index.d.ts

@@ -1,4 +1,4 @@
-import type { CheckerContext, Config, FileCategory, MetaRegistry, RootUriString, UriBinder, UriBinderContext } from '@spyglassmc/core';
+import type { CheckerContext, Config, FileCategory, MetaRegistry, RootUriString, UriBinder, UriBinderContext, UriPredicate } from '@spyglassmc/core';
 import { ReleaseVersion } from '../dependency/index.js';
 interface Resource {
     path: string;
@@ -13,11 +13,11 @@ export declare function getResources(): Generator<Resource, undefined, undefined
 export declare function getRels(uri: string, rootUris: readonly RootUriString[]): Generator<string, undefined, unknown>;
 export declare function getRoots(uri: string, rootUris: readonly RootUriString[]): Generator<RootUriString, undefined, unknown>;
 export declare function dissectUri(uri: string, ctx: UriBinderContext): {
+    expected: string | undefined;
     namespace: string;
     identifier: string;
-    expected: string | undefined;
     path: string;
-    category: "function" | "advancement" | "banner_pattern" | "cat_variant" | "chat_type" | "cow_variant" | "damage_type" | "dimension" | "dimension_type" | "enchantment" | "enchantment_provider" | "frog_variant" | "instrument" | "item_modifier" | "jukebox_song" | "loot_table" | "painting_variant" | "pig_variant" | "predicate" | "recipe" | "structure" | "test_environment" | "test_instance" | "trial_spawner" | "trim_material" | "trim_pattern" | "wolf_variant" | "tag/function" | "tag/activity" | "tag/armor_material" | "tag/attribute" | "tag/block" | "tag/block_entity_type" | "tag/block_predicate_type" | "tag/block_type" | "tag/chunk_status" | "tag/command_argument_type" | "tag/consume_effect_type" | "tag/creative_mode_tab" | "tag/custom_stat" | "tag/data_component_predicate_type" | "tag/data_component_type" | "tag/decorated_pot_pattern" | "tag/decorated_pot_patterns" | "tag/enchantment_effect_component_type" | "tag/enchantment_entity_effect_type" | "tag/enchantment_level_based_value_type" | "tag/enchantment_location_based_effect_type" | "tag/enchantment_provider_type" | "tag/enchantment_value_effect_type" | "tag/entity_sub_predicate_type" | "tag/entity_type" | "tag/float_provider_type" | "tag/fluid" | "tag/game_event" | "tag/height_provider_type" | "tag/instrument" | "tag/int_provider_type" | "tag/item" | "tag/item_sub_predicate_type" | "tag/loot_condition_type" | "tag/loot_function_type" | "tag/loot_nbt_provider_type" | "tag/loot_number_provider_type" | "tag/loot_pool_entry_type" | "tag/loot_score_provider_type" | "tag/map_decoration_type" | "tag/memory_module_type" | "tag/menu" | "tag/mob_effect" | "tag/motive" | "tag/number_format_type" | "tag/particle_type" | "tag/point_of_interest_type" | "tag/pos_rule_test" | "tag/position_source_type" | "tag/potion" | "tag/recipe_book_category" | "tag/recipe_display" | "tag/recipe_serializer" | "tag/recipe_type" | "tag/rule_block_entity_modifier" | "tag/rule_test" | "tag/schedule" | "tag/sensor_type" | "tag/slot_display" | "tag/sound_event" | "tag/spawn_condition_type" | "tag/stat_type" | "tag/test_environment_definition_type" | "tag/test_function" | "tag/test_instance_type" | "tag/trigger_type" | "tag/ticket_type" | "tag/villager_profession" | "tag/villager_type" | "tag/worldgen/biome_source" | "tag/worldgen/block_placer_type" | "tag/worldgen/block_state_provider_type" | "tag/worldgen/carver" | "tag/worldgen/chunk_generator" | "tag/worldgen/decorator" | "tag/worldgen/density_function_type" | "tag/worldgen/feature" | "tag/worldgen/feature_size_type" | "tag/worldgen/foliage_placer_type" | "tag/worldgen/material_condition" | "tag/worldgen/material_rule" | "tag/worldgen/placement_modifier_type" | "tag/worldgen/pool_alias_binding" | "tag/worldgen/root_placer_type" | "tag/worldgen/structure_feature" | "tag/worldgen/structure_piece" | "tag/worldgen/structure_placement" | "tag/worldgen/structure_pool_element" | "tag/worldgen/structure_processor" | "tag/worldgen/structure_type" | "tag/worldgen/surface_builder" | "tag/worldgen/tree_decorator_type" | "tag/worldgen/trunk_placer_type" | "tag/advancement" | "tag/banner_pattern" | "tag/cat_variant" | "tag/chat_type" | "tag/cow_variant" | "tag/damage_type" | "tag/dimension" | "tag/dimension_type" | "tag/enchantment" | "tag/enchantment_provider" | "tag/frog_variant" | "tag/item_modifier" | "tag/jukebox_song" | "tag/loot_table" | "tag/painting_variant" | "tag/pig_variant" | "tag/predicate" | "tag/recipe" | "tag/structure" | "tag/test_environment" | "tag/test_instance" | "tag/trial_spawner" | "tag/trim_material" | "tag/trim_pattern" | "tag/wolf_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";
+    category: "function" | "advancement" | "banner_pattern" | "cat_variant" | "chat_type" | "cow_variant" | "damage_type" | "dimension" | "dimension_type" | "enchantment" | "enchantment_provider" | "frog_variant" | "instrument" | "item_modifier" | "jukebox_song" | "loot_table" | "painting_variant" | "pig_variant" | "predicate" | "recipe" | "structure" | "test_environment" | "test_instance" | "trial_spawner" | "trim_material" | "trim_pattern" | "wolf_sound_variant" | "wolf_variant" | "tag/function" | "tag/activity" | "tag/armor_material" | "tag/attribute" | "tag/block" | "tag/block_entity_type" | "tag/block_predicate_type" | "tag/block_type" | "tag/chunk_status" | "tag/command_argument_type" | "tag/consume_effect_type" | "tag/creative_mode_tab" | "tag/custom_stat" | "tag/data_component_predicate_type" | "tag/data_component_type" | "tag/decorated_pot_pattern" | "tag/decorated_pot_patterns" | "tag/enchantment_effect_component_type" | "tag/enchantment_entity_effect_type" | "tag/enchantment_level_based_value_type" | "tag/enchantment_location_based_effect_type" | "tag/enchantment_provider_type" | "tag/enchantment_value_effect_type" | "tag/entity_sub_predicate_type" | "tag/entity_type" | "tag/float_provider_type" | "tag/fluid" | "tag/game_event" | "tag/height_provider_type" | "tag/instrument" | "tag/int_provider_type" | "tag/item" | "tag/item_sub_predicate_type" | "tag/loot_condition_type" | "tag/loot_function_type" | "tag/loot_nbt_provider_type" | "tag/loot_number_provider_type" | "tag/loot_pool_entry_type" | "tag/loot_score_provider_type" | "tag/map_decoration_type" | "tag/memory_module_type" | "tag/menu" | "tag/mob_effect" | "tag/motive" | "tag/number_format_type" | "tag/particle_type" | "tag/point_of_interest_type" | "tag/pos_rule_test" | "tag/position_source_type" | "tag/potion" | "tag/recipe_book_category" | "tag/recipe_display" | "tag/recipe_serializer" | "tag/recipe_type" | "tag/rule_block_entity_modifier" | "tag/rule_test" | "tag/schedule" | "tag/sensor_type" | "tag/slot_display" | "tag/sound_event" | "tag/spawn_condition_type" | "tag/stat_type" | "tag/test_environment_definition_type" | "tag/test_function" | "tag/test_instance_type" | "tag/trigger_type" | "tag/ticket_type" | "tag/villager_profession" | "tag/villager_type" | "tag/worldgen/biome_source" | "tag/worldgen/block_placer_type" | "tag/worldgen/block_state_provider_type" | "tag/worldgen/carver" | "tag/worldgen/chunk_generator" | "tag/worldgen/decorator" | "tag/worldgen/density_function_type" | "tag/worldgen/feature" | "tag/worldgen/feature_size_type" | "tag/worldgen/foliage_placer_type" | "tag/worldgen/material_condition" | "tag/worldgen/material_rule" | "tag/worldgen/placement_modifier_type" | "tag/worldgen/pool_alias_binding" | "tag/worldgen/root_placer_type" | "tag/worldgen/structure_feature" | "tag/worldgen/structure_piece" | "tag/worldgen/structure_placement" | "tag/worldgen/structure_pool_element" | "tag/worldgen/structure_processor" | "tag/worldgen/structure_type" | "tag/worldgen/surface_builder" | "tag/worldgen/tree_decorator_type" | "tag/worldgen/trunk_placer_type" | "tag/advancement" | "tag/banner_pattern" | "tag/cat_variant" | "tag/chat_type" | "tag/cow_variant" | "tag/damage_type" | "tag/dimension" | "tag/dimension_type" | "tag/enchantment" | "tag/enchantment_provider" | "tag/frog_variant" | "tag/item_modifier" | "tag/jukebox_song" | "tag/loot_table" | "tag/painting_variant" | "tag/pig_variant" | "tag/predicate" | "tag/recipe" | "tag/structure" | "tag/test_environment" | "tag/test_instance" | "tag/trial_spawner" | "tag/trim_material" | "tag/trim_pattern" | "tag/wolf_sound_variant" | "tag/wolf_variant" | "tag/worldgen/biome" | "tag/worldgen/configured_carver" | "tag/worldgen/configured_feature" | "tag/worldgen/configured_structure_feature" | "tag/worldgen/configured_surface_builder" | "tag/worldgen/density_function" | "tag/worldgen/flat_level_generator_preset" | "tag/worldgen/multi_noise_biome_source_parameter_list" | "tag/worldgen/noise" | "tag/worldgen/noise_settings" | "tag/worldgen/placed_feature" | "tag/worldgen/processor_list" | "tag/worldgen/structure" | "tag/worldgen/structure_set" | "tag/worldgen/template_pool" | "tag/worldgen/world_preset" | "worldgen/biome" | "worldgen/configured_carver" | "worldgen/configured_feature" | "worldgen/configured_structure_feature" | "worldgen/configured_surface_builder" | "worldgen/density_function" | "worldgen/flat_level_generator_preset" | "worldgen/multi_noise_biome_source_parameter_list" | "worldgen/noise" | "worldgen/noise_settings" | "worldgen/placed_feature" | "worldgen/processor_list" | "worldgen/structure" | "worldgen/structure_set" | "worldgen/template_pool" | "worldgen/world_preset" | "atlas" | "block_definition" | "equipment" | "font" | "font/ttf" | "font/otf" | "font/unihex" | "gpu_warnlist" | "item_definition" | "lang" | "lang/deprecated" | "model" | "particle" | "post_effect" | "regional_compliancies" | "shader" | "shader/fragment" | "shader/vertex" | "sound" | "sounds" | "texture" | "texture_meta";
     ext: `.${string}`;
     pack: "assets" | "data";
     since?: `1.${number}` | undefined;
@@ -28,5 +28,11 @@ export declare const uriBinder: UriBinder;
 export declare function registerCustomResources(config: Config): void;
 export declare function reportDissectError(realPath: string, expectedPath: string | undefined, ctx: CheckerContext): void;
 export declare function registerUriBuilders(meta: MetaRegistry): void;
+/**
+ * Returns true for JSON file URIs that belong to any known resource category. No version check is
+ * performed as we would like to provide errors even for files in the wrong folder or files for the
+ * wrong version.
+ */
+export declare const jsonUriPredicate: UriPredicate;
 export {};
 //# sourceMappingURL=index.d.ts.map

package/lib/binder/index.js

@@ -61,6 +61,7 @@ resource('test_environment', { since: '1.21.5' });
 resource('trial_spawner', { since: '1.21.2' });
 resource('trim_pattern', { since: '1.19.4' });
 resource('trim_material', { since: '1.19.4' });
+resource('wolf_sound_variant', { since: '1.21.5' });
 resource('wolf_variant', { since: '1.20.5' });
 // Worldgen
 resource('dimension', { since: '1.16' });
@@ -159,6 +160,52 @@ export function* getRoots(uri, rootUris) {
     }
     return undefined;
 }
+function getCandidateResourcesForRel(rel) {
+    const parts = rel.split('/');
+    if (parts.length < 3) {
+        return [];
+    }
+    const [pack, namespace, ...rest] = parts;
+    if (pack !== 'data' && pack !== 'assets') {
+        return [];
+    }
+    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, namespace, identifier });
+        }
+    }
+    for (let i = 1; i < rest.length; i += 1) {
+        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);
+            if (res.identifier && identifier !== res.identifier) {
+                continue;
+            }
+            candidateResources.push({ ...res, namespace, identifier });
+        }
+    }
+    return candidateResources;
+}
 export function dissectUri(uri, ctx) {
     const rels = getRels(uri, ctx.roots);
     const release = ctx.project['loadedVersion'];
@@ -166,63 +213,21 @@ export function dissectUri(uri, ctx) {
         return undefined;
     }
     for (const rel of rels) {
-        const parts = rel.split('/');
-        if (parts.length < 3) {
-            continue;
-        }
-        const [pack, namespace, ...rest] = parts;
-        if (pack !== 'data' && pack !== 'assets') {
-            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 ?? []) {
-                if (res.pack !== pack) {
-                    continue;
-                }
-                let identifier = rest.slice(i).join('/');
-                if (!identifier.endsWith(res.ext)) {
-                    continue;
-                }
-                identifier = identifier.slice(0, -res.ext.length);
-                if (res.identifier && identifier !== res.identifier) {
-                    continue;
-                }
-                candidateResources.push([res, identifier]);
-            }
-        }
+        const candidateResources = getCandidateResourcesForRel(rel);
         if (candidateResources.length === 0) {
             continue;
         }
         // Finding the last, because that will be the deepest match
-        let res = candidateResources.findLast(([res]) => matchVersion(release, res.since, res.until));
+        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 };
+            return { ok: true, ...res, expected: undefined };
         }
         // 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) {
+                if (other.category !== res.category) {
                     continue;
                 }
                 if (matchVersion(release, other.since, other.until)) {
@@ -231,7 +236,7 @@ export function dissectUri(uri, ctx) {
                 }
             }
         }
-        return { ok: false, ...res[0], namespace, identifier: res[1], expected };
+        return { ok: false, ...res, expected };
     }
     return undefined;
 }
@@ -303,4 +308,13 @@ export function registerUriBuilders(meta) {
         meta.registerUriBuilder(category, uriBuilder(resources));
     }
 }
+/**
+ * Returns true for JSON file URIs that belong to any known resource category. No version check is
+ * performed as we would like to provide errors even for files in the wrong folder or files for the
+ * wrong version.
+ */
+export const jsonUriPredicate = (uri, ctx) => {
+    const rels = [...getRels(uri, ctx.roots)];
+    return rels.some((rel) => getCandidateResourcesForRel(rel).length > 0);
+};
 //# sourceMappingURL=index.js.map

package/lib/index.js

@@ -2,7 +2,7 @@ import * as core from '@spyglassmc/core';
 import * as json from '@spyglassmc/json';
 import * as mcdoc from '@spyglassmc/mcdoc';
 import * as nbt from '@spyglassmc/nbt';
-import { registerUriBuilders, uriBinder } from './binder/index.js';
+import { jsonUriPredicate, registerUriBuilders, uriBinder } from './binder/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';
@@ -111,7 +111,6 @@ export const initialize = async (ctx) => {
     });
     registerMcdocAttributes(meta, summary.commands, release);
     registerPackFormatAttribute(meta, release, versions, packs);
-    registerPackFormatAttribute(meta, release, versions, packs);
     meta.registerLanguage('zip', { extensions: ['.zip'] });
     meta.registerLanguage('png', { extensions: ['.png'] });
     meta.registerLanguage('ogg', { extensions: ['.ogg'] });
@@ -119,7 +118,7 @@ export const initialize = async (ctx) => {
     meta.registerLanguage('otf', { extensions: ['.otf'] });
     meta.registerLanguage('fsh', { extensions: ['.fsh'] });
     meta.registerLanguage('vsh', { extensions: ['.vsh'] });
-    json.initialize(ctx);
+    json.getInitializer(jsonUriPredicate)(ctx);
     jeJson.initialize(ctx);
     jeMcf.initialize(ctx, summary.commands, release);
     nbt.initialize(ctx);

package/lib/json/parser/index.js

@@ -60,10 +60,10 @@ export const translationValueParser = (src, ctx) => {
                 hasInteger = true;
             }
             if (hasInteger && !src.trySkip('$')) {
-                ctx.err.report(localize('expected', localeQuote('$')), src);
+                ctx.err.report(localize('java-edition.translation-value.percent-escape-hint', localize('expected', localeQuote('$'))), src);
             }
             if (!src.trySkip('s')) {
-                ctx.err.report(localize('expected', localeQuote('s')), src);
+                ctx.err.report(localize('java-edition.translation-value.percent-escape-hint', localize('expected', localeQuote('s'))), src);
             }
             const token = src.sliceToCursor(argStart);
             ans.children.push({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/java-edition",
-  "version": "0.3.35",
+  "version": "0.3.37",
   "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.26",
-    "@spyglassmc/json": "0.3.30",
-    "@spyglassmc/locales": "0.3.12",
-    "@spyglassmc/mcfunction": "0.2.28",
-    "@spyglassmc/mcdoc": "0.3.30",
-    "@spyglassmc/nbt": "0.3.31"
+    "@spyglassmc/core": "0.4.28",
+    "@spyglassmc/json": "0.3.32",
+    "@spyglassmc/locales": "0.3.14",
+    "@spyglassmc/mcfunction": "0.2.30",
+    "@spyglassmc/mcdoc": "0.3.32",
+    "@spyglassmc/nbt": "0.3.33"
   },
   "devDependencies": {},
   "publishConfig": {