From 8cb5d2f3e2d803069060066254be68cdca5646ff Mon Sep 17 00:00:00 2001 From: Misode Date: Mon, 15 Apr 2024 18:30:08 +0200 Subject: [PATCH] 1.20.5-pre1 --- java/1.20.5/package.json | 2 +- java/1.20.5/src/schemas/Common.ts | 17 +++++++++++------ java/1.20.5/src/schemas/assets/Font.ts | 2 +- package-lock.json | 2 +- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/java/1.20.5/package.json b/java/1.20.5/package.json index 229b10c..5e5d88d 100644 --- 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.24", + "version": "0.0.25", "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/schemas/Common.ts b/java/1.20.5/src/schemas/Common.ts index cfedbc2..c71b0c3 100644 --- a/java/1.20.5/src/schemas/Common.ts +++ b/java/1.20.5/src/schemas/Common.ts @@ -519,6 +519,11 @@ export function initCommonSchemas(schemas: SchemaRegistry, collections: Collecti })), }) + const ListOperation = ({ node, maxLength }: { node: INode, maxLength: number }) => ObjectNode({ + values: node, + ...ListOperationFields({ maxLength }) + }, { context: 'list_operation'}) + ConditionCases = (entitySourceNode: INode = StringNode({ enum: 'entity_source' })) => ({ 'minecraft:all_of': { terms: ListNode( @@ -580,7 +585,8 @@ export function initCommonSchemas(schemas: SchemaRegistry, collections: Collecti 'minecraft:table_bonus': { enchantment: StringNode({ validator: 'resource', params: { pool: 'enchantment' } }), chances: ListNode( - NumberNode({ min: 0, max: 1 }) + NumberNode({ min: 0, max: 1 }), + { minLength: 1 }, ) }, 'minecraft:time_check': { @@ -732,11 +738,10 @@ export function initCommonSchemas(schemas: SchemaRegistry, collections: Collecti add: Opt(BooleanNode()) }, 'minecraft:set_fireworks': { - explosions: Opt(ListNode( - Reference('firework_explosion'), - { maxLength: 256 }, - )), - ...ListOperationFields({ maxLength: 256 }), + explosions: Opt(ListOperation({ + node: Reference('firework_explosion'), + maxLength: 256, + })), flight_duration: Opt(NumberNode({ integer: true, min: 0, max: 255 })), }, 'minecraft:set_firework_explosion': { diff --git a/java/1.20.5/src/schemas/assets/Font.ts b/java/1.20.5/src/schemas/assets/Font.ts index 0e069ea..0174b95 100644 --- a/java/1.20.5/src/schemas/assets/Font.ts +++ b/java/1.20.5/src/schemas/assets/Font.ts @@ -50,7 +50,7 @@ export function initFontSchemas(schemas: SchemaRegistry, collections: Collection size: Opt(NumberNode()), oversample: Opt(NumberNode()), shift: Opt(ListNode( - NumberNode(), + NumberNode({ min: -100, max: 100 }), { minLength: 2, maxLength: 2 } )), skip: Opt(StringOrList( diff --git a/package-lock.json b/package-lock.json index 231523d..120ae3b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -115,7 +115,7 @@ }, "java/1.20.5": { "name": "@mcschema/java-1.20.5", - "version": "0.0.24", + "version": "0.0.25", "license": "MIT", "dependencies": { "@mcschema/core": "^0.13.0"