Updated filter refernences

2021-06-03 14:11:45 +02:00
parent 8edda85149
commit 85f00c81cf
217 changed files with 277 additions and 349 deletions
--- a/source/behavior/entities/1.10.0/types/trigger.json
+++ b/source/behavior/entities/1.10.0/types/trigger.json
@@ -11,7 +11,7 @@
      "description": "The filters to check to determine if the event should be fired",
      "title": "Filters"
    },
-    "target": { "$ref": "../../1.8.0/filters/types/base_subject.json", "description": "The entity to target", "title": "Target" }
+    "target": { "$ref": "../../filters/filters/types/subject.json", "description": "The entity to target", "title": "Target" }
  },
  "additionalProperties": false
 }
--- a/source/behavior/entities/1.12.0/types/trigger.json
+++ b/source/behavior/entities/1.12.0/types/trigger.json
@@ -11,7 +11,7 @@
      "description": "The filters to check to determine if the event should be fired",
      "title": "Filters"
    },
-    "target": { "$ref": "../../1.8.0/filters/types/base_subject.json", "description": "The entity to target", "title": "Target" }
+    "target": { "$ref": "../../filters/filters/types/subject.json", "description": "The entity to target", "title": "Target" }
  },
  "additionalProperties": false
 }
--- a/source/behavior/entities/1.13.0/behaviors/minecraft.behavior.find_mount.json
+++ b/source/behavior/entities/1.13.0/behaviors/minecraft.behavior.find_mount.json
@@ -6,7 +6,7 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
+    "priority": { "$ref": "types/priority.json" },
    "avoid_water": {
      "type": "boolean",
      "default": false,
--- a/source/behavior/entities/1.13.0/behaviors/minecraft.behavior.go_home.json
+++ b/source/behavior/entities/1.13.0/behaviors/minecraft.behavior.go_home.json
@@ -6,8 +6,8 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
-    "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
+    "priority": { "$ref": "types/priority.json" },
+    "speed_multiplier": { "$ref": "types/speed_multiplier.json" },
    "goal_radius": {
      "type": "number",
      "default": 0.5,
--- a/source/behavior/entities/1.13.0/behaviors/minecraft.behavior.stomp_turtle_egg.json
+++ b/source/behavior/entities/1.13.0/behaviors/minecraft.behavior.stomp_turtle_egg.json
@@ -6,8 +6,8 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
-    "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
+    "priority": { "$ref": "types/priority.json" },
+    "speed_multiplier": { "$ref": "types/speed_multiplier.json" },
    "goal_radius": {
      "type": "number",
      "default": 0.5,
--- a/source/behavior/entities/1.13.0/behaviors/minecraft.behavior.tempt.json
+++ b/source/behavior/entities/1.13.0/behaviors/minecraft.behavior.tempt.json
@@ -6,8 +6,8 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
-    "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
+    "priority": { "$ref": "types/priority.json" },
+    "speed_multiplier": { "$ref": "types/speed_multiplier.json" },
    "can_get_scared": {
      "type": "boolean",
      "default": false,
--- a/source/behavior/entities/1.8.0/behaviors/types/base_priority.json
+++ b/source/behavior/entities/1.8.0/behaviors/types/base_priority.json
@@ -1,5 +1,5 @@
 {
-  "$id": "blockception.minecraft.behavior.entities.1.8.0.base_priority",
+  "$id": "blockception.minecraft.behavior.entities.1.13.0.priority",
  "additionalProperties": false,
  "type": "integer",
  "title": "Priority",
--- a/source/behavior/entities/1.13.0/behaviors/types/base_speed_multiplier.json
+++ b/source/behavior/entities/1.13.0/behaviors/types/base_speed_multiplier.json
--- a/source/behavior/entities/1.13.0/components/minecraft.damage_sensor.json
+++ b/source/behavior/entities/1.13.0/components/minecraft.damage_sensor.json
@@ -34,7 +34,7 @@
          "properties": {
            "filters": { "$ref": "../../filters/filters.json" },
            "event": { "type": "string", "pattern": "^.*$", "description": "TODO description: event", "title": "Event" },
-            "target": { "$ref": "../filters/types/base_subject.json", "description": "TODO description: target", "title": "Target" }
+            "target": { "$ref": "../../filters/filters/types/subject.json", "description": "TODO description: target", "title": "Target" }
          },
          "on_damage_sound_event": {
            "type": "string",
--- a/source/behavior/entities/1.13.0/components/minecraft.rideable.json
+++ b/source/behavior/entities/1.13.0/components/minecraft.rideable.json
@@ -35,7 +35,7 @@
  },
  "required": [],
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
+    "priority": { "$ref": "types/priority.json" },
    "controlling_seat": {
      "type": "integer",
      "default": 0,
--- a/source/behavior/entities/1.13.0/components/types/base_priority.json
+++ b/source/behavior/entities/1.13.0/components/types/base_priority.json
@@ -1,5 +1,5 @@
 {
-  "$id": "blockception.minecraft.behavior.entities.1.13.0.base_priority",
+  "$id": "blockception.minecraft.behavior.entities.1.13.0.priority",
  "additionalProperties": false,
  "type": "integer",
  "title": "Priority",
--- a/source/behavior/entities/1.13.0/types/trigger.json
+++ b/source/behavior/entities/1.13.0/types/trigger.json
@@ -11,7 +11,7 @@
      "description": "The filters to check to determine if the event should be fired",
      "title": "Filters"
    },
-    "target": { "$ref": "../filters/types/base_subject.json", "description": "The entity to target", "title": "Target" }
+    "target": { "$ref": "../../filters/filters/types/subject.json", "description": "The entity to target", "title": "Target" }
  },
  "additionalProperties": false
 }
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.admire_item.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.admire_item.json
@@ -5,7 +5,7 @@
  "description": "Enables the mob to admire items that have been configured as admirable. Must be used in combination with the admire_item component.",
  "additionalProperties": false,
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
+    "priority": { "$ref": "types/priority.json" },
    "admire_item_sound": {
      "type": "string",
      "default": "",
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.avoid_block.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.avoid_block.json
@@ -5,7 +5,7 @@
  "description": "UNDOCUMENTATED",
  "additionalProperties": false,
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
+    "priority": { "$ref": "types/priority.json" },
    "tick_interval": { "type": "integer", "title": "Tick Interval", "description": "UNDOCUMENTATED" },
    "search_range": { "type": "integer", "title": "Search Range", "description": "UNDOCUMENTATED" },
    "search_height": { "type": "integer", "title": "Search Height", "description": "UNDOCUMENTATED" },
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.barter.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.barter.json
@@ -4,5 +4,5 @@
  "title": "Barter 1.16.0",
  "description": "Enables the mob to barter for items that have been configured as barter currency. Must be used in combination with the barter component",
  "additionalProperties": false,
-  "properties": { "priority": { "$ref": "types/base_priority.json" } }
+  "properties": { "priority": { "$ref": "types/priority.json" } }
 }
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.celebrate.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.celebrate.json
@@ -5,7 +5,7 @@
  "description": "This allows the mob celebrate by jumping up and playing a sound periodically.",
  "additionalProperties": false,
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
+    "priority": { "$ref": "types/priority.json" },
    "celebration_sound": { "type": "string", "default": "", "description": "The sound to occasionally play.", "title": "Celebration Sound" },
    "duration": { "type": "number", "default": 1, "description": "The duration of the celebration (in seconds).", "title": "Duration" },
    "jump_interval": {
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.defend_trusted_target.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.defend_trusted_target.json
@@ -5,7 +5,7 @@
  "description": "Allows the mob to target another mob that hurts an entity it trusts.",
  "additionalProperties": false,
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
+    "priority": { "$ref": "types/priority.json" },
    "aggro_sound": { "type": "string", "default": "", "description": "Sound to occasionally play while defending.", "title": "Aggro Sound" },
    "attack_interval": { "type": "integer", "default": 0, "description": "Time in seconds between attacks", "title": "Attack Interval" },
    "must_see": {
--- 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
@@ -6,8 +6,8 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" },
-    "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" },
+    "priority": { "$ref": "./types/priority.json" },
+    "speed_multiplier": { "$ref": "./types/speed_multiplier.json" },
    "speed_modifier": { "default": 0.0, "description": "TODO description: speed modifier", "title": "Speed Modifier" },
    "potions": {
      "type": "array",
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.drop_item_for.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.drop_item_for.json
@@ -5,8 +5,8 @@
  "title": "Drop Item For 1.16.0",
  "type": "object",
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
-    "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
+    "priority": { "$ref": "types/priority.json" },
+    "speed_multiplier": { "$ref": "types/speed_multiplier.json" },
    "cooldown": { "title": "Cooldown", "description": "UNDOCUMENTATED", "type": "number" },
    "drop_item_chance": {
      "type": "number",
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.eat_carried_item.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.eat_carried_item.json
@@ -5,7 +5,7 @@
  "description": "If the mob is carrying a food item, the mob will eat it and the effects will be applied to the mob.",
  "additionalProperties": false,
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
+    "priority": { "$ref": "types/priority.json" },
    "delay_before_eating": {
      "type": "number",
      "description": "Time in seconds the mob should wait before eating the item.",
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.equip_item.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.equip_item.json
@@ -4,5 +4,5 @@
  "title": "Equip Item 1.16.0",
  "description": "UNDOCUMENTATED",
  "additionalProperties": false,
-  "properties": { "priority": { "$ref": "types/base_priority.json" } }
+  "properties": { "priority": { "$ref": "types/priority.json" } }
 }
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.find_cover.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.find_cover.json
@@ -5,8 +5,8 @@
  "description": "Allows the mob to seek shade.",
  "additionalProperties": false,
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
-    "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
+    "priority": { "$ref": "types/priority.json" },
+    "speed_multiplier": { "$ref": "types/speed_multiplier.json" },
    "cooldown_time": {
      "type": "number",
      "default": 0,
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.find_mount.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.find_mount.json
@@ -5,7 +5,7 @@
  "title": "Find Mount 1.16.0",
  "type": "object",
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
+    "priority": { "$ref": "types/priority.json" },
    "avoid_water": {
      "type": "boolean",
      "default": false,
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.go_home.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.go_home.json
@@ -23,8 +23,8 @@
    }
  },
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
-    "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
+    "priority": { "$ref": "types/priority.json" },
+    "speed_multiplier": { "$ref": "types/speed_multiplier.json" },
    "goal_radius": {
      "type": "number",
      "default": 0.5,
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.hold_ground.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.hold_ground.json
@@ -5,7 +5,7 @@
  "description": "The mob freezes and looks at the mob they are targeting.",
  "additionalProperties": false,
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
+    "priority": { "$ref": "types/priority.json" },
    "broadcast": {
      "type": "boolean",
      "default": false,
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.knockback_roar.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.knockback_roar.json
@@ -6,7 +6,7 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" },
+    "priority": { "$ref": "./types/priority.json" },
    "attack_time": {
      "type": "number",
      "default": 0.5,
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.leap_at_target.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.leap_at_target.json
@@ -6,7 +6,7 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" },
+    "priority": { "$ref": "./types/priority.json" },
    "must_be_on_ground": {
      "type": "boolean",
      "default": true,
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.look_at_player.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.look_at_player.json
@@ -6,7 +6,7 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" },
+    "priority": { "$ref": "./types/priority.json" },
    "angle_of_view_vertical": {
      "type": "integer",
      "default": 360,
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.move_to_lava.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.move_to_lava.json
@@ -5,8 +5,8 @@
  "description": "Allows the mob to move back into lava when on land.",
  "additionalProperties": false,
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
-    "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
+    "priority": { "$ref": "types/priority.json" },
+    "speed_multiplier": { "$ref": "types/speed_multiplier.json" },
    "goal_radius": {
      "type": "number",
      "default": 0.5,
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.move_towards_home_restriction.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.move_towards_home_restriction.json
@@ -4,5 +4,5 @@
  "title": "Move Towards Home Restriction 1.16.0",
  "description": "UNDOCUMENTATED",
  "additionalProperties": false,
-  "properties": { "priority": { "$ref": "types/base_priority.json" }, "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" } }
+  "properties": { "priority": { "$ref": "types/priority.json" }, "speed_multiplier": { "$ref": "types/speed_multiplier.json" } }
 }
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.nap.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.nap.json
@@ -5,8 +5,8 @@
  "description": "Allows the mob to move back into lava when on land.",
  "additionalProperties": false,
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
-    "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
+    "priority": { "$ref": "types/priority.json" },
+    "speed_multiplier": { "$ref": "types/speed_multiplier.json" },
    "cooldown_max": {
      "type": "number",
      "default": 0,
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.nearest_attackable_target.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.nearest_attackable_target.json
@@ -33,7 +33,7 @@
    }
  },
  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" },
+    "priority": { "$ref": "./types/priority.json" },
    "entity_types": {
      "description": "Filters which types of targets are valid for this entity.",
      "title": "Entity Types",
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.nearest_prioritized_attackable_target.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.nearest_prioritized_attackable_target.json
@@ -6,7 +6,7 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" },
+    "priority": { "$ref": "./types/priority.json" },
    "entity_types": {
      "description": "List of entity types that this mob considers valid targets",
      "title": "Entity Types",
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.pet_sleep_with_owner.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.pet_sleep_with_owner.json
@@ -6,8 +6,8 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
-    "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
+    "priority": { "$ref": "types/priority.json" },
+    "speed_multiplier": { "$ref": "types/speed_multiplier.json" },
    "goal_radius": {
      "type": "number",
      "default": 0.5,
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.pickup_items.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.pickup_items.json
@@ -5,8 +5,8 @@
  "type": "object",
  "title": "Pickup Items 1.16.0",
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
-    "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
+    "priority": { "$ref": "types/priority.json" },
+    "speed_multiplier": { "$ref": "types/speed_multiplier.json" },
    "can_pickup_any_item": {
      "type": "boolean",
      "default": false,
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.random_fly.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.random_fly.json
@@ -6,8 +6,8 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
-    "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
+    "priority": { "$ref": "types/priority.json" },
+    "speed_multiplier": { "$ref": "types/speed_multiplier.json" },
    "avoid_damage_blocks": { "type": "boolean", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
    "can_land_on_trees": {
      "type": "boolean",
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.random_hover.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.random_hover.json
@@ -6,8 +6,8 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
-    "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
+    "priority": { "$ref": "types/priority.json" },
+    "speed_multiplier": { "$ref": "types/speed_multiplier.json" },
    "hover_height": {
      "type": "array",
      "description": "UNDOCUMENTATED",
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.random_look_around_and_sit.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.random_look_around_and_sit.json
@@ -6,7 +6,7 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
+    "priority": { "$ref": "types/priority.json" },
    "max_look_count": {
      "type": "integer",
      "default": 2,
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.rise_to_liquid_level.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.rise_to_liquid_level.json
@@ -6,7 +6,7 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
+    "priority": { "$ref": "types/priority.json" },
    "liquid_y_offset": { "type": "number", "title": "Liquid Y Offset", "description": "UNDOCUMENTATED" },
    "rise_delta": { "type": "number", "title": "Rise Delta", "description": "UNDOCUMENTATED" },
    "sink_delta": { "type": "number", "title": "Sink Delta", "description": "UNDOCUMENTATED" }
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.send_event.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.send_event.json
@@ -13,7 +13,7 @@
        "type": "object",
        "additionalProperties": false,
        "properties": {
-          "base_delay": { "type": "number", "default": 0, "description": "Amount of time in seconds before starting this step" },
+          "delay": { "type": "number", "default": 0, "description": "Amount of time in seconds before starting this step" },
          "event": { "type": "string", "default": "", "description": "The event to send to the entity" },
          "sound_event": { "type": "string", "default": "", "description": "The sound event to play when this step happens" }
        }
@@ -21,7 +21,7 @@
    }
  },
  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" },
+    "priority": { "$ref": "./types/priority.json" },
    "cast_duration": { "type": "number", "description": "Time in seconds for the entire event sending process", "title": "TODO Title" },
    "event_choices": {
      "type": "array",
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.stalk_and_pounce_on_target.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.stalk_and_pounce_on_target.json
@@ -6,7 +6,7 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
+    "priority": { "$ref": "types/priority.json" },
    "interest_time": {
      "type": "number",
      "default": 2,
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.stroll_towards_village.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.stroll_towards_village.json
@@ -6,7 +6,7 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
+    "priority": { "$ref": "types/priority.json" },
    "cooldown_time": {
      "type": "number",
      "default": 0,
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.swim_idle.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.swim_idle.json
@@ -6,7 +6,7 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
+    "priority": { "$ref": "types/priority.json" },
    "idle_time": { "type": "number", "title": "Idle Time", "description": "UNDOCUMENTATED" },
    "success_rate": { "type": "number", "title": "Succes Rate", "description": "UNDOCUMENTATED" }
  }
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.tempt.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.tempt.json
@@ -6,8 +6,8 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
-    "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
+    "priority": { "$ref": "types/priority.json" },
+    "speed_multiplier": { "$ref": "types/speed_multiplier.json" },
    "can_get_scared": {
      "type": "boolean",
      "default": false,
--- a/source/behavior/entities/1.13.0/behaviors/types/base_priority.json
+++ b/source/behavior/entities/1.13.0/behaviors/types/base_priority.json
@@ -1,5 +1,5 @@
 {
-  "$id": "blockception.minecraft.behavior.entities.1.13.0.base_priority",
+  "$id": "blockception.minecraft.behavior.entities.1.16.0.priority",
  "additionalProperties": false,
  "type": "integer",
  "title": "Priority",
--- a/source/behavior/entities/1.16.0/behaviors/types/base_speed_multiplier.json
+++ b/source/behavior/entities/1.16.0/behaviors/types/base_speed_multiplier.json
--- a/source/behavior/entities/1.16.0/components/minecraft.buoyant.json
+++ b/source/behavior/entities/1.16.0/components/minecraft.buoyant.json
@@ -11,7 +11,7 @@
      "description": "Applies gravity each tick. Causes more of a wave simulation, but will cause more gravity to be applied outside liquids.",
      "title": "Apply Gravity"
    },
-    "base_buoyancy": {
+    "buoyancy": {
      "type": "number",
      "default": 1,
      "description": "Base buoyancy used to calculate how much will a mob float.",
--- a/source/behavior/entities/1.16.0/components/minecraft.damage_sensor.json
+++ b/source/behavior/entities/1.16.0/components/minecraft.damage_sensor.json
@@ -34,7 +34,7 @@
          "properties": {
            "filters": { "$ref": "../../filters/filters.json" },
            "event": { "type": "string", "pattern": "^.*$", "description": "TODO description: event", "title": "Event" },
-            "target": { "$ref": "../filters/types/base_subject.json", "description": "TODO description: target", "title": "Target" }
+            "target": { "$ref": "../../filters/filters/types/subject.json", "description": "TODO description: target", "title": "Target" }
          },
          "on_damage_sound_event": {
            "type": "string",
--- a/source/behavior/entities/1.16.0/types/trigger.json
+++ b/source/behavior/entities/1.16.0/types/trigger.json
@@ -10,7 +10,7 @@
      "description": "The filters to check to determine if the event should be fired",
      "title": "TODO Title"
    },
-    "target": { "$ref": "../filters/types/base_subject.json", "description": "The entity to target", "title": "Target" }
+    "target": { "$ref": "../../filters/filters/types/subject.json", "description": "The entity to target", "title": "Target" }
  },
  "additionalProperties": false
 }
--- a/source/behavior/entities/1.16.0/behaviors/types/base_priority.json
+++ b/source/behavior/entities/1.16.0/behaviors/types/base_priority.json
@@ -1,5 +1,5 @@
 {
-  "$id": "blockception.minecraft.behavior.entities.1.16.0.base_priority",
+  "$id": "blockception.minecraft.behavior.entities.1.16.100.priority",
  "additionalProperties": false,
  "type": "integer",
  "title": "Priority",
--- a/source/behavior/entities/1.16.100/behaviors/types/base_speed_multiplier.json
+++ b/source/behavior/entities/1.16.100/behaviors/types/base_speed_multiplier.json
--- a/source/behavior/entities/1.16.100/types/trigger.json
+++ b/source/behavior/entities/1.16.100/types/trigger.json
@@ -10,7 +10,7 @@
      "description": "The filters to check to determine if the event should be fired",
      "title": "TODO Title"
    },
-    "target": { "$ref": "../filters/types/base_subject.json", "description": "The entity to target", "title": "Target" }
+    "target": { "$ref": "../../filters/filters/types/subject.json", "description": "The entity to target", "title": "Target" }
  },
  "additionalProperties": false
 }
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.avoid_mob_type.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.avoid_mob_type.json
@@ -6,7 +6,7 @@
  "title": "Avoid Mob Type 1.8.0",
  "required": [],
  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" },
+    "priority": { "$ref": "./types/priority.json" },
    "max_dist": { "type": "number", "default": 0, "description": "Maximum distance to look for an entity", "title": "Max Dist" },
    "max_flee": {
      "type": "number",
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.beg.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.beg.json
@@ -6,7 +6,7 @@
  "description": "Allows this mob to look at and follow the player that holds food they like.",
  "required": [],
  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" },
+    "priority": { "$ref": "./types/priority.json" },
    "items": {
      "type": "array",
      "description": "List of items that this mob likes",
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.break_door.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.break_door.json
@@ -4,6 +4,6 @@
  "title": "Break Door 1.8.0",
  "description": "Allows this mob to break doors.",
  "required": [],
-  "properties": { "priority": { "$ref": "types/base_priority.json" }, "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" } },
+  "properties": { "priority": { "$ref": "types/priority.json" }, "speed_multiplier": { "$ref": "./types/speed_multiplier.json" } },
  "additionalProperties": false
 }
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.breed.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.breed.json
@@ -5,5 +5,5 @@
  "title": "Breed 1.8.0",
  "description": "Allows this mob to breed with other mobs.",
  "required": [],
-  "properties": { "priority": { "$ref": "types/base_priority.json" }, "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" } }
+  "properties": { "priority": { "$ref": "types/priority.json" }, "speed_multiplier": { "$ref": "./types/speed_multiplier.json" } }
 }
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.celebrate.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.celebrate.json
@@ -5,7 +5,7 @@
  "description": "This allows the mob celebrate by jumping up and playing a sound periodically.",
  "additionalProperties": false,
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
+    "priority": { "$ref": "types/priority.json" },
    "celebration_sound": { "type": "string", "default": "", "description": "The sound to occasionally play.", "title": "Celebration Sound" },
    "duration": { "type": "number", "default": 1, "description": "The duration of the celebration (in seconds).", "title": "Duration" },
    "jump_interval": {
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.charge_attack.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.charge_attack.json
@@ -5,5 +5,5 @@
  "title": "Charge Attack 1.8.0",
  "description": "Allows the mob to attack its target by running at it.",
  "required": [],
-  "properties": { "priority": { "$ref": "types/base_priority.json" }, "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" } }
+  "properties": { "priority": { "$ref": "types/priority.json" }, "speed_multiplier": { "$ref": "types/speed_multiplier.json" } }
 }
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.charge_held_item.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.charge_held_item.json
@@ -6,7 +6,7 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" },
+    "priority": { "$ref": "./types/priority.json" },
    "items": {
      "type": "array",
      "title": "Items",
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.circle_around_anchor.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.circle_around_anchor.json
@@ -6,7 +6,7 @@
  "description": "Allows the mob to move in a circle around a point or a target.",
  "required": [],
  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" },
+    "priority": { "$ref": "./types/priority.json" },
    "speed_multiplier": {
      "type": "number",
      "default": 1.0,
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.controlled_by_player.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.controlled_by_player.json
@@ -5,7 +5,7 @@
  "title": "Controlled By Player 1.8.0",
  "description": "Allows the mob to be controlled by the player.",
  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" },
+    "priority": { "$ref": "./types/priority.json" },
    "mount_speed_multiplier": {
      "type": "number",
      "default": 1,
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.defend_trusted_target.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.defend_trusted_target.json
@@ -5,7 +5,7 @@
  "description": "Allows the mob to target another mob that hurts an entity it trusts.",
  "additionalProperties": false,
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
+    "priority": { "$ref": "types/priority.json" },
    "aggro_sound": { "type": "string", "default": "", "description": "Sound to occasionally play while defending.", "title": "Aggro Sound" },
    "attack_interval": { "type": "integer", "default": 0, "description": "Time in seconds between attacks", "title": "Attack Interval" },
    "must_see": {
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.defend_village_target.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.defend_village_target.json
@@ -5,7 +5,7 @@
  "title": "Defend Village Target 1.8.0",
  "description": "Allows the mob to stay in the village and fight mobs hostile to the villagers.",
  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" },
+    "priority": { "$ref": "./types/priority.json" },
    "entity_types": {
      "$ref": "../types/entity_types.json",
      "description": "List of entity types this mob considers a threat to the village",
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.delayed_attack.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.delayed_attack.json
@@ -5,8 +5,8 @@
  "title": "Delayed Attack 1.8.0",
  "description": "Allows the mob to drink potions based on specified environment conditions.",
  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" },
-    "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" },
+    "priority": { "$ref": "./types/priority.json" },
+    "speed_multiplier": { "$ref": "./types/speed_multiplier.json" },
    "attack_duration": { "type": "number", "default": 1, "description": "The duration of the attack animation in seconds", "title": "TODO Title" },
    "attack_once": { "type": "boolean", "default": false, "description": "If true, this mob will attack only one time.", "title": "TODO Title" },
    "attack_types": { "type": "string", "default": "", "description": "Defines the entity types this mob will attack", "title": "TODO Title" },
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.door_interact.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.door_interact.json
@@ -4,5 +4,5 @@
  "type": "object",
  "title": "Door Interact 1.8.0",
  "description": "Allows the mob to drink potions based on specified environment conditions.",
-  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
+  "properties": { "priority": { "$ref": "./types/priority.json" } }
 }
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.dragonchargeplayer.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.dragonchargeplayer.json
@@ -4,5 +4,5 @@
  "type": "object",
  "title": "Dragonchargeplayer 1.8.0",
  "description": "Allows the dragon to attack a player by flying fast at them. The player is chosen by the dragonscanning goal. Can only be used by the Ender Dragon.",
-  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
+  "properties": { "priority": { "$ref": "./types/priority.json" } }
 }
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.dragondeath.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.dragondeath.json
@@ -4,5 +4,5 @@
  "type": "object",
  "title": "Dragondeath 1.8.0",
  "description": "Allows the dragon to go out with glory. This controls the Ender Dragon's death animation and can't be used by other mobs.",
-  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
+  "properties": { "priority": { "$ref": "./types/priority.json" } }
 }
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.dragonflaming.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.dragonflaming.json
@@ -4,5 +4,5 @@
  "type": "object",
  "title": "Dragonflaming 1.8.0",
  "description": "Allows the dragon to use its flame breath attack. Can only be used by the Ender Dragon.",
-  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
+  "properties": { "priority": { "$ref": "./types/priority.json" } }
 }
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.dragonholdingpattern.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.dragonholdingpattern.json
@@ -4,5 +4,5 @@
  "type": "object",
  "title": "Dragonholdingpattern 1.8.0",
  "description": "Allows the Dragon to fly around in a circle around the center podium. Can only be used by the Ender Dragon.",
-  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
+  "properties": { "priority": { "$ref": "./types/priority.json" } }
 }
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.dragonlanding.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.dragonlanding.json
@@ -4,5 +4,5 @@
  "type": "object",
  "title": "Dragonlanding 1.8.0",
  "description": "Allows the Dragon to stop flying and transition into perching mode. Can only be used by the Ender Dragon.",
-  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
+  "properties": { "priority": { "$ref": "./types/priority.json" } }
 }
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.dragonscanning.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.dragonscanning.json
@@ -4,5 +4,5 @@
  "type": "object",
  "title": "Dragonscanning 1.8.0",
  "description": "Allows the dragon to look around for a player to attack while in perch mode. Can only be used by the Ender Dragon.",
-  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
+  "properties": { "priority": { "$ref": "./types/priority.json" } }
 }
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.dragonstrafeplayer.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.dragonstrafeplayer.json
@@ -4,5 +4,5 @@
  "type": "object",
  "title": "Dragonstrafeplayer 1.8.0",
  "description": "Allows the dragon to fly around looking for a player and shoot fireballs at them. Can only be used by the Ender Dragon.",
-  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
+  "properties": { "priority": { "$ref": "./types/priority.json" } }
 }
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.dragontakeoff.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.dragontakeoff.json
@@ -4,5 +4,5 @@
  "type": "object",
  "title": "Dragontakeoff 1.8.0",
  "description": "Allows the dragon to leave perch mode and go back to flying around. Can only be used by the Ender Dragon.",
-  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
+  "properties": { "priority": { "$ref": "./types/priority.json" } }
 }
--- 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
@@ -6,8 +6,8 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" },
-    "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" },
+    "priority": { "$ref": "./types/priority.json" },
+    "speed_multiplier": { "$ref": "./types/speed_multiplier.json" },
    "speed_modifier": { "default": 0.0, "description": "TODO description: speed modifier", "title": "Speed Modifier" },
    "potions": {
      "type": "array",
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.drop_item_for.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.drop_item_for.json
@@ -5,8 +5,8 @@
  "title": "Drop Item For 1.8.0",
  "description": "Allows the mob to drink potions based on specified environment conditions.",
  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" },
-    "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" },
+    "priority": { "$ref": "./types/priority.json" },
+    "speed_multiplier": { "$ref": "./types/speed_multiplier.json" },
    "entity_types": { "$ref": "../types/entity_types.json" },
    "drop_item_chance": { "type": "number", "default": 1.0, "description": "The probability that the mob will drop an item.", "title": "TODO Title" },
    "goal_radius": {
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.eat_block.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.eat_block.json
@@ -6,7 +6,7 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" },
+    "priority": { "$ref": "./types/priority.json" },
    "on_eat": { "$ref": "../types/trigger.json", "description": "UNDOCUMENTATED", "title": "On Eat" },
    "success_chance": {
      "title": "Succes Chance",
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.eat_carried_item.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.eat_carried_item.json
@@ -5,7 +5,7 @@
  "description": "If the mob is carrying a food item, the mob will eat it and the effects will be applied to the mob.",
  "additionalProperties": false,
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
+    "priority": { "$ref": "types/priority.json" },
    "delay_before_eating": {
      "type": "number",
      "description": "Time in seconds the mob should wait before eating the item.",
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.enderman_leave_block.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.enderman_leave_block.json
@@ -5,5 +5,5 @@
  "additionalProperties": false,
  "description": "Allows the enderman to drop a block they are carrying. Can only be used by Endermen.",
  "required": [],
-  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
+  "properties": { "priority": { "$ref": "./types/priority.json" } }
 }
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.enderman_take_block.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.enderman_take_block.json
@@ -5,5 +5,5 @@
  "description": "Allows the enderman to take a block and carry it around. Can only be used by Endermen.",
  "additionalProperties": false,
  "required": [],
-  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
+  "properties": { "priority": { "$ref": "./types/priority.json" } }
 }
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.explore_outskirts.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.explore_outskirts.json
@@ -6,8 +6,8 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
-    "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
+    "priority": { "$ref": "types/priority.json" },
+    "speed_multiplier": { "$ref": "types/speed_multiplier.json" },
    "explore_dist": {
      "type": "number",
      "default": 5,
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.find_cover.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.find_cover.json
@@ -5,8 +5,8 @@
  "description": "Allows the mob to seek shade.",
  "additionalProperties": false,
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
-    "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
+    "priority": { "$ref": "types/priority.json" },
+    "speed_multiplier": { "$ref": "types/speed_multiplier.json" },
    "cooldown_time": {
      "type": "number",
      "default": 0,
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.find_mount.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.find_mount.json
@@ -6,7 +6,7 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
+    "priority": { "$ref": "types/priority.json" },
    "avoid_water": {
      "type": "boolean",
      "default": false,
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.find_underwater_treasure.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.find_underwater_treasure.json
@@ -6,8 +6,8 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" },
-    "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" },
+    "priority": { "$ref": "./types/priority.json" },
+    "speed_multiplier": { "$ref": "./types/speed_multiplier.json" },
    "search_range": {
      "type": "integer",
      "default": 0,
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.flee_sun.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.flee_sun.json
@@ -5,5 +5,5 @@
  "description": "Allows the mob to run away from direct sunlight and seek shade.",
  "additionalProperties": false,
  "required": [],
-  "properties": { "priority": { "$ref": "types/base_priority.json" }, "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" } }
+  "properties": { "priority": { "$ref": "types/priority.json" }, "speed_multiplier": { "$ref": "types/speed_multiplier.json" } }
 }
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.float.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.float.json
@@ -5,5 +5,5 @@
  "description": "Allows the mob to stay afloat while swimming.",
  "additionalProperties": false,
  "required": [],
-  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
+  "properties": { "priority": { "$ref": "./types/priority.json" } }
 }
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.float_wander.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.float_wander.json
@@ -6,7 +6,7 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" },
+    "priority": { "$ref": "./types/priority.json" },
    "xz_dist": {
      "type": "integer",
      "default": 10,
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.follow_caravan.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.follow_caravan.json
@@ -6,8 +6,8 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" },
-    "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" },
+    "priority": { "$ref": "./types/priority.json" },
+    "speed_multiplier": { "$ref": "./types/speed_multiplier.json" },
    "entity_types": {
      "$ref": "../types/entity_types.json",
      "description": "List of entity types that this mob can follow in a caravan",
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.follow_mob.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.follow_mob.json
@@ -6,8 +6,8 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
-    "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" },
+    "priority": { "$ref": "types/priority.json" },
+    "speed_multiplier": { "$ref": "./types/speed_multiplier.json" },
    "search_range": {
      "type": "integer",
      "default": 0,
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.follow_owner.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.follow_owner.json
@@ -6,8 +6,8 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
-    "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" },
+    "priority": { "$ref": "types/priority.json" },
+    "speed_multiplier": { "$ref": "./types/speed_multiplier.json" },
    "start_distance": {
      "type": "number",
      "default": 10,
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.follow_parent.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.follow_parent.json
@@ -5,5 +5,5 @@
  "description": "Allows the mob to follow their parent around.",
  "additionalProperties": false,
  "required": [],
-  "properties": { "priority": { "$ref": "types/base_priority.json" }, "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" } }
+  "properties": { "priority": { "$ref": "types/priority.json" }, "speed_multiplier": { "$ref": "./types/speed_multiplier.json" } }
 }
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.follow_target_captain.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.follow_target_captain.json
@@ -6,8 +6,8 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
-    "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
+    "priority": { "$ref": "types/priority.json" },
+    "speed_multiplier": { "$ref": "types/speed_multiplier.json" },
    "follow_distance": {
      "type": "number",
      "default": 0,
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.go_home.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.go_home.json
@@ -6,8 +6,8 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
-    "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
+    "priority": { "$ref": "types/priority.json" },
+    "speed_multiplier": { "$ref": "types/speed_multiplier.json" },
    "goal_radius": {
      "type": "number",
      "default": 0.5,
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.guardian_attack.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.guardian_attack.json
@@ -5,5 +5,5 @@
  "description": "Allows the guardian to use its laser beam attack. Can only be used by Guardians and Elder Guardians.",
  "additionalProperties": false,
  "required": [],
-  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
+  "properties": { "priority": { "$ref": "./types/priority.json" } }
 }
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.harvest_farm_block.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.harvest_farm_block.json
@@ -6,8 +6,8 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
-    "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
+    "priority": { "$ref": "types/priority.json" },
+    "speed_multiplier": { "$ref": "types/speed_multiplier.json" },
    "max_seconds_before_search": { "title": "UNDOCUMENTATED", "description": "UNDOCUMENATED", "type": "number" },
    "search_cooldown_max_seconds": { "title": "UNDOCUMENTATED", "description": "UNDOCUMENATED", "type": "number" },
    "seconds_until_new_task": { "title": "UNDOCUMENTATED", "description": "UNDOCUMENATED", "type": "number" }
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.hide.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.hide.json
@@ -6,8 +6,8 @@
  "description": "Allows a mob with the hide component to attempt to move to - and hide at - an owned or nearby POI.",
  "required": [],
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
-    "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
+    "priority": { "$ref": "types/priority.json" },
+    "speed_multiplier": { "$ref": "types/speed_multiplier.json" },
    "duration": { "type": "number", "default": 1, "description": "Amount of time in seconds that the mob reacts.", "title": "TODO Title" },
    "poi_type": { "type": "string", "default": "", "description": "Defines what POI type to hide at.", "title": "TODO Title" },
    "timeout_cooldown": {
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.hold_ground.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.hold_ground.json
@@ -5,7 +5,7 @@
  "description": "The mob freezes and looks at the mob they are targeting.",
  "additionalProperties": false,
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
+    "priority": { "$ref": "types/priority.json" },
    "broadcast": {
      "type": "boolean",
      "default": false,
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.hurt_by_target.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.hurt_by_target.json
@@ -6,7 +6,7 @@
  "description": "Allows the mob to target another mob that hurts them.",
  "required": [],
  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" },
+    "priority": { "$ref": "./types/priority.json" },
    "entity_types": { "$ref": "../types/entity_types.json", "description": "TODO description: entity types", "title": "Entity Types" },
    "alert_same_type": {
      "type": "boolean",
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.inspect_bookshelf.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.inspect_bookshelf.json
@@ -6,8 +6,8 @@
  "description": "Allows the mob to inspect bookshelves.",
  "required": [],
  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
-    "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
+    "priority": { "$ref": "types/priority.json" },
+    "speed_multiplier": { "$ref": "types/speed_multiplier.json" },
    "goal_radius": {
      "type": "number",
      "default": 0.5,
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.knockback_roar.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.knockback_roar.json
@@ -6,7 +6,7 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" },
+    "priority": { "$ref": "./types/priority.json" },
    "attack_time": {
      "type": "number",
      "default": 0.5,
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.lay_down.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.lay_down.json
@@ -6,7 +6,7 @@
  "additionalProperties": false,
  "required": [],
  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" },
+    "priority": { "$ref": "./types/priority.json" },
    "interval": {
      "type": "integer",
      "default": 120,
--- a/Show More
+++ b/Show More