From 7cb1c0375577a2d94a3882b325b027de854248da Mon Sep 17 00:00:00 2001 From: Misode Date: Sat, 13 Apr 2024 19:38:45 +0200 Subject: [PATCH] Fix list operation dispatched fields --- java/1.20.5/package.json | 2 +- java/1.20.5/src/schemas/Common.ts | 16 ++++++---------- package-lock.json | 2 +- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/java/1.20.5/package.json b/java/1.20.5/package.json index d1976d3..229b10c 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.22", + "version": "0.0.24", "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 baa510e..cfedbc2 100644 --- a/java/1.20.5/src/schemas/Common.ts +++ b/java/1.20.5/src/schemas/Common.ts @@ -511,16 +511,12 @@ export function initCommonSchemas(schemas: SchemaRegistry, collections: Collecti const ListOperationFields = ({ maxLength }: { maxLength: number }) => ({ mode: StringNode({ enum: 'list_operation' }), - [Switch]: [{ push: 'mode' }], - [Case]: { - 'insert': { - offset: Opt(NumberNode({ integer: true, min: 0 })), - }, - 'replace_section': { - offset: Opt(NumberNode({ integer: true, min: 0 })), - size: Opt(NumberNode({ integer: true, min: 0, max: maxLength })), - }, - } + offset: Opt(Mod(NumberNode({ integer: true, min: 0 }), { + enabled: (path) => ['insert', 'replace_section'].includes(path.push("mode").get()) + })), + size: Opt(Mod(NumberNode({ integer: true, min: 0, max: maxLength }), { + enabled: (path) => ['replace_section'].includes(path.push("mode").get()) + })), }) ConditionCases = (entitySourceNode: INode = StringNode({ enum: 'entity_source' })) => ({ diff --git a/package-lock.json b/package-lock.json index 9d304a0..231523d 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.22", + "version": "0.0.24", "license": "MIT", "dependencies": { "@mcschema/core": "^0.13.0"