From 66015d42a410a43fbb79266fdfb04b5081287b77 Mon Sep 17 00:00:00 2001
From: DaanV2 <daanverstraten@hotmail.com>
Date: Thu, 1 Jul 2021 16:56:10 +0200
Subject: [PATCH] Updated

---
 source/behavior/entities/1.10.0/types/trigger.json |  3 +--
 source/behavior/entities/1.12.0/types/trigger.json |  3 +--
 source/behavior/entities/1.13.0/types/trigger.json |  3 +--
 .../behaviors/minecraft.behavior.drink_potion.json | 14 +++++++-------
 .../1.16.0/components/minecraft.angry.json         |  3 +--
 .../1.16.0/components/minecraft.despawn.json       |  3 +--
 .../1.16.0/components/minecraft.group_size.json    |  3 +--
 source/behavior/entities/1.16.0/types/trigger.json |  3 +--
 .../behavior/entities/1.16.100/types/trigger.json  |  3 +--
 .../behaviors/minecraft.behavior.drink_potion.json |  4 ++--
 .../minecraft.behavior.look_at_entity.json         |  3 +--
 .../entities/1.8.0/components/minecraft.angry.json |  3 +--
 .../1.8.0/components/minecraft.despawn.json        |  3 +--
 .../1.8.0/components/minecraft.group_size.json     |  3 +--
 .../1.8.0/components/minecraft.movement.sway.json  |  2 +-
 .../1.8.0/components/minecraft.nameable.json       |  2 +-
 .../1.8.0/components/minecraft.on_death.json       |  3 +--
 .../components/minecraft.on_friendly_anger.json    |  3 +--
 .../components/minecraft.on_hurt_by_player.json    |  6 +++---
 .../1.8.0/components/minecraft.spawn_entity.json   |  3 +--
 source/behavior/entities/1.8.0/types/trigger.json  |  3 +--
 source/behavior/entities/filters/filters.json      |  4 ++--
 22 files changed, 32 insertions(+), 48 deletions(-)

diff --git a/source/behavior/entities/1.10.0/types/trigger.json b/source/behavior/entities/1.10.0/types/trigger.json
index 66c4a1e2..d4412955 100644
--- a/source/behavior/entities/1.10.0/types/trigger.json
+++ b/source/behavior/entities/1.10.0/types/trigger.json
@@ -8,8 +8,7 @@
     "event": { "type": "string", "description": "Event", "title": "Event To Fire" },
     "filters": {
       "$ref": "../../filters/filters.json",
-      "description": "The filters to check to determine if the event should be fired",
-      "title": "Filters"
+      "description": "The filters to check to determine if the event should be fired"
     },
     "target": { "$ref": "../../filters/filters/types/subject.json", "description": "The entity to target", "title": "Target" }
   },
diff --git a/source/behavior/entities/1.12.0/types/trigger.json b/source/behavior/entities/1.12.0/types/trigger.json
index fefe8861..737def82 100644
--- a/source/behavior/entities/1.12.0/types/trigger.json
+++ b/source/behavior/entities/1.12.0/types/trigger.json
@@ -8,8 +8,7 @@
     "event": { "type": "string", "description": "Event", "title": "Event To Fire" },
     "filters": {
       "$ref": "../../filters/filters.json",
-      "description": "The filters to check to determine if the event should be fired",
-      "title": "Filters"
+      "description": "The filters to check to determine if the event should be fired"
     },
     "target": { "$ref": "../../filters/filters/types/subject.json", "description": "The entity to target", "title": "Target" }
   },
diff --git a/source/behavior/entities/1.13.0/types/trigger.json b/source/behavior/entities/1.13.0/types/trigger.json
index a0ded597..55608131 100644
--- a/source/behavior/entities/1.13.0/types/trigger.json
+++ b/source/behavior/entities/1.13.0/types/trigger.json
@@ -8,8 +8,7 @@
     "event": { "type": "string", "description": "Event", "title": "Event To Fire" },
     "filters": {
       "$ref": "../../filters/filters.json",
-      "description": "The filters to check to determine if the event should be fired",
-      "title": "Filters"
+      "description": "The filters to check to determine if the event should be fired"
     },
     "target": { "$ref": "../../filters/filters/types/subject.json", "description": "The entity to target", "title": "Target" }
   },
