Allow Custom Eggs

src/main/java/com/songoda/ultimatecatcher/UltimateCatcher.java

@@ -176,14 +176,20 @@ private void setupMobs() {
     private void setupEgg() {
         eggConfig.createDefaultSection("Eggs")
                 .setDefault("Regular.Name", "&7Regular Egg")
+                .setDefault("Regular.Material", "GHAST_SPAWN_EGG")
+                .setDefault("Regular.CustomModelData", 0)
                 .setDefault("Regular.Recipe", Arrays.asList("1:EGG", "5:IRON_INGOT"))
                 .setDefault("Regular.Cost", 0)
                 .setDefault("Regular.Chance", "25%")
                 .setDefault("Ultra.Name", "&6Ultra Egg")
+                .setDefault("Ultra.Material", "GHAST_SPAWN_EGG")
+                .setDefault("Ultra.CustomModelData", 0)
                 .setDefault("Ultra.Recipe", Arrays.asList("1:EGG", "5:DIAMOND"))
                 .setDefault("Ultra.Cost", 15)
                 .setDefault("Ultra.Chance", "60%")
                 .setDefault("Insane.Name", "&5Insane Egg")
+                .setDefault("Insane.Material", "GHAST_SPAWN_EGG")
+                .setDefault("Insane.CustomModelData", 0)
                 .setDefault("Insane.Recipe", Arrays.asList("1:EGG", "5:EMERALD"))
                 .setDefault("Insane.Cost", 50)
                 .setDefault("Insane.Chance", "100%");

src/main/java/com/songoda/ultimatecatcher/egg/CEgg.java

@@ -6,6 +6,7 @@
 import com.songoda.core.utils.TextUtils;
 import com.songoda.ultimatecatcher.UltimateCatcher;
 import com.songoda.ultimatecatcher.settings.Settings;
+
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
@@ -17,17 +18,19 @@ public class CEgg {
 
     private final String key;
     private String name;
+    private CompatibleMaterial material;
     private List<String> recipe;
     private double cost;
     private int chance;
+    private int customModelData;
 
     CEgg(String key) {
         this.key = key;
     }
 
     public ItemStack toItemStack() {
-        ItemStack item = CompatibleMaterial.GHAST_SPAWN_EGG.getItem();
-
+        ItemStack item = material.getItem();
+        
         ItemMeta meta = item.getItemMeta();
         meta.setDisplayName(TextUtils.formatText(name));
 
@@ -46,6 +49,9 @@ public ItemStack toItemStack() {
         meta.setLore(lore);
 
         item.setItemMeta(meta);
+
+        if(customModelData!=0)
+        	meta.setCustomModelData(customModelData);
 
         NBTItem nbtItem = new NBTItem(item);
 
@@ -58,6 +64,18 @@ public ItemStack toItemStack() {
     public String getKey() {
         return key;
     }
+
+    public CompatibleMaterial getMaterial() {
+    	return material;
+    }
+
+    public void setMaterial(String material) {
+    	try {
+    		this.material = CompatibleMaterial.valueOf(material);
+    	}catch(IllegalArgumentException e) {
+    		this.material = CompatibleMaterial.GHAST_SPAWN_EGG;
+    	}
+    }
 
     public String getName() {
         return name;
@@ -66,6 +84,14 @@ public String getName() {
     public void setName(String name) {
         this.name = name;
     }
+
+    public int getCustomModelData() {
+    	return customModelData;
+    }
+
+    public void setCustomModelData(int customModelData) {
+    	this.customModelData = customModelData;;
+    }
 
     public List<String> getRecipe() {
         return recipe;

src/main/java/com/songoda/ultimatecatcher/egg/EggBuilder.java

@@ -9,6 +9,11 @@ public final class EggBuilder {
     public EggBuilder(String key) {
         this.egg = new CEgg(key);
     }
+
+    public EggBuilder setMaterial(String name) {
+        this.egg.setMaterial(name);
+        return this;
+    }
 
     public EggBuilder setName(String name) {
         this.egg.setName(name);
@@ -29,6 +34,11 @@ public EggBuilder setChance(int chance) {
         this.egg.setChance(chance);
         return this;
     }
+
+    public EggBuilder setCustomModelData(int customModelData) {
+    	this.egg.setCustomModelData(customModelData);
+    	return this;
+    }
 
     public CEgg build() {
         return egg;

src/main/java/com/songoda/ultimatecatcher/egg/EggManager.java

@@ -27,9 +27,11 @@ public void loadEggs() {
 
             EggBuilder eggBuilder = new EggBuilder(keyName)
                     .setName(section.getString("Name"))
+                    .setMaterial(section.getString("Material"))
                     .setRecipe(section.getStringList("Recipe"))
                     .setCost(section.getDouble("Cost"))
-                    .setChance(Integer.parseInt(section.getString("Chance").replace("%", "")));
+                    .setChance(Integer.parseInt(section.getString("Chance").replace("%", "")))
+                    .setCustomModelData(Integer.parseInt(section.getString("CustomModelData")));
 
             addEgg(eggBuilder.build());
         }