@spyglassmc/java-edition 0.3.19 → 0.3.21

package/lib/dependency/mcmeta.d.ts

@@ -5,7 +5,7 @@ export declare const NEXT_RELEASE_VERSION = "1.21.4";
 /**
  * @param inputVersion {@link core.Config.env.gameVersion}
  */
-export declare function resolveConfiguredVersion(inputVersion: string, versions: McmetaVersions, packMcmeta: PackMcmeta | undefined, packType: 'assets' | 'data' | undefined): VersionInfo;
+export declare function resolveConfiguredVersion(inputVersion: string, versions: McmetaVersions, packMcmeta: PackMcmeta | undefined, packType: 'assets' | 'data' | undefined, logger: core.Logger): VersionInfo;
 export declare function getMcmetaSummaryUris(version: string, isLatest: boolean, source: string): {
     blocks: core.RemoteUriString;
     commands: core.RemoteUriString;

package/lib/dependency/mcmeta.js

@@ -5,7 +5,7 @@ export const NEXT_RELEASE_VERSION = '1.21.4';
 /**
  * @param inputVersion {@link core.Config.env.gameVersion}
  */
-export function resolveConfiguredVersion(inputVersion, versions, packMcmeta, packType) {
+export function resolveConfiguredVersion(inputVersion, versions, packMcmeta, packType, logger) {
     function findReleaseTarget(version) {
         if (version.release_target) {
             return version.release_target;
@@ -34,6 +34,12 @@ export function resolveConfiguredVersion(inputVersion, versions, packMcmeta, pac
     if (versions.length === 0) {
         throw new Error('mcmeta version list is empty');
     }
+    // This should never happen, but for some reason happens sometimes
+    // https://github.com/SpyglassMC/Spyglass/issues/1621
+    if (inputVersion === undefined) {
+        logger.warn('[resolveConfiguredVersion] Input version was undefined! Falling back to "auto"');
+        inputVersion = 'auto';
+    }
     inputVersion = inputVersion.toLowerCase();
     versions = versions.sort((a, b) => b.data_version - a.data_version);
     const latestRelease = versions.find((v) => v.type === 'release');
@@ -130,52 +136,55 @@ export function symbolRegistrar(summary, release) {
                 });
             });
         }
-        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' },
+        const stateTypes = { block: summary.blocks, fluid: summary.fluids };
+        for (const [type, states] of Object.entries(stateTypes)) {
+            symbols.query(McmetaSummaryUri, 'mcdoc/dispatcher', `mcdoc:${type}_states`)
+                .enter({ usage: { type: 'declaration' } })
+                .onEach(Object.entries(states), ([id, [properties]], query) => {
+                const data = {
+                    typeDef: {
+                        kind: 'struct',
+                        fields: Object.entries(properties).map(([propKey, propValues]) => ({
+                            kind: 'pair',
+                            key: propKey,
+                            optional: true,
+                            type: {
+                                kind: 'union',
+                                members: propValues.map(value => ({
+                                    kind: 'literal',
+                                    value: { kind: 'string', value },
+                                })),
+                            },
+                        })),
+                    },
+                };
+                query.member(id, (stateQuery) => {
+                    stateQuery.enter({
+                        data: { data },
+                        usage: { type: 'declaration' },
+                    });
                 });
             });
-        });
-        symbols.query(McmetaSummaryUri, 'mcdoc/dispatcher', 'mcdoc: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' },
+            symbols.query(McmetaSummaryUri, 'mcdoc/dispatcher', `mcdoc:${type}_state_keys`)
+                .enter({ usage: { type: 'declaration' } })
+                .onEach(Object.entries(states), ([id, [properties]], query) => {
+                const data = {
+                    typeDef: {
+                        kind: 'union',
+                        members: Object.keys(properties).map(propKey => ({
+                            kind: 'literal',
+                            value: { kind: 'string', value: propKey },
+                        })),
+                    },
+                };
+                query.member(id, (stateQuery) => {
+                    stateQuery.enter({
+                        data: { data },
+                        usage: { type: 'declaration' },
+                    });
                 });
             });
-        });
+        }
     }
     function addRegistriesSymbols(registries, symbols) {
         function isCategory(str) {

package/lib/index.d.ts

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

package/lib/index.js

@@ -10,6 +10,7 @@ import * as jeMcf from './mcfunction/index.js';
 export * as binder from './binder/index.js';
 export * as dependency from './dependency/index.js';
 export * as json from './json/index.js';
+export * from './mcdocAttributes.js';
 export * as mcf from './mcfunction/index.js';
 export const initialize = async (ctx) => {
     const { config, downloader, externals, logger, meta, projectRoots } = ctx;
@@ -43,7 +44,7 @@ export const initialize = async (ctx) => {
                         readPackMcmeta(uri),
                         PackMcmeta.getType(packRoot, externals),
                     ]);
-                    const versionInfo = resolveConfiguredVersion(config.env.gameVersion, versions, packMcmeta, type);
+                    const versionInfo = resolveConfiguredVersion(config.env.gameVersion, versions, packMcmeta, type, logger);
                     packs.push({ type, packRoot, packMcmeta, versionInfo });
                 }
             }