diff --git a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.drink_potion.json b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.drink_potion.json
index 9b85ec11..dc20597c 100644
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.drink_potion.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.drink_potion.json
@@ -12,9 +12,13 @@
     "potions": {
       "type": "array",
       "description": "A list of potions that this entity can drink.",
+      "title": "Potions",
       "items": {
         "required": ["id", "chance", "filters"],
         "additionalProperties": false,
+        "type": "object",
+        "description": "UNDOCUMENTATED: potions",
+        "title": "Potions",
         "properties": {
           "id": { "type": "integer", "default": -1, "description": "The registry ID of the potion to use", "title": "Id" },
           "chance": {
@@ -27,14 +31,10 @@
           },
           "filters": {
             "description": "The filters to use when determining if this potion can be selected.",
-            "$ref": "../../filters/filters.json",
-            "title": "Filters"
+            "$ref": "../../filters/filters.json"
           }
-        },
-        "description": "UNDOCUMENTATED: potions",
-        "title": "Potions"
-      },
-      "title": "Potions"
+        }
+      }
     }
   }
 }
diff --git a/source/behavior/entities/1.16.0/components/minecraft.angry.json b/source/behavior/entities/1.16.0/components/minecraft.angry.json
index adac7f81..89b36e5c 100644
--- a/source/behavior/entities/1.16.0/components/minecraft.angry.json
+++ b/source/behavior/entities/1.16.0/components/minecraft.angry.json
@@ -19,8 +19,7 @@
     },
     "filters": {
       "$ref": "../../filters/filters.json",
-      "description": "Filter out mob types that it should not attack while angry (other Piglins)",
-      "title": "Filters"
+      "description": "Filter out mob types that it should not attack while angry (other Piglins)"
     },
     "broadcast_range": {
       "type": "integer",
diff --git a/source/behavior/entities/1.16.0/components/minecraft.despawn.json b/source/behavior/entities/1.16.0/components/minecraft.despawn.json
index c06d3b69..56cd0b1e 100644
--- a/source/behavior/entities/1.16.0/components/minecraft.despawn.json
+++ b/source/behavior/entities/1.16.0/components/minecraft.despawn.json
@@ -46,8 +46,7 @@
     },
     "filters": {
       "$ref": "../../filters/filters.json",
-      "description": "The list of conditions that must be satisfied before the Actor is despawned. If a filter is defined then standard despawn rules are ignored.",
-      "title": "Filters"
+      "description": "The list of conditions that must be satisfied before the Actor is despawned. If a filter is defined then standard despawn rules are ignored."
     },
     "min_range_inactivity_timer": {
       "type": "integer",
diff --git a/source/behavior/entities/1.16.0/components/minecraft.group_size.json b/source/behavior/entities/1.16.0/components/minecraft.group_size.json
index fd85ef6c..d23f5a19 100644
--- a/source/behavior/entities/1.16.0/components/minecraft.group_size.json
+++ b/source/behavior/entities/1.16.0/components/minecraft.group_size.json
@@ -7,8 +7,7 @@
   "properties": {
     "filters": {
       "$ref": "../../filters/filters.json",
-      "description": "The list of conditions that must be satisfied for other entities to be counted towards group size.",
-      "title": "Filters"
+      "description": "The list of conditions that must be satisfied for other entities to be counted towards group size."
     },
     "radius": { "type": "number", "default": 16, "description": "Radius from center of entity.", "title": "Radius" }
   }
diff --git a/source/behavior/entities/1.16.0/types/trigger.json b/source/behavior/entities/1.16.0/types/trigger.json
index 6901c471..987bdb29 100644
--- a/source/behavior/entities/1.16.0/types/trigger.json
+++ b/source/behavior/entities/1.16.0/types/trigger.json
@@ -8,8 +8,7 @@
     "event": { "type": "string", "description": "Event", "title": "Event To Fire" },
     "filters": {
       "$ref": "../../filters/filters.json",
-      "description": "The filters to check to determine if the event should be fired",
-      "title": "Filters"
+      "description": "The filters to check to determine if the event should be fired"
     },
     "target": { "$ref": "../../filters/filters/types/subject.json", "description": "The entity to target", "title": "Target" }
   }
diff --git a/source/behavior/entities/1.16.100/types/trigger.json b/source/behavior/entities/1.16.100/types/trigger.json
index d9e775b4..7c0b791f 100644
--- a/source/behavior/entities/1.16.100/types/trigger.json
+++ b/source/behavior/entities/1.16.100/types/trigger.json
@@ -7,8 +7,7 @@
     "event": { "type": "string", "description": "Event", "title": "Event To Fire" },
     "filters": {
       "$ref": "../../filters/filters.json",
-      "description": "The filters to check to determine if the event should be fired",
-      "title": "Filters"
+      "description": "The filters to check to determine if the event should be fired"
     },
     "target": { "$ref": "../../filters/filters/types/subject.json", "description": "The entity to target", "title": "Target" }
   },
