From 59d3404abfb7381cdb6073c3b842044d0619ed41 Mon Sep 17 00:00:00 2001 From: ME1312 Date: Sun, 21 Feb 2021 04:40:43 -0500 Subject: [PATCH] Update GalaxiEngine --- SubServers.Bungee/common/pom.xml | 4 ++-- .../Compatibility/Galaxi/GalaxiCommand.java | 6 ++--- .../Galaxi/GalaxiCommandWrapper.java | 6 ++--- .../Compatibility/Galaxi/GalaxiInfo.java | 2 +- .../Bungee/Library/Compatibility/Logger.java | 4 ++-- SubServers.Bungee/pom.xml | 6 ++--- .../Galaxi/GalaxiEventListener.java | 6 ++--- .../ME1312/SubServers/Bungee/SubProxy.java | 2 +- SubServers.Client/Bukkit/pom.xml | 4 ++-- SubServers.Client/Common/pom.xml | 4 ++-- SubServers.Client/Sponge/pom.xml | 4 ++-- SubServers.Host/pom.xml | 24 +++++++++++++++++-- .../Host/Event/SubAddHostEvent.java | 2 +- .../Host/Event/SubAddProxyEvent.java | 2 +- .../Host/Event/SubAddServerEvent.java | 2 +- .../SubServers/Host/Event/SubCreateEvent.java | 2 +- .../Host/Event/SubCreatedEvent.java | 2 +- .../Host/Event/SubEditServerEvent.java | 2 +- .../Host/Event/SubNetworkConnectEvent.java | 2 +- .../Host/Event/SubNetworkDisconnectEvent.java | 2 +- .../Host/Event/SubRemoveHostEvent.java | 2 +- .../Host/Event/SubRemoveProxyEvent.java | 2 +- .../Host/Event/SubRemoveServerEvent.java | 2 +- .../Host/Event/SubSendCommandEvent.java | 2 +- .../SubServers/Host/Event/SubStartEvent.java | 2 +- .../Host/Event/SubStartedEvent.java | 2 +- .../SubServers/Host/Event/SubStopEvent.java | 2 +- .../Host/Event/SubStoppedEvent.java | 2 +- .../net/ME1312/SubServers/Host/ExHost.java | 8 +++---- .../Host/Executable/SubLoggerImpl.java | 4 ++-- .../Host/Library/Compatibility/JNA.java | 2 +- .../SubServers/Host/Library/Metrics.java | 2 +- .../SubServers/Host/Network/SubProtocol.java | 2 +- .../ME1312/SubServers/Host/SubCommand.java | 12 +++++----- SubServers.Sync/pom.xml | 6 ++--- .../net/ME1312/SubServers/Sync/ExProxy.java | 2 +- 36 files changed, 81 insertions(+), 61 deletions(-) diff --git a/SubServers.Bungee/common/pom.xml b/SubServers.Bungee/common/pom.xml index 1513d727..5c9767f6 100644 --- a/SubServers.Bungee/common/pom.xml +++ b/SubServers.Bungee/common/pom.xml @@ -30,13 +30,13 @@ net.ME1312.Galaxi GalaxiUtil - 21w08b + 21w08m provided net.ME1312.Galaxi GalaxiEngine - 21w08b + 21w08m provided diff --git a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiCommand.java b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiCommand.java index 75b42d6a..c50d2dc4 100644 --- a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiCommand.java +++ b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiCommand.java @@ -27,7 +27,7 @@ public class GalaxiCommand { * @return The Command */ public static Command description(Command command, String value) { - Util.isException(() -> Util.reflect(Class.forName("net.ME1312.Galaxi.Plugin.Command.Command").getMethod("description", String.class), command, value)); + Util.isException(() -> Util.reflect(Class.forName("net.ME1312.Galaxi.Command.Command").getMethod("description", String.class), command, value)); return command; } @@ -39,7 +39,7 @@ public class GalaxiCommand { * @return The Command */ public static Command help(Command command, String... lines) { - Util.isException(() -> Util.reflect(Class.forName("net.ME1312.Galaxi.Plugin.Command.Command").getMethod("help", String[].class), command, (Object) lines)); + Util.isException(() -> Util.reflect(Class.forName("net.ME1312.Galaxi.Command.Command").getMethod("help", String[].class), command, (Object) lines)); return command; } @@ -51,7 +51,7 @@ public class GalaxiCommand { * @return The Command */ public static Command usage(Command command, String... args) { - Util.isException(() -> Util.reflect(Class.forName("net.ME1312.Galaxi.Plugin.Command.Command").getMethod("usage", String[].class), command, (Object) args)); + Util.isException(() -> Util.reflect(Class.forName("net.ME1312.Galaxi.Command.Command").getMethod("usage", String[].class), command, (Object) args)); return command; } diff --git a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiCommandWrapper.java b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiCommandWrapper.java index 2f4dbbec..be6b113d 100644 --- a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiCommandWrapper.java +++ b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiCommandWrapper.java @@ -2,9 +2,9 @@ package net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi; import net.ME1312.Galaxi.Galaxi; import net.ME1312.Galaxi.Library.Util; -import net.ME1312.Galaxi.Plugin.Command.Command; -import net.ME1312.Galaxi.Plugin.Command.CommandSender; -import net.ME1312.Galaxi.Plugin.Command.CompletionHandler; +import net.ME1312.Galaxi.Command.Command; +import net.ME1312.Galaxi.Command.CommandSender; +import net.ME1312.Galaxi.Command.CompletionHandler; import net.ME1312.Galaxi.Plugin.PluginManager; import java.util.ArrayList; diff --git a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiInfo.java b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiInfo.java index 7d41379b..1782db76 100644 --- a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiInfo.java +++ b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiInfo.java @@ -24,7 +24,7 @@ public class GalaxiInfo { */ public static Version getVersion() { return Util.getDespiteException(() -> Version.fromString((String) Class.forName("net.ME1312.Galaxi.Plugin.App").getMethod("version").invoke( - Class.forName("net.ME1312.Galaxi.Engine.GalaxiEngine").getAnnotation(asAnnotation(Class.forName("net.ME1312.Galaxi.Plugin.App"))))), null); + Class.forName("net.ME1312.Galaxi.Engine.Runtime.Engine").getAnnotation(asAnnotation(Class.forName("net.ME1312.Galaxi.Plugin.App"))))), null); } /** diff --git a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Logger.java b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Logger.java index fa792011..e925ee38 100644 --- a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Logger.java +++ b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Logger.java @@ -21,8 +21,8 @@ public class Logger { */ public static java.util.logging.Logger get(String prefix) { if (!existing.keySet().contains(prefix)) { - java.util.logging.Logger log = Util.getDespiteException(() -> Util.reflect(Class.forName("net.ME1312.Galaxi.Library.Log.Logger").getDeclaredMethod("toPrimitive"), - Util.reflect(Class.forName("net.ME1312.Galaxi.Library.Log.Logger").getConstructor(String.class), prefix)), null); + java.util.logging.Logger log = Util.getDespiteException(() -> Util.reflect(Class.forName("net.ME1312.Galaxi.Log.Logger").getDeclaredMethod("toPrimitive"), + Util.reflect(Class.forName("net.ME1312.Galaxi.Log.Logger").getConstructor(String.class), prefix)), null); if (log == null) { log = java.util.logging.Logger.getAnonymousLogger(); diff --git a/SubServers.Bungee/pom.xml b/SubServers.Bungee/pom.xml index 3c0a6f89..5788fc21 100644 --- a/SubServers.Bungee/pom.xml +++ b/SubServers.Bungee/pom.xml @@ -30,14 +30,14 @@ net.ME1312.Galaxi GalaxiUtil - 21w08b + 21w08m compile true net.ME1312.Galaxi GalaxiEngine - 21w08b + 21w08m provided @@ -50,7 +50,7 @@ net.ME1312.SubData Server - 21w05f + 21w08a compile true diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiEventListener.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiEventListener.java index df48a19c..8b65b520 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiEventListener.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiEventListener.java @@ -1,9 +1,9 @@ package net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi; -import net.ME1312.Galaxi.Event.ConsoleInputEvent; +import net.ME1312.Galaxi.Event.Engine.ConsoleInputEvent; import net.ME1312.Galaxi.Galaxi; -import net.ME1312.Galaxi.Library.Event.ListenerOrder; -import net.ME1312.Galaxi.Library.Event.Subscribe; +import net.ME1312.Galaxi.Event.ListenerOrder; +import net.ME1312.Galaxi.Event.Subscribe; import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger; import net.ME1312.SubServers.Bungee.SubProxy; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java index 0353e5a1..41008cfb 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java @@ -110,7 +110,7 @@ public final class SubProxy extends BungeeCommon implements Listener { super(SubAPI::getInstance); this.isPatched = isPatched; this.isGalaxi = !Util.isException(() -> - Util.reflect(Class.forName("net.ME1312.Galaxi.Engine.PluginManager").getMethod("findClasses", Class.class), + Util.reflect(Class.forName("net.ME1312.Galaxi.Engine.CodeManager").getMethod("catalogLibrary", Class.class), Util.reflect(Class.forName("net.ME1312.Galaxi.Engine.GalaxiEngine").getMethod("getPluginManager"), Util.reflect(Class.forName("net.ME1312.Galaxi.Engine.GalaxiEngine").getMethod("getInstance"), null)), Launch.class)); diff --git a/SubServers.Client/Bukkit/pom.xml b/SubServers.Client/Bukkit/pom.xml index 2094413e..49809520 100644 --- a/SubServers.Client/Bukkit/pom.xml +++ b/SubServers.Client/Bukkit/pom.xml @@ -48,7 +48,7 @@ net.ME1312.Galaxi GalaxiUtil - 21w08b + 21w08m compile true @@ -62,7 +62,7 @@ net.ME1312.SubData Client - 21w05f + 21w08a compile true diff --git a/SubServers.Client/Common/pom.xml b/SubServers.Client/Common/pom.xml index bd4df02e..8cd8d60f 100644 --- a/SubServers.Client/Common/pom.xml +++ b/SubServers.Client/Common/pom.xml @@ -20,13 +20,13 @@ net.ME1312.Galaxi GalaxiUtil - 21w08b + 21w08m provided net.ME1312.SubData Client - 21w05f + 21w08a provided diff --git a/SubServers.Client/Sponge/pom.xml b/SubServers.Client/Sponge/pom.xml index d0d2472b..5910c605 100644 --- a/SubServers.Client/Sponge/pom.xml +++ b/SubServers.Client/Sponge/pom.xml @@ -30,7 +30,7 @@ net.ME1312.Galaxi GalaxiUtil - 21w08b + 21w08m compile true @@ -44,7 +44,7 @@ net.ME1312.SubData Client - 21w05f + 21w08a compile true diff --git a/SubServers.Host/pom.xml b/SubServers.Host/pom.xml index 629c13bb..4ed48459 100644 --- a/SubServers.Host/pom.xml +++ b/SubServers.Host/pom.xml @@ -17,13 +17,33 @@ + + org.fusesource.jansi + jansi + 1.18 + provided + + + net.sf.jopt-simple + jopt-simple + 5.0.4 + compile + true + net.ME1312.Galaxi GalaxiEngine - 21w08b + 21w08m compile true + + net.ME1312.Galaxi + GalaxiUI + 21w08m + runtime + true + net.ME1312.SubServers SubServers.Client.Common @@ -34,7 +54,7 @@ net.ME1312.SubData Client - 21w05f + 21w08a compile true diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubAddHostEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubAddHostEvent.java index 6e5fd299..a1952be0 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubAddHostEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubAddHostEvent.java @@ -1,6 +1,6 @@ package net.ME1312.SubServers.Host.Event; -import net.ME1312.Galaxi.Library.Event.Event; +import net.ME1312.Galaxi.Event.Event; import net.ME1312.Galaxi.Library.Util; import java.util.UUID; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubAddProxyEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubAddProxyEvent.java index 24bdbae5..2ab7a813 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubAddProxyEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubAddProxyEvent.java @@ -1,6 +1,6 @@ package net.ME1312.SubServers.Host.Event; -import net.ME1312.Galaxi.Library.Event.Event; +import net.ME1312.Galaxi.Event.Event; import net.ME1312.Galaxi.Library.Util; /** diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubAddServerEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubAddServerEvent.java index fc793bac..015c0dfd 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubAddServerEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubAddServerEvent.java @@ -1,6 +1,6 @@ package net.ME1312.SubServers.Host.Event; -import net.ME1312.Galaxi.Library.Event.Event; +import net.ME1312.Galaxi.Event.Event; import net.ME1312.Galaxi.Library.Util; import java.util.UUID; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubCreateEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubCreateEvent.java index 6de77f46..31f1cdc9 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubCreateEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubCreateEvent.java @@ -1,7 +1,7 @@ package net.ME1312.SubServers.Host.Event; import net.ME1312.Galaxi.Library.Callback.Callback; -import net.ME1312.Galaxi.Library.Event.Event; +import net.ME1312.Galaxi.Event.Event; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubServers.Client.Common.Network.API.SubServer; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubCreatedEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubCreatedEvent.java index 002ed5b2..54243369 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubCreatedEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubCreatedEvent.java @@ -1,7 +1,7 @@ package net.ME1312.SubServers.Host.Event; import net.ME1312.Galaxi.Library.Callback.Callback; -import net.ME1312.Galaxi.Library.Event.Event; +import net.ME1312.Galaxi.Event.Event; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubServers.Client.Common.Network.API.SubServer; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubEditServerEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubEditServerEvent.java index 40b96fff..7433b2d0 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubEditServerEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubEditServerEvent.java @@ -2,7 +2,7 @@ package net.ME1312.SubServers.Host.Event; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Container.Pair; -import net.ME1312.Galaxi.Library.Event.Event; +import net.ME1312.Galaxi.Event.Event; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Map.ObjectMapValue; import net.ME1312.Galaxi.Library.Util; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubNetworkConnectEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubNetworkConnectEvent.java index 280497c4..2e904679 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubNetworkConnectEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubNetworkConnectEvent.java @@ -1,6 +1,6 @@ package net.ME1312.SubServers.Host.Event; -import net.ME1312.Galaxi.Library.Event.Event; +import net.ME1312.Galaxi.Event.Event; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.SubDataClient; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubNetworkDisconnectEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubNetworkDisconnectEvent.java index 24235629..7c18c33d 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubNetworkDisconnectEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubNetworkDisconnectEvent.java @@ -1,6 +1,6 @@ package net.ME1312.SubServers.Host.Event; -import net.ME1312.Galaxi.Library.Event.Event; +import net.ME1312.Galaxi.Event.Event; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.DataClient; import net.ME1312.SubData.Client.Library.DisconnectReason; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubRemoveHostEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubRemoveHostEvent.java index 11803193..367f3046 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubRemoveHostEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubRemoveHostEvent.java @@ -1,6 +1,6 @@ package net.ME1312.SubServers.Host.Event; -import net.ME1312.Galaxi.Library.Event.Event; +import net.ME1312.Galaxi.Event.Event; import net.ME1312.Galaxi.Library.Util; import java.util.UUID; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubRemoveProxyEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubRemoveProxyEvent.java index 84dce104..b7ecefbe 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubRemoveProxyEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubRemoveProxyEvent.java @@ -1,6 +1,6 @@ package net.ME1312.SubServers.Host.Event; -import net.ME1312.Galaxi.Library.Event.Event; +import net.ME1312.Galaxi.Event.Event; import net.ME1312.Galaxi.Library.Util; /** diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubRemoveServerEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubRemoveServerEvent.java index 7874c841..acc1536e 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubRemoveServerEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubRemoveServerEvent.java @@ -1,6 +1,6 @@ package net.ME1312.SubServers.Host.Event; -import net.ME1312.Galaxi.Library.Event.Event; +import net.ME1312.Galaxi.Event.Event; import net.ME1312.Galaxi.Library.Util; import java.util.UUID; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubSendCommandEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubSendCommandEvent.java index b0f1f7cc..5827095f 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubSendCommandEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubSendCommandEvent.java @@ -1,6 +1,6 @@ package net.ME1312.SubServers.Host.Event; -import net.ME1312.Galaxi.Library.Event.Event; +import net.ME1312.Galaxi.Event.Event; import net.ME1312.Galaxi.Library.Util; import java.util.UUID; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStartEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStartEvent.java index 653bdb98..bf9a10ea 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStartEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStartEvent.java @@ -1,6 +1,6 @@ package net.ME1312.SubServers.Host.Event; -import net.ME1312.Galaxi.Library.Event.Event; +import net.ME1312.Galaxi.Event.Event; import net.ME1312.Galaxi.Library.Util; import java.util.UUID; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStartedEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStartedEvent.java index 3faeb8bd..6fc31641 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStartedEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStartedEvent.java @@ -1,6 +1,6 @@ package net.ME1312.SubServers.Host.Event; -import net.ME1312.Galaxi.Library.Event.Event; +import net.ME1312.Galaxi.Event.Event; import net.ME1312.Galaxi.Library.Util; /** diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStopEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStopEvent.java index 46635b28..3fbfaefa 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStopEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStopEvent.java @@ -1,6 +1,6 @@ package net.ME1312.SubServers.Host.Event; -import net.ME1312.Galaxi.Library.Event.Event; +import net.ME1312.Galaxi.Event.Event; import net.ME1312.Galaxi.Library.Util; import java.util.UUID; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStoppedEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStoppedEvent.java index 6bf6b237..0af86b06 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStoppedEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStoppedEvent.java @@ -1,6 +1,6 @@ package net.ME1312.SubServers.Host.Event; -import net.ME1312.Galaxi.Library.Event.Event; +import net.ME1312.Galaxi.Event.Event; import net.ME1312.Galaxi.Library.Util; /** diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java b/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java index af966919..f723de5e 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java @@ -1,11 +1,11 @@ package net.ME1312.SubServers.Host; import net.ME1312.Galaxi.Engine.GalaxiEngine; -import net.ME1312.Galaxi.Event.GalaxiReloadEvent; +import net.ME1312.Galaxi.Event.Engine.GalaxiReloadEvent; import net.ME1312.Galaxi.Library.Config.YAMLConfig; import net.ME1312.Galaxi.Library.Config.YAMLSection; import net.ME1312.Galaxi.Library.Container.Pair; -import net.ME1312.Galaxi.Library.Log.Logger; +import net.ME1312.Galaxi.Log.Logger; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Platform; import net.ME1312.Galaxi.Library.UniversalFile; @@ -18,7 +18,6 @@ import net.ME1312.SubData.Client.DataClient; import net.ME1312.SubData.Client.Encryption.AES; import net.ME1312.SubData.Client.Encryption.DHE; import net.ME1312.SubData.Client.Encryption.RSA; -import net.ME1312.SubData.Client.Library.DataSize; import net.ME1312.SubData.Client.Library.DisconnectReason; import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubServers.Host.Executable.SubCreatorImpl; @@ -32,6 +31,7 @@ import com.dosse.upnp.UPnP; import org.json.JSONObject; import java.io.*; +import java.lang.reflect.InvocationTargetException; import java.net.InetAddress; import java.net.URL; import java.nio.charset.Charset; @@ -113,7 +113,7 @@ public final class ExHost { log = new Logger("SubServers"); try { - info = PluginInfo.getPluginInfo(this); + info = PluginInfo.load(this); info.setLogger(log); if (ExHost.class.getPackage().getSpecificationTitle() != null) info.setBuild(new Version(ExHost.class.getPackage().getSpecificationTitle())); info.setIcon(ExHost.class.getResourceAsStream("/net/ME1312/SubServers/Host/Library/Files/icon.png")); diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java index 889b83aa..4a99fdce 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java @@ -3,8 +3,8 @@ package net.ME1312.SubServers.Host.Executable; import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Container.Value; -import net.ME1312.Galaxi.Library.Log.LogStream; -import net.ME1312.Galaxi.Library.Log.Logger; +import net.ME1312.Galaxi.Log.LogStream; +import net.ME1312.Galaxi.Log.Logger; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.DataClient; import net.ME1312.SubData.Client.Library.DisconnectReason; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Compatibility/JNA.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Compatibility/JNA.java index 693ee6ba..8d7e8147 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Compatibility/JNA.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Compatibility/JNA.java @@ -1,7 +1,7 @@ package net.ME1312.SubServers.Host.Library.Compatibility; import net.ME1312.Galaxi.Galaxi; -import net.ME1312.Galaxi.Library.Log.Logger; +import net.ME1312.Galaxi.Log.Logger; import net.ME1312.Galaxi.Library.UniversalFile; import java.io.FileNotFoundException; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Metrics.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Metrics.java index f96b1f0b..11013cf7 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Metrics.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Metrics.java @@ -2,7 +2,7 @@ package net.ME1312.SubServers.Host.Library; import net.ME1312.Galaxi.Engine.GalaxiEngine; import net.ME1312.Galaxi.Library.Config.YAMLConfig; -import net.ME1312.Galaxi.Library.Log.Logger; +import net.ME1312.Galaxi.Log.Logger; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.SubServers.Host.ExHost; import net.ME1312.SubServers.Host.SubAPI; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubProtocol.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubProtocol.java index 87eab820..bcd968ff 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubProtocol.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubProtocol.java @@ -130,7 +130,7 @@ public class SubProtocol extends SubDataProtocol { } private Logger getLogger(int channel) { - return new net.ME1312.Galaxi.Library.Log.Logger("SubData" + ((channel != 0)?File.separator+"Sub-"+channel:"")).toPrimitive(); + return new net.ME1312.Galaxi.Log.Logger("SubData" + ((channel != 0)?File.separator+"Sub-"+channel:"")).toPrimitive(); } @Override diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java b/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java index 59ada304..1124e309 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java @@ -1,7 +1,7 @@ package net.ME1312.SubServers.Host; +import net.ME1312.Galaxi.Engine.CommandParser; import net.ME1312.Galaxi.Engine.GalaxiEngine; -import net.ME1312.Galaxi.Engine.Library.ConsoleReader; import net.ME1312.Galaxi.Library.AsyncConsolidator; import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Callback.ReturnRunnable; @@ -11,9 +11,9 @@ import net.ME1312.Galaxi.Library.Container.Value; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; -import net.ME1312.Galaxi.Plugin.Command.Command; -import net.ME1312.Galaxi.Plugin.Command.CommandSender; -import net.ME1312.Galaxi.Plugin.Command.CompletionHandler; +import net.ME1312.Galaxi.Command.Command; +import net.ME1312.Galaxi.Command.CommandSender; +import net.ME1312.Galaxi.Command.CompletionHandler; import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubServers.Client.Common.Network.API.*; import net.ME1312.SubServers.Client.Common.Network.Packet.PacketCreateServer; @@ -58,7 +58,7 @@ public class SubCommand { LinkedList args = new LinkedList(Arrays.asList(rargs)); args.removeFirst(); - ConsoleReader console = GalaxiEngine.getInstance().getConsoleReader(); + CommandParser console = GalaxiEngine.getInstance().getCommandProcessor(); console.runCommand(sender, console.escapeCommand(rargs[0], args.toArray(new String[0]))); } else { sender.sendMessage("Usage: /" + label + " [Args...]"); @@ -68,7 +68,7 @@ public class SubCommand { LinkedList args = new LinkedList(Arrays.asList(rargs)); args.removeFirst(); - ConsoleReader console = GalaxiEngine.getInstance().getConsoleReader(); + CommandParser console = GalaxiEngine.getInstance().getCommandProcessor(); return console.complete(sender, console.escapeCommand(rargs[0], args.toArray(new String[0]))).toArray(new String[0]); }).usage("", "[Args...]").description("An alias for commands").help( "This command is an alias for all registered commands for ease of use.", diff --git a/SubServers.Sync/pom.xml b/SubServers.Sync/pom.xml index 61df2bac..857cb90f 100644 --- a/SubServers.Sync/pom.xml +++ b/SubServers.Sync/pom.xml @@ -30,14 +30,14 @@ net.ME1312.Galaxi GalaxiUtil - 21w08b + 21w08m compile true net.ME1312.Galaxi GalaxiEngine - 21w08b + 21w08m provided @@ -57,7 +57,7 @@ net.ME1312.SubData Client - 21w05f + 21w08a compile true diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java index 3cf4df71..929b86d5 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java @@ -85,7 +85,7 @@ public final class ExProxy extends BungeeCommon implements Listener { super(SubAPI::getInstance); this.isPatched = isPatched; this.isGalaxi = !Util.isException(() -> - Util.reflect(Class.forName("net.ME1312.Galaxi.Engine.PluginManager").getMethod("findClasses", Class.class), + Util.reflect(Class.forName("net.ME1312.Galaxi.Engine.CodeManager").getMethod("catalogLibrary", Class.class), Util.reflect(Class.forName("net.ME1312.Galaxi.Engine.GalaxiEngine").getMethod("getPluginManager"), Util.reflect(Class.forName("net.ME1312.Galaxi.Engine.GalaxiEngine").getMethod("getInstance"), null)), Launch.class));