Moved plugin files

server/src/io/anuke/mindustry/server/ServerControl.java

@@ -21,8 +21,8 @@ import io.anuke.mindustry.maps.*;
 import io.anuke.mindustry.net.Administration.*;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.net.Packets.*;
-import io.anuke.mindustry.server.plugin.*;
-import io.anuke.mindustry.server.plugin.Plugins.*;
+import io.anuke.mindustry.plugin.Plugins;
+import io.anuke.mindustry.plugin.Plugins.*;
 import io.anuke.mindustry.type.*;
 
 import java.io.*;
@@ -42,7 +42,7 @@ public class ServerControl implements ApplicationListener{
 
     private final CommandHandler handler = new CommandHandler("");
     private final FileHandle logFolder = Core.files.local("logs/");
-    private final Plugins plugins = new Plugins();
+    private final io.anuke.mindustry.plugin.Plugins plugins = new Plugins();
 
     private FileHandle currentLogFile;
     private boolean inExtraRound;
@@ -174,7 +174,7 @@ public class ServerControl implements ApplicationListener{
         });
 
         //initialize plugins
-        plugins.each(Plugin::init);
+        plugins.each(io.anuke.mindustry.plugin.Plugin::init);
 
         if(!plugins.all().isEmpty()){
             info("&lc{0} plugins loaded.", plugins.all().size);

server/src/io/anuke/mindustry/server/plugin/Plugin.java

@@ -1,21 +0,0 @@
-package io.anuke.mindustry.server.plugin;
-
-import io.anuke.arc.util.*;
-
-public abstract class Plugin{
-
-    /** Called after all plugins have been created and commands have been registered.*/
-    public void init(){
-
-    }
-
-    /** Register any commands to be used on the server side, e.g. from the console. */
-    public void registerServerCommands(CommandHandler handler){
-
-    }
-
-    /** Register any commands to be used on the client side, e.g. sent from an in-game player.. */
-    public void registerClientCommands(CommandHandler handler){
-
-    }
-}

server/src/io/anuke/mindustry/server/plugin/Plugins.java

@@ -1,82 +0,0 @@
-package io.anuke.mindustry.server.plugin;
-
-import io.anuke.arc.collection.Array;
-import io.anuke.arc.files.*;
-import io.anuke.arc.function.*;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.io.*;
-
-import java.lang.reflect.*;
-import java.net.*;
-
-import static io.anuke.mindustry.Vars.pluginDirectory;
-
-public class Plugins{
-    private Array<LoadedPlugin> loaded = new Array<>();
-
-    /** Loads all plugins from the folder, but does call any methods on them.*/
-    public void load(){
-        for(FileHandle file : pluginDirectory.list()){
-            if(!file.extension().equals("jar")) continue;
-
-            try{
-                loaded.add(loadPlugin(file));
-            }catch(IllegalArgumentException ignored){
-            }catch(Exception e){
-                Log.err("Failed to load plugin file {0}. Skipping.", file);
-                e.printStackTrace();
-            }
-        }
-    }
-
-    /** @return all loaded plugins. */
-    public Array<LoadedPlugin> all(){
-        return loaded;
-    }
-
-    /** Iterates through each plugin.*/
-    public void each(Consumer<Plugin> cons){
-        loaded.each(p -> cons.accept(p.plugin));
-    }
-
-    private LoadedPlugin loadPlugin(FileHandle jar) throws Exception{
-        FileHandle zip = new ZipFileHandle(jar);
-
-        FileHandle metaf = zip.child("plugin.json");
-        if(!metaf.exists()){
-            Log.warn("Plugin {0} doesn't have a 'plugin.json' file, skipping.", jar);
-            throw new IllegalArgumentException();
-        }
-
-        PluginMeta meta = JsonIO.read(PluginMeta.class, metaf.readString());
-
-        URLClassLoader classLoader = (URLClassLoader)ClassLoader.getSystemClassLoader();
-        Method method = URLClassLoader.class.getDeclaredMethod("addURL", URL.class);
-        method.setAccessible(true);
-        method.invoke(classLoader, jar.file().toURI().toURL());
-
-        Class<?> main = Class.forName(meta.main);
-        return new LoadedPlugin(jar, zip, (Plugin)main.newInstance(), meta);
-    }
-
-    /** Represents a plugin that has been loaded from a jar file.*/
-    public static class LoadedPlugin{
-        public final FileHandle jarFile;
-        public final FileHandle zipRoot;
-        public final Plugin plugin;
-        public final PluginMeta meta;
-
-        public LoadedPlugin(FileHandle jarFile, FileHandle zipRoot, Plugin plugin, PluginMeta meta){
-            this.zipRoot = zipRoot;
-            this.jarFile = jarFile;
-            this.plugin = plugin;
-            this.meta = meta;
-        }
-    }
-
-    /** Plugin metadata information.*/
-    public static class PluginMeta{
-        public String name, author, main, description;
-        public String version;
-    }
-}