✨ Add support for item components

packages/core/src/symbol/Symbol.ts

@@ -119,6 +119,8 @@ export type TagFileCategory = (typeof TagFileCategories)[number]
 export const FileCategories = Object.freeze(
 	[
 		'advancement',
+		'chat_type',
+		'damage_type',
 		'dimension',
 		'dimension_type',
 		'function',
@@ -127,6 +129,8 @@ export const FileCategories = Object.freeze(
 		'predicate',
 		'recipe',
 		'structure',
+		'trim_material',
+		'trim_pattern',
 		...TagFileCategories,
 		...WorldgenFileCategories,
 	] as const,

packages/java-edition/src/dependency/common.ts

@@ -28,7 +28,12 @@ export const PackVersionMap: Record<number, RegExp | undefined> = {
 	7: /^1\.17.*$/,
 	8: /^1\.18(\.1)?$/,
 	9: /^1\.18.*$/,
-	10: /^1\.19.*$/,
+	10: /^1\.19(\.[1-3])?$/,
+	12: /^1\.19.*$/,
+	15: /^1\.20(\.1)?$/,
+	18: /^1\.20\.2$/,
+	26: /^1\.20\.[3-4]$/,
+	41: /^1\.20\.[5-6]$/,
 }
 
 export interface PackMcmeta {

packages/java-edition/src/mcfunction/checker/index.ts

@@ -5,7 +5,11 @@ import * as mcf from '@spyglassmc/mcfunction'
 import * as nbt from '@spyglassmc/nbt'
 import { getTagValues } from '../../common/index.js'
 import { text_component } from '../../json/checker/data/text_component.js'
-import type { EntitySelectorInvertableArgumentValueNode } from '../node/index.js'
+import type {
+	ComponentListNode,
+	EntitySelectorInvertableArgumentValueNode,
+} from '../node/index.js'
+import { ItemOldNode } from '../node/index.js'
 import { BlockNode, EntityNode, ItemNode, ParticleNode } from '../node/index.js'
 
 export const command: core.Checker<mcf.CommandNode> = (node, ctx) => {
@@ -162,14 +166,46 @@ const entity: core.SyncChecker<EntityNode> = (node, ctx) => {
 }
 
 const item: core.SyncChecker<ItemNode> = (node, ctx) => {
-	if (!node.nbt) {
+	if (!ItemNode.hasUserData(node)) {
 		return
 	}
 
-	nbt.checker.index(
-		'item',
-		core.ResourceLocationNode.toString(node.id, 'full'),
-	)(node.nbt, ctx)
+	if (ItemOldNode.is(node)) {
+		nbt.checker.index(
+			'item',
+			core.ResourceLocationNode.toString(node.id, 'full'),
+		)(node.nbt!, ctx)
+	} else {
+		const groupedComponents = new Map<
+			string,
+			core.PairNode<core.ResourceLocationNode, nbt.NbtNode>[]
+		>()
+
+		node.components!.children.forEach(component => {
+			const componentName = core.ResourceLocationNode.toString(
+				component.key!,
+				'full',
+			)
+
+			if (!groupedComponents.has(componentName)) {
+				groupedComponents.set(componentName, [])
+			}
+
+			groupedComponents.get(componentName)!.push(component)
+		})
+
+		groupedComponents.forEach((components, componentName) => {
+			if (components.length > 1) {
+				components.forEach(component => {
+					ctx.err.report(
+						localize('duplicate-components', componentName),
+						component.key!.range,
+						core.ErrorSeverity.Error,
+					)
+				})
+			}
+		})
+	}
 }
 
 const particle: core.SyncChecker<ParticleNode> = (node, ctx) => {

packages/java-edition/src/mcfunction/common/index.ts

@@ -66,3 +66,25 @@ export const SwizzleArgumentValues = [
 	'zxy',
 	'zyx',
 ]
+
+export const HeightmapValues = [
+	'motion_blocking',
+	'motion_blocking_no_leaves',
+	'ocean_floor',
+	'ocean_floor_wg',
+	'world_surface',
+	'world_surface_wg',
+]
+
+export const RotationValues = [
+	'none',
+	'clockwise_90',
+	'180',
+	'counterclockwise_90',
+]
+
+export const MirrorValues = [
+	'none',
+	'left_right',
+	'front_back',
+]

packages/java-edition/src/mcfunction/completer/argument.ts

@@ -1,6 +1,7 @@
 import type {
 	Arrayable,
 	Completer,
+	CompleterContext,
 	MetaRegistry,
 	RegistryCategory,
 	WorldgenFileCategory,
@@ -27,18 +28,23 @@ import * as json from '@spyglassmc/json'
 import { localeQuote, localize } from '@spyglassmc/locales'
 import type * as mcf from '@spyglassmc/mcfunction'
 import { getTagValues } from '../../common/index.js'
+import { ReleaseVersion } from '../../dependency/common.js'
 import {
 	ColorArgumentValues,
 	EntityAnchorArgumentValues,
 	GamemodeArgumentValues,
+	HeightmapValues,
 	ItemSlotArgumentValues,
+	MirrorValues,
 	OperationArgumentValues,
+	RotationValues,
 	ScoreboardSlotArgumentValues,
 	SwizzleArgumentValues,
 } from '../common/index.js'
 import type {
 	BlockStatesNode,
 	EntitySelectorArgumentsNode,
+	ItemOldNode,
 } from '../node/index.js'
 import {
 	BlockNode,
@@ -53,9 +59,17 @@ import {
 } from '../node/index.js'
 import type { ArgumentTreeNode } from '../tree/index.js'
 
+function getItemStackFormat(ctx: CompleterContext): 'old' | 'new' {
+	const release = ctx.config.env.gameVersion as ReleaseVersion | undefined
+	return (release === undefined || ReleaseVersion.cmp(release, '1.20.5') < 0)
+		? 'old'
+		: 'new'
+}
+
 export const getMockNodes: mcf.completer.MockNodesGetter = (
 	rawTreeNode,
 	range,
+	ctx,
 ): Arrayable<AstNode> => {
 	const treeNode = rawTreeNode as ArgumentTreeNode
 
@@ -98,6 +112,8 @@ export const getMockNodes: mcf.completer.MockNodesGetter = (
 		case 'minecraft:entity':
 		case 'minecraft:game_profile':
 			return EntitySelectorNode.mock(range)
+		case 'minecraft:heightmap':
+			return LiteralNode.mock(range, { pool: HeightmapValues })
 		case 'minecraft:entity_anchor':
 			return LiteralNode.mock(range, { pool: EntityAnchorArgumentValues })
 		case 'minecraft:entity_summon':
@@ -111,11 +127,11 @@ export const getMockNodes: mcf.completer.MockNodesGetter = (
 		case 'minecraft:item_enchantment':
 			return ResourceLocationNode.mock(range, { category: 'enchantment' })
 		case 'minecraft:item_predicate':
-			return ItemNode.mock(range, true)
+			return ItemNode.mock(range, true, getItemStackFormat(ctx))
 		case 'minecraft:item_slot':
 			return LiteralNode.mock(range, { pool: ItemSlotArgumentValues })
 		case 'minecraft:item_stack':
-			return ItemNode.mock(range, false)
+			return ItemNode.mock(range, false, getItemStackFormat(ctx))
 		case 'minecraft:mob_effect':
 			return ResourceLocationNode.mock(range, { category: 'mob_effect' })
 		case 'minecraft:objective':
@@ -130,6 +146,7 @@ export const getMockNodes: mcf.completer.MockNodesGetter = (
 		case 'minecraft:particle':
 			return ParticleNode.mock(range)
 		case 'minecraft:resource':
+		case 'minecraft:resource_key':
 		case 'minecraft:resource_or_tag':
 			return ResourceLocationNode.mock(range, {
 				category: ResourceLocation.shorten(treeNode.properties.registry) as
@@ -152,6 +169,10 @@ export const getMockNodes: mcf.completer.MockNodesGetter = (
 			return LiteralNode.mock(range, { pool: SwizzleArgumentValues })
 		case 'minecraft:team':
 			return SymbolNode.mock(range, { category: 'team' })
+		case 'minecraft:template_mirror':
+			return LiteralNode.mock(range, { pool: MirrorValues })
+		case 'minecraft:template_rotation':
+			return LiteralNode.mock(range, { pool: RotationValues })
 		case 'minecraft:vec2':
 			return VectorNode.mock(range, { dimension: 2, integersOnly: true })
 		case 'minecraft:vec3':
@@ -243,7 +264,7 @@ const coordinate: Completer<CoordinateNode> = (node, _ctx) => {
 	return [CompletionItem.create('~', node)]
 }
 
-const item: Completer<ItemNode> = (node, ctx) => {
+const item: Completer<ItemOldNode> = (node, ctx) => {
 	const ans: CompletionItem[] = []
 	if (Range.contains(node.id, ctx.offset, true)) {
 		ans.push(...completer.resourceLocation(node.id, ctx))
@@ -299,7 +320,7 @@ const particle: Completer<ParticleNode> = (node, ctx) => {
 			VectorNode.mock(ctx.offset, { dimension: 3 }),
 		],
 		falling_dust: [BlockNode.mock(ctx.offset, false)],
-		item: [ItemNode.mock(ctx.offset, false)],
+		item: [ItemNode.mock(ctx.offset, false, getItemStackFormat(ctx))],
 		sculk_charge: [FloatNode.mock(ctx.offset)],
 		shriek: [IntegerNode.mock(ctx.offset)],
 		vibration: [
@@ -434,7 +455,7 @@ export function register(meta: MetaRegistry) {
 		selectorArguments,
 	)
 	meta.registerCompleter<IntRangeNode>('mcfunction:int_range', intRange)
-	meta.registerCompleter<ItemNode>('mcfunction:item', item)
+	meta.registerCompleter<ItemOldNode>('mcfunction:item', item)
 	meta.registerCompleter<ObjectiveCriteriaNode>(
 		'mcfunction:objective_criteria',
 		objectiveCriteria,

packages/java-edition/src/mcfunction/node/argument.ts

@@ -279,22 +279,60 @@ export interface FloatRangeNode extends core.AstNode {
 	value: [number | undefined, number | undefined]
 }
 
-export interface ItemNode extends core.AstNode {
+export interface ItemOldNode extends core.AstNode {
 	type: 'mcfunction:item'
 	children: (core.ResourceLocationNode | nbt.NbtCompoundNode)[]
 	id: core.ResourceLocationNode
 	nbt?: nbt.NbtCompoundNode
 }
+export namespace ItemOldNode {
+	export function is(node: core.AstNode | undefined): node is ItemOldNode {
+		return (node as ItemOldNode | undefined)?.type === 'mcfunction:item' &&
+			'nbt' in (node as ItemNode)
+	}
+}
+
+export interface ItemNewNode extends core.AstNode {
+	type: 'mcfunction:item'
+	children: (core.ResourceLocationNode | ComponentListNode)[]
+	id: core.ResourceLocationNode
+	components?: ComponentListNode
+}
+
+export namespace ItemNewNode {
+	export function is(node: core.AstNode | undefined): node is ItemNewNode {
+		return (node as ItemNewNode | undefined)?.type === 'mcfunction:item' &&
+			'components' in (node as ItemNode)
+	}
+}
+
+export type ItemNode = ItemOldNode | ItemNewNode
+
 export namespace ItemNode {
 	export function is(node: core.AstNode | undefined): node is ItemNode {
-		return (node as ItemNode | undefined)?.type === 'mcfunction:item'
+		return (
+			ItemOldNode.is(node) || ItemNewNode.is(node)
+		)
 	}
 
-	export function mock(range: core.RangeLike, isPredicate: boolean): ItemNode {
+	export function hasUserData(node: ItemNode): boolean {
+		if (ItemOldNode.is(node)) {
+			return !!node.nbt
+		} else {
+			return !!node.components
+		}
+	}
+
+	export function mock(
+		range: core.RangeLike,
+		isPredicate: boolean,
+		format: 'old' | 'new',
+	): ItemNode {
 		const id = core.ResourceLocationNode.mock(range, {
 			category: 'item',
 			allowTag: isPredicate,
 		})
+
 		return {
 			type: 'mcfunction:item',
 			range: core.Range.get(range),
@@ -304,6 +342,17 @@ export namespace ItemNode {
 	}
 }
 
+export interface ComponentListNode extends core.AstNode {
+	type: 'mcfunction:component_list'
+	children: core.PairNode<core.ResourceLocationNode, nbt.NbtNode>[]
+}
+
+export namespace ComponentListNode {
+	export function is(node: core.AstNode): node is ComponentListNode {
+		return (node as ComponentListNode).type === 'mcfunction:component_list'
+	}
+}
+
 export interface IntRangeNode extends core.AstNode {
 	type: 'mcfunction:int_range'
 	children: (core.IntegerNode | core.LiteralNode)[]