diff --git a/source/behavior/entities/format/components/breedable.json b/source/behavior/entities/format/components/breedable.json index e1c691b7..44753b74 100644 --- 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 index d64963c8..9e41cabe 100644 --- 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 index d68039f6..ba5b4954 100644 --- 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 deleted file mode 100644 index 0da319b3..00000000 --- a/source/behavior/entities/format/types/event_object_filters.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "$id": "blockception.minecraft.entities.event_object", - "title": "Event", - "description": "Minecraft behavior event.", - "examples": [{ "event": "example:foo", "target": "self" }], - "type": "object", - "additionalProperties": false, - "properties": { - "event": { "type": "string", "pattern": "^[a-zA-Z0-9_\\-:]+$", "description": "The event to fire.", "title": "Event" }, - "target": { - "type": "string", - "description": "The target of the event.", - "title": "Target", - "enum": ["baby", "block", "damager", "other", "parent", "player", "self", "target"] - }, - "filters": { - "$ref": "../../filters/filters.json" - } - } -}