@spyglassmc/java-edition 0.3.3 → 0.3.4

package/lib/binder/index.d.ts

@@ -7,7 +7,7 @@ export declare const Categories: Map<string, {
 }>;
 export declare function getRels(uri: string, rootUris: readonly RootUriString[]): Generator<string, undefined, unknown>;
 export declare function dissectUri(uri: string, ctx: ContextBase): {
-    category: "function" | "advancement" | "dimension" | "dimension_type" | "item_modifier" | "loot_table" | "predicate" | "recipe" | "structure" | "worldgen/biome" | "worldgen/configured_carver" | "worldgen/configured_feature" | "worldgen/configured_structure_feature" | "worldgen/configured_surface_builder" | "worldgen/density_function" | "worldgen/noise" | "worldgen/noise_settings" | "worldgen/placed_feature" | "worldgen/processor_list" | "worldgen/template_pool" | "tag/function" | "tag/activity" | "tag/attribute" | "tag/block" | "tag/block_entity_type" | "tag/block_predicate_type" | "tag/chunk_status" | "tag/custom_stat" | "tag/enchantment" | "tag/entity_type" | "tag/float_provider_type" | "tag/fluid" | "tag/game_event" | "tag/height_provider_type" | "tag/int_provider_type" | "tag/item" | "tag/loot_condition_type" | "tag/loot_function_type" | "tag/loot_nbt_provider_type" | "tag/loot_number_provider_type" | "tag/loot_pool_entry_type" | "tag/loot_score_provider_type" | "tag/memory_module_type" | "tag/menu" | "tag/mob_effect" | "tag/motive" | "tag/particle_type" | "tag/point_of_interest_type" | "tag/pos_rule_test" | "tag/position_source_type" | "tag/potion" | "tag/recipe_serializer" | "tag/recipe_type" | "tag/rule_test" | "tag/schedule" | "tag/sensor_type" | "tag/sound_event" | "tag/stat_type" | "tag/villager_profession" | "tag/villager_type" | "tag/worldgen/biome_source" | "tag/worldgen/block_placer_type" | "tag/worldgen/block_state_provider_type" | "tag/worldgen/carver" | "tag/worldgen/chunk_generator" | "tag/worldgen/decorator" | "tag/worldgen/feature" | "tag/worldgen/feature_size_type" | "tag/worldgen/foliage_placer_type" | "tag/worldgen/material_condition" | "tag/worldgen/material_rule" | "tag/worldgen/placement_modifier_type" | "tag/worldgen/structure_feature" | "tag/worldgen/structure_piece" | "tag/worldgen/structure_pool_element" | "tag/worldgen/structure_processor" | "tag/worldgen/surface_builder" | "tag/worldgen/tree_decorator_type" | "tag/worldgen/trunk_placer_type" | "tag/worldgen/biome" | "tag/worldgen/configured_carver" | "tag/worldgen/configured_feature" | "tag/worldgen/configured_structure_feature" | "tag/worldgen/configured_surface_builder" | "tag/worldgen/density_function" | "tag/worldgen/noise" | "tag/worldgen/noise_settings" | "tag/worldgen/placed_feature" | "tag/worldgen/processor_list" | "tag/worldgen/template_pool";
+    category: "function" | "advancement" | "chat_type" | "damage_type" | "dimension" | "dimension_type" | "item_modifier" | "loot_table" | "predicate" | "recipe" | "structure" | "trim_material" | "trim_pattern" | "tag/function" | "tag/activity" | "tag/attribute" | "tag/block" | "tag/block_entity_type" | "tag/block_predicate_type" | "tag/chunk_status" | "tag/custom_stat" | "tag/enchantment" | "tag/entity_type" | "tag/float_provider_type" | "tag/fluid" | "tag/game_event" | "tag/height_provider_type" | "tag/int_provider_type" | "tag/item" | "tag/loot_condition_type" | "tag/loot_function_type" | "tag/loot_nbt_provider_type" | "tag/loot_number_provider_type" | "tag/loot_pool_entry_type" | "tag/loot_score_provider_type" | "tag/memory_module_type" | "tag/menu" | "tag/mob_effect" | "tag/motive" | "tag/particle_type" | "tag/point_of_interest_type" | "tag/pos_rule_test" | "tag/position_source_type" | "tag/potion" | "tag/recipe_serializer" | "tag/recipe_type" | "tag/rule_test" | "tag/schedule" | "tag/sensor_type" | "tag/sound_event" | "tag/stat_type" | "tag/villager_profession" | "tag/villager_type" | "tag/worldgen/biome_source" | "tag/worldgen/block_placer_type" | "tag/worldgen/block_state_provider_type" | "tag/worldgen/carver" | "tag/worldgen/chunk_generator" | "tag/worldgen/decorator" | "tag/worldgen/feature" | "tag/worldgen/feature_size_type" | "tag/worldgen/foliage_placer_type" | "tag/worldgen/material_condition" | "tag/worldgen/material_rule" | "tag/worldgen/placement_modifier_type" | "tag/worldgen/structure_feature" | "tag/worldgen/structure_piece" | "tag/worldgen/structure_pool_element" | "tag/worldgen/structure_processor" | "tag/worldgen/surface_builder" | "tag/worldgen/tree_decorator_type" | "tag/worldgen/trunk_placer_type" | "tag/worldgen/biome" | "tag/worldgen/configured_carver" | "tag/worldgen/configured_feature" | "tag/worldgen/configured_structure_feature" | "tag/worldgen/configured_surface_builder" | "tag/worldgen/density_function" | "tag/worldgen/noise" | "tag/worldgen/noise_settings" | "tag/worldgen/placed_feature" | "tag/worldgen/processor_list" | "tag/worldgen/template_pool" | "worldgen/biome" | "worldgen/configured_carver" | "worldgen/configured_feature" | "worldgen/configured_structure_feature" | "worldgen/configured_surface_builder" | "worldgen/density_function" | "worldgen/noise" | "worldgen/noise_settings" | "worldgen/placed_feature" | "worldgen/processor_list" | "worldgen/template_pool";
     namespace: string;
     identifier: string;
 } | undefined;

