Fix item damage component and event object schema (#316)

* Fix item damage component * Remove duplicate event schema and unnecessary pattern match
Blockception · Oct 8, 2024 · fa09417 · fa09417
1 parent 8473646
commit fa09417
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 31 deletions.
diff --git a/source/behavior/entities/format/components/breedable.json b/source/behavior/entities/format/components/breedable.json
@@ -16,7 +16,7 @@
           "title": "Baby Type"
         },
         "breed_event": {
-          "$ref": "../types/event_object_filters.json",
+          "$ref": "../types/event_object.json",
           "description": "Event to run when this entity breeds.",
           "title": "Breed Event"
         },

diff --git a/source/behavior/entities/format/types/event.json b/source/behavior/entities/format/types/event.json
@@ -10,11 +10,11 @@
     }
   ],
   "oneOf": [
-    { "type": "string", "pattern": "^[a-zA-Z0-9_\\-:]+$", "description": "The event to fire." },
+    { "type": "string", "description": "The event to fire." },
     {
       "type": "object",
       "properties": {
-        "event": { "type": "string", "pattern": "^[a-zA-Z0-9_\\-:]+$", "description": "The event to fire.", "title": "Event" },
+        "event": { "type": "string", "description": "The event to fire.", "title": "Event" },
         "target": {
           "type": "string",
           "description": "The target of the event.",

diff --git a/source/behavior/entities/format/types/event_object.json b/source/behavior/entities/format/types/event_object.json
@@ -9,7 +9,7 @@
     "filters": {
       "$ref": "../../filters/filters.json"
     },
-    "event": { "type": "string", "pattern": "^[a-zA-Z0-9_\\-:]+$", "description": "The event to fire.", "title": "Event" },
+    "event": { "type": "string", "description": "The event to fire.", "title": "Event" },
     "target": {
       "type": "string",
       "description": "The target of the event.",

diff --git a/source/behavior/entities/format/types/event_object_filters.json b/source/behavior/entities/format/types/event_object_filters.json
diff --git a/source/behavior/items/format/components/damage.json b/source/behavior/items/format/components/damage.json
@@ -1,12 +1,25 @@
 {
   "$id": "blockception.minecraft.behavior.items.minecraft:damage",
-  "additionalProperties": false,
-  "type": "object",
   "title": "Damage",
   "description": "The damage component determines how much extra damage the item does on attack.",
-  "required": ["value"],
-  "properties": { "value": { "type": "number", "title": "Value", "description": "How much extra damage the item does, must be a positive number.", "minimum": 1 } },
-  "examples": [
-    { "value": 7 }
-  ]
+  "oneOf": [
+    {
+      "type": "number",
+      "minimum": 1
+    },
+    {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["value"],
+      "properties": {
+        "value": {
+          "type": "number",
+          "title": "Value",
+          "description": "How much extra damage the item does, must be a positive number.",
+          "minimum": 1
+        }
+      }
+    }
+  ],
+  "examples": [{ "value": 7 }]
 }