@spyglassmc/java-edition 0.3.59 → 0.3.61

package/lib/binder/index.js

@@ -49,6 +49,7 @@ resource('cat_variant', { since: '1.21.5' });
 resource('chat_type', { since: '1.19' });
 resource('chicken_variant', { since: '1.21.5' });
 resource('cow_variant', { since: '1.21.5' });
+resource('decorated_pot_pattern', { since: '26.3' });
 resource('damage_type', { since: '1.19.4' });
 resource('dialog', { since: '1.21.6' });
 resource('enchantment', { since: '1.21' });
@@ -58,6 +59,7 @@ resource('instrument', { since: '1.21.2' });
 resource('jukebox_song', { since: '1.21' });
 resource('painting_variant', { since: '1.21' });
 resource('pig_variant', { since: '1.21.5' });
+resource('slot_source', { since: '26.3' });
 resource('sulfur_cube_archetype', { since: '26.2' });
 resource('test_instance', { since: '1.21.5' });
 resource('test_environment', { since: '1.21.5' });
@@ -76,16 +78,19 @@ resource('dimension', { since: '1.16' });
 resource('dimension_type', { since: '1.16' });
 resource('worldgen/biome', { since: '1.16.2' });
 resource('worldgen/configured_carver', { since: '1.16.2' });
-resource('worldgen/configured_feature', { since: '1.16.2' });
+resource('worldgen/configured_feature', { since: '1.16.2', until: '26.3' });
 resource('worldgen/configured_structure_feature', { since: '1.16.2', until: '1.19' });
+resource('worldgen/configured_surface_builder', { since: '1.16.2', until: '1.18' });
 resource('worldgen/density_function', { since: '1.18.2' });
+resource('worldgen/feature', { since: '26.3' });
 resource('worldgen/flat_level_generator_preset', { since: '1.19' });
+resource('worldgen/material_condition', { since: '26.3' });
+resource('worldgen/material_rule', { since: '26.3' });
 resource('worldgen/multi_noise_biome_source_parameter_list', { since: '1.19.4' });
 resource('worldgen/noise', { since: '1.18' });
 resource('worldgen/noise_settings', { since: '1.16.2' });
 resource('worldgen/placed_feature', { since: '1.18' });
 resource('worldgen/processor_list', { since: '1.16.2' });
