@spyglassmc/java-edition 0.3.27 → 0.3.28

package/lib/binder/index.d.ts

@@ -17,7 +17,7 @@ export declare function dissectUri(uri: string, ctx: UriBinderContext): {
     identifier: string;
     expected: string | undefined;
     path: string;
-    category: "function" | "advancement" | "banner_pattern" | "chat_type" | "damage_type" | "dimension" | "dimension_type" | "enchantment" | "enchantment_provider" | "instrument" | "item_modifier" | "jukebox_song" | "loot_table" | "painting_variant" | "predicate" | "recipe" | "structure" | "trial_spawner" | "trim_material" | "trim_pattern" | "wolf_variant" | "tag/function" | "tag/activity" | "tag/armor_material" | "tag/attribute" | "tag/block" | "tag/block_entity_type" | "tag/block_predicate_type" | "tag/block_type" | "tag/cat_variant" | "tag/chunk_status" | "tag/command_argument_type" | "tag/consume_effect_type" | "tag/creative_mode_tab" | "tag/custom_stat" | "tag/data_component_type" | "tag/decorated_pot_pattern" | "tag/decorated_pot_patterns" | "tag/enchantment_effect_component_type" | "tag/enchantment_entity_effect_type" | "tag/enchantment_level_based_value_type" | "tag/enchantment_location_based_effect_type" | "tag/enchantment_provider_type" | "tag/enchantment_value_effect_type" | "tag/entity_sub_predicate_type" | "tag/entity_type" | "tag/float_provider_type" | "tag/fluid" | "tag/frog_variant" | "tag/game_event" | "tag/height_provider_type" | "tag/instrument" | "tag/int_provider_type" | "tag/item" | "tag/item_sub_predicate_type" | "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/map_decoration_type" | "tag/memory_module_type" | "tag/menu" | "tag/mob_effect" | "tag/motive" | "tag/number_format_type" | "tag/particle_type" | "tag/point_of_interest_type" | "tag/pos_rule_test" | "tag/position_source_type" | "tag/potion" | "tag/recipe_book_category" | "tag/recipe_display" | "tag/recipe_serializer" | "tag/recipe_type" | "tag/rule_block_entity_modifier" | "tag/rule_test" | "tag/schedule" | "tag/sensor_type" | "tag/slot_display" | "tag/sound_event" | "tag/stat_type" | "tag/trigger_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/density_function_type" | "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/pool_alias_binding" | "tag/worldgen/root_placer_type" | "tag/worldgen/structure_feature" | "tag/worldgen/structure_piece" | "tag/worldgen/structure_placement" | "tag/worldgen/structure_pool_element" | "tag/worldgen/structure_processor" | "tag/worldgen/structure_type" | "tag/worldgen/surface_builder" | "tag/worldgen/tree_decorator_type" | "tag/worldgen/trunk_placer_type" | "tag/advancement" | "tag/banner_pattern" | "tag/chat_type" | "tag/damage_type" | "tag/dimension" | "tag/dimension_type" | "tag/enchantment" | "tag/enchantment_provider" | "tag/item_modifier" | "tag/jukebox_song" | "tag/loot_table" | "tag/painting_variant" | "tag/predicate" | "tag/recipe" | "tag/structure" | "tag/trial_spawner" | "tag/trim_material" | "tag/trim_pattern" | "tag/wolf_variant" | "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/flat_level_generator_preset" | "tag/worldgen/multi_noise_biome_source_parameter_list" | "tag/worldgen/noise" | "tag/worldgen/noise_settings" | "tag/worldgen/placed_feature" | "tag/worldgen/processor_list" | "tag/worldgen/structure" | "tag/worldgen/structure_set" | "tag/worldgen/template_pool" | "tag/worldgen/world_preset" | "worldgen/biome" | "worldgen/configured_carver" | "worldgen/configured_feature" | "worldgen/configured_structure_feature" | "worldgen/configured_surface_builder" | "worldgen/density_function" | "worldgen/flat_level_generator_preset" | "worldgen/multi_noise_biome_source_parameter_list" | "worldgen/noise" | "worldgen/noise_settings" | "worldgen/placed_feature" | "worldgen/processor_list" | "worldgen/structure" | "worldgen/structure_set" | "worldgen/template_pool" | "worldgen/world_preset" | "atlas" | "block_definition" | "equipment" | "font" | "font/ttf" | "font/otf" | "font/unihex" | "gpu_warnlist" | "item_definition" | "lang" | "lang/deprecated" | "model" | "particle" | "post_effect" | "regional_compliancies" | "shader" | "shader/fragment" | "shader/vertex" | "sound" | "sounds" | "texture" | "texture_meta";
+    category: "function" | "advancement" | "banner_pattern" | "chat_type" | "damage_type" | "dimension" | "dimension_type" | "enchantment" | "enchantment_provider" | "instrument" | "item_modifier" | "jukebox_song" | "loot_table" | "painting_variant" | "pig_variant" | "predicate" | "recipe" | "structure" | "trial_spawner" | "trim_material" | "trim_pattern" | "wolf_variant" | "tag/function" | "tag/activity" | "tag/armor_material" | "tag/attribute" | "tag/block" | "tag/block_entity_type" | "tag/block_predicate_type" | "tag/block_type" | "tag/cat_variant" | "tag/chunk_status" | "tag/command_argument_type" | "tag/consume_effect_type" | "tag/creative_mode_tab" | "tag/custom_stat" | "tag/data_component_type" | "tag/decorated_pot_pattern" | "tag/decorated_pot_patterns" | "tag/enchantment_effect_component_type" | "tag/enchantment_entity_effect_type" | "tag/enchantment_level_based_value_type" | "tag/enchantment_location_based_effect_type" | "tag/enchantment_provider_type" | "tag/enchantment_value_effect_type" | "tag/entity_sub_predicate_type" | "tag/entity_type" | "tag/float_provider_type" | "tag/fluid" | "tag/frog_variant" | "tag/game_event" | "tag/height_provider_type" | "tag/instrument" | "tag/int_provider_type" | "tag/item" | "tag/item_sub_predicate_type" | "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/map_decoration_type" | "tag/memory_module_type" | "tag/menu" | "tag/mob_effect" | "tag/motive" | "tag/number_format_type" | "tag/particle_type" | "tag/point_of_interest_type" | "tag/pos_rule_test" | "tag/position_source_type" | "tag/potion" | "tag/recipe_book_category" | "tag/recipe_display" | "tag/recipe_serializer" | "tag/recipe_type" | "tag/rule_block_entity_modifier" | "tag/rule_test" | "tag/schedule" | "tag/sensor_type" | "tag/slot_display" | "tag/sound_event" | "tag/stat_type" | "tag/trigger_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/density_function_type" | "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/pool_alias_binding" | "tag/worldgen/root_placer_type" | "tag/worldgen/structure_feature" | "tag/worldgen/structure_piece" | "tag/worldgen/structure_placement" | "tag/worldgen/structure_pool_element" | "tag/worldgen/structure_processor" | "tag/worldgen/structure_type" | "tag/worldgen/surface_builder" | "tag/worldgen/tree_decorator_type" | "tag/worldgen/trunk_placer_type" | "tag/advancement" | "tag/banner_pattern" | "tag/chat_type" | "tag/damage_type" | "tag/dimension" | "tag/dimension_type" | "tag/enchantment" | "tag/enchantment_provider" | "tag/item_modifier" | "tag/jukebox_song" | "tag/loot_table" | "tag/painting_variant" | "tag/pig_variant" | "tag/predicate" | "tag/recipe" | "tag/structure" | "tag/trial_spawner" | "tag/trim_material" | "tag/trim_pattern" | "tag/wolf_variant" | "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/flat_level_generator_preset" | "tag/worldgen/multi_noise_biome_source_parameter_list" | "tag/worldgen/noise" | "tag/worldgen/noise_settings" | "tag/worldgen/placed_feature" | "tag/worldgen/processor_list" | "tag/worldgen/structure" | "tag/worldgen/structure_set" | "tag/worldgen/template_pool" | "tag/worldgen/world_preset" | "worldgen/biome" | "worldgen/configured_carver" | "worldgen/configured_feature" | "worldgen/configured_structure_feature" | "worldgen/configured_surface_builder" | "worldgen/density_function" | "worldgen/flat_level_generator_preset" | "worldgen/multi_noise_biome_source_parameter_list" | "worldgen/noise" | "worldgen/noise_settings" | "worldgen/placed_feature" | "worldgen/processor_list" | "worldgen/structure" | "worldgen/structure_set" | "worldgen/template_pool" | "worldgen/world_preset" | "atlas" | "block_definition" | "equipment" | "font" | "font/ttf" | "font/otf" | "font/unihex" | "gpu_warnlist" | "item_definition" | "lang" | "lang/deprecated" | "model" | "particle" | "post_effect" | "regional_compliancies" | "shader" | "shader/fragment" | "shader/vertex" | "sound" | "sounds" | "texture" | "texture_meta";
     ext: `.${string}`;
     pack: "assets" | "data";
     since?: `1.${number}` | undefined;

package/lib/binder/index.js

@@ -52,6 +52,7 @@ resource('enchantment_provider', { since: '1.21' });
 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('trial_spawner', { since: '1.21.2' });
 resource('trim_pattern', { since: '1.19.4' });
 resource('trim_material', { since: '1.19.4' });

package/lib/dependency/mcmeta.d.ts

@@ -1,7 +1,7 @@
 import * as core from '@spyglassmc/core';
 import type { PackMcmeta, VersionInfo } from './common.js';
 import { ReleaseVersion } from './common.js';
-export declare const NEXT_RELEASE_VERSION = "1.21.4";
+export declare const NEXT_RELEASE_VERSION = "1.21.5";
 /**
  * @param inputVersion {@link core.Config.env.gameVersion}
  */

package/lib/dependency/mcmeta.js

@@ -1,7 +1,7 @@
 import * as core from '@spyglassmc/core';
 import { ReleaseVersion } from './common.js';
 // DOCS: Update this when a new snapshot cycle begins
-export const NEXT_RELEASE_VERSION = '1.21.4';
+export const NEXT_RELEASE_VERSION = '1.21.5';
 /**
  * @param inputVersion {@link core.Config.env.gameVersion}
  */

package/lib/mcfunction/checker/index.js

@@ -51,6 +51,9 @@ const rootCommand = (nodes, index, ctx) => {
         else if (json.TypedJsonNode.is(node)) {
             json.checker.typed(node, ctx);
         }
+        else if (nbt.TypedNbtNode.is(node)) {
+            nbt.checker.typed(node, ctx);
+        }
         else if (NbtNode.is(node) && node.properties) {
             const dispatchedBy = getEarlierNode(nodes, i, node.properties.dispatchedBy);
             const indexedBy = getEarlierNode(nodes, i, node.properties.indexedBy);

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

@@ -1,6 +1,7 @@
 import * as core from '@spyglassmc/core';
 import * as json from '@spyglassmc/json';
 import * as mcf from '@spyglassmc/mcfunction';
+import * as nbt from '@spyglassmc/nbt';
 import type { BlockNode, EntityNode, ParticleNode, ScoreHolderNode, UuidNode } from '../node/index.js';
 import { EntitySelectorNode } from '../node/index.js';
 /**
@@ -11,7 +12,9 @@ export declare const argument: mcf.ArgumentParserGetter;
 export declare const blockPredicate: core.InfallibleParser<BlockNode>;
 export declare function criterion(advancement: core.FullResourceLocation, usageType?: core.SymbolUsageType, terminators?: string[]): core.InfallibleParser<core.SymbolNode>;
 export declare function entity(amount: 'multiple' | 'single', type: 'entities' | 'players'): core.Parser<EntityNode>;
+export declare function typeRefParser(typeRef: `::${string}::${string}`): core.Parser<json.TypedJsonNode | nbt.TypedNbtNode>;
 export declare function jsonParser(typeRef: `::${string}::${string}`): core.Parser<json.TypedJsonNode>;
+export declare function nbtParser(typeRef: `::${string}::${string}`): core.Parser<nbt.TypedNbtNode>;
 export declare const particle: core.InfallibleParser<ParticleNode>;
 /**
  * Failure when not beginning with `@[parse]`

package/lib/mcfunction/parser/argument.js

@@ -87,7 +87,7 @@ export const argument = (rawTreeNode, prevNodes) => {
         case 'minecraft:column_pos':
             return wrap(vector({ dimension: 2, integersOnly: true }));
         case 'minecraft:component':
-            return wrap(jsonParser('::java::server::util::text::Text'));
+            return wrap(typeRefParser('::java::server::util::text::Text'));
         case 'minecraft:dimension':
             return wrap(core.resourceLocation({ category: 'dimension' }));
         case 'minecraft:entity':
@@ -133,11 +133,11 @@ export const argument = (rawTreeNode, prevNodes) => {
         case 'minecraft:mob_effect':
             return wrap(core.resourceLocation({ category: 'mob_effect' }));
         case 'minecraft:nbt_compound_tag':
-            return wrap(nbtParser(nbt.parser.compound, treeNode.properties));
+            return wrap(nbtDispatchedParser(nbt.parser.compound, treeNode.properties));
         case 'minecraft:nbt_path':
             return wrap(nbtPathParser(nbt.parser.path, treeNode.properties));
         case 'minecraft:nbt_tag':
-            return wrap(nbtParser(nbt.parser.entry, treeNode.properties));
+            return wrap(nbtDispatchedParser(nbt.parser.entry, treeNode.properties));
         case 'minecraft:objective':
             return wrap(objective(core.SymbolUsageType.is(treeNode.properties?.usageType)
                 ? treeNode.properties?.usageType
@@ -171,7 +171,7 @@ export const argument = (rawTreeNode, prevNodes) => {
                 return commandLiteral({ pool: getScoreboardSlotArgumentValues(ctx) })(src, ctx);
             });
         case 'minecraft:style':
-            return wrap(jsonParser('::java::server::util::text::TextStyle'));
+            return wrap(typeRefParser('::java::server::util::text::TextStyle'));
         case 'minecraft:swizzle':
             return wrap(commandLiteral({ pool: SwizzleArgumentValues }));
         case 'minecraft:team':
@@ -358,6 +358,15 @@ const itemPredicate = (src, ctx) => {
         return ans;
     })(src, ctx);
 };
+export function typeRefParser(typeRef) {
+    return (src, ctx) => {
+        const release = ctx.project['loadedVersion'];
+        if (!release || ReleaseVersion.cmp(release, '1.21.5') < 0) {
+            return jsonParser(typeRef)(src, ctx);
+        }
+        return nbtParser(typeRef)(src, ctx);
+    };
+}
 export function jsonParser(typeRef) {
     return core.map(json.parser.entry, (res) => ({
         type: 'json:typed',
@@ -366,6 +375,14 @@ export function jsonParser(typeRef) {
         targetType: { kind: 'reference', path: typeRef },
     }));
 }
+export function nbtParser(typeRef) {
+    return core.map(nbt.parser.entry, (res) => ({
+        type: 'nbt:typed',
+        range: res.range,
+        children: [res],
+        targetType: { kind: 'reference', path: typeRef },
+    }));
+}
 function commandLiteral(options) {
     return (src, ctx) => {
         const ans = core.literal(options)(src, ctx);
@@ -392,7 +409,7 @@ const message = (src, ctx) => {
     }
     return ans;
 };
-function nbtParser(parser, properties) {
+function nbtDispatchedParser(parser, properties) {
     return core.map(parser, (res) => {
         const ans = { type: 'mcfunction:nbt', range: res.range, children: [res], properties };
         return ans;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/java-edition",
-  "version": "0.3.27",
+  "version": "0.3.28",
   "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.21",
-    "@spyglassmc/json": "0.3.24",
+    "@spyglassmc/core": "0.4.22",
+    "@spyglassmc/json": "0.3.25",
     "@spyglassmc/locales": "0.3.12",
-    "@spyglassmc/mcfunction": "0.2.23",
-    "@spyglassmc/mcdoc": "0.3.25",
-    "@spyglassmc/nbt": "0.3.25"
+    "@spyglassmc/mcfunction": "0.2.24",
+    "@spyglassmc/mcdoc": "0.3.26",
+    "@spyglassmc/nbt": "0.3.26"
   },
   "devDependencies": {},
   "publishConfig": {