@spyglassmc/java-edition 0.3.2 → 0.3.4

package/lib/mcfunction/parser/argument.js

@@ -5,7 +5,7 @@ import { localeQuote, localize } from '@spyglassmc/locales';
 import * as mcf from '@spyglassmc/mcfunction';
 import * as nbt from '@spyglassmc/nbt';
 import { ReleaseVersion } from '../../dependency/index.js';
-import { ColorArgumentValues, EntityAnchorArgumentValues, ItemSlotArgumentValues, OperationArgumentValues, ScoreboardSlotArgumentValues, SwizzleArgumentValues, } from '../common/index.js';
+import { ColorArgumentValues, EntityAnchorArgumentValues, GamemodeArgumentValues, HeightmapValues, ItemSlotArgumentValues, MirrorValues, OperationArgumentValues, RotationValues, ScoreboardSlotArgumentValues, SwizzleArgumentValues, } from '../common/index.js';
 import { BlockStatesNode, EntitySelectorArgumentsNode, EntitySelectorAtVariable, EntitySelectorAtVariables, EntitySelectorNode, ObjectiveCriteriaNode, TimeNode, } from '../node/index.js';
 const IntegerPattern = /^-?\d+$/;
 /**
@@ -103,8 +103,12 @@ export const argument = (rawTreeNode) => {
                 category: 'function',
                 allowTag: true,
             }));
+        case 'minecraft:gamemode':
+            return wrap(core.literal(...GamemodeArgumentValues));
         case 'minecraft:game_profile':
             return wrap(entity('multiple', 'players'));
+        case 'minecraft:heightmap':
+            return wrap(core.literal(...HeightmapValues));
         case 'minecraft:int_range':
             return wrap(range('integer'));
         case 'minecraft:item_enchantment':
@@ -143,6 +147,7 @@ export const argument = (rawTreeNode) => {
         case 'minecraft:particle':
             return wrap(particle);
         case 'minecraft:resource':
+        case 'minecraft:resource_key':
         case 'minecraft:resource_or_tag':
             return wrap(core.resourceLocation({
                 category: core.ResourceLocation.shorten(treeNode.properties.registry),
@@ -167,6 +172,10 @@ export const argument = (rawTreeNode) => {
             return wrap(team(core.SymbolUsageType.is(treeNode.properties?.usageType)
                 ? treeNode.properties?.usageType
                 : undefined));
+        case 'minecraft:template_mirror':
+            return wrap(core.literal(...MirrorValues));
+        case 'minecraft:template_rotation':
+            return wrap(core.literal(...RotationValues));
         case 'minecraft:time':
             return wrap(time);
         case 'minecraft:uuid':
@@ -217,7 +226,7 @@ function block(isPredicate) {
 }
 const blockState = block(false);
 export const blockPredicate = block(true);
-export const component = json.parser.json();
+export const component = json.parser.entry;
 function double(min = DoubleMin, max = DoubleMax) {
     return core.float({
         pattern: FloatPattern,
@@ -400,7 +409,9 @@ function range(type, min, max, cycleable) {
             : res.children.filter(core.IntegerNode.is);
         const sepNode = res.children.find(core.LiteralNode.is);
         const ans = {
-            type: type === 'float' ? 'mcfunction:float_range' : 'mcfunction:int_range',
+            type: type === 'float'
+                ? 'mcfunction:float_range'
+                : 'mcfunction:int_range',
             range: res.range,
             children: res.children,
             value: sepNode
@@ -452,7 +463,10 @@ function selector() {
                 typeLimited = playersOnly;
                 function invertable(parser) {
                     return core.map(core.sequence([
-                        core.optional(core.failOnEmpty(core.literal({ pool: ['!'], colorTokenType: 'keyword' }))),
+                        core.optional(core.failOnEmpty(core.literal({
+                            pool: ['!'],
+                            colorTokenType: 'keyword',
+                        }))),
                         (src) => {
                             src.skipSpace();
                             return undefined;
@@ -476,7 +490,9 @@ function selector() {
                             ...core.BrigadierStringOptions,
                             value: {
                                 parser: core.literal({
-                                    pool: [...EntitySelectorNode.ArgumentKeys],
+                                    pool: [
+                                        ...EntitySelectorNode.ArgumentKeys,
+                                    ],
                                     colorTokenType: 'property',
                                 }),
                                 type: 'literal',
@@ -505,7 +521,8 @@ function selector() {
                                                             pair: {
                                                                 key: unquotedString,
                                                                 sep: '=',
-                                                                value: core.boolean,
+                                                                value: core
+                                                                    .boolean,
                                                                 end: ',',
                                                                 trailingEnd: true,
                                                             },
@@ -540,8 +557,8 @@ function selector() {
                                         return core.map(range('float', 0), (res, _, ctx) => {
                                             dimensionLimited = true;
                                             // x, y, z, dx, dy, dz take precedence over distance, so we use ??= instead of = to ensure it won't override the result.
-                                            chunkLimited ??=
-                                                !playersOnly && res.value[1] !== undefined;
+                                            chunkLimited ??= !playersOnly &&
+                                                res.value[1] !== undefined;
                                             if (hasKey(key.value)) {
                                                 ctx.err.report(localize('duplicate-key', localeQuote(key.value)), key);
                                             }
@@ -549,10 +566,11 @@ function selector() {
                                         });
                                     case 'gamemode':
                                         return core.map(invertable(core.string({
-                                            unquotable: core.BrigadierUnquotableOption,
+                                            unquotable: core
+                                                .BrigadierUnquotableOption,
                                             value: {
                                                 type: 'literal',
-                                                parser: core.literal('adventure', 'creative', 'spectator', 'survival'),
+                                                parser: core.literal(...GamemodeArgumentValues),
                                             },
                                         })), (res, _, ctx) => {
                                             playersOnly = true;
@@ -594,7 +612,9 @@ function selector() {
                                     case 'nbt':
                                         return invertable(nbt.parser.compound);
                                     case 'predicate':
-                                        return invertable(core.resourceLocation({ category: 'predicate' }));
+                                        return invertable(core.resourceLocation({
+                                            category: 'predicate',
+                                        }));
                                     case 'scores':
                                         return core.map(core.record({
                                             start: '{',
@@ -625,7 +645,8 @@ function selector() {
                                         });
                                     case 'sort':
                                         return core.map(core.string({
-                                            unquotable: core.BrigadierUnquotableOption,
+                                            unquotable: core
+                                                .BrigadierUnquotableOption,
                                             value: {
                                                 type: 'literal',
                                                 parser: core.literal('arbitrary', 'furthest', 'nearest', 'random'),
@@ -640,7 +661,14 @@ function selector() {
                                             return res;
                                         });
                                     case 'tag':
-                                        return invertable(tag(['[', '=', ',', ']', '{', '}']));
+                                        return invertable(tag([
+                                            '[',
+                                            '=',
+                                            ',',
+                                            ']',
+                                            '{',
+                                            '}',
+                                        ]));
                                     case 'team':
                                         return core.map(invertable(team('reference', [
                                             '[',
@@ -670,9 +698,11 @@ function selector() {
                                                     ctx.err.report(localize('mcfunction.parser.entity-selector.arguments.not-applicable', localeQuote(key.value)), key);
                                                 }
                                             }
-                                            else if (!res.inverted && !res.value.isTag) {
+                                            else if (!res.inverted &&
+                                                !res.value.isTag) {
                                                 typeLimited = true;
-                                                if (core.ResourceLocationNode.toString(res.value, 'short') === 'player') {
+                                                if (core.ResourceLocationNode
+                                                    .toString(res.value, 'short') === 'player') {
                                                     playersOnly = true;
                                                 }
                                             }
@@ -757,15 +787,15 @@ function selector() {
 // Might not make into the actual release.
 function getEntitySelectorHover(node) {
     const grades = new Map([
-        [0, '🤢'],
-        [1, '😅'],
-        [2, 'Good'],
-        [3, 'Great'],
+        [0, '🤢'], // Bad
+        [1, '😅'], // Normal
+        [2, 'Good'], // Good
+        [3, 'Great'], // Great
         [4, '😌👌'], // Excellent
     ]);
     let ans;
     if (node.currentEntity) {
-        ans = `**Performance**: ${grades.get(4)}  
+        ans = `**Performance**: ${grades.get(4)}
 - \`currentEntity\`: \`${node.currentEntity}\``;
     }
     else {
@@ -775,7 +805,7 @@ function getEntitySelectorHover(node) {
             node.playersOnly,
             node.typeLimited,
         ].filter((v) => v).length;
-        ans = `**Performance**: ${grades.get(amountOfTrue)}  
+        ans = `**Performance**: ${grades.get(amountOfTrue)}
 - \`chunkLimited\`: \`${!!node.chunkLimited}\`
 - \`dimensionLimited\`: \`${!!node.dimensionLimited}\`
 - \`playersOnly\`: \`${!!node.playersOnly}\`
@@ -785,7 +815,7 @@ function getEntitySelectorHover(node) {
         ans += `
 
 ------
-**Predicates**: 
+**Predicates**:
 ${node.predicates.map((p) => `- \`${p}\``).join('\n')}`;
     }
     return ans;
@@ -824,7 +854,8 @@ function symbol(options, terminators = []) {
 function objective(usageType, terminators = []) {
     return validateLength(unquotableSymbol({ category: 'objective', usageType }, terminators), ObjectiveMaxLength, 'mcfunction.parser.objective.too-long');
 }
-const objectiveCriteria = core.map(core.any([
+const objectiveCriteria = core
+    .map(core.any([
     core.sequence([
         core.stopBefore(core.resourceLocation({
             category: 'stat_type',
@@ -834,7 +865,8 @@ const objectiveCriteria = core.map(core.any([
         {
             get: (res) => {
                 if (core.ResourceLocationNode.is(res.children[0])) {
-                    const category = ObjectiveCriteriaNode.ComplexCategories.get(core.ResourceLocationNode.toString(res.children[0], 'short'));
+                    const category = ObjectiveCriteriaNode.ComplexCategories
+                        .get(core.ResourceLocationNode.toString(res.children[0], 'short'));
                     if (category) {
                         return core.resourceLocation({
                             category,

package/lib/mcfunction/signatureHelpProvider.js

@@ -37,7 +37,9 @@ export function signatureHelpProvider(commandTreeName) {
         };
         ans.signatures = options.map((v) => {
             const part1 = v[selectedIndex];
-            const part2 = selectedIndex + 1 < v.length ? ` ${v[selectedIndex + 1]}` : '';
+            const part2 = selectedIndex + 1 < v.length
+                ? ` ${v[selectedIndex + 1]}`
+                : '';
             const label = `${part1}${part2}`;
             return {
                 label,

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

@@ -80,9 +80,15 @@ export interface MinecraftFloatRangeArgumentTreeNode extends mcf.ArgumentTreeNod
 export interface MinecraftFunctionArgumentTreeNode extends mcf.ArgumentTreeNode {
     parser: 'minecraft:function';
 }
+export interface MinecraftGamemodeArgumentTreeNode extends mcf.ArgumentTreeNode {
+    parser: 'minecraft:gamemode';
+}
 export interface MinecraftGameProfileArgumentTreeNode extends mcf.ArgumentTreeNode {
     parser: 'minecraft:game_profile';
 }
+export interface MinecraftHeightmapArgumentTreeNode extends mcf.ArgumentTreeNode {
+    parser: 'minecraft:heightmap';
+}
 export interface MinecraftIntRangeArgumentTreeNode extends mcf.ArgumentTreeNode {
     parser: 'minecraft:int_range';
 }
@@ -131,6 +137,12 @@ export interface MinecraftResourceArgumentTreeNode extends mcf.ArgumentTreeNode
         registry: string;
     };
 }
+export interface MinecraftResourceKeyArgumentTreeNode extends mcf.ArgumentTreeNode {
+    parser: 'minecraft:resource_key';
+    properties: {
+        registry: string;
+    };
+}
 export interface MinecraftResourceLocationArgumentTreeNode extends mcf.ArgumentTreeNode {
     parser: 'minecraft:resource_location';
     properties?: core.ResourceLocationOptions;
@@ -159,6 +171,12 @@ export interface MinecraftSwizzleArgumentTreeNode extends mcf.ArgumentTreeNode {
 export interface MinecraftTeamArgumentTreeNode extends mcf.ArgumentTreeNode {
     parser: 'minecraft:team';
 }
+export interface MinecraftTemplateMirrorArgumentTreeNode extends mcf.ArgumentTreeNode {
+    parser: 'minecraft:template_mirror';
+}
+export interface MinecraftTemplateRotationArgumentTreeNode extends mcf.ArgumentTreeNode {
+    parser: 'minecraft:template_rotation';
+}
 export interface MinecraftTimeArgumentTreeNode extends mcf.ArgumentTreeNode {
     parser: 'minecraft:time';
 }
@@ -175,5 +193,5 @@ export interface MinecraftVec3ArgumentTreeNode extends mcf.ArgumentTreeNode {
 export interface SpyglassmcTagArgumentTreeNode extends mcf.ArgumentTreeNode {
     parser: 'spyglassmc:tag';
 }
-export declare type ArgumentTreeNode = BrigadierBoolArgumentTreeNode | BrigadierDoubleArgumentTreeNode | BrigadierFloatArgumentTreeNode | BrigadierIntegerArgumentTreeNode | BrigadierLongArgumentTreeNode | BrigadierStringArgumentTreeNode | MinecraftAngleArgumentTreeNode | MinecraftBlockPosArgumentTreeNode | MinecraftBlockPredicateArgumentTreeNode | MinecraftBlockStateArgumentTreeNode | MinecraftColorArgumentTreeNode | MinecraftColumnPosArgumentTreeNode | MinecraftComponentArgumentTreeNode | MinecraftDimensionArgumentTreeNode | MinecraftEntityArgumentTreeNode | MinecraftEntityAnchorArgumentTreeNode | MinecraftEntitySummonArgumentTreeNode | MinecraftFloatRangeArgumentTreeNode | MinecraftFunctionArgumentTreeNode | MinecraftGameProfileArgumentTreeNode | MinecraftIntRangeArgumentTreeNode | MinecraftItemEnchantmentArgumentTreeNode | MinecraftItemPredicateArgumentTreeNode | MinecraftItemSlotArgumentTreeNode | MinecraftItemStackArgumentTreeNode | MinecraftMessageArgumentTreeNode | MinecraftMobEffectArgumentTreeNode | MinecraftNbtCompoundTagArgumentTreeNode | MinecraftNbtPathArgumentTreeNode | MinecraftNbtTagArgumentTreeNode | MinecraftObjectiveArgumentTreeNode | MinecraftObjectiveCriteriaArgumentTreeNode | MinecraftOperationArgumentTreeNode | MinecraftParticleArgumentTreeNode | MinecraftResourceArgumentTreeNode | MinecraftResourceLocationArgumentTreeNode | MinecraftResourceOrTagArgumentTreeNode | MinecraftRotationArgumentTreeNode | MinecraftScoreHolderArgumentTreeNode | MinecraftScoreboardSlotArgumentTreeNode | MinecraftSwizzleArgumentTreeNode | MinecraftTeamArgumentTreeNode | MinecraftTimeArgumentTreeNode | MinecraftUuidArgumentTreeNode | MinecraftVec2ArgumentTreeNode | MinecraftVec3ArgumentTreeNode | SpyglassmcTagArgumentTreeNode;
+export type ArgumentTreeNode = BrigadierBoolArgumentTreeNode | BrigadierDoubleArgumentTreeNode | BrigadierFloatArgumentTreeNode | BrigadierIntegerArgumentTreeNode | BrigadierLongArgumentTreeNode | BrigadierStringArgumentTreeNode | MinecraftAngleArgumentTreeNode | MinecraftBlockPosArgumentTreeNode | MinecraftBlockPredicateArgumentTreeNode | MinecraftBlockStateArgumentTreeNode | MinecraftColorArgumentTreeNode | MinecraftColumnPosArgumentTreeNode | MinecraftComponentArgumentTreeNode | MinecraftDimensionArgumentTreeNode | MinecraftEntityArgumentTreeNode | MinecraftEntityAnchorArgumentTreeNode | MinecraftEntitySummonArgumentTreeNode | MinecraftFloatRangeArgumentTreeNode | MinecraftFunctionArgumentTreeNode | MinecraftGamemodeArgumentTreeNode | MinecraftGameProfileArgumentTreeNode | MinecraftHeightmapArgumentTreeNode | MinecraftIntRangeArgumentTreeNode | MinecraftItemEnchantmentArgumentTreeNode | MinecraftItemPredicateArgumentTreeNode | MinecraftItemSlotArgumentTreeNode | MinecraftItemStackArgumentTreeNode | MinecraftMessageArgumentTreeNode | MinecraftMobEffectArgumentTreeNode | MinecraftNbtCompoundTagArgumentTreeNode | MinecraftNbtPathArgumentTreeNode | MinecraftNbtTagArgumentTreeNode | MinecraftObjectiveArgumentTreeNode | MinecraftObjectiveCriteriaArgumentTreeNode | MinecraftOperationArgumentTreeNode | MinecraftParticleArgumentTreeNode | MinecraftResourceArgumentTreeNode | MinecraftResourceKeyArgumentTreeNode | MinecraftResourceLocationArgumentTreeNode | MinecraftResourceOrTagArgumentTreeNode | MinecraftRotationArgumentTreeNode | MinecraftScoreHolderArgumentTreeNode | MinecraftScoreboardSlotArgumentTreeNode | MinecraftSwizzleArgumentTreeNode | MinecraftTeamArgumentTreeNode | MinecraftTemplateMirrorArgumentTreeNode | MinecraftTemplateRotationArgumentTreeNode | MinecraftTimeArgumentTreeNode | MinecraftUuidArgumentTreeNode | MinecraftVec2ArgumentTreeNode | MinecraftVec3ArgumentTreeNode | SpyglassmcTagArgumentTreeNode;
 //# sourceMappingURL=argument.d.ts.map

package/lib/mcfunction/tree/patch.js

@@ -327,6 +327,13 @@ export function getPatch(release) {
             help: {
                 permission: 0,
             },
+            ...(ReleaseVersion.cmp(release, '1.18') >= 0
+                ? {
+                    jfr: {
+                        permission: 4,
+                    },
+                }
+                : {}),
             kick: {
                 permission: 3,
             },
@@ -412,6 +419,30 @@ export function getPatch(release) {
             'pardon-ip': {
                 permission: 3,
             },
+            ...(ReleaseVersion.cmp(release, '1.17') >= 0
+                ? {
+                    perf: {
+                        permission: 4,
+                    },
+                }
+                : {}),
+            ...(ReleaseVersion.cmp(release, '1.19') >= 0
+                ? {
+                    place: {
+                        children: {
+                            template: {
+                                children: {
+                                    template: {
+                                        properties: {
+                                            category: 'structure'
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                }
+                : {}),
             playsound: Sound,
             publish: {
                 permission: 4,
@@ -528,7 +559,7 @@ export function getPatch(release) {
              * 2. `teleport <location: vec3>`
              * 3. `teleport <targets: entity(multiple)> <...arguments>`
              *
-             * It is impossible for Spyglass to differentiate between (1) and (3) when it encouters a single entity
+             * It is impossible for Spyglass to differentiate between (1) and (3) when it encounters a single entity
              * at the position of the first argument, due to its lack of ability to backtrack.
              *
              * Therefore, we have compromised to patch the trees to something like this:
@@ -553,6 +584,13 @@ export function getPatch(release) {
             tell: {
                 permission: 0,
             },
+            ...(ReleaseVersion.cmp(release, '1.20.2') >= 0
+                ? {
+                    tick: {
+                        permission: 3,
+                    },
+                }
+                : {}),
             tm: {
                 permission: 0,
             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/java-edition",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "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.1",
-    "@spyglassmc/json": "0.3.2",
-    "@spyglassmc/locales": "0.3.1",
-    "@spyglassmc/mcfunction": "0.2.3",
-    "@spyglassmc/mcdoc": "0.3.2",
-    "@spyglassmc/nbt": "0.3.2"
+    "@spyglassmc/core": "0.4.3",
+    "@spyglassmc/json": "0.3.4",
+    "@spyglassmc/locales": "0.3.3",
+    "@spyglassmc/mcfunction": "0.2.5",
+    "@spyglassmc/mcdoc": "0.3.4",
+    "@spyglassmc/nbt": "0.3.4"
   },
   "devDependencies": {
     "fast-glob": "^3.2.5",

package/lib/json/checker/data/advancement.d.ts

@@ -1,14 +0,0 @@
-export declare const item_predicate: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
-export declare const block_predicate: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
-export declare const fluid_predicate: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
-export declare const location_predicate: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
-export declare const distance_predicate: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
-export declare const mob_effect_predicate: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
-export declare const statistic_predicate: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
-export declare const player_predicate: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
-export declare const entity_predicate: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
-export declare const damage_source_predicate: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
-export declare const damage_predicate: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
-export declare const criterion: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
-export declare const advancement: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
-//# sourceMappingURL=advancement.d.ts.map