From c4eb500299b813017c6d8876aca2dec3d1c32e7e Mon Sep 17 00:00:00 2001
From: GrandPartyMask <16635607+MusicScore@users.noreply.github.com>
Date: Tue, 22 Jan 2019 11:57:09 -0500
Subject: [PATCH] Add entity property handled lists (#1894)

---
 .../denizen/objects/properties/entity/EntityAI.java   |  8 ++++++++
 .../denizen/objects/properties/entity/EntityAge.java  |  8 ++++++++
 .../objects/properties/entity/EntityAnger.java        |  9 +++++++++
 .../objects/properties/entity/EntityAngry.java        |  9 +++++++++
 .../properties/entity/EntityAreaEffectCloud.java      | 11 +++++++++++
 .../objects/properties/entity/EntityArmorBonus.java   |  8 ++++++++
 .../objects/properties/entity/EntityArmorPose.java    |  8 ++++++++
 .../denizen/objects/properties/entity/EntityArms.java |  9 +++++++++
 .../objects/properties/entity/EntityBasePlate.java    |  9 +++++++++
 .../objects/properties/entity/EntityBeamTarget.java   |  9 +++++++++
 .../objects/properties/entity/EntityBoatType.java     |  9 +++++++++
 .../objects/properties/entity/EntityBodyArrows.java   |  9 +++++++++
 .../objects/properties/entity/EntityBoundingBox.java  |  9 +++++++++
 .../objects/properties/entity/EntityChestCarrier.java |  9 +++++++++
 .../objects/properties/entity/EntityColor.java        |  8 ++++++++
 .../objects/properties/entity/EntityCritical.java     |  9 +++++++++
 .../objects/properties/entity/EntityCustomName.java   |  8 ++++++++
 .../properties/entity/EntityDisabledSlots.java        |  9 +++++++++
 .../objects/properties/entity/EntityElder.java        |  9 +++++++++
 .../objects/properties/entity/EntityEquipment.java    |  8 ++++++++
 .../objects/properties/entity/EntityFirework.java     |  9 +++++++++
 .../objects/properties/entity/EntityFramed.java       |  8 ++++++++
 .../objects/properties/entity/EntityGravity.java      |  9 +++++++++
 .../objects/properties/entity/EntityHealth.java       |  8 ++++++++
 .../objects/properties/entity/EntityInfected.java     |  8 ++++++++
 .../objects/properties/entity/EntityInventory.java    |  8 ++++++++
 .../objects/properties/entity/EntityInvulnerable.java |  9 +++++++++
 .../properties/entity/EntityIsShowingBottom.java      |  9 +++++++++
 .../denizen/objects/properties/entity/EntityItem.java |  9 +++++++++
 .../objects/properties/entity/EntityJumpStrength.java |  8 ++++++++
 .../objects/properties/entity/EntityKnockback.java    |  9 +++++++++
 .../objects/properties/entity/EntityMarker.java       |  9 +++++++++
 .../objects/properties/entity/EntityPainting.java     |  9 +++++++++
 .../objects/properties/entity/EntityPotion.java       |  8 ++++++++
 .../properties/entity/EntityPotionEffects.java        |  9 +++++++++
 .../objects/properties/entity/EntityPowered.java      |  9 +++++++++
 .../objects/properties/entity/EntityProfession.java   |  8 ++++++++
 .../objects/properties/entity/EntityRiptide.java      |  9 +++++++++
 .../objects/properties/entity/EntityRotation.java     |  8 ++++++++
 .../objects/properties/entity/EntitySilent.java       |  8 ++++++++
 .../objects/properties/entity/EntitySitting.java      |  9 +++++++++
 .../denizen/objects/properties/entity/EntitySize.java |  8 ++++++++
 .../objects/properties/entity/EntitySkeleton.java     |  9 +++++++++
 .../objects/properties/entity/EntitySmall.java        |  8 ++++++++
 .../objects/properties/entity/EntitySpeed.java        |  8 ++++++++
 .../objects/properties/entity/EntitySpell.java        |  9 +++++++++
 .../denizen/objects/properties/entity/EntityTame.java |  8 ++++++++
 .../objects/properties/entity/EntityVisible.java      |  8 ++++++++
 48 files changed, 413 insertions(+)

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityAI.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityAI.java
index f017d9de71..ba6df1928c 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityAI.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityAI.java
@@ -24,6 +24,14 @@ public static EntityAI getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "has_ai"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "has_ai", "toggle_ai"
+    };
+
 
     ///////////////////
     // Instance Fields and Methods
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityAge.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityAge.java
index 539d31683b..93bc759d3b 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityAge.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityAge.java
@@ -33,6 +33,14 @@ public static EntityAge getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "age", "is_age_locked", "is_baby"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "age_lock", "age"
+    };
+
 
     ///////////////////
     // Instance Fields and Methods
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityAnger.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityAnger.java
index f0e1f9cc68..5207c5d619 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityAnger.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityAnger.java
@@ -24,6 +24,15 @@ public static EntityAnger getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "anger"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "anger"
+    };
+
+
     ///////////////////
     // Instance Fields and Methods
     /////////////
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityAngry.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityAngry.java
index d10d3cf1a8..fcb34fd7c1 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityAngry.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityAngry.java
@@ -26,6 +26,15 @@ public static EntityAngry getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "angry"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "angry"
+    };
+
+
     ///////////////////
     // Instance Fields and Methods
     /////////////
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityAreaEffectCloud.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityAreaEffectCloud.java
index e724791578..dabadfee02 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityAreaEffectCloud.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityAreaEffectCloud.java
@@ -33,6 +33,17 @@ public static EntityAreaEffectCloud getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "base_potion", "particle", "duration", "radius", "reapplication_delay", "wait_time",
+            "has_custom_effect", "source", "custom_effects"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "clear_custom_effects", "remove_custom_effect", "custom_effects", "particle_color",
+            "base_potion", "duration", "duration_on_use", "particle", "radius", "radius_on_use",
+            "radius_per_tick", "reapplication_delay", "source", "wait_time"
+    };
+
 
     ///////////////////
     // Instance Fields and Methods
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityArmorBonus.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityArmorBonus.java
index 65a6112ad8..cbb1f6f481 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityArmorBonus.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityArmorBonus.java
@@ -23,6 +23,14 @@ public static EntityArmorBonus getFrom(dObject entity) {
         return new EntityArmorBonus((dEntity) entity);
     }
 
