New zone maps / Dark map border / Tweaks

core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java

@@ -13,20 +13,16 @@ import io.anuke.arc.scene.ui.layout.Unit;
 import io.anuke.arc.scene.utils.UIUtils;
 import io.anuke.arc.util.*;
 import io.anuke.arc.util.pooling.Pools;
-import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.core.Platform;
 
 import java.util.Arrays;
 
 public class FileChooser extends FloatingDialog{
-    public static Predicate<FileHandle> pngFilter = file -> file.extension().equalsIgnoreCase("png");
-    public static Predicate<FileHandle> mapFilter = file -> file.extension().equalsIgnoreCase(Vars.mapExtension);
-    public static Predicate<FileHandle> jpegFilter = file -> file.extension().equalsIgnoreCase("png") || file.extension().equalsIgnoreCase("jpg") || file.extension().equalsIgnoreCase("jpeg");
-    public static Predicate<FileHandle> defaultFilter = file -> true;
+    private static final FileHandle homeDirectory = Core.files.absolute(OS.isMac ? OS.getProperty("user.home") + "/Downloads/" : Core.files.getExternalStoragePath());
+    private static FileHandle lastDirectory = homeDirectory;
+
     private Table files;
-    private FileHandle homeDirectory = Core.files.absolute(OS.isMac ? OS.getProperty("user.home") + "/Downloads/" :
-    Core.files.getExternalStoragePath());
-    private FileHandle directory = homeDirectory;
+    private FileHandle directory = lastDirectory;
     private ScrollPane pane;
     private TextField navigation, filefield;
     private TextButton ok;
@@ -117,6 +113,7 @@ public class FileChooser extends FloatingDialog{
         home.resizeImage(isize);
         home.clicked(() -> {
             directory = homeDirectory;
+            lastDirectory = directory;
             updateFiles(true);
         });
 
@@ -198,6 +195,7 @@ public class FileChooser extends FloatingDialog{
             TextButton upbutton = new TextButton(".." + directory.toString(), "clear-toggle");
             upbutton.clicked(() -> {
                 directory = directory.parent();
+                lastDirectory = directory;
                 updateFiles(true);
             });
 
@@ -226,6 +224,7 @@ public class FileChooser extends FloatingDialog{
                     updateFileFieldStatus();
                 }else{
                     directory = directory.child(filename);
+                    lastDirectory = directory;
                     updateFiles(true);
                 }
             });
@@ -296,12 +295,14 @@ public class FileChooser extends FloatingDialog{
             if(!canBack()) return;
             index--;
             directory = history.get(index - 1);
+            lastDirectory = directory;
             updateFiles(false);
         }
 
         public void forward(){
             if(!canForward()) return;
             directory = history.get(index);
+            lastDirectory = directory;
             index++;
             updateFiles(false);
         }

core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java

@@ -116,7 +116,7 @@ public class BlockInventoryFragment extends Fragment{
         int row = 0;
 
         table.margin(6f);
-        table.defaults().size(8 * 5).space(6f);
+        table.defaults().size(8 * 5).space(8f);
 
         if(tile.block().hasItems){