New item bars / Map bugfixes / Stub wave editing

core/src/io/anuke/mindustry/maps/Map.java

@@ -12,7 +12,7 @@ public class Map{
     public final boolean custom;
     /** Metadata. Author description, display name, etc.*/
     public final ObjectMap<String, String> tags;
-    /** Base file of this map.*/
+    /** Base file of this map. File can be named anything at all.*/
     public final FileHandle file;
     /** Format version.*/
     public final int version;
@@ -41,23 +41,15 @@ public class Map{
         this(file, width, height, tags, custom, MapIO.version);
     }
 
-    public String fileName(){
-        return file.nameWithoutExtension();
-    }
-
     public int getHightScore(){
-        return Core.settings.getInt("hiscore" + fileName(), 0);
+        return Core.settings.getInt("hiscore" + file.nameWithoutExtension(), 0);
     }
 
     public void setHighScore(int score){
-        Core.settings.put("hiscore" + fileName(), score);
+        Core.settings.put("hiscore" + file.nameWithoutExtension(), score);
         Vars.data.modified();
     }
 
-    public String getDisplayName(){
-        return tags.get("name", fileName());
-    }
-
     public String author(){
         return tag("author");
     }
@@ -74,6 +66,10 @@ public class Map{
         return tags.containsKey(name) && !tags.get(name).trim().isEmpty() ? tags.get(name): Core.bundle.get("unknown");
     }
 
+    public boolean hasTag(String name){
+        return tags.containsKey(name);
+    }
+
     @Override
     public String toString(){
         return "Map{" +

core/src/io/anuke/mindustry/maps/Maps.java

@@ -8,6 +8,7 @@ import io.anuke.arc.graphics.Texture;
 import io.anuke.arc.util.Disposable;
 import io.anuke.arc.util.Log;
 import io.anuke.arc.util.Time;
+import io.anuke.arc.util.serialization.Json;
 import io.anuke.mindustry.io.MapIO;
 import io.anuke.mindustry.world.Tile;
 
@@ -16,10 +17,15 @@ import java.io.IOException;
 import static io.anuke.mindustry.Vars.*;
 
 public class Maps implements Disposable{
-    /** List of all built-in maps. */
+    /** List of all built-in maps. Filenames only.*/
     private static final String[] defaultMapNames = {"Fortress"};
     /** All maps stored in an ordered array. */
     private Array<Map> maps = new Array<>();
+    /** Serializer for meta.*/
+    private Json json = new Json();
+
+    public Maps(){
+    }
 
     /** Returns a list of all maps, including custom ones. */
     public Array<Map> all(){
@@ -78,10 +84,11 @@ public class Maps implements Disposable{
             ObjectMap<String, String> tags = new ObjectMap<>(baseTags);
             String name = tags.get("name");
             if(name == null) throw new IllegalArgumentException("Can't save a map with no name. How did this happen?");
-            FileHandle file = customMapDirectory.child(name + "." + mapExtension);
+            //FileHandle file = customMapDirectory.child(name + "." + mapExtension);
+            FileHandle file;
 
             //find map with the same exact display name
-            Map other = maps.find(m -> m.getDisplayName().equals(name));
+            Map other = maps.find(m -> m.name().equals(name));
 
             if(other != null){
                 //dispose of map if it's already there
@@ -90,6 +97,9 @@ public class Maps implements Disposable{
                     other.texture = null;
                 }
                 maps.remove(other);
+                file = other.file;
+            }else{
+                file = findFile();
             }
 
             //create map, write it, etc etc etc
@@ -106,12 +116,11 @@ public class Maps implements Disposable{
     }
 
     /** Import a map, then save it. This updates all values and stored data necessary. */
-    public void importMap(FileHandle file, Map map) throws IOException{
-        file.copyTo(customMapDirectory.child(map.name() + ".mmap"));
-        if(!headless){
-            map.texture = new Texture(MapIO.generatePreview(map));
-        }
-        maps.add(map);
+    public void importMap(FileHandle file) throws IOException{
+        FileHandle dest = findFile();
+        file.copyTo(dest);
+
+        loadMap(dest, true);
     }
 
     /** Removes a map completely. */
@@ -125,9 +134,23 @@ public class Maps implements Disposable{
         map.file.delete();
     }
 
+    /** Find a new filename to put a map to.*/
+    private FileHandle findFile(){
+        //find a map name that isn't used.
+        int i = maps.size;
+        while(customMapDirectory.child("map_" + i + "." + mapExtension).exists()){
+            i ++;
+        }
+        return customMapDirectory.child("map_" + i + "." + mapExtension);
+    }
+
     private void loadMap(FileHandle file, boolean custom) throws IOException{
         Map map = MapIO.readMap(file, custom);
 
+        if(map.name() == null){
+            throw new IOException("Map name cannot be empty! File: " + file);
+        }
+
         if(!headless){
             map.texture = new Texture(MapIO.generatePreview(map));
         }