-resource('worldgen/configured_surface_builder', { since: '1.16.2', until: '1.18' });
 resource('worldgen/structure', { since: '1.19' });
 resource('worldgen/structure_set', { since: '1.18.2' });
 resource('worldgen/template_pool', { since: '1.16.2' });

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';
@@ -110,12 +110,16 @@ export const getMockNodes = (rawTreeNode, prevNodes, ctx) => {
             return LiteralNode.mock(range, { pool: getScoreboardSlotArgumentValues(ctx) });
         case 'minecraft:score_holder':
             return ScoreHolderNode.mock(range);
+        case 'minecraft:slot_source':
+            return LiteralNode.mock(range, { pool: getItemSlotsArgumentValues(ctx) });
         case 'minecraft:style':
             return json.JsonObjectNode.mock(range);
         case 'minecraft:swizzle':
             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/node/argument.d.ts

@@ -253,7 +253,7 @@ export interface ObjectiveCriteriaNode extends core.AstNode {
 }
 export declare namespace ObjectiveCriteriaNode {
     const SimpleValues: string[];
-    const ComplexCategories: Map<string, "activity" | "armor_material" | "attribute" | "attribute_type" | "block" | "block_entity_type" | "block_predicate_type" | "block_type" | "chunk_status" | "command_argument_type" | "consume_effect_type" | "creative_mode_tab" | "custom_stat" | "data_component_predicate_type" | "data_component_type" | "debug_subscription" | "decorated_pot_pattern" | "decorated_pot_patterns" | "dialog_action_type" | "dialog_body_type" | "dialog_type" | "enchantment_effect_component_type" | "enchantment_entity_effect_type" | "enchantment_level_based_value_type" | "enchantment_location_based_effect_type" | "enchantment_provider_type" | "enchantment_value_effect_type" | "entity_sub_predicate_type" | "entity_type" | "environment_attribute" | "float_provider_type" | "fluid" | "game_event" | "game_rule" | "height_provider_type" | "incoming_rpc_methods" | "input_control_type" | "instrument" | "int_provider_type" | "item" | "item_sub_predicate_type" | "loot_condition_type" | "loot_function_type" | "loot_nbt_provider_type" | "loot_number_provider_type" | "loot_pool_entry_type" | "loot_score_provider_type" | "map_decoration_type" | "memory_module_type" | "menu" | "mob_effect" | "motive" | "number_format_type" | "outgoing_rpc_methods" | "particle_type" | "permission_check_type" | "permission_type" | "point_of_interest_type" | "pos_rule_test" | "position_source_type" | "potion" | "recipe_book_category" | "recipe_display" | "recipe_serializer" | "recipe_type" | "rule_block_entity_modifier" | "rule_test" | "schedule" | "sensor_type" | "slot_display" | "slot_source_type" | "sound_event" | "spawn_condition_type" | "stat_type" | "test_environment_definition_type" | "test_function" | "test_instance_type" | "ticket_type" | "trigger_type" | "villager_profession" | "villager_type" | "worldgen/biome_source" | "worldgen/block_placer_type" | "worldgen/block_state_provider_type" | "worldgen/carver" | "worldgen/chunk_generator" | "worldgen/decorator" | "worldgen/density_function_type" | "worldgen/feature" | "worldgen/feature_size_type" | "worldgen/foliage_placer_type" | "worldgen/material_condition" | "worldgen/material_rule" | "worldgen/placement_modifier_type" | "worldgen/pool_alias_binding" | "worldgen/root_placer_type" | "worldgen/structure_feature" | "worldgen/structure_piece" | "worldgen/structure_placement" | "worldgen/structure_pool_element" | "worldgen/structure_processor" | "worldgen/structure_type" | "worldgen/surface_builder" | "worldgen/tree_decorator_type" | "worldgen/trunk_placer_type">;
+    const ComplexCategories: Map<string, "activity" | "armor_material" | "attribute" | "attribute_type" | "block" | "block_entity_type" | "block_predicate_type" | "block_type" | "chunk_status" | "command_argument_type" | "consume_effect_type" | "creative_mode_tab" | "custom_stat" | "data_component_predicate_type" | "data_component_type" | "debug_subscription" | "decorated_pot_pattern" | "decorated_pot_patterns" | "dialog_action_type" | "dialog_body_type" | "dialog_type" | "enchantment_effect_component_type" | "enchantment_entity_effect_type" | "enchantment_level_based_value_type" | "enchantment_location_based_effect_type" | "enchantment_provider_type" | "enchantment_value_effect_type" | "entity_sub_predicate_type" | "entity_type" | "environment_attribute" | "float_provider_type" | "fluid" | "game_event" | "game_rule" | "height_provider_type" | "incoming_rpc_methods" | "input_control_type" | "instrument" | "int_provider_type" | "item" | "item_sub_predicate_type" | "loot_condition_type" | "loot_function_type" | "loot_nbt_provider_type" | "loot_number_provider_type" | "loot_pool_entry_type" | "loot_score_provider_type" | "map_decoration_type" | "memory_module_type" | "menu" | "mob_effect" | "motive" | "number_format_type" | "outgoing_rpc_methods" | "particle_type" | "permission_check_type" | "permission_type" | "point_of_interest_type" | "pos_rule_test" | "position_source_type" | "potion" | "recipe_book_category" | "recipe_display" | "recipe_serializer" | "recipe_type" | "rule_block_entity_modifier" | "rule_test" | "schedule" | "sensor_type" | "slot_display" | "slot_source_type" | "sound_event" | "spawn_condition_type" | "stat_type" | "test_environment_definition_type" | "test_function" | "test_instance_type" | "ticket_type" | "trigger_type" | "villager_profession" | "villager_type" | "worldgen/biome_source" | "worldgen/block_placer_type" | "worldgen/block_state_provider_type" | "worldgen/carver" | "worldgen/chunk_generator" | "worldgen/decorator" | "worldgen/density_function_type" | "worldgen/feature" | "worldgen/feature_size_type" | "worldgen/feature_type" | "worldgen/foliage_placer_type" | "worldgen/material_condition" | "worldgen/material_condition_type" | "worldgen/material_rule" | "worldgen/material_rule_type" | "worldgen/placement_modifier_type" | "worldgen/pool_alias_binding" | "worldgen/root_placer_type" | "worldgen/structure_feature" | "worldgen/structure_piece" | "worldgen/structure_placement" | "worldgen/structure_pool_element" | "worldgen/structure_processor" | "worldgen/structure_type" | "worldgen/surface_builder" | "worldgen/tree_decorator_type" | "worldgen/trunk_placer_type">;
     const ComplexSep = ":";
     function mock(range: core.RangeLike): ObjectiveCriteriaNode;
 }

package/lib/mcfunction/parser/argument.js

@@ -174,6 +174,8 @@ export const argument = (rawTreeNode, prevNodes) => {
             return wrap((src, ctx) => {
                 return commandLiteral({ pool: getScoreboardSlotArgumentValues(ctx) })(src, ctx);
             });
+        case 'minecraft:slot_source':
+            return wrap(slotSource);
         case 'minecraft:style':
             return wrap(typeRefParser('::java::server::util::text::TextStyle'));
         case 'minecraft:swizzle':
@@ -182,6 +184,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':
@@ -965,6 +974,13 @@ export function scoreHolder(usageType, amount) {
         return ans;
     });
 }
+const slotSource = core
+    .any([
+    (src, ctx) => {
+        return commandLiteral({ pool: getItemSlotsArgumentValues(ctx) })(src, ctx);
+    },
+    resourceOrInline('slot_source'),
+]);
 function symbol(options, terminators = []) {
     return core.stopBefore(core.symbol(options), core.Whitespaces, terminators);
 }

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

@@ -246,6 +246,9 @@ export interface MinecraftScoreHolderArgumentTreeNode extends mcf.ArgumentTreeNo
 export interface MinecraftScoreboardSlotArgumentTreeNode extends mcf.ArgumentTreeNode {
     parser: 'minecraft:scoreboard_slot';
 }
+export interface MinecraftSlotSourceArgumentTreeNode extends mcf.ArgumentTreeNode {
+    parser: 'minecraft:slot_source';
+}
 export interface MinecraftStyleArgumentTreeNode extends mcf.ArgumentTreeNode {
     parser: 'minecraft:style';
 }
@@ -255,6 +258,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 +286,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 | MinecraftSlotSourceArgumentTreeNode | 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.61",
   "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.47",
-    "@spyglassmc/json": "0.3.51",
-    "@spyglassmc/locales": "0.3.24",
-    "@spyglassmc/mcfunction": "0.2.50",
-    "@spyglassmc/mcdoc": "0.3.51",
-    "@spyglassmc/nbt": "0.3.53"
+    "@spyglassmc/core": "0.4.48",
+    "@spyglassmc/json": "0.3.52",
+    "@spyglassmc/locales": "0.3.25",
+    "@spyglassmc/mcfunction": "0.2.51",
+    "@spyglassmc/mcdoc": "0.3.52",
+    "@spyglassmc/nbt": "0.3.54"
   },
   "devDependencies": {},
   "publishConfig": {