More mod setup

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

@@ -1,9 +1,9 @@
 package io.anuke.mindustry.server;
 
 import io.anuke.arc.*;
-import io.anuke.arc.util.*;
 import io.anuke.mindustry.*;
 import io.anuke.mindustry.core.*;
+import io.anuke.mindustry.mod.*;
 
 import static io.anuke.mindustry.Vars.*;
 
@@ -28,5 +28,9 @@ public class MindustryServer implements ApplicationListener{
         Core.app.addListener(logic = new Logic());
         Core.app.addListener(netServer = new NetServer());
         Core.app.addListener(new ServerControl(args));
+
+        mods.each(Mod::init);
     }
+
+
 }

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

@@ -21,8 +21,6 @@ import io.anuke.mindustry.maps.*;
 import io.anuke.mindustry.mod.Mods.*;
 import io.anuke.mindustry.net.Administration.*;
 import io.anuke.mindustry.net.Packets.*;
-import io.anuke.mindustry.plugin.*;
-import io.anuke.mindustry.plugin.Plugins.*;
 import io.anuke.mindustry.type.*;
 
 import java.io.*;
@@ -52,7 +50,6 @@ public class ServerControl implements ApplicationListener{
     private PrintWriter socketOutput;
 
     public ServerControl(String[] args){
-
         Core.settings.defaults(
             "shufflemode", "normal",
             "bans", "",
@@ -110,9 +107,6 @@ public class ServerControl implements ApplicationListener{
         Effects.setScreenShakeProvider((a, b) -> {});
         Effects.setEffectProvider((a, b, c, d, e, f) -> {});
 
-        //load plugins
-        plugins.load();
-
         registerCommands();
 
         Core.app.post(() -> {
@@ -176,9 +170,6 @@ public class ServerControl implements ApplicationListener{
             }
         });
 
-        //initialize plugins
-        plugins.each(Plugin::init);
-
         if(!mods.all().isEmpty()){
             info("&lc{0} plugins loaded.", mods.all().size);
         }