@@ -62,7 +63,7 @@ export const initialize = async (ctx) => {
         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)
+            ? resolveConfiguredVersion(config.env.gameVersion, versions, undefined, undefined, logger)
             : pack.versionInfo;
         const packMessage = pack === undefined
             ? 'Failed finding a valid pack.mcmeta'
@@ -89,7 +90,7 @@ export const initialize = async (ctx) => {
         return;
     }
     meta.registerSymbolRegistrar('mcmeta-summary', {
-        checksum: `${summary.checksum}_v2`,
+        checksum: `${summary.checksum}_v3`,
         registrar: symbolRegistrar(summary, release),
     });
     meta.registerLinter('nameOfNbtKey', {

package/lib/mcdocAttributes.d.ts

@@ -1,6 +1,6 @@
 import * as core from '@spyglassmc/core';
-import type { McmetaVersions, PackInfo } from './dependency';
-import { ReleaseVersion } from './dependency';
+import { ReleaseVersion } from './dependency/index.js';
+import type { McmetaVersions, PackInfo } from './dependency/index.js';
 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

@@ -1,7 +1,7 @@
 import * as core from '@spyglassmc/core';
 import { localize } from '@spyglassmc/locales';
 import * as mcdoc from '@spyglassmc/mcdoc';
-import { NEXT_RELEASE_VERSION, ReleaseVersion } from './dependency';
+import { NEXT_RELEASE_VERSION, ReleaseVersion } from './dependency/index.js';
 export function registerMcdocAttributes(meta, release) {
     mcdoc.runtime.registerAttribute(meta, 'since', mcdoc.runtime.attribute.validator.string, {
         filterElement: (config, ctx) => {

package/lib/mcfunction/checker/index.js

@@ -269,16 +269,13 @@ const particle = (node, ctx) => {
         return;
     }
     const options = node.children?.find(nbt.NbtCompoundNode.is);
-    if (ParticleNode.requiresOptions(id)) {
-        if (options) {
-            nbt.checker.index('minecraft:particle', core.ResourceLocation.lengthen(id))(options, ctx);
-        }
-        else {
-            ctx.err.report(localize('expected', localize('nbt.node.compound')), core.Range.create(node.id.range.end, node.id.range.end + 1));
-        }
+    if (options) {
+        // Even if particle isn't explicitly marked as requiring options,
+        // run the type checker anyways to allow an empty compound
+        nbt.checker.index('minecraft:particle', core.ResourceLocation.lengthen(id))(options, ctx);
     }
-    else if (options) {
-        ctx.err.report(localize('expected', localize('nothing')), options);
+    else if (ParticleNode.requiresOptions(id)) {
+        ctx.err.report(localize('expected', localize('nbt.node.compound')), core.Range.create(node.id.range.end, node.id.range.end + 1));
     }
 };
 // #endregion

package/lib/mcfunction/node/argument.js

@@ -341,8 +341,10 @@ export var ParticleNode;
     // since 1.20.5
     const OptionTypes = new Set([
         ...SpecialTypes,
+        'block_crumble',
         'dust_pillar',
         'entity_effect',
+        'trail',
     ]);
     function requiresOptions(type) {
         return OptionTypes.has(type);

package/lib/mcfunction/parser/argument.js

@@ -97,7 +97,7 @@ export const argument = (rawTreeNode, prevNodes) => {
         case 'minecraft:entity_summon':
             return wrap(core.resourceLocation({ category: 'entity_type' }));
         case 'minecraft:float_range':
-            return wrap(range('float'));
+            return wrap(range('float', treeNode.properties?.min, treeNode.properties?.max, treeNode.properties?.minSpan, treeNode.properties?.maxSpan));
         case 'minecraft:function':
             return wrap(core.resourceLocation({ category: 'function', allowTag: true }));
         case 'minecraft:gamemode':
@@ -107,7 +107,7 @@ export const argument = (rawTreeNode, prevNodes) => {
         case 'minecraft:heightmap':
             return wrap(core.literal(...HeightmapValues));
         case 'minecraft:int_range':
-            return wrap(range('integer'));
+            return wrap(range('integer', treeNode.properties?.min, treeNode.properties?.max, treeNode.properties?.minSpan, treeNode.properties?.maxSpan));
         case 'minecraft:item_enchantment':
             return wrap(core.resourceLocation({ category: 'enchantment' }));
         case 'minecraft:item_predicate':
@@ -453,7 +453,7 @@ export const particle = (src, ctx) => {
         return ans;
     })(src, ctx);
 };
-function range(type, min, max, cycleable) {
+function range(type, min, max, minSpan, maxSpan, cycleable) {
     const number = type === 'float'
         ? float(min, max)
         : integer(min, max);
@@ -488,6 +488,17 @@ function range(type, min, max, cycleable) {
             && ans.value[0] > ans.value[1]) {
             ctx.err.report(localize('mcfunction.parser.range.min>max', ans.value[0], ans.value[1]), res);
         }
+        else if (minSpan !== undefined || maxSpan !== undefined) {
+            const span = ans.value[0] !== undefined && ans.value[1] !== undefined
+                ? Math.abs(ans.value[0] - ans.value[1])
+                : (ans.value[0] ?? ans.value[1] ?? Infinity);
+            if (minSpan !== undefined && span < minSpan) {
+                ctx.err.report(localize('mcfunction.parser.range.span-too-small', span, minSpan), res);
+            }
+            else if (maxSpan !== undefined && span > maxSpan) {
+                ctx.err.report(localize('mcfunction.parser.range.span-too-large', span, maxSpan), res);
+            }
+        }
         return ans;
     });
 }
@@ -798,7 +809,7 @@ export function selector(ignoreInvalidPrefix = false) {
                                         });
                                     case 'x_rotation':
                                     case 'y_rotation':
-                                        return core.map(range('float', undefined, undefined, true), (res, _, ctx) => {
+                                        return core.map(range('float', undefined, undefined, undefined, undefined, true), (res, _, ctx) => {
                                             if (hasKey(key.value)) {
                                                 ctx.err.report(localize('duplicate-key', localeQuote(key.value)), key);
                                             }

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

@@ -74,8 +74,15 @@ export interface MinecraftEntityAnchorArgumentTreeNode extends mcf.ArgumentTreeN
 export interface MinecraftEntitySummonArgumentTreeNode extends mcf.ArgumentTreeNode {
     parser: 'minecraft:entity_summon';
 }
+export interface RangeProperties extends Record<string, unknown> {
+    min: number;
+    max: number;
+    minSpan: number;
+    maxSpan: number;
+}
 export interface MinecraftFloatRangeArgumentTreeNode extends mcf.ArgumentTreeNode {
     parser: 'minecraft:float_range';
+    properties?: RangeProperties;
 }
 export interface MinecraftFunctionArgumentTreeNode extends mcf.ArgumentTreeNode {
     parser: 'minecraft:function';
@@ -91,6 +98,7 @@ export interface MinecraftHeightmapArgumentTreeNode extends mcf.ArgumentTreeNode
 }
 export interface MinecraftIntRangeArgumentTreeNode extends mcf.ArgumentTreeNode {
     parser: 'minecraft:int_range';
+    properties?: RangeProperties;
 }
 export interface MinecraftItemEnchantmentArgumentTreeNode extends mcf.ArgumentTreeNode {
     parser: 'minecraft:item_enchantment';

package/lib/mcfunction/tree/patch.js

@@ -515,6 +515,10 @@ export function getPatch(release) {
                             roll: {
                                 children: {
                                     range: {
+                                        properties: {
+                                            minSpan: 1,
+                                            maxSpan: 2147483646,
+                                        },
                                         children: {
                                             sequence: {
                                                 properties: {
@@ -529,6 +533,10 @@ export function getPatch(release) {
                             value: {
                                 children: {
                                     range: {
+                                        properties: {
+                                            minSpan: 1,
+                                            maxSpan: 2147483646,
+                                        },
                                         children: {
                                             sequence: {
                                                 properties: {

package/package.json

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