+    public static final String[] handledTags = new String[]{
+            "armor_bonus"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "armor_bonus"
+    };
+
 
     ///////////////////
     // Instance Fields and Methods
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityArmorPose.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityArmorPose.java
index 3f78e08573..804d78565e 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityArmorPose.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityArmorPose.java
@@ -31,6 +31,14 @@ public static EntityArmorPose getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "armor_pose_list", "armor_pose"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "armor_pose"
+    };
+
 
     ///////////////////
     // Instance Fields and Methods
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityArms.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityArms.java
index 9a274362f7..79c9961606 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityArms.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityArms.java
@@ -24,6 +24,15 @@ public static EntityArms getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "arms"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "arms"
+    };
+
+
     ///////////////////
     // Instance Fields and Methods
     /////////////
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityBasePlate.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityBasePlate.java
index 1053fd32ca..f9fd7264c5 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityBasePlate.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityBasePlate.java
@@ -24,6 +24,15 @@ public static EntityBasePlate getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "base_plate"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "base_plate"
+    };
+
+
     ///////////////////
     // Instance Fields and Methods
     /////////////
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityBeamTarget.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityBeamTarget.java
index e22cc303e6..b45e1f892a 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityBeamTarget.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityBeamTarget.java
@@ -25,6 +25,15 @@ public static EntityBeamTarget getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "beam_target"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "beam_target"
+    };
+
+
     ///////////////////
     // Instance Fields and Methods
     /////////////
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityBoatType.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityBoatType.java
index 3bc11d875b..2d2aca4739 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityBoatType.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityBoatType.java
@@ -25,6 +25,15 @@ public static EntityBoatType getFrom(dObject object) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "boat_type"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "boat_type"
+    };
+
+
     ///////////////////
     // Instance Fields and Methods
     /////////////
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityBodyArrows.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityBodyArrows.java
index 9790a0bc51..f1feb76480 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityBodyArrows.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityBodyArrows.java
@@ -22,6 +22,15 @@ public static EntityBodyArrows getFrom(dObject object) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "body_arrows"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "body_arrows", "clear_body_arrows"
+    };
+
+
     ///////////////////
     // Instance Fields and Methods
     /////////////
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityBoundingBox.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityBoundingBox.java
index b64b4acda6..695d07cfdd 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityBoundingBox.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityBoundingBox.java
@@ -32,6 +32,15 @@ public static EntityBoundingBox getFrom(dObject object) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "bounding_box"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "bounding_box"
+    };
+
+
     private static Set<UUID> modifiedBoxes = new HashSet<UUID>();
 
     public static void remove(UUID uuid) {
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityChestCarrier.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityChestCarrier.java
index a7a7a8edb8..2e0f53c64d 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityChestCarrier.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityChestCarrier.java
@@ -24,6 +24,15 @@ public static EntityChestCarrier getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "carries_chest"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "carries_chest"
+    };
+
+
     ///////////////////
     // Instance Fields and Methods
     /////////////
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityColor.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityColor.java
index 5ec2ad8eb6..513f671830 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityColor.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityColor.java
@@ -43,6 +43,14 @@ public static EntityColor getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "color"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "color"
+    };
+
 
     ///////////////////
     // Instance Fields and Methods
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityCritical.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityCritical.java
index cbd024f4e1..9763630542 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityCritical.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityCritical.java
@@ -24,6 +24,15 @@ public static EntityCritical getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "critical"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "critical"
+    };
+
+
     ///////////////////
     // Instance Fields and Methods
     /////////////
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityCustomName.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityCustomName.java
index 20518fef47..73d3da984b 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityCustomName.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityCustomName.java
@@ -20,6 +20,14 @@ public static EntityCustomName getFrom(dObject entity) {
         return new EntityCustomName((dEntity) entity);
     }
 
