24w13a

misode · Mar 28, 2024 · 90de455 · 90de455
1 parent 48cccf9
commit 90de455
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 38 deletions.
diff --git a/java/1.20.5/package.json b/java/1.20.5/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mcschema/java-1.20.5",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "description": "Schemas for Java Edition 1.20.5",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

diff --git a/java/1.20.5/src/LootContext.ts b/java/1.20.5/src/LootContext.ts
@@ -25,6 +25,7 @@ export const LootTableTypes = new Map<string, LootContextRegistration>([
     ['minecraft:command', { requires: [LootContext.Origin], allows: [LootContext.ThisEntity] }],
     ['minecraft:empty', { requires: [], allows: [] }],
     ['minecraft:entity', { requires: [LootContext.DamageSource, LootContext.Origin, LootContext.ThisEntity], allows: [LootContext.DirectKillerEntity, LootContext.KillerEntity, LootContext.LastDamagePlayer] }],
+    ['minecraft:equipment', { requires: [LootContext.Origin, LootContext.ThisEntity], allows: [] } ],
     ['minecraft:fishing', { requires: [LootContext.Origin, LootContext.Tool], allows: [LootContext.ThisEntity] }],
     ['minecraft:generic', { requires: [LootContext.DamageSource, LootContext.BlockEntity, LootContext.BlockState, LootContext.DirectKillerEntity, LootContext.ExplosionRadius, LootContext.KillerEntity, LootContext.LastDamagePlayer, LootContext.Origin, LootContext.ThisEntity, LootContext.Tool], allows: [] }],
     ['minecraft:gift', { requires: [LootContext.Origin, LootContext.ThisEntity], allows: [] }],

diff --git a/java/1.20.5/src/schemas/Common.ts b/java/1.20.5/src/schemas/Common.ts
@@ -315,25 +315,19 @@ export function initCommonSchemas(schemas: SchemaRegistry, collections: Collecti
         value: NumberNode(config)
       },
       'minecraft:uniform': {
-        value: ObjectNode({
-          min_inclusive: NumberNode(config),
-          max_exclusive: NumberNode(config)
-        })
+        min_inclusive: NumberNode(config),
+        max_exclusive: NumberNode(config)
       },
       'minecraft:clamped_normal': {
-        value: ObjectNode({
-          min: NumberNode(),
-          max: NumberNode(),
-          mean: NumberNode(),
-          deviation: NumberNode()
-        })
+        min: NumberNode(),
+        max: NumberNode(),
+        mean: NumberNode(),
+        deviation: NumberNode()
       },
       'minecraft:trapezoid': {
-        value: ObjectNode({
-          min: NumberNode(),
-          max: NumberNode(),
-          plateau: NumberNode()
-        })
+        min: NumberNode(),
+        max: NumberNode(),
+        plateau: NumberNode()
       }
     }
   )
