@spyglassmc/java-edition 0.3.54 → 0.3.56

package/lib/binder/index.d.ts

@@ -29,10 +29,10 @@ 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
+ * Returns true for 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 declare const jeFileUriPredicate: UriPredicate;
 export {};
 //# sourceMappingURL=index.d.ts.map

package/lib/binder/index.js

@@ -68,6 +68,7 @@ resource('trim_material', { since: '1.19.4' });
 resource('villager_trade', { since: '26.1' });
 resource('wolf_sound_variant', { since: '1.21.5' });
 resource('wolf_variant', { since: '1.20.5' });
+resource('world_clock', { since: '26.1' });
 resource('zombie_nautilus_variant', { since: '1.21.11' });
 // Worldgen
 resource('dimension', { since: '1.16' });
@@ -316,11 +317,11 @@ export function registerUriBuilders(meta) {
     }
 }
 /**
- * Returns true for JSON file URIs that belong to any known resource category. No version check is
+ * Returns true for 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) => {
+export const jeFileUriPredicate = (uri, ctx) => {
     const rels = [...getRels(uri, ctx.roots)];
     return rels.some((rel) => getCandidateResourcesForRel(rel).length > 0);
 };

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 { jsonUriPredicate, registerUriBuilders, uriBinder } from './binder/index.js';
+import { jeFileUriPredicate, 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';
@@ -92,14 +92,14 @@ export const initialize = async (ctx) => {
     });
     registerMcdocAttributes(meta, summary.commands, release);
     registerPackFormatAttribute(meta, 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.getInitializer(jsonUriPredicate)(ctx);
+    meta.registerLanguage('zip', { extensions: ['.zip'], uriPredicate: jeFileUriPredicate });
+    meta.registerLanguage('png', { extensions: ['.png'], uriPredicate: jeFileUriPredicate });
+    meta.registerLanguage('ogg', { extensions: ['.ogg'], uriPredicate: jeFileUriPredicate });
+    meta.registerLanguage('ttf', { extensions: ['.ttf'], uriPredicate: jeFileUriPredicate });
+    meta.registerLanguage('otf', { extensions: ['.otf'], uriPredicate: jeFileUriPredicate });
+    meta.registerLanguage('fsh', { extensions: ['.fsh'], uriPredicate: jeFileUriPredicate });
+    meta.registerLanguage('vsh', { extensions: ['.vsh'], uriPredicate: jeFileUriPredicate });
+    json.getInitializer(jeFileUriPredicate)(ctx);
     jeJson.initialize(ctx);
     jeMcf.initialize(ctx, summary.commands, release);
     nbt.initialize(ctx);

package/lib/mcdocAttributes.js

@@ -8,32 +8,17 @@ const gameRuleValidator = validator.tree({
 export function registerMcdocAttributes(meta, commands, release) {
     mcdoc.runtime.registerAttribute(meta, 'since', 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', 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', validator.optional(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) {
+            if (!config || ReleaseVersion.cmp(release, config) >= 0) {
                 return { ...field, deprecated: true };
             }
             return field;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/java-edition",
-  "version": "0.3.54",
+  "version": "0.3.56",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -17,12 +17,12 @@
     "release:dry": "npm publish --tag latest --dry-run"
   },
   "dependencies": {
-    "@spyglassmc/core": "0.4.42",
-    "@spyglassmc/json": "0.3.46",
-    "@spyglassmc/locales": "0.3.21",
-    "@spyglassmc/mcfunction": "0.2.45",
-    "@spyglassmc/mcdoc": "0.3.46",
-    "@spyglassmc/nbt": "0.3.48"
+    "@spyglassmc/core": "0.4.44",
+    "@spyglassmc/json": "0.3.48",
+    "@spyglassmc/locales": "0.3.23",
+    "@spyglassmc/mcfunction": "0.2.47",
+    "@spyglassmc/mcdoc": "0.3.48",
+    "@spyglassmc/nbt": "0.3.50"
   },
   "devDependencies": {},
   "publishConfig": {