Add support for GalaxiBungee

ME1312 · May 16, 2019 · b808a62 · b808a62
1 parent 463ae05
commit b808a62
Show file tree

Hide file tree

Showing 40 changed files with 643 additions and 255 deletions.
diff --git a/SubServers.Bungee/pom.xml b/SubServers.Bungee/pom.xml
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiUtil</artifactId>
-            <version>19w20b</version>
+            <version>19w20k</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.java
@@ -10,6 +10,7 @@
 import net.ME1312.SubServers.Bungee.Host.SubCreator;
 import net.ME1312.SubServers.Bungee.Host.SubServer;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
+import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
 import net.ME1312.SubServers.Bungee.Library.Exception.InvalidServerException;
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
@@ -227,7 +228,7 @@ public boolean recycleSubServer(UUID player, String name) throws InterruptedExce
                 getSubServer(server).waitFor();
             }
 
-            System.out.println("SubServers > Saving...");
+            Logger.get("SubServers").info("Saving...");
             ObjectMap<String> info = (plugin.servers.get().getMap("Servers").getKeys().contains(server))?plugin.servers.get().getMap("Servers").getMap(server).clone():new ObjectMap<String>();
             info.set("Name", server);
             info.set("Timestamp", Calendar.getInstance().getTime().getTime());
@@ -240,13 +241,13 @@ public boolean recycleSubServer(UUID player, String name) throws InterruptedExce
                 e.printStackTrace();
             }
 
-            System.out.println("SubServers > Moving Files...");
+            Logger.get("SubServers").info("Moving Files...");
             queue(new PacketExDeleteServer(server, info, true, data -> {
                 if (data.getInt(0x0001) == 0 || data.getInt(0x0001) == 1) {
                     servers.remove(server.toLowerCase());
-                    System.out.println("SubServers > Deleted SubServer: " + server);
+                    Logger.get("SubServers").info("Deleted SubServer: " + server);
                 } else {
-                    System.out.println("SubServers > Couldn't remove " + server + " from memory. See " + getName() + " console for more details");
+                    Logger.get("SubServers").info("Couldn't remove " + server + " from memory. See " + getName() + " console for more details");
                 }
             }));
             return true;
@@ -264,7 +265,7 @@ public boolean forceRecycleSubServer(UUID player, String name) throws Interrupte
             getSubServer(server).terminate();
         }
 
-        System.out.println("SubServers > Saving...");
+        Logger.get("SubServers").info("Saving...");
         ObjectMap<String> info = (plugin.servers.get().getMap("Servers").getKeys().contains(server))?plugin.servers.get().getMap("Servers").getMap(server).clone():new ObjectMap<String>();
         info.set("Name", server);
         info.set("Timestamp", Calendar.getInstance().getTime().getTime());
@@ -277,14 +278,14 @@ public boolean forceRecycleSubServer(UUID player, String name) throws Interrupte
             e.printStackTrace();
         }
 
-        System.out.println("SubServers > Moving Files...");
+        Logger.get("SubServers").info("Moving Files...");
         queue(new PacketExDeleteServer(server, info, true, data -> {
             if (data.getInt(0x0001) == 0 || data.getInt(0x0001) == 1) {
                 for (String group : getSubServer(server).getGroups()) getSubServer(server).removeGroup(group);
                 servers.remove(server.toLowerCase());
-                System.out.println("SubServers > Deleted SubServer: " + server);
+                Logger.get("SubServers").info("Deleted SubServer: " + server);
             } else {
-                System.out.println("SubServers > Couldn't remove " + server + " from memory. See " + getName() + " console for more details");
+                Logger.get("SubServers").info("Couldn't remove " + server + " from memory. See " + getName() + " console for more details");
             }
         }));
         return true;
@@ -303,7 +304,7 @@ public boolean deleteSubServer(UUID player, String name) throws InterruptedExcep
                 getSubServer(server).waitFor();
             }
 
-            System.out.println("SubServers > Saving...");
+            Logger.get("SubServers").info("Saving...");
             ObjectMap<String> info = (plugin.servers.get().getMap("Servers").getKeys().contains(server))?plugin.servers.get().getMap("Servers").getMap(server).clone():new ObjectMap<String>();
             info.set("Name", server);
             info.set("Timestamp", Calendar.getInstance().getTime().getTime());
