2 files changed, 33 insertions, 3 deletions
diff --git a/src/main/java/org/bukkit/inventory/meta/SpawnEggMeta.java b/src/main/java/org/bukkit/inventory/meta/SpawnEggMeta.java
new file mode 100644
index 00000000..b89802d1
--- /dev/null
+++ b/src/main/java/org/bukkit/inventory/meta/SpawnEggMeta.java
@@ -0,0 +1,28 @@
+package org.bukkit.inventory.meta;
+
+import org.bukkit.Material;
+import org.bukkit.entity.EntityType;
+
+/**
+ * Represents a {@link Material#MONSTER_EGG} and it's spawned type.
+ */
+public interface SpawnEggMeta extends ItemMeta {
+
+    /**
+     * Get the type of entity this egg will spawn.
+     *
+     * @return The entity type. May be null for implementation specific default.
+     */
+    EntityType getSpawnedType();
+
+    /**
+     * Set the type of entity this egg will spawn.
+     *
+     * @param type The entity type. May be null for implementation specific
+     * default.
+     */
+    void setSpawnedType(EntityType type);
+
+    @Override
+    SpawnEggMeta clone();
+}
diff --git a/src/main/java/org/bukkit/material/SpawnEgg.java b/src/main/java/org/bukkit/material/SpawnEgg.java
index 596d08ae..40be534a 100644
--- a/src/main/java/org/bukkit/material/SpawnEgg.java
+++ b/src/main/java/org/bukkit/material/SpawnEgg.java
@@ -2,11 +2,13 @@ package org.bukkit.material;
 
 import org.bukkit.Material;
 import org.bukkit.entity.EntityType;
-import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.inventory.meta.SpawnEggMeta;
 
 /**
  * Represents a spawn egg that can be used to spawn mobs
+ * @deprecated use {@link SpawnEggMeta}
  */
+@Deprecated
 public class SpawnEgg extends MaterialData {
 
     public SpawnEgg() {
@@ -41,7 +43,7 @@ public class SpawnEgg extends MaterialData {
      * Get the type of entity this egg will spawn.
      *
      * @return The entity type.
-     * @deprecated This is now stored in {@link ItemMeta}. See SPIGOT-1592.
+     * @deprecated This is now stored in {@link SpawnEggMeta}.
      */
     @Deprecated
     public EntityType getSpawnedType() {
@@ -52,7 +54,7 @@ public class SpawnEgg extends MaterialData {
      * Set the type of entity this egg will spawn.
      *
      * @param type The entity type.
-     * @deprecated This is now stored in {@link ItemMeta}. See SPIGOT-1592.
+     * @deprecated This is now stored in {@link SpawnEggMeta}.
      */
     @Deprecated
     public void setSpawnedType(EntityType type) {