From 6aecce6566bc5946a79320a26963ba730923c844 Mon Sep 17 00:00:00 2001 From: DaanV2 Date: Wed, 28 Apr 2021 22:33:53 +0200 Subject: [PATCH] Fixing timeline regex valedation --- source/behavior/animations/1.10.0/animations.json | 2 +- source/behavior/animations/1.8.0/animations.json | 2 +- .../resource/animations/1.10.0/actor_animation.json | 12 ++++++------ .../resource/animations/1.8.0/actor_animation.json | 12 ++++++------ 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/source/behavior/animations/1.10.0/animations.json b/source/behavior/animations/1.10.0/animations.json index 92d93f69..2ce46fa7 100644 --- a/source/behavior/animations/1.10.0/animations.json +++ b/source/behavior/animations/1.10.0/animations.json @@ -75,7 +75,7 @@ "title": "Timeline", "description": "A timeline specification, property names are timestamps", "type": "object", - "propertyNames": { "pattern": "^(\\d+.\\d+|\\d+)$", "examples": ["0.0", "1.0"] }, + "propertyNames": { "pattern": "^(\\d+\\.\\d+|\\d+)$", "examples": ["0.0", "1.0"] }, "additionalProperties": { "oneOf": [ { "type": "string", "$ref": "#/definitions/commands" }, diff --git a/source/behavior/animations/1.8.0/animations.json b/source/behavior/animations/1.8.0/animations.json index 5e5ef9c3..89878a98 100644 --- a/source/behavior/animations/1.8.0/animations.json +++ b/source/behavior/animations/1.8.0/animations.json @@ -75,7 +75,7 @@ "title": "Timeline", "description": "A timeline specification, property names are timestamps", "type": "object", - "propertyNames": { "pattern": "^(\\d+.\\d+|\\d+)$", "examples": ["0.0", "1.0"] }, + "propertyNames": { "pattern": "^(\\d+\\.\\d+|\\d+)$", "examples": ["0.0", "1.0"] }, "additionalProperties": { "oneOf": [{ "$ref": "#/definitions/commands" }, { "type": "array", "title": "Collection Timelime Items", "items": { "$ref": "#/definitions/commands" } }] } diff --git a/source/resource/animations/1.10.0/actor_animation.json b/source/resource/animations/1.10.0/actor_animation.json index 56063e65..6dc12711 100644 --- a/source/resource/animations/1.10.0/actor_animation.json +++ b/source/resource/animations/1.10.0/actor_animation.json @@ -113,7 +113,7 @@ { "$ref": "../../../molang/1.8.0/arraynumber3.json" }, { "type": "object", - "propertyNames": { "pattern": "^[\\d.]+$" }, + "propertyNames": { "pattern": "^(\\d+\\.\\d+|\\d+)$" }, "additionalProperties": { "title": "Timeline Object", "description": "A single point in time", @@ -135,7 +135,7 @@ { "$ref": "../../../molang/1.8.0/arraynumber3.json" }, { "type": "object", - "propertyNames": { "pattern": "^[\\d.]+$" }, + "propertyNames": { "pattern": "^(\\d+\\.\\d+|\\d+)$" }, "additionalProperties": { "title": "Timeline Object", "description": "A single point in time", @@ -164,7 +164,7 @@ { "$ref": "#/definitions/ScaleV3" }, { "type": "object", - "propertyNames": { "pattern": "^[\\d.]+$" }, + "propertyNames": { "pattern": "^(\\d+\\.\\d+|\\d+)$" }, "additionalProperties": { "title": "Timeline Object", "description": "A single point in time", @@ -200,7 +200,7 @@ "title": "Particle Effects", "description": "TODO", "type": "object", - "propertyNames": { "pattern": "^[\\d.]+$", "examples": ["0.0"] }, + "propertyNames": { "pattern": "^(\\d+\\.\\d+|\\d+)$", "examples": ["0.0"] }, "additionalProperties": { "title": "Timeline Object", "description": "A single point in time", @@ -219,14 +219,14 @@ "title": "Sound Effect", "description": "TODO", "type": "object", - "propertyNames": { "pattern": "^[\\d.]+$" }, + "propertyNames": { "pattern": "^(\\d+\\.\\d+|\\d+)$" }, "additionalProperties": { "$ref": "#/definitions/SoundEffect" } }, "timeline": { "title": "Timeline", "description": "The time line", "type": "object", - "propertyNames": { "pattern": "^(\\d+.\\d+|\\d+)$" }, + "propertyNames": { "pattern": "^(\\d+\\.\\d+|\\d+)$" }, "additionalProperties": { "oneOf": [ { "type": "string", "title": "Molang", "description": "Variable definition", "pattern": "^(v|variable)\\..*=.*;$" }, diff --git a/source/resource/animations/1.8.0/actor_animation.json b/source/resource/animations/1.8.0/actor_animation.json index 5e4ac3b7..6a860978 100644 --- a/source/resource/animations/1.8.0/actor_animation.json +++ b/source/resource/animations/1.8.0/actor_animation.json @@ -113,7 +113,7 @@ { "$ref": "../../../molang/1.8.0/arraynumber3.json" }, { "type": "object", - "propertyNames": { "pattern": "^[\\d.]+$" }, + "propertyNames": { "pattern": "^(\\d+\\.\\d+|\\d+)$" }, "additionalProperties": { "title": "Timeline Object", "description": "A single point in time", @@ -135,7 +135,7 @@ { "$ref": "../../../molang/1.8.0/arraynumber3.json" }, { "type": "object", - "propertyNames": { "pattern": "^[\\d.]+$" }, + "propertyNames": { "pattern": "^(\\d+\\.\\d+|\\d+)$" }, "additionalProperties": { "title": "Timeline Object", "description": "A single point in time", @@ -164,7 +164,7 @@ { "$ref": "#/definitions/ScaleV3" }, { "type": "object", - "propertyNames": { "pattern": "^[\\d.]+$" }, + "propertyNames": { "pattern": "^(\\d+\\.\\d+|\\d+)$" }, "additionalProperties": { "title": "Timeline Object", "description": "A single point in time", @@ -200,7 +200,7 @@ "title": "Particle Effects", "description": "TODO", "type": "object", - "propertyNames": { "pattern": "^[\\d.]+$", "examples": ["0.0"] }, + "propertyNames": { "pattern": "^(\\d+\\.\\d+|\\d+)$", "examples": ["0.0"] }, "additionalProperties": { "title": "Timeline Object", "description": "A single point in time", @@ -219,14 +219,14 @@ "title": "Sound Effect", "description": "TODO", "type": "object", - "propertyNames": { "pattern": "^[\\d.]+$" }, + "propertyNames": { "pattern": "^(\\d+\\.\\d+|\\d+)$" }, "additionalProperties": { "$ref": "#/definitions/SoundEffect" } }, "timeline": { "title": "Timeline", "description": "The time line", "type": "object", - "propertyNames": { "pattern": "^(\\d+.\\d+|\\d+)$" }, + "propertyNames": { "pattern": "^(\\d+\\.\\d+|\\d+)$" }, "additionalProperties": { "oneOf": [ { "type": "string", "title": "Molang", "description": "Variable definition", "pattern": "^(v|variable)\\..*=.*;$" },