getMissileFromName now use schematic name instead of display name

missilewars-plugin/src/main/java/de/butzlabben/missilewars/wrapper/abstracts/arena/MissileConfiguration.java

@@ -70,9 +70,9 @@ public class MissileConfiguration {
     }
 
     public Missile getMissileFromName(String name) {
-        for (Missile m : missiles) {
-            if (m.getName().equalsIgnoreCase(name) || m.getName().replaceAll("§.", "").equalsIgnoreCase(name))
-                return m;
+        String filteredName = name.replaceAll("§.", "");
+        for (Missile missile : missiles) {
+            if (missile.getSchematicName(false).equalsIgnoreCase(filteredName)) return missile;
         }
         return null;
     }
@@ -82,7 +82,7 @@ public class MissileConfiguration {
         for (Missile missile : missiles) {
             File schematic = missile.getSchematic();
             if (!schematic.exists()) {
-                Logger.WARN.log(missile.getName() + " §7has no schematic. Removing this missile");
+                Logger.WARN.log(missile.getDisplayName() + " §7has no schematic. Removing this missile");
                 toRemove.add(missile);
             }
         }

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

@@ -45,7 +45,7 @@ import java.io.File;
 public class Missile {
 
     private final String schematic;
-    @Getter private final String name;
+    @Getter private final String displayName;
     private final EntityType egg;
     private final int down;
     private final int dist;
@@ -77,17 +77,25 @@ public class Missile {
             PasteProvider.getPaster().pasteMissile(getSchematic(), pastePos, rotation, loc.getWorld(),
                     game.getPlayer(p).getTeam());
         } catch (Exception e) {
-            Logger.ERROR.log("Could not load " + name);
+            Logger.ERROR.log("Could not load " + displayName);
             e.printStackTrace();
         }
     }
 
     public File getSchematic() {
         File pluginDir = MissileWars.getInstance().getDataFolder();
-        File file = new File(pluginDir, "missiles/" + schematic);
+        File file = new File(pluginDir, "missiles/" + getSchematicName(false));
         return file;
     }
 
+    public String getSchematicName(boolean withoutExtension) {
+        if (withoutExtension) {
+            return schematic.replace(".schematic", "")
+                    .replace(".schem", "");
+        }
+        return schematic;
+    }
+
     public EntityType getType() {
         return egg;
     }
@@ -112,7 +120,7 @@ public class Missile {
             is.setAmount(1);
         }
         ItemMeta im = is.getItemMeta();
-        im.setDisplayName(name);
+        im.setDisplayName(displayName);
         is.setItemMeta(im);
         return is;
     }