Mod import/export dialog, restarting

core/src/io/anuke/mindustry/mod/Mods.java

@@ -5,15 +5,18 @@ import io.anuke.arc.collection.*;
 import io.anuke.arc.files.*;
 import io.anuke.arc.function.*;
 import io.anuke.arc.util.*;
-import io.anuke.mindustry.io.*;
+import io.anuke.arc.util.serialization.*;
 
+import java.io.*;
 import java.net.*;
 
 import static io.anuke.mindustry.Vars.*;
 
 public class Mods{
+    private Json json = new Json();
     private Array<LoadedMod> loaded = new Array<>();
     private ObjectMap<Class<?>, ModMeta> metas = new ObjectMap<>();
+    private boolean requiresRestart;
 
     /** Returns a file named 'config.json' in a special folder for the specified plugin.
      * Call this in init(). */
@@ -28,13 +31,44 @@ public class Mods{
         return loaded.find(l -> l.mod.getClass() == type);
     }
 
+    /** Imports an external mod file.*/
+    public void importMod(FileHandle file) throws IOException{
+        FileHandle dest = modDirectory.child(file.name());
+        if(dest.exists()){
+            throw new IOException("A mod with the same filename already exists!");
+        }
+
+        file.copyTo(dest);
+        try{
+            loaded.add(loadMod(file));
+            requiresRestart = true;
+        }catch(IOException e){
+            dest.delete();
+            throw e;
+        }catch(Throwable t){
+            dest.delete();
+            throw new IOException(t);
+        }
+    }
+
+    /** Removes a mod file and marks it for requiring a restart. */
+    public void removeMod(LoadedMod mod){
+        mod.file.delete();
+        loaded.remove(mod);
+        requiresRestart = true;
+    }
+
+    public boolean requiresRestart(){
+        return requiresRestart;
+    }
+
     /** Loads all mods from the folder, but does call any methods on them.*/
     public void load(){
         for(FileHandle file : modDirectory.list()){
-            if(!file.extension().equals("jar") || !file.extension().equals("zip")) continue;
+            if(!file.extension().equals("jar") && !file.extension().equals("zip")) continue;
 
             try{
-                loaded.add(loadmod(file));
+                loaded.add(loadMod(file));
             }catch(IllegalArgumentException ignored){
             }catch(Exception e){
                 Log.err("Failed to load plugin file {0}. Skipping.", file);
@@ -55,22 +89,28 @@ public class Mods{
         loaded.each(p -> p.mod != null, p -> cons.accept(p.mod));
     }
 
-    private LoadedMod loadmod(FileHandle jar) throws Exception{
+    /** Loads a mod file+meta, but does not add it to the list. */
+    private LoadedMod loadMod(FileHandle jar) throws Exception{
         FileHandle zip = new ZipFileHandle(jar);
 
         FileHandle metaf = zip.child("mod.json").exists() ? zip.child("mod.json") : zip.child("plugin.json");
         if(!metaf.exists()){
             Log.warn("Mod {0} doesn't have a 'mod.json'/'plugin.json' file, skipping.", jar);
-            throw new IllegalArgumentException();
+            throw new IllegalArgumentException("No mod.json found.");
         }
 
-        ModMeta meta = JsonIO.read(ModMeta.class, metaf.readString());
+        ModMeta meta = json.fromJson(ModMeta.class, metaf.readString());
         String camelized = meta.name.replace(" ", "");
         String mainClass = meta.main == null ? camelized.toLowerCase() + "." + camelized + "Mod" : meta.main;
         Mod mainMod;
 
         //make sure the main class exists before loading it; if it doesn't just don't put it there
         if(zip.child(mainClass.replace('.', '/') + ".class").exists()){
+            //other platforms don't have standard java class loaders
+            if(mobile){
+                throw new IllegalArgumentException("This mod is not compatible with " + (ios ? "iOS" : "Android") + ".");
+            }
+
             URLClassLoader classLoader = new URLClassLoader(new URL[]{jar.file().toURI().toURL()}, ClassLoader.getSystemClassLoader());
             Class<?> main = classLoader.loadClass(mainClass);
             metas.put(main, meta);
@@ -92,6 +132,8 @@ public class Mods{
         public final @Nullable Mod mod;
         /** This mod's metadata. */
         public final ModMeta meta;
+        //TODO implement
+        protected boolean enabled;
 
         public LoadedMod(FileHandle file, FileHandle root, Mod mod, ModMeta meta){
             this.root = root;