diff --git a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.drink_potion.json b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.drink_potion.json
index aef5172d..2f033f8a 100644
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.drink_potion.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.drink_potion.json
@@ -15,6 +15,7 @@
       "items": {
         "required": ["id", "chance", "filters"],
         "additionalProperties": false,
+        "type": "object",
         "properties": {
           "id": { "type": "integer", "default": -1, "description": "The registry ID of the potion to use", "title": "Id" },
           "chance": {
@@ -27,8 +28,7 @@
           },
           "filters": {
             "description": "The filters to use when determining if this potion can be selected.",
-            "$ref": "../../filters/filters.json",
-            "title": "Filters"
+            "$ref": "../../filters/filters.json"
           }
         },
         "description": "UNDOCUMENTATED: potions",
diff --git a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.look_at_entity.json b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.look_at_entity.json
index e75fdc65..5b35d981 100644
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.look_at_entity.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.look_at_entity.json
@@ -39,8 +39,7 @@
     },
     "filters": {
       "description": "Filter to determine the conditions for this mob to look at the entity",
-      "$ref": "../../filters/filters.json",
-      "title": "Filters"
+      "$ref": "../../filters/filters.json"
     }
   }
 }
diff --git a/source/behavior/entities/1.8.0/components/minecraft.angry.json b/source/behavior/entities/1.8.0/components/minecraft.angry.json
index e2526a23..ac9fc412 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.angry.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.angry.json
@@ -21,8 +21,7 @@
     },
     "filters": {
       "$ref": "../../filters/filters.json",
-      "description": "Filter out mob types that it should not attack while angry (other Piglins)",
-      "title": "Filters"
+      "description": "Filter out mob types that it should not attack while angry (other Piglins)"
     },
     "broadcast_range": {
       "type": "integer",
diff --git a/source/behavior/entities/1.8.0/components/minecraft.despawn.json b/source/behavior/entities/1.8.0/components/minecraft.despawn.json
index ff866d8a..f0194888 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.despawn.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.despawn.json
@@ -8,8 +8,7 @@
   "properties": {
     "filters": {
       "$ref": "../../filters/filters.json",
-      "description": "The list of conditions that must be satisfied before the Actor is despawned. If a filter is defined then standard despawn rules are ignored.",
-      "title": "Filters"
+      "description": "The list of conditions that must be satisfied before the Actor is despawned. If a filter is defined then standard despawn rules are ignored."
     },
     "despawn_from_chance": {
       "type": "boolean",
diff --git a/source/behavior/entities/1.8.0/components/minecraft.group_size.json b/source/behavior/entities/1.8.0/components/minecraft.group_size.json
index 486a81a5..bf9cf847 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.group_size.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.group_size.json
@@ -7,8 +7,7 @@
   "properties": {
     "filters": {
       "$ref": "../../filters/filters.json",
-      "description": "The list of conditions that must be satisfied for other entities to be counted towards group size.",
-      "title": "Filters"
+      "description": "The list of conditions that must be satisfied for other entities to be counted towards group size."
     },
     "radius": { "type": "number", "default": 16, "description": "Radius from center of entity.", "title": "Radius" }
   }
diff --git a/source/behavior/entities/1.8.0/components/minecraft.movement.sway.json b/source/behavior/entities/1.8.0/components/minecraft.movement.sway.json
index 0f0ef430..5317cb61 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.movement.sway.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.movement.sway.json
@@ -12,6 +12,6 @@
       "description": "The maximum number in degrees the mob can turn per tick.",
       "title": "Maximum Turn"
     },
-    "sway_amplitude": { "type": "number", "description": "UNDOCUMENTED", "$comment": "UNDOCUMENTED", "title": "TODO Title" }
+    "sway_amplitude": { "type": "number", "description": "UNDOCUMENTED", "$comment": "UNDOCUMENTED", "title": "Sway Amplitude" }
   }
 }
