Changing SpawnEgg check

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/missile/Missile.java

@@ -23,11 +23,10 @@ import de.butzlabben.missilewars.Logger;
 import de.butzlabben.missilewars.configuration.Config;
 import de.butzlabben.missilewars.game.Game;
 import de.butzlabben.missilewars.game.missile.paste.PasteProvider;
-import de.butzlabben.missilewars.util.version.VersionUtil;
-import java.io.File;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
@@ -35,6 +34,8 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.SpawnEggMeta;
 import org.bukkit.util.Vector;
 
+import java.io.File;
+
 /**
  * @author Butzlabben
  * @since 06.01.2018
@@ -108,7 +109,7 @@ public class Missile {
      * @return ItemStack = the spawn egg with the missile name
      */
     public ItemStack getItem() {
-        ItemStack is = new ItemStack(VersionUtil.getMonsterEgg(egg));
+        ItemStack is = new ItemStack(getSpawnEgg(egg));
         SpawnEggMeta sm = (SpawnEggMeta) is.getItemMeta();
         is.setItemMeta(sm);
         
@@ -117,4 +118,20 @@ public class Missile {
         is.setItemMeta(im);
         return is;
     }
+
+    public static Material getSpawnEgg(EntityType type) {
+        if (type == EntityType.MUSHROOM_COW) {
+            //noinspection SpellCheckingInspection
+            return Material.valueOf("MOOSHROOM_SPAWN_EGG");
+
+        }
+        return Material.valueOf(type.name() + "_SPAWN_EGG");
+    }
+
+    public static boolean isSpawnEgg(Material material) {
+        if (material == null) return false;
+        
+        String name = material.name();
+        return name.contains("SPAWN_EGG") || name.equals("MONSTER_EGG");
+    }
 }

missilewars-plugin/src/main/java/de/butzlabben/missilewars/listener/game/GameListener.java

@@ -27,9 +27,9 @@ import de.butzlabben.missilewars.game.Team;
 import de.butzlabben.missilewars.game.enums.GameResult;
 import de.butzlabben.missilewars.game.misc.RespawnGoldBlock;
 import de.butzlabben.missilewars.game.misc.Shield;
+import de.butzlabben.missilewars.game.missile.Missile;
 import de.butzlabben.missilewars.player.MWPlayer;
 import de.butzlabben.missilewars.util.geometry.Geometry;
-import de.butzlabben.missilewars.util.version.VersionUtil;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -104,9 +104,9 @@ public class GameListener extends GameBoundListener {
         ItemStack itemStack = event.getItem();
 
         // missile spawn with using of a missile spawn egg
-        if (VersionUtil.isMonsterEgg(itemStack.getType())) {
+        if (Missile.isSpawnEgg(itemStack.getType())) {
             event.setCancelled(true);
-
+            
             // Can missiles only be spawned if the item interaction was performed on a block (no air)?
             boolean isOnlyBlockPlaceable = getGame().getArena().getMissileConfiguration().isOnlyBlockPlaceable();
             if (isOnlyBlockPlaceable) {

missilewars-plugin/src/main/java/de/butzlabben/missilewars/util/version/VersionUtil.java

@@ -22,7 +22,6 @@ import de.butzlabben.missilewars.Logger;
 import de.butzlabben.missilewars.game.Team;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
-import org.bukkit.entity.EntityType;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
@@ -70,25 +69,6 @@ public class VersionUtil {
         return version;
     }
     
-    public static Material getMonsterEgg(EntityType type) {
-        if (type == EntityType.MUSHROOM_COW) {
-            //noinspection SpellCheckingInspection
-            return Material.valueOf("MOOSHROOM_SPAWN_EGG");
-
-        }
-        return Material.valueOf(type.name() + "_SPAWN_EGG");
-    }
-
-    public static boolean isMonsterEgg(Material material) {
-        if (material == null) return false;
-        
-        String name = material.name();
-        
-        if (name.equals("EGG")) return false;
-        if (name.contains("SPAWN_EGG")) return true;
-        return name.equals("MONSTER_EGG");
-    }
-    
     public static ItemStack getGlassPlane(Team team) {
         String colorCode = team.getColorCode();
         ItemStack is = new ItemStack(ColorConverter.getGlassPaneFromColorCode(colorCode));