@spyglassmc/java-edition 0.3.41 → 0.3.42

package/lib/mcfunction/completer/argument.js

@@ -42,6 +42,8 @@ export const getMockNodes = (rawTreeNode, prevNodes, ctx) => {
                 json.JsonObjectNode.mock(range),
                 json.JsonStringNode.mock(range),
             ];
+        case 'minecraft:dialog':
+            return ResourceLocationNode.mock(range, { category: 'dialog' });
         case 'minecraft:dimension':
             return ResourceLocationNode.mock(range, { category: 'dimension' });
         case 'minecraft:entity':

package/lib/mcfunction/mcdocAttributes.js

@@ -9,6 +9,7 @@ import * as parser from './parser/index.js';
 const validator = mcdoc.runtime.attribute.validator;
 const commandValidator = validator.alternatives(validator.tree({
     slash: validator.optional(validator.options('allowed', 'required', 'chat')),
+    macro: validator.optional(validator.options('implicit')),
     max_length: validator.optional(validator.number),
     empty: validator.optional(validator.options('allowed')),
     incomplete: validator.optional(validator.options('allowed')),
@@ -23,8 +24,11 @@ const scoreHolderValidator = validator.alternatives(validator.tree({
 export function registerMcdocAttributes(meta, rootTreeNode) {
     mcdoc.runtime.registerAttribute(meta, 'command', commandValidator, {
         // TODO: fix completer inside commands
-        stringParser: ({ slash, max_length, empty, incomplete }) => {
+        stringParser: ({ slash, macro, max_length, empty, incomplete }) => {
             return (src, ctx) => {
+                if (macro) {
+                    return mcf.macro(false)(src, ctx);
+                }
                 if ((empty && !src.canRead()) || (slash === 'chat' && src.peek() !== '/')) {
                     return core.string({
                         unquotable: { blockList: new Set(), allowEmpty: true },

package/lib/mcfunction/parser/argument.js

@@ -88,6 +88,8 @@ export const argument = (rawTreeNode, prevNodes) => {
             return wrap(vector({ dimension: 2, integersOnly: true }));
         case 'minecraft:component':
             return wrap(typeRefParser('::java::server::util::text::Text'));
+        case 'minecraft:dialog':
+            return wrap(resourceOrInline('dialog'));
         case 'minecraft:dimension':
             return wrap(core.resourceLocation({ category: 'dimension' }));
         case 'minecraft:entity':

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

@@ -58,6 +58,9 @@ export interface MinecraftColumnPosArgumentTreeNode extends mcf.ArgumentTreeNode
 export interface MinecraftComponentArgumentTreeNode extends mcf.ArgumentTreeNode {
     parser: 'minecraft:component';
 }
+export interface MinecraftDialogArgumentTreeNode extends mcf.ArgumentTreeNode {
+    parser: 'minecraft:dialog';
+}
 export interface MinecraftDimensionArgumentTreeNode extends mcf.ArgumentTreeNode {
     parser: 'minecraft:dimension';
 }
@@ -277,5 +280,5 @@ export interface SpyglassmcCriterionArgumentTreeNode extends mcf.ArgumentTreeNod
 export interface SpyglassmcTagArgumentTreeNode extends mcf.ArgumentTreeNode {
     parser: 'spyglassmc:tag';
 }
-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 | MinecraftItemSlotsArgumentTreeNode | MinecraftItemStackArgumentTreeNode | MinecraftLootModifierArgumentTreeNode | MinecraftLootPredicateArgumentTreeNode | MinecraftLootTableArgumentTreeNode | MinecraftMessageArgumentTreeNode | MinecraftMobEffectArgumentTreeNode | MinecraftNbtCompoundTagArgumentTreeNode | MinecraftNbtPathArgumentTreeNode | MinecraftNbtTagArgumentTreeNode | MinecraftObjectiveArgumentTreeNode | MinecraftObjectiveCriteriaArgumentTreeNode | MinecraftOperationArgumentTreeNode | MinecraftParticleArgumentTreeNode | MinecraftResourceArgumentTreeNode | MinecraftResourceKeyArgumentTreeNode | MinecraftResourceLocationArgumentTreeNode | MinecraftResourceOrTagArgumentTreeNode | MinecraftResourceOrTagKeyArgumentTreeNode | MinecraftResourceSelectorTreeNode | MinecraftRotationArgumentTreeNode | MinecraftScoreHolderArgumentTreeNode | MinecraftScoreboardSlotArgumentTreeNode | MinecraftStyleArgumentTreeNode | MinecraftSwizzleArgumentTreeNode | MinecraftTeamArgumentTreeNode | MinecraftTemplateMirrorArgumentTreeNode | MinecraftTemplateRotationArgumentTreeNode | MinecraftTimeArgumentTreeNode | MinecraftUuidArgumentTreeNode | MinecraftVec2ArgumentTreeNode | MinecraftVec3ArgumentTreeNode | SpyglassmcCriterionArgumentTreeNode | SpyglassmcTagArgumentTreeNode;
+export type ArgumentTreeNode = BrigadierBoolArgumentTreeNode | BrigadierDoubleArgumentTreeNode | BrigadierFloatArgumentTreeNode | BrigadierIntegerArgumentTreeNode | BrigadierLongArgumentTreeNode | BrigadierStringArgumentTreeNode | MinecraftAngleArgumentTreeNode | MinecraftBlockPosArgumentTreeNode | MinecraftBlockPredicateArgumentTreeNode | MinecraftBlockStateArgumentTreeNode | MinecraftColorArgumentTreeNode | MinecraftColumnPosArgumentTreeNode | MinecraftComponentArgumentTreeNode | MinecraftDialogArgumentTreeNode | MinecraftDimensionArgumentTreeNode | MinecraftEntityArgumentTreeNode | MinecraftEntityAnchorArgumentTreeNode | MinecraftEntitySummonArgumentTreeNode | MinecraftFloatRangeArgumentTreeNode | MinecraftFunctionArgumentTreeNode | MinecraftGamemodeArgumentTreeNode | MinecraftGameProfileArgumentTreeNode | MinecraftHeightmapArgumentTreeNode | MinecraftIntRangeArgumentTreeNode | MinecraftItemEnchantmentArgumentTreeNode | MinecraftItemPredicateArgumentTreeNode | MinecraftItemSlotArgumentTreeNode | MinecraftItemSlotsArgumentTreeNode | MinecraftItemStackArgumentTreeNode | MinecraftLootModifierArgumentTreeNode | MinecraftLootPredicateArgumentTreeNode | MinecraftLootTableArgumentTreeNode | MinecraftMessageArgumentTreeNode | MinecraftMobEffectArgumentTreeNode | MinecraftNbtCompoundTagArgumentTreeNode | MinecraftNbtPathArgumentTreeNode | MinecraftNbtTagArgumentTreeNode | MinecraftObjectiveArgumentTreeNode | MinecraftObjectiveCriteriaArgumentTreeNode | MinecraftOperationArgumentTreeNode | MinecraftParticleArgumentTreeNode | MinecraftResourceArgumentTreeNode | MinecraftResourceKeyArgumentTreeNode | MinecraftResourceLocationArgumentTreeNode | MinecraftResourceOrTagArgumentTreeNode | MinecraftResourceOrTagKeyArgumentTreeNode | MinecraftResourceSelectorTreeNode | MinecraftRotationArgumentTreeNode | MinecraftScoreHolderArgumentTreeNode | MinecraftScoreboardSlotArgumentTreeNode | MinecraftStyleArgumentTreeNode | MinecraftSwizzleArgumentTreeNode | MinecraftTeamArgumentTreeNode | MinecraftTemplateMirrorArgumentTreeNode | MinecraftTemplateRotationArgumentTreeNode | MinecraftTimeArgumentTreeNode | MinecraftUuidArgumentTreeNode | MinecraftVec2ArgumentTreeNode | MinecraftVec3ArgumentTreeNode | SpyglassmcCriterionArgumentTreeNode | SpyglassmcTagArgumentTreeNode;
 //# sourceMappingURL=argument.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/java-edition",
-  "version": "0.3.41",
+  "version": "0.3.42",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -20,7 +20,7 @@
     "@spyglassmc/core": "0.4.31",
     "@spyglassmc/json": "0.3.35",
     "@spyglassmc/locales": "0.3.16",
-    "@spyglassmc/mcfunction": "0.2.33",
+    "@spyglassmc/mcfunction": "0.2.34",
     "@spyglassmc/mcdoc": "0.3.35",
     "@spyglassmc/nbt": "0.3.36"
   },