diff --git a/source/behavior/entities/1.8.0/components/minecraft.nameable.json b/source/behavior/entities/1.8.0/components/minecraft.nameable.json
index 419e4622..c73ce165 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.nameable.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.nameable.json
@@ -9,7 +9,7 @@
     "name_actions": {
       "type": "object",
       "description": "Describes the special names for this entity and the events to call when the entity acquires those names",
-      "title": "TODO Title",
+      "title": "Name Actions",
       "additionalProperties": false,
       "properties": {
         "on_named": {
diff --git a/source/behavior/entities/1.8.0/components/minecraft.on_death.json b/source/behavior/entities/1.8.0/components/minecraft.on_death.json
index 041b510f..2af53533 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.on_death.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.on_death.json
@@ -13,8 +13,7 @@
     },
     "filters": {
       "$ref": "../../filters/filters.json",
-      "description": "The list of conditions for this trigger to execute.",
-      "title": "Filters"
+      "description": "The list of conditions for this trigger to execute."
     },
     "target": {
       "type": "string",
diff --git a/source/behavior/entities/1.8.0/components/minecraft.on_friendly_anger.json b/source/behavior/entities/1.8.0/components/minecraft.on_friendly_anger.json
index d27e7cca..4736d35d 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.on_friendly_anger.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.on_friendly_anger.json
@@ -13,8 +13,7 @@
     },
     "filters": {
       "$ref": "../../filters/filters.json",
-      "description": "The list of conditions for this trigger",
-      "title": "Filters"
+      "description": "The list of conditions for this trigger"
     },
     "target": {
       "type": "string",
diff --git a/source/behavior/entities/1.8.0/components/minecraft.on_hurt_by_player.json b/source/behavior/entities/1.8.0/components/minecraft.on_hurt_by_player.json
index 925f61eb..228ac93e 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.on_hurt_by_player.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.on_hurt_by_player.json
@@ -6,14 +6,14 @@
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "event": { "type": "string", "description": "The event to run when the conditions for this trigger are met", "title": "TODO Title" },
-    "filters": { "$ref": "../../filters/filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
+    "event": { "type": "string", "description": "The event to run when the conditions for this trigger are met", "title": "Event" },
+    "filters": { "$ref": "../../filters/filters.json", "description": "The list of conditions for this trigger", "title": "Filters" },
     "target": {
       "type": "string",
       "$ref": "../../filters/filters/types/subject.json",
       "default": "self",
       "description": "The target of the event",
-      "title": "TODO Title"
+      "title": "Target"
     }
   }
 }
diff --git a/source/behavior/entities/1.8.0/components/minecraft.spawn_entity.json b/source/behavior/entities/1.8.0/components/minecraft.spawn_entity.json
index 3dbad691..8f9273d6 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.spawn_entity.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.spawn_entity.json
@@ -52,8 +52,7 @@
     },
     "filters": {
       "description": "If present, the specified entity will only spawn if the filter evaluates to true",
-      "$ref": "../../filters/filters.json",
-      "title": "Filters"
+      "$ref": "../../filters/filters.json"
     },
     "single_use": {
       "type": "boolean",
diff --git a/source/behavior/entities/1.8.0/types/trigger.json b/source/behavior/entities/1.8.0/types/trigger.json
index f6fa5d6e..cc888160 100644
--- a/source/behavior/entities/1.8.0/types/trigger.json
+++ b/source/behavior/entities/1.8.0/types/trigger.json
@@ -9,8 +9,7 @@
     "event": { "type": "string", "description": "Event", "title": "Event To Fire" },
     "filters": {
       "$ref": "../../filters/filters.json",
-      "description": "The filters to check to determine if the event should be fired",
-      "title": "Filters"
+      "description": "The filters to check to determine if the event should be fired"
     },
     "target": { "$ref": "../../filters/filters/types/subject.json", "description": "The entity to target", "title": "Target" }
   }
diff --git a/source/behavior/entities/filters/filters.json b/source/behavior/entities/filters/filters.json
index c11eb006..a067dda4 100644
--- a/source/behavior/entities/filters/filters.json
+++ b/source/behavior/entities/filters/filters.json
@@ -1,6 +1,7 @@
 {
   "$id": "blockception.minecraft.behavior.entities.minecraft.filters",
   "title": "Filters",
+  "$ref": "#/definitions/groups_spec",
   "definitions": {
     "filters_spec": {
       "oneOf": [
@@ -124,6 +125,5 @@
         { "type": "object", "$ref": "#/definitions/filters_spec" }
       ]
     }
-  },
-  "$ref": "#/definitions/groups_spec"
+  }
 }