+    public static final String[] handledTags = new String[]{
+            "custom_name_visible", "custom_name"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "custom_name_visibility", "custom_name_visible", "custom_name"
+    };
+
     private EntityCustomName(dEntity ent) {
         entity = ent;
     }
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityDisabledSlots.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityDisabledSlots.java
index c7f305b946..132c372c79 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityDisabledSlots.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityDisabledSlots.java
@@ -30,6 +30,15 @@ public static EntityDisabledSlots getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "disabled_slots"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "disabled_slots_raw", "disabled_slots"
+    };
+
+
     ///////////////////
     // Instance Fields and Methods
     /////////////
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityElder.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityElder.java
index 4e455a7a52..e63a3504f2 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityElder.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityElder.java
@@ -24,6 +24,15 @@ public static EntityElder getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "elder"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "elder"
+    };
+
+
     ///////////////////
     // Instance Fields and Methods
     /////////////
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityEquipment.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityEquipment.java
index e724d08ea6..49b8e380b3 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityEquipment.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityEquipment.java
@@ -27,6 +27,14 @@ public static EntityEquipment getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "equipment"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "equipment"
+    };
+
 
     ///////////////////
     // Instance Fields and Methods
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityFirework.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityFirework.java
index a4bfae3eec..10f7e42f26 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityFirework.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityFirework.java
@@ -28,6 +28,15 @@ public static EntityFirework getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "firework_item"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "firework_item", "detonate"
+    };
+
+
     ///////////////////
     // Instance Fields and Methods
     /////////////
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityFramed.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityFramed.java
index 7fa976f59a..5232d3fe92 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityFramed.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityFramed.java
@@ -31,6 +31,14 @@ public static EntityFramed getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "framed_item_rotation", "framed_item", "has_framed_item"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "framed"
+    };
+
 
     ///////////////////
     // Instance Fields and Methods
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityGravity.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityGravity.java
index 1d8bc427d3..e1d6bfeed0 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityGravity.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityGravity.java
@@ -28,6 +28,15 @@ public static EntityGravity getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "gravity"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "gravity"
+    };
+
+
     ///////////////////
     // Instance Fields and Methods
     /////////////
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityHealth.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityHealth.java
index 6aa84db9f0..2449601b59 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityHealth.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityHealth.java
@@ -28,6 +28,14 @@ public static EntityHealth getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "health"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "max_health", "health_data", "health"
+    };
+
 
     ///////////////////
     // Instance Fields and Methods
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityInfected.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityInfected.java
index b6bfa4f5fe..4e9153d6f6 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityInfected.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityInfected.java
@@ -35,6 +35,14 @@ public static EntityInfected getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "is_infected"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "is_infected"
+    };
+
 
     ///////////////////
     // Instance Fields and Methods
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityInventory.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityInventory.java
index 6849813c96..3f9ba6f5b7 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityInventory.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityInventory.java
@@ -27,6 +27,14 @@ public static EntityInventory getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "inventory"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "inventory_contents"
+    };
+
 
     ///////////////////
     // Instance Fields and Methods
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityInvulnerable.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityInvulnerable.java
index eb1e798cb0..ac0f83b675 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityInvulnerable.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityInvulnerable.java
@@ -22,6 +22,15 @@ public static EntityInvulnerable getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "invulnerable"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "invulnerable"
+    };
+
+
     ///////////////////
     // Instance Fields and Methods
     /////////////
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityIsShowingBottom.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityIsShowingBottom.java
index 438291c51d..06b105c46c 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityIsShowingBottom.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityIsShowingBottom.java
@@ -24,6 +24,15 @@ public static EntityIsShowingBottom getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "is_showing_bottom"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "is_showing_bottom"
+    };
+
+
     ///////////////////
     // Instance Fields and Methods
     /////////////
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityItem.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityItem.java
index 3c28a1f305..31f1be6530 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityItem.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityItem.java
@@ -29,6 +29,15 @@ public static EntityItem getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "item"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "item"
+    };
+
+
     ///////////////////
     // Instance Fields and Methods
     /////////////
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityJumpStrength.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityJumpStrength.java
index 63d83d93fb..f46a93ec1d 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityJumpStrength.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityJumpStrength.java
@@ -26,6 +26,14 @@ public static EntityJumpStrength getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "jump_strength"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "jump_strength"
+    };
+
 
     ///////////////////
     // Instance Fields and Methods
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityKnockback.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityKnockback.java
index ab0ea3596e..c6ab3ff92b 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityKnockback.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityKnockback.java
@@ -24,6 +24,15 @@ public static EntityKnockback getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "knockback"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "knockback"
+    };
+
+
     ///////////////////
     // Instance Fields and Methods
     /////////////
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityMarker.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityMarker.java
index e2effbd32e..cad1e77840 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityMarker.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityMarker.java
@@ -24,6 +24,15 @@ public static EntityMarker getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "marker"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "marker"
+    };
+
+
     ///////////////////
     // Instance Fields and Methods
     /////////////
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPainting.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPainting.java
index 0c4850ad21..3266e4530f 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPainting.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPainting.java
@@ -25,6 +25,15 @@ public static EntityPainting getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "painting_width", "painting_height", "painting"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "painting"
+    };
+
+
     ///////////////////
     // Instance Fields and Methods
     /////////////
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPotion.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPotion.java
index 3aa95bd573..e9e2a7a479 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPotion.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPotion.java
@@ -29,6 +29,14 @@ public static EntityPotion getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "potion"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "potion"
+    };
+
 
     ///////////////////
     // Instance Fields and Methods
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPotionEffects.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPotionEffects.java
index 67fc158cb8..1ad6a38b96 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPotionEffects.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPotionEffects.java
@@ -36,6 +36,15 @@ public static EntityPotionEffects getFrom(dObject object) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "list_effects", "has_effect"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "potion_effects"
+    };
+
+
     ///////////////////
     // Instance Fields and Methods
     /////////////
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPowered.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPowered.java
index 331230909b..5e01aadfb0 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPowered.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPowered.java
@@ -24,6 +24,15 @@ public static EntityPowered getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "powered"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "powered"
+    };
+
+
     ///////////////////
     // Instance Fields and Methods
     /////////////
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityProfession.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityProfession.java
index b4eb6aacc8..753365b4ed 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityProfession.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityProfession.java
@@ -37,6 +37,14 @@ public static EntityProfession getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "profession"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "profession"
+    };
+
 
     ///////////////////
     // Instance Fields and Methods
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityRiptide.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityRiptide.java
index 38274aed0b..1b0e70a6ab 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityRiptide.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityRiptide.java
@@ -22,6 +22,15 @@ public static EntityRiptide getFrom(dObject object) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "is_using_riptide"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "is_using_riptide"
+    };
+
+
     ///////////////////
     // Instance Fields and Methods
     /////////////
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityRotation.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityRotation.java
index a06af4fcb9..04140cc4b8 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityRotation.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityRotation.java
@@ -31,6 +31,14 @@ public static EntityRotation getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "rotation"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "rotation"
+    };
+
 
     ///////////////////
     // Instance Fields and Methods
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySilent.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySilent.java
index b5699e5ff7..13640e402c 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySilent.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySilent.java
@@ -23,6 +23,14 @@ public static EntitySilent getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "silent"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "silent"
+    };
+
 
     ///////////////////
     // Instance Fields and Methods
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySitting.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySitting.java
index 43654b030e..c50fc9efda 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySitting.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySitting.java
@@ -27,6 +27,15 @@ public static EntitySitting getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "sitting"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "sitting"
+    };
+
+
     ///////////////////
     // Instance Fields and Methods
     /////////////
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySize.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySize.java
index aead8458e7..046d2516c1 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySize.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySize.java
@@ -29,6 +29,14 @@ public static EntitySize getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "size"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "size"
+    };
+
 
     ///////////////////
     // Instance Fields and Methods
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySkeleton.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySkeleton.java
index 56f1bb00ca..e2e1f476eb 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySkeleton.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySkeleton.java
@@ -26,6 +26,15 @@ public static EntitySkeleton getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "skeleton_type"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "skeleton"
+    };
+
+
     ///////////////////
     // Instance Fields and Methods
     /////////////
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySmall.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySmall.java
index 34d7e7a0dc..3320943287 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySmall.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySmall.java
@@ -25,6 +25,14 @@ public static EntitySmall getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "is_small"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "is_small"
+    };
+
 
     ///////////////////
     // Instance Fields and Methods
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySpeed.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySpeed.java
index 15f7b9f4c1..2576862781 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySpeed.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySpeed.java
@@ -43,6 +43,14 @@ public static EntitySpeed getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "speed"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "speed"
+    };
+
 
     ///////////////////
     // Instance Fields and Methods
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySpell.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySpell.java
index ac05032b9b..c44b87daca 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySpell.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySpell.java
@@ -23,6 +23,15 @@ public static EntitySpell getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "spell"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "spell"
+    };
+
+
     ///////////////////
     // Instance Fields and Methods
     /////////////
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityTame.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityTame.java
index cb178c820a..5838557de5 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityTame.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityTame.java
@@ -29,6 +29,14 @@ public static EntityTame getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "is_tamed", "get_owner"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "tame", "owner"
+    };
+
 
     ///////////////////
     // Instance Fields and Methods
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityVisible.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityVisible.java
index 325db8d0be..2ac3520ec7 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityVisible.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityVisible.java
@@ -28,6 +28,14 @@ public static EntityVisible getFrom(dObject entity) {
         }
     }
 
+    public static final String[] handledTags = new String[]{
+            "visible"
+    };
+
+    public static final String[] handledMechs = new String[] {
+            "visible"
+    };
+
 
     ///////////////////
     // Instance Fields and Methods