package/lib/binder/index.js

@@ -6,7 +6,7 @@ export const Categories = (() => {
         'fluid',
         'function',
         'game_event',
-        'item',
+        'item', // They have the legacy `tags/${plural}` path.
         'worldgen/block_placer_type',
         'worldgen/surface_builder', // They are removed at some point.
     ]);

package/lib/dependency/common.d.ts

@@ -14,10 +14,6 @@ export interface VersionInfo {
     name: string;
     isLatest: boolean;
 }
-/**
- * A map from `pack_format` numbers to a RegExp. The latest version whose `release_target` matches the RegExp should be used.
- */
-export declare const PackVersionMap: Record<number, RegExp | undefined>;
 export interface PackMcmeta {
     pack: {
         pack_format: number;

package/lib/dependency/common.js

@@ -11,18 +11,6 @@ export var ReleaseVersion;
     }
     ReleaseVersion.cmp = cmp;
 })(ReleaseVersion || (ReleaseVersion = {}));
-// DOCS: Update here when format_version is changed.
-/**
- * A map from `pack_format` numbers to a RegExp. The latest version whose `release_target` matches the RegExp should be used.
- */
-export const PackVersionMap = {
-    5: /^1\.15.*$/,
-    6: /^1\.16.*$/,
-    7: /^1\.17.*$/,
-    8: /^1\.18(\.1)?$/,
-    9: /^1\.18.*$/,
-    10: /^1\.19.*$/,
-};
 export var PackMcmeta;
 (function (PackMcmeta) {
     function assert(data) {
@@ -30,9 +18,6 @@ export var PackMcmeta;
         if (!format) {
             throw new Error('“pack.pack_format” undefined');
         }
-        if (!Object.keys(PackVersionMap).includes(format)) {
-            throw new Error(`Unknown pack_format “${format}”`);
-        }
     }
     PackMcmeta.assert = assert;
 })(PackMcmeta || (PackMcmeta = {}));

package/lib/dependency/index.d.ts