@@ -350,31 +344,23 @@ export function initCommonSchemas(schemas: SchemaRegistry, collections: Collecti
         value: NumberNode({ integer: true, ...config })
       },
       'minecraft:uniform': {
-        value: ObjectNode({
-          min_inclusive: NumberNode({ integer: true, ...config }),
-          max_inclusive: NumberNode({ integer: true, ...config })
-        })
+        min_inclusive: NumberNode({ integer: true, ...config }),
+        max_inclusive: NumberNode({ integer: true, ...config })
       },
       'minecraft:biased_to_bottom': {
-        value: ObjectNode({
-          min_inclusive: NumberNode({ integer: true, ...config }),
-          max_inclusive: NumberNode({ integer: true, ...config })
-        })
+        min_inclusive: NumberNode({ integer: true, ...config }),
+        max_inclusive: NumberNode({ integer: true, ...config })
       },
       'minecraft:clamped': {
-        value: ObjectNode({
-          min_inclusive: NumberNode({ integer: true, ...config }),
-          max_inclusive: NumberNode({ integer: true, ...config }),
-          source: Reference('int_provider')
-        })
+        min_inclusive: NumberNode({ integer: true, ...config }),
+        max_inclusive: NumberNode({ integer: true, ...config }),
+        source: Reference('int_provider')
       },
       'minecraft:clamped_normal': {
-        value: ObjectNode({
-          min_inclusive: NumberNode({ integer: true, ...config }),
-          max_inclusive: NumberNode({ integer: true, ...config }),
-          mean: NumberNode(),
-          deviation: NumberNode()
-        })
+        min_inclusive: NumberNode({ integer: true, ...config }),
+        max_inclusive: NumberNode({ integer: true, ...config }),
+        mean: NumberNode(),
+        deviation: NumberNode()
       },
       'minecraft:weighted_list': {
         distribution: ListNode(
@@ -636,9 +622,12 @@ export function initCommonSchemas(schemas: SchemaRegistry, collections: Collecti
       },
       'minecraft:copy_components': {
         source: StringNode({ enum: ['block_entity'] }),
-        components: ListNode(
+        include: Opt(ListNode(
           StringNode({ validator: 'resource', params: { pool: 'data_component_type' } }),
-        ),
+        )),
+        exclude: Opt(ListNode(
+          StringNode({ validator: 'resource', params: { pool: 'data_component_type' } }),
+        )),
       },
       'minecraft:copy_custom_data': {
         source: Reference('nbt_provider'),
@@ -771,11 +760,15 @@ export function initCommonSchemas(schemas: SchemaRegistry, collections: Collecti
       },
       'minecraft:set_name': {
         entity: Opt(entitySourceNode),
+        target: Opt(StringNode({ enum: ['custom_name', 'item_name'] })),
         name: Opt(Reference('text_component'))
       },
       'minecraft:set_potion': {
         id: StringNode({ validator: 'resource', params: { pool: 'potion' } })
       },
+      'minecraft:ominous_bottle_amplifier': {
+        amplifier: Reference('number_provider')
+      },
       'minecraft:set_stew_effect': {
         effects: Opt(ListNode(
           ObjectNode({

diff --git a/java/1.20.5/src/schemas/Components.ts b/java/1.20.5/src/schemas/Components.ts
@@ -155,6 +155,7 @@ export function initComponentsSchemas(schemas: SchemaRegistry, collections: Coll
       show_in_tooltip: Opt(BooleanNode())
     }, { context: 'data_component.unbreakable' }),
     'minecraft:custom_name': StringNode(), // text component
+    'minecraft:item_name': StringNode(), // text component
     'minecraft:lore': ListNode(
       StringNode(), // text component
       { context: 'data_component.lore', maxLength: 256 },
@@ -321,6 +322,7 @@ export function initComponentsSchemas(schemas: SchemaRegistry, collections: Coll
       // TODO: any unsafe data
     }, { context: 'data_component.block_entity_data' }),
     'minecraft:instrument': StringNode({ validator: 'resource', params: { pool: 'instrument' } }),
+    'minecraft:ominous_bottle_amplifier': NumberNode({ integer: true, min: 0, max: 4 }),
     'minecraft:recipes': ListNode(
       StringNode({ validator: 'resource', params: { pool: '$recipe' } }),
       { context: 'data_component.recipes' },

diff --git a/java/1.20.5/src/schemas/Predicates.ts b/java/1.20.5/src/schemas/Predicates.ts
@@ -232,6 +232,10 @@ export function initPredicatesSchemas(schemas: SchemaRegistry, collections: Coll
         'minecraft:rabbit': {
           variant: Opt(StringNode({ enum: 'rabbit_variant' }))
         },
+        'minecraft:raider': {
+          has_raid: Opt(BooleanNode()),
+          is_captain: Opt(BooleanNode()),
+        },
         'minecraft:slime': {
           size: Reference('int_bounds')
         },

diff --git a/package-lock.json b/package-lock.json