fix spawn eggs, add item.spawn_type properties

plugin/src/main/java/net/aufdemrand/denizen/objects/properties/item/ItemSpawnEgg.java

@@ -3,23 +3,23 @@
 import net.aufdemrand.denizen.nms.NMSHandler;
 import net.aufdemrand.denizen.nms.NMSVersion;
 import net.aufdemrand.denizen.objects.dItem;
+import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.Mechanism;
 import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.objects.properties.Property;
 import net.aufdemrand.denizencore.tags.Attribute;
-import org.bukkit.Material;
 import org.bukkit.entity.EntityType;
 import org.bukkit.inventory.meta.SpawnEggMeta;
 
 public class ItemSpawnEgg implements Property {
 
     public static boolean describes(dObject item) {
-        if (!NMSHandler.getVersion().isAtLeast(NMSVersion.v1_12_R1)) {
+        if (!NMSHandler.getVersion().isAtLeast(NMSVersion.v1_11_R1)) {
             return false;
         }
         return item instanceof dItem
-                && ((dItem) item).getItemStack().getType() == Material.MONSTER_EGG;
+                && ((dItem) item).getItemStack().getItemMeta() instanceof SpawnEggMeta;
     }
 
     public static ItemSpawnEgg getFrom(dObject _item) {
@@ -38,6 +38,10 @@ private ItemSpawnEgg(dItem _item) {
 
     dItem item;
 
+    private EntityType getEntityType() {
+        return ((SpawnEggMeta) item.getItemStack().getItemMeta()).getSpawnedType();
+    }
+
     @Override
     public String getAttribute(Attribute attribute) {
 
@@ -46,16 +50,31 @@ public String getAttribute(Attribute attribute) {
         }
 
         // <--[tag]
-        // @attribute <i@item.spawn_egg_entity>
+        // @attribute <i@item.spawn_id>
         // @returns Element(Number)
         // @group properties
-        // @mechanism dItem.spawn_egg
+        // @mechanism dItem.spawn_id
         // @description
+        // NOTE: ID numbers are deprecated since 1.11
+        //  Use <i@item.spawn_type> instead!
         // Returns the spawn egg number of the item.
-        // Also works for mob spawners.
         // -->
-        if (attribute.startsWith("spawn_egg_entity")) {
-            return new Element(((SpawnEggMeta) item.getItemStack().getItemMeta()).getSpawnedType().getTypeId())
+        if ((attribute.startsWith("spawn_id") || attribute.startsWith("spawn_egg_entity"))
+                && getEntityType() != null) {
+            return new Element(getEntityType().getTypeId())
+                    .getAttribute(attribute.fulfill(1));
+        }
+
+        // <--[tag]
+        // @attribute <i@item.spawn_type>
+        // @returns Element
+        // @group properties
+        // @mechanism dItem.spawn_type
+        // @description
+        // Returns the spawn egg's entity type.
+        // -->
+        if (attribute.startsWith("spawn_type") && getEntityType() != null) {
+            return new Element(getEntityType().name())
                     .getAttribute(attribute.fulfill(1));
         }
 
@@ -65,32 +84,53 @@ public String getAttribute(Attribute attribute) {
 
     @Override
     public String getPropertyString() {
-        return String.valueOf(((SpawnEggMeta) item.getItemStack().getItemMeta()).getSpawnedType().getTypeId());
+        return getEntityType() != null ? getEntityType().name() : null;
     }
 
     @Override
     public String getPropertyId() {
-        return "spawn_egg";
+        return "spawn_type";
     }
 
     @Override
     public void adjust(Mechanism mechanism) {
 
         // <--[mechanism]
         // @object dItem
-        // @name spawn_egg
+        // @name spawn_id
         // @input Element(Number)
         // @description
+        // NOTE: ID numbers are deprecated since 1.11
+        //  Use <@link mechanism dItem.spawn_type> instead!
         // Sets what mob a spawn egg holds.
-        // Also works for mob spawners.
         // @tags
-        // <i@item.spawn_egg_entity>
+        // <i@item.spawn_id>
         // -->
-
-        if (mechanism.matches("spawn_egg")) {
+        if ((mechanism.matches("spawn_id") || mechanism.matches("spawn_egg"))
+                && mechanism.requireInteger()) {
             SpawnEggMeta sem = (SpawnEggMeta) item.getItemStack().getItemMeta();
             sem.setSpawnedType(EntityType.fromId(mechanism.getValue().asInt()));
             item.getItemStack().setItemMeta(sem);
         }
+
+        // <--[mechanism]
+        // @object dItem
+        // @name spawn_type
+        // @input Element
+        // @description
+        // Sets what entity type a spawn egg holds.
+        // @tags
+        // <i@item.spawn_type>
+        // -->
+        if (mechanism.matches("spawn_type") && mechanism.requireEnum(false, EntityType.values())) {
+            try {
+                SpawnEggMeta sem = (SpawnEggMeta) item.getItemStack().getItemMeta();
+                sem.setSpawnedType(EntityType.valueOf(mechanism.getValue().asString().toUpperCase()));
+                item.getItemStack().setItemMeta(sem);
+            }
+            catch (IllegalArgumentException e) {
+                dB.echoError(mechanism.getValue().asString().toUpperCase() + " is not a valid spawn egg entity!");
+            }
+        }
     }
 }