sandstone 1.1.1 → 1.1.2

package/src/core/resources/datapack/bannerPattern.ts

@@ -1,4 +1,4 @@
-import { RESOURCE_PATHS, type SymbolResource } from 'sandstone/arguments'
+import { RESOURCE_PATHS, type MCDocToJSON, type SymbolResource } from 'sandstone/arguments'
 import { ContainerNode } from '../../nodes'
 import type { SandstoneCore } from '../../sandstoneCore'
 import type { ResourceClassArguments, ResourceNode } from '../resource'
@@ -22,7 +22,7 @@ export type BannerPatternClassArguments = {
   /**
    * The banner pattern's JSON.
    */
-  json: SymbolResource[(typeof BannerPatternClass)['resourceType']]
+  json: MCDocToJSON<SymbolResource[(typeof BannerPatternClass)['resourceType']]>
 } & ResourceClassArguments<'default'>
 
 export class BannerPatternClass extends ResourceClass<BannerPatternNode> {

package/src/core/resources/datapack/chatType.ts

@@ -1,4 +1,4 @@
-import { RESOURCE_PATHS, type SymbolResource } from 'sandstone/arguments'
+import { RESOURCE_PATHS, type MCDocToJSON, type SymbolResource } from 'sandstone/arguments'
 import { ContainerNode } from '../../nodes'
 import type { SandstoneCore } from '../../sandstoneCore'
 import type { ResourceClassArguments, ResourceNode } from '../resource'
@@ -22,7 +22,7 @@ export type ChatTypeClassArguments = {
   /**
    * The chat type's JSON.
    */
-  json: SymbolResource[(typeof ChatTypeClass)['resourceType']]
+  json: MCDocToJSON<SymbolResource[(typeof ChatTypeClass)['resourceType']]>
 } & ResourceClassArguments<'default'>
 
 export class ChatTypeClass extends ResourceClass<ChatTypeNode> {

package/src/core/resources/datapack/damageType.ts

@@ -1,8 +1,8 @@
 /* eslint-disable max-len */
 
-import { RESOURCE_PATHS, type Coordinates, type SingleEntityArgument, type SymbolResource } from 'sandstone/arguments'
+import { RESOURCE_PATHS, type Coordinates, type SingleEntityArgument, type MCDocToJSON, type SymbolResource } from 'sandstone/arguments'
 import type { SetType } from 'sandstone/utils'
-import type { ComponentClass } from 'sandstone/variables'
+import type { TextComponentClass } from 'sandstone/variables'
 import { ContainerNode } from '../../nodes'
 import type { SandstoneCore } from '../../sandstoneCore'
 import type { ResourceClassArguments, ResourceNode } from '../resource'
@@ -30,7 +30,7 @@ export type DamageTypeClassArguments = {
   /**
    * The damage type's JSON.
    */
-  json: SymbolResource[(typeof DamageTypeClass)['resourceType']]
+  json: MCDocToJSON<SymbolResource[(typeof DamageTypeClass)['resourceType']]>
 } & ResourceClassArguments<'default'> & {
     /**
      * Optional. Automatically adds damage type to minecraft damage type group tag flags.
@@ -38,7 +38,9 @@ export type DamageTypeClassArguments = {
     flags?: (SetType<typeof TAG_DAMAGE_TYPES_SET> | 'bypasses_cooldown')[] // Haha funny bypasses_cooldown doesn't show up in the server reports
   }
 
-export class DamageTypeClass extends ResourceClass<DamageTypeNode> implements ComponentClass {
+export class DamageTypeClass extends ResourceClass<DamageTypeNode> implements TextComponentClass {
+  declare readonly __textComponentClassBrand: true
+
   static readonly resourceType = 'damage_type' as const
 
   public damageTypeJSON: DamageTypeClassArguments['json']
@@ -132,7 +134,7 @@ export class DamageTypeClass extends ResourceClass<DamageTypeNode> implements Co
   }
 
   /** @internal */
-  _toChatComponent = () => ({ translate: this.translationKey })
+  _toChatComponent = () => ({ translate: this.translationKey as `${string}:${string}` })
 
   toString = () => this.name
 }

package/src/core/resources/datapack/dialog.ts

@@ -1,4 +1,4 @@
-import { RESOURCE_PATHS, type SymbolResource } from 'sandstone/arguments'
+import { RESOURCE_PATHS, type MCDocToJSON, type SymbolResource } from 'sandstone/arguments'
 import { ContainerNode } from '../../nodes'
 import type { SandstoneCore } from '../../sandstoneCore'
 import type { ResourceClassArguments, ResourceNode } from '../resource'
@@ -22,7 +22,7 @@ export type DialogClassArguments = {
   /**
    * The dialog's JSON.
    */
-  json: SymbolResource[(typeof DialogClass)['resourceType']]
+  json: MCDocToJSON<SymbolResource[(typeof DialogClass)['resourceType']]>
 } & ResourceClassArguments<'default'>
 
 export class DialogClass extends ResourceClass<DialogNode> {

package/src/core/resources/datapack/enchantment.ts

@@ -1,4 +1,4 @@
-import { RESOURCE_PATHS, type SymbolResource } from 'sandstone/arguments'
+import { RESOURCE_PATHS, type MCDocToJSON, type SymbolResource } from 'sandstone/arguments'
 import { ContainerNode } from '../../nodes'
 import type { SandstoneCore } from '../../sandstoneCore'
 import type { ResourceClassArguments, ResourceNode } from '../resource'
@@ -26,7 +26,7 @@ export type EnchantmentClassArguments = {
   /**
    * The enchantment's JSON.
    */
-  json: SymbolResource[(typeof EnchantmentClass)['resourceType']]
+  json: MCDocToJSON<SymbolResource[(typeof EnchantmentClass)['resourceType']]>
 } & ResourceClassArguments<'default'>
 
 export class EnchantmentClass extends ResourceClass<EnchantmentNode> {
@@ -72,7 +72,7 @@ export type EnchantmentProviderClassArguments = {
   /**
    * The enchantment provider's JSON.
    */
-  json: SymbolResource[(typeof EnchantmentProviderClass)['resourceType']]
+  json: MCDocToJSON<SymbolResource[(typeof EnchantmentProviderClass)['resourceType']]>
 } & ResourceClassArguments<'default'>
 
 export class EnchantmentProviderClass extends ResourceClass<EnchantmentProviderNode> {

package/src/core/resources/datapack/gametest.ts

@@ -1,4 +1,4 @@
-import { RESOURCE_PATHS, type SymbolResource } from 'sandstone/arguments'
+import { RESOURCE_PATHS, type MCDocToJSON, type SymbolResource } from 'sandstone/arguments'
 import { ContainerNode } from '../../nodes'
 import type { SandstoneCore } from '../../sandstoneCore'
 import type { ResourceClassArguments, ResourceNode } from '../resource'
@@ -26,7 +26,7 @@ export type TestEnvironmentClassArguments = {
   /**
    * The test environment's JSON.
    */
-  json: SymbolResource[(typeof TestEnvironmentClass)['resourceType']]
+  json: MCDocToJSON<SymbolResource[(typeof TestEnvironmentClass)['resourceType']]>
 } & ResourceClassArguments<'default'>
 
 export class TestEnvironmentClass extends ResourceClass<TestEnvironmentNode> {
@@ -72,7 +72,7 @@ export type TestInstanceClassArguments = {
   /**
    * The test instance's JSON.
    */
-  json: SymbolResource[(typeof TestInstanceClass)['resourceType']]
+  json: MCDocToJSON<SymbolResource[(typeof TestInstanceClass)['resourceType']]>
 } & ResourceClassArguments<'default'>
 
 export class TestInstanceClass extends ResourceClass<TestInstanceNode> {

package/src/core/resources/datapack/index.ts

@@ -2,7 +2,7 @@ export * from './advancement'
 export * from './bannerPattern'
 export * from './chatType'
 export * from './damageType'
-export * from './decoratedPotPattern'
+// export * from './decoratedPotPattern'
 export * from './dialog'
 export * from './enchantment'
 export * from './gametest'
@@ -13,7 +13,7 @@ export * from './lootTable'
 export * from './mcfunction'
 export * from './predicate'
 export * from './recipe'
-export * from './slotSource'
+// export * from './slotSource'
 export * from './structure'
 export * from './sulfurCubeArchetype'
 export * from './tag'

package/src/core/resources/datapack/instrument.ts

@@ -1,4 +1,4 @@
-import { RESOURCE_PATHS, type SymbolResource } from 'sandstone/arguments'
+import { RESOURCE_PATHS, type MCDocToJSON, type SymbolResource } from 'sandstone/arguments'
 import { ContainerNode } from '../../nodes'
 import type { SandstoneCore } from '../../sandstoneCore'
 import type { ResourceClassArguments, ResourceNode } from '../resource'
@@ -22,7 +22,7 @@ export type InstrumentClassArguments = {
   /**
    * The instrument's JSON.
    */
-  json: SymbolResource[(typeof InstrumentClass)['resourceType']]
+  json: MCDocToJSON<SymbolResource[(typeof InstrumentClass)['resourceType']]>
 } & ResourceClassArguments<'default'>
 
 export class InstrumentClass extends ResourceClass<InstrumentNode> {

package/src/core/resources/datapack/itemModifier.ts

@@ -4,7 +4,7 @@ import {
   type Coordinates,
   type ENTITY_SLOTS,
   type MultipleEntitiesArgument,
-  type SymbolResource,
+  type MCDocToJSON, type SymbolResource,
 } from 'sandstone/arguments'
 import { targetParser } from 'sandstone/variables/parsers'
 import { ContainerNode } from '../../nodes'
@@ -26,13 +26,13 @@ export class ItemModifierNode extends ContainerNode implements ResourceNode<Item
   getValue = () => jsonStringify(this.resource.itemModifierJSON, this.resource._resourceType as keyof typeof RESOURCE_PATHS)
 }
 
-type ItemModifierJSON = SymbolResource['item_modifier']
+type ItemModifierJSON = MCDocToJSON<SymbolResource['item_modifier']>
 
 export type ItemModifierClassArguments = {
   /**
    * The item modifier's JSON.
    */
-  json: SymbolResource[(typeof ItemModifierClass)['resourceType']]
+  json: MCDocToJSON<SymbolResource[(typeof ItemModifierClass)['resourceType']]>
 } & ResourceClassArguments<'list'>
 
 type Modifier = ItemModifierJSON | ItemModifierClass

package/src/core/resources/datapack/jukeboxSong.ts

@@ -1,4 +1,4 @@
-import { RESOURCE_PATHS, type SymbolResource } from 'sandstone/arguments'
+import { RESOURCE_PATHS, type MCDocToJSON, type SymbolResource } from 'sandstone/arguments'
 import { ContainerNode } from '../../nodes'
 import type { SandstoneCore } from '../../sandstoneCore'
 import type { ResourceClassArguments, ResourceNode } from '../resource'
@@ -22,7 +22,7 @@ export type JukeboxSongClassArguments = {
   /**
    * The jukebox song's JSON.
    */
-  json: SymbolResource[(typeof JukeboxSongClass)['resourceType']]
+  json: MCDocToJSON<SymbolResource[(typeof JukeboxSongClass)['resourceType']]>
 } & ResourceClassArguments<'default'>
 
 export class JukeboxSongClass extends ResourceClass<JukeboxSongNode> {

package/src/core/resources/datapack/lootTable.ts

@@ -5,7 +5,7 @@ import {
   type ENTITY_SLOTS,
   type MultipleEntitiesArgument,
   type MultiplePlayersArgumentOf,
-  type SymbolResource,
+  type MCDocToJSON, type SymbolResource,
 } from 'sandstone/arguments'
 import type { LiteralUnion } from 'sandstone/utils'
 import { ContainerNode } from '../../nodes'
@@ -31,7 +31,7 @@ export type LootTableClassArguments = {
   /**
    * The loot table's JSON.
    */
-  json: SymbolResource[(typeof LootTableClass)['resourceType']]
+  json: MCDocToJSON<SymbolResource[(typeof LootTableClass)['resourceType']]>
 } & ResourceClassArguments<'default'>
 
 export class LootTableClass extends ResourceClass<LootTableNode> {

package/src/core/resources/datapack/mcfunction.ts

@@ -479,13 +479,6 @@ export class _RawMCFunctionClass<
 
     this.node.body.splice(start, removeItems === 'auto' ? fullBody.length : removeItems, ...fullBody)
   }
-
-  /**
-   * @internal
-   */
-  toNBT() {
-    return this.name
-  }
 }
 
 export const MCFunctionClass = makeClassCallable(_RawMCFunctionClass)

package/src/core/resources/datapack/predicate.ts

@@ -1,4 +1,4 @@
-import { RESOURCE_PATHS, type SymbolResource } from 'sandstone/arguments'
+import { RESOURCE_PATHS, type MCDocToJSON, type SymbolResource } from 'sandstone/arguments'
 import type { ConditionClass } from 'sandstone/variables'
 import { ContainerNode } from '../../nodes'
 import type { SandstoneCore } from '../../sandstoneCore'
@@ -19,18 +19,20 @@ export class PredicateNode extends ContainerNode implements ResourceNode<Predica
   getValue = () => jsonStringify(this.resource.predicateJSON, this.resource._resourceType as keyof typeof RESOURCE_PATHS)
 }
 
-type PredicateJSON = NonNullable<SymbolResource['predicate']>
+type PredicateJSON = NonNullable<MCDocToJSON<SymbolResource['predicate']>>
 
 export type PredicateClassArguments = {
   /**
    * The predicate's JSON.
    */
-  json: SymbolResource[(typeof PredicateClass)['resourceType']]
+  json: MCDocToJSON<SymbolResource[(typeof PredicateClass)['resourceType']]>
 } & ResourceClassArguments<'list'>
 
 type Predicate = PredicateJSON | PredicateClass
 
 export class PredicateClass extends ResourceClass<PredicateNode> implements ListResource, ConditionClass {
+  declare readonly __conditionClassBrand: true
+
   static readonly resourceType = 'predicate' as const
 
   public predicateJSON: NonNullable<PredicateClassArguments['json']>

package/src/core/resources/datapack/recipe.ts

@@ -1,4 +1,4 @@
-import { RESOURCE_PATHS, type SymbolResource, type MultiplePlayersArgumentOf } from 'sandstone/arguments'
+import { RESOURCE_PATHS, type MCDocToJSON, type SymbolResource, type MultiplePlayersArgumentOf } from 'sandstone/arguments'
 import { ContainerNode } from '../../nodes'
 import type { SandstoneCore } from '../../sandstoneCore'
 import type { ResourceClassArguments, ResourceNode } from '../resource'
@@ -22,7 +22,7 @@ export type RecipeClassArguments = {
   /**
    * The recipe's JSON.
    */
-  json: SymbolResource[(typeof RecipeClass)['resourceType']]
+  json: MCDocToJSON<SymbolResource[(typeof RecipeClass)['resourceType']]>
 } & ResourceClassArguments<'default'>
 
 export class RecipeClass extends ResourceClass<RecipeNode> {

package/src/core/resources/datapack/structure.ts

@@ -82,7 +82,7 @@ type VariableInsertion = Score | DataPointClass<'storage'>
 export class StructureClass extends ResourceClass<StructureNode> {
   static readonly resourceType = 'structure' as const
 
-  structureBuffer?: Promise<Buffer>
+  structureBuffer?: Promise<ArrayBuffer | Buffer>
 
   structureNBT?: StructureNBT
 
@@ -106,7 +106,7 @@ export class StructureClass extends ResourceClass<StructureNode> {
       } else if (args.structure.structureBuffer) {
         this.structureBuffer = args.structure.structureBuffer
       } else {
-        this.structureBuffer = args.structure.structure() as Promise<Buffer>
+        this.structureBuffer = args.structure.structure() as Promise<ArrayBuffer | Buffer>
       }
     } else if (Array.isArray(args.structure)) {
       this.structureNBT = this.arrayToNBT(args.structure)
@@ -117,7 +117,7 @@ export class StructureClass extends ResourceClass<StructureNode> {
     this.handleConflicts()
   }
 
-  structure(): StructureNBT | Promise<Buffer> {
+  structure(): StructureNBT | Promise<ArrayBuffer | Buffer> {
     if (this.structureNBT) {
       return this.structureNBT
     }
@@ -130,7 +130,7 @@ export class StructureClass extends ResourceClass<StructureNode> {
   }
 
   async readBuffer() {
-    this.structureNBT = await decodeStructure(await (this.structureBuffer as Promise<Buffer>))
+    this.structureNBT = await decodeStructure(await (this.structureBuffer as Promise<ArrayBuffer | Buffer>))
   }
 
   async array(): Promise<[[[StructureEntry]]]> {
@@ -457,7 +457,7 @@ function encodeStructure(nbt: StructureNBT) {
   )
 }
 
-async function decodeStructure(buffer: Buffer) {
+async function decodeStructure(buffer: ArrayBuffer | Buffer) {
   const nbt = await prismarine.parse(buffer)
 
   return prismarine.simplify(nbt.parsed) as StructureNBT

package/src/core/resources/datapack/sulfurCubeArchetype.ts

@@ -1,4 +1,4 @@
-import { RESOURCE_PATHS, type SymbolResource } from 'sandstone/arguments'
+import { RESOURCE_PATHS, type MCDocToJSON, type SymbolResource } from 'sandstone/arguments'
 import { ContainerNode } from '../../nodes'
 import type { SandstoneCore } from '../../sandstoneCore'
 import type { ResourceClassArguments, ResourceNode } from '../resource'
@@ -22,7 +22,7 @@ export type SulfurCubeArchetypeClassArguments = {
   /**
    * The sulfur cube archetype's JSON.
    */
-  json: SymbolResource[(typeof SulfurCubeArchetypeClass)['resourceType']]
+  json: MCDocToJSON<SymbolResource[(typeof SulfurCubeArchetypeClass)['resourceType']]>
 } & ResourceClassArguments<'default'>
 
 export class SulfurCubeArchetypeClass extends ResourceClass<SulfurCubeArchetypeNode> {

package/src/core/resources/datapack/tag.ts

@@ -139,6 +139,8 @@ type Resource<T extends LiteralUnion<REGISTRIES>> = Add<
 export class TagClass<REGISTRY extends LiteralUnion<REGISTRIES>>
   extends ResourceClass
   implements ListResource, ConditionClass, NBTSerializable {
+  declare readonly __conditionClassBrand: true
+
   static readonly resourceType = 'tag' as const
 
   readonly type: REGISTRY
@@ -146,6 +148,12 @@ export class TagClass<REGISTRY extends LiteralUnion<REGISTRIES>>
   readonly tagJSON: NonNullable<TagJSON<REGISTRY>>
 
   constructor(sandstoneCore: SandstoneCore, type: REGISTRY, name: string, args: TagClassArguments<REGISTRY>) {
+    if (type === ('entity' as REGISTRY)) {
+      console.warn(
+        `[TagClass] Tag type 'entity' is not a valid Minecraft tag registry. Did you mean 'entity_type'?`
+      )
+    }
+
     super(
       sandstoneCore,
       { packType: sandstoneCore.pack.dataPack(), extension: 'json' },
@@ -224,10 +232,6 @@ export class TagClass<REGISTRY extends LiteralUnion<REGISTRIES>>
     return this.name
   }
 
-  toNBT() {
-    return this.name
-  }
-
   /**
    * @internal
    */

package/src/core/resources/datapack/timeline.ts

@@ -1,4 +1,4 @@
-import { RESOURCE_PATHS, type SymbolResource } from 'sandstone/arguments'
+import { RESOURCE_PATHS, type MCDocToJSON, type SymbolResource } from 'sandstone/arguments'
 import { ContainerNode } from '../../nodes'
 import type { SandstoneCore } from '../../sandstoneCore'
 import type { ResourceClassArguments, ResourceNode } from '../resource'
@@ -26,7 +26,7 @@ export type TimelineClassArguments = {
   /**
    * The timeline's JSON.
    */
-  json: SymbolResource[(typeof TimelineClass)['resourceType']]
+  json: MCDocToJSON<SymbolResource[(typeof TimelineClass)['resourceType']]>
 } & ResourceClassArguments<'default'>
 
 export class TimelineClass extends ResourceClass<TimelineNode> {
@@ -72,7 +72,7 @@ export type WorldClockClassArguments = {
   /**
    * The world clock's JSON.
    */
-  json: SymbolResource[(typeof WorldClockClass)['resourceType']]
+  json: MCDocToJSON<SymbolResource[(typeof WorldClockClass)['resourceType']]>
 } & ResourceClassArguments<'default'>
 
 export class WorldClockClass extends ResourceClass<WorldClockNode> {

package/src/core/resources/datapack/trialSpawner.ts

@@ -1,4 +1,4 @@
-import { RESOURCE_PATHS, type SymbolResource } from 'sandstone/arguments'
+import { RESOURCE_PATHS, type MCDocToJSON, type SymbolResource } from 'sandstone/arguments'
 import { ContainerNode } from '../../nodes'
 import type { SandstoneCore } from '../../sandstoneCore'
 import type { ResourceClassArguments, ResourceNode } from '../resource'
@@ -22,7 +22,7 @@ export type TrialSpawnerClassArguments = {
   /**
    * The trial spawner configuration's JSON.
    */
-  json: SymbolResource[(typeof TrialSpawnerClass)['resourceType']]
+  json: MCDocToJSON<SymbolResource[(typeof TrialSpawnerClass)['resourceType']]>
 } & ResourceClassArguments<'default'>
 
 export class TrialSpawnerClass extends ResourceClass<TrialSpawnerNode> {

package/src/core/resources/datapack/trimMaterial.ts

@@ -1,4 +1,4 @@
-import { RESOURCE_PATHS, type SymbolResource } from 'sandstone/arguments'
+import { RESOURCE_PATHS, type MCDocToJSON, type SymbolResource } from 'sandstone/arguments'
 import { ContainerNode } from '../../nodes'
 import type { SandstoneCore } from '../../sandstoneCore'
 import type { ResourceClassArguments, ResourceNode } from '../resource'
@@ -23,7 +23,7 @@ export type TrimMaterialClassArguments = {
   /**
    * The trim material's JSON.
    */
-  json: SymbolResource[(typeof TrimMaterialClass)['resourceType']]
+  json: MCDocToJSON<SymbolResource[(typeof TrimMaterialClass)['resourceType']]>
 } & ResourceClassArguments<'default'>
 
 export class TrimMaterialClass extends ResourceClass<TrimMaterialNode> {

package/src/core/resources/datapack/trimPattern.ts

@@ -1,4 +1,4 @@
-import { RESOURCE_PATHS, type SymbolResource } from 'sandstone/arguments'
+import { RESOURCE_PATHS, type MCDocToJSON, type SymbolResource } from 'sandstone/arguments'
 import { ContainerNode } from '../../nodes'
 import type { SandstoneCore } from '../../sandstoneCore'
 import type { ResourceClassArguments, ResourceNode } from '../resource'
@@ -23,7 +23,7 @@ export type TrimPatternClassArguments = {
   /**
    * The trim pattern's JSON.
    */
-  json: SymbolResource[(typeof TrimPatternClass)['resourceType']]
+  json: MCDocToJSON<SymbolResource[(typeof TrimPatternClass)['resourceType']]>
 } & ResourceClassArguments<'default'>
 
 export class TrimPatternClass extends ResourceClass<TrimPatternNode> {

package/src/core/resources/datapack/variant.ts

@@ -1,4 +1,4 @@
-import { type RESOURCE_PATHS, type SymbolResource } from 'sandstone/arguments'
+import { type RESOURCE_PATHS, type MCDocToJSON, type SymbolResource } from 'sandstone/arguments'
 import { ContainerNode } from '../../nodes'
 import type { SandstoneCore } from '../../sandstoneCore'
 import type { ResourceClassArguments, ResourceNode } from '../resource'
@@ -31,7 +31,7 @@ type VariantSymbolKey<T extends VariantType> = `${T}_variant`
 /**
  * Gets the JSON type for a variant from SymbolResource.
  */
-type VariantJSON<T extends VariantType> = SymbolResource[VariantSymbolKey<T>]
+type VariantJSON<T extends VariantType> = MCDocToJSON<SymbolResource[VariantSymbolKey<T>]>
 
 /**
  * A node representing a Minecraft entity variant.

package/src/core/resources/datapack/villagerTrade.ts

@@ -1,4 +1,4 @@
-import { RESOURCE_PATHS, type SymbolResource } from 'sandstone/arguments'
+import { RESOURCE_PATHS, type MCDocToJSON, type SymbolResource } from 'sandstone/arguments'
 import { ContainerNode } from '../../nodes'
 import type { SandstoneCore } from '../../sandstoneCore'
 import type { ResourceClassArguments, ResourceNode } from '../resource'
@@ -22,7 +22,7 @@ export type VillagerTradeClassArguments = {
   /**
    * The villager trade's JSON.
    */
-  json: SymbolResource[(typeof VillagerTradeClass)['resourceType']]
+  json: MCDocToJSON<SymbolResource[(typeof VillagerTradeClass)['resourceType']]>
 } & ResourceClassArguments<'default'>
 
 export class VillagerTradeClass extends ResourceClass<VillagerTradeNode> {
@@ -64,7 +64,7 @@ export type TradeSetClassArguments = {
   /**
    * The trade set's JSON.
    */
-  json: SymbolResource[(typeof TradeSetClass)['resourceType']]
+  json: MCDocToJSON<SymbolResource[(typeof TradeSetClass)['resourceType']]>
 } & ResourceClassArguments<'default'>
 
 export class TradeSetClass extends ResourceClass<TradeSetNode> {

package/src/core/resources/resource.ts

@@ -185,11 +185,8 @@ export abstract class ResourceClass<N extends ResourceNode = ResourceNode<any>>
     return this.name
   }
 
-  /**
-   * @internal
-   */
   toNBT(): string {
-    return this.name
+    return `'${this.name}'`
   }
 
   /**

package/src/core/resources/resourcepack/atlas.ts

@@ -1,4 +1,4 @@
-import { RESOURCE_PATHS, type SymbolResource } from 'sandstone/arguments'
+import { RESOURCE_PATHS, type MCDocToJSON, type SymbolResource } from 'sandstone/arguments'
 import { ContainerNode } from '../../nodes'
 import type { SandstoneCore } from '../../sandstoneCore'
 import type { ListResource, ResourceClassArguments, ResourceNode } from '../resource'
@@ -23,7 +23,7 @@ export type AtlasClassArguments = {
   /**
    * The atlas JSON.
    */
-  json?: SymbolResource[(typeof AtlasClass)['resourceType']]
+  json?: MCDocToJSON<SymbolResource[(typeof AtlasClass)['resourceType']]>
 } & ResourceClassArguments<'list'>
 
 export class AtlasClass extends ResourceClass<AtlasNode> implements ListResource {
@@ -46,7 +46,7 @@ export class AtlasClass extends ResourceClass<AtlasNode> implements ListResource
     this.handleConflicts()
   }
 
-  push(...sources: SpriteSource[] | AtlasClass[]) {
+  push(...sources: MCDocToJSON<SpriteSource>[] | AtlasClass[]) {
     if (sources[0] instanceof AtlasClass) {
       for (const provider of sources) {
         /** @ts-ignore */
@@ -58,7 +58,7 @@ export class AtlasClass extends ResourceClass<AtlasNode> implements ListResource
     }
   }
 
-  unshift(...sources: SpriteSource[] | AtlasClass[]) {
+  unshift(...sources: MCDocToJSON<SpriteSource>[] | AtlasClass[]) {
     if (sources[0] instanceof AtlasClass) {
       for (const provider of sources) {
         /** @ts-ignore */

package/src/core/resources/resourcepack/blockstate.ts

@@ -1,4 +1,4 @@
-import { RESOURCE_PATHS, type SymbolResource } from 'sandstone/arguments'
+import { RESOURCE_PATHS, type MCDocToJSON, type SymbolResource } from 'sandstone/arguments'
 import { ContainerNode } from '../../nodes'
 
 import type { SandstoneCore } from '../../sandstoneCore'
@@ -6,7 +6,7 @@ import type { ListResource, ResourceClassArguments, ResourceNode } from '../reso
 import { ResourceClass, jsonStringify } from '../resource'
 import type { AllKeys } from 'sandstone/utils'
 
-export type BlockStateJSON = NonNullable<SymbolResource['block_definition']>
+export type BlockStateJSON = NonNullable<MCDocToJSON<SymbolResource['block_definition']>>
 export type BlockStateType = AllKeys<BlockStateJSON>
 
 /**

package/src/core/resources/resourcepack/equipment.ts

@@ -1,4 +1,4 @@
-import { RESOURCE_PATHS, type SymbolResource } from 'sandstone/arguments'
+import { RESOURCE_PATHS, type MCDocToJSON, type SymbolResource } from 'sandstone/arguments'
 import { ContainerNode } from '../../nodes'
 import type { SandstoneCore } from '../../sandstoneCore'
 import type { ResourceClassArguments, ResourceNode } from '../resource'
@@ -22,7 +22,7 @@ export type EquipmentClassArguments = {
   /**
    * The equipment's JSON.
    */
-  json: SymbolResource[(typeof EquipmentClass)['resourceType']]
+  json: MCDocToJSON<SymbolResource[(typeof EquipmentClass)['resourceType']]>
 } & ResourceClassArguments<'default'>
 
 export class EquipmentClass extends ResourceClass<EquipmentNode> {

package/src/core/resources/resourcepack/font.ts

@@ -1,4 +1,4 @@
-import { RESOURCE_PATHS } from 'sandstone/arguments'
+import { type MCDocToJSON, RESOURCE_PATHS } from 'sandstone/arguments'
 import type { GlyphProvider } from 'sandstone/arguments/generated/assets/font'
 import { ContainerNode } from '../../nodes'
 import type { SandstoneCore } from '../../sandstoneCore'
@@ -23,7 +23,7 @@ export type FontArguments = {
   /**
    * The font's JSON.
    */
-  providers: GlyphProvider[] | []
+  providers: MCDocToJSON<GlyphProvider>[] | []
 } & ResourceClassArguments<'list'>
 
 export class FontClass extends ResourceClass<FontNode> implements ListResource {
@@ -46,7 +46,7 @@ export class FontClass extends ResourceClass<FontNode> implements ListResource {
     this.handleConflicts()
   }
 
-  push(...providers: GlyphProvider[] | FontClass[]) {
+  push(...providers: MCDocToJSON<GlyphProvider>[] | FontClass[]) {
     if (providers[0] instanceof FontClass) {
       for (const provider of providers) {
         /** @ts-ignore */
@@ -58,7 +58,7 @@ export class FontClass extends ResourceClass<FontNode> implements ListResource {
     }
   }
 
-  unshift(...providers: GlyphProvider[] | FontClass[]) {
+  unshift(...providers: MCDocToJSON<GlyphProvider>[] | FontClass[]) {
     if (providers[0] instanceof FontClass) {
       for (const provider of providers) {
         /** @ts-ignore */