@@ -17,6 +17,14 @@ interface GetMcmetaSummaryResult extends Partial<McmetaSummary> {
  * @throws Network/file system errors.
  */
 export declare function getMcmetaSummary(externals: core.Externals, downloader: core.Downloader, logger: core.Logger, version: string, isLatest: boolean, source: string, overridePaths?: core.EnvConfig['mcmetaSummaryOverrides']): Promise<GetMcmetaSummaryResult>;
+/**
+ * @throws Network/file system errors.
+ *
+ * @returns
+ * 	- `startDepth`: The amount of level to skip when unzipping the tarball.
+ * 	- `uri`: URI to the `.tar.gz` file.
+ */
+export declare function getVanillaDatapack(downloader: core.Downloader, version: string, isLatest: boolean): Promise<core.Dependency>;
 /**
  * @throws Network/file system errors.
  *

package/lib/dependency/index.js

@@ -2,7 +2,7 @@ export * from './common.js';
 export * from './mcmeta.js';
 import * as core from '@spyglassmc/core';
 import { Fluids, getMcmetaSummaryUris } from './mcmeta.js';
-const DownloaderTtl = 15000;
+const DownloaderTtl = 15_000;
 /* istanbul ignore next */
 /**
  * Return the deserialized [`versions.json`][versions.json].
@@ -125,6 +125,28 @@ async function downloadGitHubRepo({ defaultBranch, downloader, getTag, repo, isL
     return out.cacheUri;
 }
 /* istanbul ignore next */
+/**
+ * @throws Network/file system errors.
+ *
+ * @returns
+ * 	- `startDepth`: The amount of level to skip when unzipping the tarball.
+ * 	- `uri`: URI to the `.tar.gz` file.
+ */
+export async function getVanillaDatapack(downloader, version, isLatest) {
+    const uri = await downloadGitHubRepo({
+        defaultBranch: 'data',
+        downloader,
+        getTag: (v) => `${v}-data`,
+        owner: 'misode',
+        repo: 'mcmeta',
+        isLatest,
+        version,
+    });
+    return {
+        info: { startDepth: 1 },
+        uri,
+    };
+}
 /**
  * @throws Network/file system errors.
  *

package/lib/dependency/mcmeta.d.ts

@@ -17,7 +17,7 @@ export declare const Fluids: McmetaStates;
 export interface McmetaVersion {
     id: string;
     name: string;
-    release_target: string;
+    release_target: string | undefined;
     type: 'release' | 'snapshot';
     stable: boolean;
     data_version: number;

package/lib/dependency/mcmeta.js

@@ -1,19 +1,31 @@
 import * as core from '@spyglassmc/core';
-import { PackVersionMap } from './common.js';
 /**
  * @param inputVersion {@link core.Config.env.gameVersion}
  */
 export function resolveConfiguredVersion(inputVersion, { packMcmeta, versions, }) {
-    function toVersionInfo(index) {
-        if (index < 0) {
-            index = 0;
+    function findReleaseTarget(version) {
+        if (version.release_target) {
+            return version.release_target;
         }
-        const version = versions[index];
+        if (version.type === 'release') {
+            return version.id;
+        }
+        const index = versions.findIndex((v) => v.id === version.id);
+        for (let i = index; i >= 0; i -= 1) {
+            if (versions[i].type === 'release') {
+                return versions[i].id;
+            }
+        }
+        // DOCS: Update this when a new snapshot cycle begins
+        return '1.21';
+    }
+    function toVersionInfo(version) {
+        version = version ?? versions[0];
         return {
             id: version.id,
             name: version.name,
-            release: (version.release_target ?? '1.99'),
-            isLatest: index === 0,
+            release: findReleaseTarget(version),
+            isLatest: version === versions[0],
         };
     }
     if (versions.length === 0) {
@@ -21,22 +33,40 @@ export function resolveConfiguredVersion(inputVersion, { packMcmeta, versions, }
     }
     inputVersion = inputVersion.toLowerCase();
     versions = versions.sort((a, b) => b.data_version - a.data_version);
+    const latestRelease = versions.find((v) => v.type === 'release');
     if (inputVersion === 'auto') {
-        if (packMcmeta) {
-            const regex = PackVersionMap[packMcmeta.pack.pack_format];
-            if (regex) {
-                return toVersionInfo(versions.findIndex((v) => regex.test(v.release_target)));
+        if (packMcmeta && latestRelease) {
+            // If the pack format is larger than the latest release, use the latest snapshot
+            if (packMcmeta.pack.pack_format > latestRelease.data_pack_version) {
+                return toVersionInfo(versions[0]);
+            }
+            // Look for versions from recent to oldest, picking the most recent release that matches
+            let oldestRelease = undefined;
+            for (const version of versions) {
+                if (version.type === 'release') {
+                    // If we already passed the pack format, use the oldest release so far
+                    if (packMcmeta.pack.pack_format > version.data_pack_version) {
+                        return toVersionInfo(oldestRelease);
+                    }
+                    if (packMcmeta.pack.pack_format === version.data_pack_version) {
+                        return toVersionInfo(version);
+                    }
+                    oldestRelease = version;
+                }
             }
+            // If the pack format is still lower, use the oldest known release version
+            return toVersionInfo(oldestRelease);
         }
-        return toVersionInfo(0);
+        // Fall back to the latest release if pack mcmeta is not available
+        return toVersionInfo(latestRelease);
     }
     else if (inputVersion === 'latest release') {
-        return toVersionInfo(versions.findIndex((v) => v.type === 'release'));
+        return toVersionInfo(latestRelease);
     }
     else if (inputVersion === 'latest snapshot') {
-        return toVersionInfo(versions.findIndex((v) => v.type === 'snapshot'));
+        return toVersionInfo(versions[0]);
     }
-    return toVersionInfo(versions.findIndex((v) => inputVersion === v.id.toLowerCase() ||
+    return toVersionInfo(versions.find((v) => inputVersion === v.id.toLowerCase() ||
         inputVersion === v.name.toLowerCase()));
 }
 const DataSources = {

package/lib/index.js

@@ -2,6 +2,7 @@ import * as core from '@spyglassmc/core';
 import * as mcdoc from '@spyglassmc/mcdoc';
 import * as nbt from '@spyglassmc/nbt';
 import { uriBinder } from './binder/index.js';
+import { getVanillaDatapack } from './dependency/index.js';
 import { getMcmetaSummary, getVanillaMcdoc, getVersions, PackMcmeta, resolveConfiguredVersion, symbolRegistrar, } from './dependency/index.js';
 import * as jeJson from './json/index.js';
 import * as jeMcf from './mcfunction/index.js';
@@ -37,6 +38,7 @@ export const initialize = async (ctx) => {
         packMcmeta,
         versions,
     });
+    meta.registerDependencyProvider('@vanilla-datapack', () => getVanillaDatapack(downloader, version, isLatest));
     meta.registerDependencyProvider('@vanilla-mcdoc', () => getVanillaMcdoc(downloader));
     const summary = await getMcmetaSummary(ctx.externals, downloader, logger, version, isLatest, config.env.dataSource, config.env.mcmetaSummaryOverrides);
     if (!summary.blocks ||

package/lib/mcfunction/checker/index.js

@@ -4,7 +4,6 @@ import { localize } from '@spyglassmc/locales';
 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 { BlockNode, EntityNode, ItemNode, ParticleNode } from '../node/index.js';
 export const command = (node, ctx) => {
     if (node.slash && node.parent && mcf.McfunctionNode.is(node.parent)) {
@@ -33,7 +32,7 @@ const rootCommand = (nodes, index, ctx) => {
             particle(node, ctx);
         }
         else if (json.JsonNode.is(node)) {
-            text_component(node, { ...ctx, context: '' });
+            // TODO v4.0: check text component
         }
     }
     if (getName(nodes, index) === 'data') {

package/lib/mcfunction/common/index.d.ts

@@ -1,7 +1,11 @@
 export declare const ColorArgumentValues: string[];
 export declare const EntityAnchorArgumentValues: string[];
+export declare const GamemodeArgumentValues: string[];
 export declare const ItemSlotArgumentValues: string[];
 export declare const OperationArgumentValues: string[];
 export declare const ScoreboardSlotArgumentValues: string[];
 export declare const SwizzleArgumentValues: string[];
+export declare const HeightmapValues: string[];
+export declare const RotationValues: string[];
+export declare const MirrorValues: string[];
 //# sourceMappingURL=index.d.ts.map

package/lib/mcfunction/common/index.js

@@ -1,6 +1,12 @@
 import * as core from '@spyglassmc/core';
 export const ColorArgumentValues = [...core.Color.ColorNames, 'reset'];
 export const EntityAnchorArgumentValues = ['feet', 'eyes'];
+export const GamemodeArgumentValues = [
+    'adventure',
+    'survival',
+    'creative',
+    'spectator',
+];
 export const ItemSlotArgumentValues = [
     ...[...Array(54).keys()].map((n) => `container.${n}`),
     ...[...Array(27).keys()].map((n) => `enderchest.${n}`),
@@ -53,4 +59,23 @@ 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',
+];
 //# sourceMappingURL=index.js.map

package/lib/mcfunction/completer/argument.js

@@ -2,7 +2,7 @@ import { AstNode, BooleanNode, BrigadierStringOptions, completer, CompletionItem
 import * as json from '@spyglassmc/json';
 import { localeQuote, localize } from '@spyglassmc/locales';
 import { getTagValues } from '../../common/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 { BlockNode, CoordinateNode, EntitySelectorNode, IntRangeNode, ItemNode, ObjectiveCriteriaNode, ParticleNode, ScoreHolderNode, VectorNode, } from '../node/index.js';
 export const getMockNodes = (rawTreeNode, range) => {
     const treeNode = rawTreeNode;
@@ -45,12 +45,16 @@ export const getMockNodes = (rawTreeNode, range) => {
         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':
             return ResourceLocationNode.mock(range, { category: 'entity_type' });
         case 'minecraft:function':
             return ResourceLocationNode.mock(range, { category: 'function' });
+        case 'minecraft:gamemode':
+            return LiteralNode.mock(range, { pool: GamemodeArgumentValues });
         case 'minecraft:int_range':
             return IntRangeNode.mock(range);
         case 'minecraft:item_enchantment':
@@ -75,6 +79,7 @@ export const getMockNodes = (rawTreeNode, range) => {
         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),
@@ -92,6 +97,10 @@ export const getMockNodes = (rawTreeNode, range) => {
             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':

package/lib/mcfunction/inlayHintProvider.js

@@ -13,7 +13,8 @@ export const inlayHintProvider = (node, ctx) => {
                 config.enabledNodes.includes(node.children[0].type))) {
             ans.push({
                 offset: node.range.start,
-                text: `${node.path[node.path.length - 1]}:`,
+                label: `${node.path[node.path.length - 1]}:`,
+                paddingRight: true,
             });
         }
     });

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

@@ -78,9 +78,9 @@ export interface EntitySelectorNode extends core.AstNode {
     typeLimited?: boolean;
 }
 export declare namespace EntitySelectorNode {
-    function is<T extends core.DeepReadonly<core.AstNode> | undefined>(node: T): node is core.NodeIsHelper<EntitySelectorNode, T>;
+    function is<T extends core.DeepReadonly<core.AstNode> | undefined>(node: T): node is core.InheritReadonly<EntitySelectorNode, T>;
     function mock(range: core.RangeLike): EntitySelectorNode;
-    const ArgumentKeys: Set<"predicate" | "tag" | "team" | "type" | "level" | "advancements" | "sort" | "nbt" | "name" | "distance" | "gamemode" | "limit" | "scores" | "x" | "y" | "z" | "dx" | "dy" | "dz" | "x_rotation" | "y_rotation">;
+    const ArgumentKeys: Set<"predicate" | "tag" | "team" | "type" | "level" | "advancements" | "sort" | "distance" | "gamemode" | "limit" | "name" | "nbt" | "scores" | "x" | "y" | "z" | "dx" | "dy" | "dz" | "x_rotation" | "y_rotation">;
     type ArgumentKey = typeof ArgumentKeys extends Set<infer T> ? T : undefined;
     const enum Result {
         Ok = 0,

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,
@@ -561,7 +570,7 @@ function selector() {
                                                 .BrigadierUnquotableOption,
                                             value: {
                                                 type: 'literal',
-                                                parser: core.literal('adventure', 'creative', 'spectator', 'survival'),
+                                                parser: core.literal(...GamemodeArgumentValues),
                                             },
                                         })), (res, _, ctx) => {
                                             playersOnly = true;
@@ -778,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 {
@@ -796,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}\`
@@ -806,7 +815,7 @@ function getEntitySelectorHover(node) {
         ans += `
 
 ------
-**Predicates**: 
+**Predicates**:
 ${node.predicates.map((p) => `- \`${p}\``).join('\n')}`;
     }
     return ans;

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 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.3",
+  "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.2",
-    "@spyglassmc/json": "0.3.3",
-    "@spyglassmc/locales": "0.3.2",
-    "@spyglassmc/mcfunction": "0.2.4",
-    "@spyglassmc/mcdoc": "0.3.3",
-    "@spyglassmc/nbt": "0.3.3"
+    "@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