@@ -316,13 +317,13 @@ public boolean deleteSubServer(UUID player, String name) throws InterruptedExcep
                 e.printStackTrace();
             }
 
-            System.out.println("SubServers > Removing Files...");
+            Logger.get("SubServers").info("Removing Files...");
             queue(new PacketExDeleteServer(server, info, false, data -> {
                 if (data.getInt(0x0001) == 0 || data.getInt(0x0001) == 1) {
                     servers.remove(server.toLowerCase());
-                    System.out.println("SubServers > Deleted SubServer: " + server);
+                    Logger.get("SubServers").info("Deleted SubServer: " + server);
                 } else {
-                    System.out.println("SubServers > Couldn't remove " + server + " from memory. See " + getName() + " console for more details");
+                    Logger.get("SubServers").info("Couldn't remove " + server + " from memory. See " + getName() + " console for more details");
                 }
             }));
             return true;
@@ -340,7 +341,7 @@ public boolean forceDeleteSubServer(UUID player, String name) throws Interrupted
             getSubServer(server).terminate();
         }
 
-        System.out.println("SubServers > Saving...");
+        Logger.get("SubServers").info("Saving...");
         ObjectMap<String> info = (plugin.servers.get().getMap("Servers").getKeys().contains(server))?plugin.servers.get().getMap("Servers").getMap(server).clone():new ObjectMap<String>();
         info.set("Name", server);
         info.set("Timestamp", Calendar.getInstance().getTime().getTime());
@@ -353,14 +354,14 @@ public boolean forceDeleteSubServer(UUID player, String name) throws Interrupted
             e.printStackTrace();
         }
 
-        System.out.println("SubServers > Removing Files...");
+        Logger.get("SubServers").info("Removing Files...");
         queue(new PacketExDeleteServer(server, info, false, data -> {
             if (data.getInt(0x0001) == 0 || data.getInt(0x0001) == 1) {
                 for (String group : getSubServer(server).getGroups()) getSubServer(server).removeGroup(group);
                 servers.remove(server.toLowerCase());
-                System.out.println("SubServers > Deleted SubServer: " + server);
+                Logger.get("SubServers").info("Deleted SubServer: " + server);
             } else {
-                System.out.println("SubServers > Couldn't remove " + server + " from memory. See " + getName() + " console for more details");
+                Logger.get("SubServers").info("Couldn't remove " + server + " from memory. See " + getName() + " console for more details");
             }
         }));
         return true;

diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubLogger.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubLogger.java
@@ -4,6 +4,7 @@
 import net.ME1312.SubServers.Bungee.Host.SubLogger;
 import net.ME1312.Galaxi.Library.Container;
 import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
 import net.ME1312.SubServers.Bungee.Network.Packet.PacketInExLogMessage;
 import net.ME1312.SubServers.Bungee.SubAPI;
 import net.md_5.bungee.api.ProxyServer;
@@ -113,7 +114,7 @@ private void log(String line) {
                 }
 
             // Log to CONSOLE
