From 57924afa3f85137545da40181cda43192091dffa Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 28 Aug 2019 22:12:25 -0400
Subject: [PATCH] Moved plugin files

---
 .../src/io/anuke/mindustry}/plugin/Plugin.java            | 2 +-
 .../src/io/anuke/mindustry}/plugin/Plugins.java           | 2 +-
 server/src/io/anuke/mindustry/server/ServerControl.java   | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename {server/src/io/anuke/mindustry/server => core/src/io/anuke/mindustry}/plugin/Plugin.java (92%)
 rename {server/src/io/anuke/mindustry/server => core/src/io/anuke/mindustry}/plugin/Plugins.java (98%)

diff --git a/server/src/io/anuke/mindustry/server/plugin/Plugin.java b/core/src/io/anuke/mindustry/plugin/Plugin.java
similarity index 92%
rename from server/src/io/anuke/mindustry/server/plugin/Plugin.java
rename to core/src/io/anuke/mindustry/plugin/Plugin.java
index 813df9fc3e..5208f609fc 100644
--- a/server/src/io/anuke/mindustry/server/plugin/Plugin.java
+++ b/core/src/io/anuke/mindustry/plugin/Plugin.java
@@ -1,4 +1,4 @@
-package io.anuke.mindustry.server.plugin;
+package io.anuke.mindustry.plugin;
 
 import io.anuke.arc.util.*;
 
diff --git a/server/src/io/anuke/mindustry/server/plugin/Plugins.java b/core/src/io/anuke/mindustry/plugin/Plugins.java
similarity index 98%
rename from server/src/io/anuke/mindustry/server/plugin/Plugins.java
rename to core/src/io/anuke/mindustry/plugin/Plugins.java
index ec4bc79e69..e371c78b66 100644
--- a/server/src/io/anuke/mindustry/server/plugin/Plugins.java
+++ b/core/src/io/anuke/mindustry/plugin/Plugins.java
@@ -1,4 +1,4 @@
-package io.anuke.mindustry.server.plugin;
+package io.anuke.mindustry.plugin;
 
 import io.anuke.arc.collection.Array;
 import io.anuke.arc.files.*;
diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java
index e25fd2d8a8..12a0671e1d 100644
--- a/server/src/io/anuke/mindustry/server/ServerControl.java
+++ b/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);