@spyglassmc/java-edition 0.3.59 → 0.3.60

package/lib/mcfunction/common/index.js

@@ -11,7 +11,6 @@ export function getItemSlotArgumentValues(ctx) {
         ...[...Array(15).keys()].map((n) => `horse.${n}`),
         ...[...Array(9).keys()].map((n) => `hotbar.${n}`),
         ...[...Array(27).keys()].map((n) => `inventory.${n}`),
-        ...[...Array(8).keys()].map((n) => `villager.${n}`),
         'armor.chest',
         'armor.feet',
         'armor.head',
@@ -33,11 +32,18 @@ export function getItemSlotArgumentValues(ctx) {
     else {
         output.push('horse.saddle');
     }
+    if (ReleaseVersion.cmp(release, '26.1') >= 0) {
+        output.push(...[...Array(8).keys()].map((n) => `mob.inventory.${n}`));
+    }
+    else {
+        output.push(...[...Array(8).keys()].map((n) => `villager.${n}`));
+    }
     return output;
 }
 // Only exists since 1.20.5
 export function getItemSlotsArgumentValues(ctx) {
-    return [
+    const release = ctx.project['loadedVersion'];
+    const output = [
         ...getItemSlotArgumentValues(ctx),
         'armor.*',
         'container.*',
@@ -46,9 +52,15 @@ export function getItemSlotsArgumentValues(ctx) {
         'hotbar.*',
         'inventory.*',
         'player.crafting.*',
-        'villager.*',
         'weapon.*',
     ];
+    if (ReleaseVersion.cmp(release, '26.1') >= 0) {
+        output.push('mob.inventory.*');
+    }
+    else {
+        output.push('villager.*');
+    }
+    return output;
 }
 export const OperationArgumentValues = ['=', '+=', '-=', '*=', '/=', '%=', '<', '>', '><'];
 export function getScoreboardSlotArgumentValues(ctx) {

package/lib/mcfunction/completer/argument.js

@@ -1,4 +1,4 @@
-import { AstNode, binarySearch, BooleanNode, BrigadierStringOptions, completer, CompletionItem, FloatNode, getStates, InsertTextBuilder, IntegerNode, LiteralNode, Range, ResourceLocation, ResourceLocationNode, StringNode, SymbolNode, } from '@spyglassmc/core';
+import { AstNode, binarySearch, BooleanNode, BrigadierStringOptions, Color, completer, CompletionItem, FloatNode, getStates, InsertTextBuilder, IntegerNode, LiteralNode, Range, ResourceLocation, ResourceLocationNode, StringNode, SymbolNode, } from '@spyglassmc/core';
 import * as json from '@spyglassmc/json';
 import { localeQuote, localize } from '@spyglassmc/locales';
 import { getTagValues } from '../../common/index.js';
@@ -116,6 +116,8 @@ export const getMockNodes = (rawTreeNode, prevNodes, ctx) => {
             return LiteralNode.mock(range, { pool: SwizzleArgumentValues });
         case 'minecraft:team':
             return SymbolNode.mock(range, { category: 'team' });
+        case 'minecraft:team_color':
+            return LiteralNode.mock(range, { pool: Color.ColorNames });
         case 'minecraft:template_mirror':
             return LiteralNode.mock(range, { pool: MirrorValues });
         case 'minecraft:template_rotation':

package/lib/mcfunction/parser/argument.js

@@ -182,6 +182,13 @@ export const argument = (rawTreeNode, prevNodes) => {
             return wrap(team(core.SymbolUsageType.is(treeNode.properties?.usageType)
                 ? treeNode.properties?.usageType
                 : undefined));
+        case 'minecraft:team_color':
+            return wrap(core.map(commandLiteral({ pool: core.Color.ColorNames }), (res) => ({
+                ...res,
+                color: core.Color.NamedColors.has(res.value)
+                    ? core.Color.fromCompositeRGB(core.Color.NamedColors.get(res.value))
+                    : undefined,
+            })));
         case 'minecraft:template_mirror':
             return wrap(commandLiteral({ pool: MirrorValues }));
         case 'minecraft:template_rotation':

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

@@ -255,6 +255,9 @@ export interface MinecraftSwizzleArgumentTreeNode extends mcf.ArgumentTreeNode {
 export interface MinecraftTeamArgumentTreeNode extends mcf.ArgumentTreeNode {
     parser: 'minecraft:team';
 }
+export interface MinecraftTeamColorArgumentTreeNode extends mcf.ArgumentTreeNode {
+    parser: 'minecraft:team_color';
+}
 export interface MinecraftTemplateMirrorArgumentTreeNode extends mcf.ArgumentTreeNode {
     parser: 'minecraft:template_mirror';
 }
@@ -280,5 +283,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 | 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;
+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 | MinecraftTeamColorArgumentTreeNode | 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.59",
+  "version": "0.3.60",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",