-            if (allow) ProxyServer.getInstance().getLogger().log(level, name + " > " + msg);
+            if (allow) Logger.get(name).log(level, msg);
 
             // Log to FILE
             if (writer != null) {

diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.java
@@ -6,6 +6,7 @@
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Map.ObjectMapValue;
 import net.ME1312.Galaxi.Library.Container;
+import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
 import net.ME1312.SubServers.Bungee.Library.Exception.InvalidServerException;
 import net.ME1312.Galaxi.Library.NamedContainer;
 import net.ME1312.Galaxi.Library.Util;
@@ -77,7 +78,7 @@ public boolean start(UUID player) {
             host.plugin.getPluginManager().callEvent(event);
             lock = false;
             if (!event.isCancelled()) {
-                System.out.println("SubServers > Now starting " + getName());
+                Logger.get("SubServers").info("Now starting " + getName());
                 running = true;
                 logger.start();
                 host.queue(new PacketExUpdateServer(this, PacketExUpdateServer.UpdateType.START, logger.getExternalAddress().toString()));
@@ -86,7 +87,7 @@ public boolean start(UUID player) {
         } else return false;
     }
     private void falsestart() {
-        System.out.println("SubServers > Couldn't start " + getName() + " - See the " + host.getName() + " console for more details");
+        Logger.get("SubServers").info("Couldn't start " + getName() + " - See the " + host.getName() + " console for more details");
         running = false;
         logger.stop();
     }
@@ -106,7 +107,7 @@ public boolean stop(UUID player) {
     private void stopped(Boolean allowrestart) {
         SubStoppedEvent event = new SubStoppedEvent(this);
         host.plugin.getPluginManager().callEvent(event);
-        System.out.println("SubServers > " + getName() + " has stopped");
+        Logger.get("SubServers").info(getName() + " has stopped");
         logger.stop();
         history.clear();
         running = false;

diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalHost.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalHost.java
@@ -6,6 +6,7 @@
 import net.ME1312.SubServers.Bungee.Event.SubAddServerEvent;
 import net.ME1312.SubServers.Bungee.Event.SubRemoveServerEvent;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
+import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
 import net.ME1312.SubServers.Bungee.Library.Exception.InvalidServerException;
 import net.ME1312.SubServers.Bungee.Host.Host;
 import net.ME1312.SubServers.Bungee.Host.SubCreator;
@@ -154,7 +155,7 @@ public boolean recycleSubServer(UUID player, String name) throws InterruptedExce
                 UniversalFile to = new UniversalFile(plugin.dir, "SubServers:Recently Deleted:" + server.toLowerCase());
                 try {
                     if (from.exists()) {
-                        System.out.println("SubServers > Moving Files...");
+                        Logger.get("SubServers").info("Moving Files...");
                         if (to.exists()) {
                             if (to.isDirectory()) Util.deleteDirectory(to);
                             else to.delete();
@@ -167,7 +168,7 @@ public boolean recycleSubServer(UUID player, String name) throws InterruptedExce
                     e.printStackTrace();
                 }
 
-                System.out.println("SubServers > Saving...");
+                Logger.get("SubServers").info("Saving...");
                 YAMLSection info = (plugin.servers.get().getMap("Servers").getKeys().contains(server))?new YAMLSection(plugin.servers.get().getMap("Servers").getMap(server).get()):new YAMLSection();
                 info.set("Name", server);
                 info.set("Timestamp", Calendar.getInstance().getTime().getTime());
@@ -183,7 +184,7 @@ public boolean recycleSubServer(UUID player, String name) throws InterruptedExce
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-                System.out.println("SubServers > Deleted SubServer: " + server);
+                Logger.get("SubServers").info("Deleted SubServer: " + server);
             }, "SubServers.Bungee::Internal_Server_Recycler(" + name + ')').start();
             return true;
         } else return false;
@@ -199,7 +200,7 @@ public boolean forceRecycleSubServer(UUID player, String name) throws Interrupte
                 UniversalFile to = new UniversalFile(plugin.dir, "SubServers:Recently Deleted:" + server.toLowerCase());
                 try {
                     if (from.exists()) {
-                        System.out.println("SubServers > Moving Files...");
+                        Logger.get("SubServers").info("Moving Files...");
                         if (to.exists()) {
                             if (to.isDirectory()) Util.deleteDirectory(to);
                             else to.delete();
@@ -212,7 +213,7 @@ public boolean forceRecycleSubServer(UUID player, String name) throws Interrupte
                     e.printStackTrace();
                 }
 
-                System.out.println("SubServers > Saving...");
+                Logger.get("SubServers").info("Saving...");
                 YAMLSection info = (plugin.servers.get().getMap("Servers").getKeys().contains(server))?new YAMLSection(plugin.servers.get().getMap("Servers").getMap(server).get()):new YAMLSection();
                 info.set("Name", server);
                 info.set("Timestamp", Calendar.getInstance().getTime().getTime());
@@ -228,7 +229,7 @@ public boolean forceRecycleSubServer(UUID player, String name) throws Interrupte
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-                System.out.println("SubServers > Deleted SubServer: " + server);
+                Logger.get("SubServers").info("Deleted SubServer: " + server);
             }, "SubServers.Bungee::Internal_Server_Recycler(" + name + ')').start();
             return true;
         } else return false;
@@ -243,14 +244,14 @@ public boolean deleteSubServer(UUID player, String name) throws InterruptedExcep
             new Thread(() -> {
                 try {
                     if (from.exists()) {
-                        System.out.println("SubServers > Removing Files...");
+                        Logger.get("SubServers").info("Removing Files...");
                         Util.deleteDirectory(from);
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
 
-                System.out.println("SubServers > Saving...");
+                Logger.get("SubServers").info("Saving...");
                 try {
                     if (plugin.servers.get().getMap("Servers").getKeys().contains(server)) {
                         plugin.servers.get().getMap("Servers").remove(server);
@@ -259,7 +260,7 @@ public boolean deleteSubServer(UUID player, String name) throws InterruptedExcep
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-                System.out.println("SubServers > Deleted SubServer: " + server);
+                Logger.get("SubServers").info("Deleted SubServer: " + server);
             }, "SubServers.Bungee::Internal_Server_Deletion(" + name + ')').start();
             return true;
         } else return false;
@@ -274,14 +275,14 @@ public boolean forceDeleteSubServer(UUID player, String name) throws Interrupted
             new Thread(() -> {
                 try {
                     if (from.exists()) {
-                        System.out.println("SubServers > Removing Files...");
+                        Logger.get("SubServers").info("Removing Files...");
                         Util.deleteDirectory(from);
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
 
-                System.out.println("SubServers > Saving...");
+                Logger.get("SubServers").info("Saving...");
                 try {
                     if (plugin.servers.get().getMap("Servers").getKeys().contains(server)) {
                         plugin.servers.get().getMap("Servers").remove(server);
@@ -290,7 +291,7 @@ public boolean forceDeleteSubServer(UUID player, String name) throws Interrupted
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-                System.out.println("SubServers > Deleted SubServer: " + server);
+                Logger.get("SubServers").info("Deleted SubServer: " + server);
             }, "SubServers.Bungee::Internal_Server_Deletion(" + name + ')').start();
             return true;
         } else return false;

diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubLogger.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubLogger.java
@@ -4,6 +4,7 @@
 import net.ME1312.SubServers.Bungee.Host.SubLogger;
 import net.ME1312.Galaxi.Library.Container;
 import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
 import net.ME1312.SubServers.Bungee.SubAPI;
 import net.md_5.bungee.api.ProxyServer;
 
@@ -131,7 +132,7 @@ private void log(String line) {
                 }
 
             // Log to CONSOLE
-            if (allow) ProxyServer.getInstance().getLogger().log(level, name + " > " + msg);
+            if (allow) Logger.get(name).log(level, msg);
 
             // Log to FILE
             if (writer != null) {

diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java
@@ -5,6 +5,7 @@
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Map.ObjectMapValue;
 import net.ME1312.Galaxi.Library.Container;
+import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
 import net.ME1312.SubServers.Bungee.Library.Exception.InvalidServerException;
 import net.ME1312.Galaxi.Library.NamedContainer;
 import net.ME1312.Galaxi.Library.UniversalFile;
@@ -125,7 +126,7 @@ private void run() {
             pb.environment().put("address", host.getAddress().getHostAddress());
             pb.environment().put("port", Integer.toString(getAddress().getPort()));
             process = pb.start();
-            System.out.println("SubServers > Now starting " + getName());
+            Logger.get("SubServers").info("Now starting " + getName());
             logger.process = process;
             logger.start();
             command = new BufferedWriter(new OutputStreamWriter(process.getOutputStream()));
@@ -143,7 +144,7 @@ private void run() {
 
         SubStoppedEvent event = new SubStoppedEvent(this);
         host.plugin.getPluginManager().callEvent(event);
-        System.out.println("SubServers > " + getName() + " has stopped");
+        Logger.get("SubServers").info(getName() + " has stopped");
         process = null;
         command = null;
         history.clear();