Update GalaxiEngine

This commit is contained in:
ME1312 2021-02-21 04:40:43 -05:00
parent 91fe4e74ed
commit 59d3404abf
No known key found for this signature in database
GPG Key ID: FEFFE2F698E88FA8
36 changed files with 81 additions and 61 deletions

View File

@ -30,13 +30,13 @@
<dependency> <dependency>
<groupId>net.ME1312.Galaxi</groupId> <groupId>net.ME1312.Galaxi</groupId>
<artifactId>GalaxiUtil</artifactId> <artifactId>GalaxiUtil</artifactId>
<version>21w08b</version> <version>21w08m</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.ME1312.Galaxi</groupId> <groupId>net.ME1312.Galaxi</groupId>
<artifactId>GalaxiEngine</artifactId> <artifactId>GalaxiEngine</artifactId>
<version>21w08b</version> <version>21w08m</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@ -27,7 +27,7 @@ public class GalaxiCommand {
* @return The Command * @return The Command
*/ */
public static Command description(Command command, String value) { 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; return command;
} }
@ -39,7 +39,7 @@ public class GalaxiCommand {
* @return The Command * @return The Command
*/ */
public static Command help(Command command, String... lines) { 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; return command;
} }
@ -51,7 +51,7 @@ public class GalaxiCommand {
* @return The Command * @return The Command
*/ */
public static Command usage(Command command, String... args) { 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; return command;
} }

View File

@ -2,9 +2,9 @@ package net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi;
import net.ME1312.Galaxi.Galaxi; import net.ME1312.Galaxi.Galaxi;
import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Util;
import net.ME1312.Galaxi.Plugin.Command.Command; import net.ME1312.Galaxi.Command.Command;
import net.ME1312.Galaxi.Plugin.Command.CommandSender; import net.ME1312.Galaxi.Command.CommandSender;
import net.ME1312.Galaxi.Plugin.Command.CompletionHandler; import net.ME1312.Galaxi.Command.CompletionHandler;
import net.ME1312.Galaxi.Plugin.PluginManager; import net.ME1312.Galaxi.Plugin.PluginManager;
import java.util.ArrayList; import java.util.ArrayList;

View File

@ -24,7 +24,7 @@ public class GalaxiInfo {
*/ */
public static Version getVersion() { public static Version getVersion() {
return Util.getDespiteException(() -> Version.fromString((String) Class.forName("net.ME1312.Galaxi.Plugin.App").getMethod("version").invoke( 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);
} }
/** /**

View File

@ -21,8 +21,8 @@ public class Logger {
*/ */
public static java.util.logging.Logger get(String prefix) { public static java.util.logging.Logger get(String prefix) {
if (!existing.keySet().contains(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"), 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.Library.Log.Logger").getConstructor(String.class), prefix)), null); Util.reflect(Class.forName("net.ME1312.Galaxi.Log.Logger").getConstructor(String.class), prefix)), null);
if (log == null) { if (log == null) {
log = java.util.logging.Logger.getAnonymousLogger(); log = java.util.logging.Logger.getAnonymousLogger();

View File

@ -30,14 +30,14 @@
<dependency> <dependency>
<groupId>net.ME1312.Galaxi</groupId> <groupId>net.ME1312.Galaxi</groupId>
<artifactId>GalaxiUtil</artifactId> <artifactId>GalaxiUtil</artifactId>
<version>21w08b</version> <version>21w08m</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.ME1312.Galaxi</groupId> <groupId>net.ME1312.Galaxi</groupId>
<artifactId>GalaxiEngine</artifactId> <artifactId>GalaxiEngine</artifactId>
<version>21w08b</version> <version>21w08m</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -50,7 +50,7 @@
<dependency> <dependency>
<groupId>net.ME1312.SubData</groupId> <groupId>net.ME1312.SubData</groupId>
<artifactId>Server</artifactId> <artifactId>Server</artifactId>
<version>21w05f</version> <version>21w08a</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>

View File

@ -1,9 +1,9 @@
package net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi; 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.Galaxi;
import net.ME1312.Galaxi.Library.Event.ListenerOrder; import net.ME1312.Galaxi.Event.ListenerOrder;
import net.ME1312.Galaxi.Library.Event.Subscribe; import net.ME1312.Galaxi.Event.Subscribe;
import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger; import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
import net.ME1312.SubServers.Bungee.SubProxy; import net.ME1312.SubServers.Bungee.SubProxy;

View File

@ -110,7 +110,7 @@ public final class SubProxy extends BungeeCommon implements Listener {
super(SubAPI::getInstance); super(SubAPI::getInstance);
this.isPatched = isPatched; this.isPatched = isPatched;
this.isGalaxi = !Util.isException(() -> 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("getPluginManager"),
Util.reflect(Class.forName("net.ME1312.Galaxi.Engine.GalaxiEngine").getMethod("getInstance"), null)), Launch.class)); Util.reflect(Class.forName("net.ME1312.Galaxi.Engine.GalaxiEngine").getMethod("getInstance"), null)), Launch.class));

View File

@ -48,7 +48,7 @@
<dependency> <dependency>
<groupId>net.ME1312.Galaxi</groupId> <groupId>net.ME1312.Galaxi</groupId>
<artifactId>GalaxiUtil</artifactId> <artifactId>GalaxiUtil</artifactId>
<version>21w08b</version> <version>21w08m</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
@ -62,7 +62,7 @@
<dependency> <dependency>
<groupId>net.ME1312.SubData</groupId> <groupId>net.ME1312.SubData</groupId>
<artifactId>Client</artifactId> <artifactId>Client</artifactId>
<version>21w05f</version> <version>21w08a</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>

View File

@ -20,13 +20,13 @@
<dependency> <dependency>
<groupId>net.ME1312.Galaxi</groupId> <groupId>net.ME1312.Galaxi</groupId>
<artifactId>GalaxiUtil</artifactId> <artifactId>GalaxiUtil</artifactId>
<version>21w08b</version> <version>21w08m</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.ME1312.SubData</groupId> <groupId>net.ME1312.SubData</groupId>
<artifactId>Client</artifactId> <artifactId>Client</artifactId>
<version>21w05f</version> <version>21w08a</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@ -30,7 +30,7 @@
<dependency> <dependency>
<groupId>net.ME1312.Galaxi</groupId> <groupId>net.ME1312.Galaxi</groupId>
<artifactId>GalaxiUtil</artifactId> <artifactId>GalaxiUtil</artifactId>
<version>21w08b</version> <version>21w08m</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
@ -44,7 +44,7 @@
<dependency> <dependency>
<groupId>net.ME1312.SubData</groupId> <groupId>net.ME1312.SubData</groupId>
<artifactId>Client</artifactId> <artifactId>Client</artifactId>
<version>21w05f</version> <version>21w08a</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>

View File

@ -17,13 +17,33 @@
</repositories> </repositories>
<dependencies> <dependencies>
<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
<version>1.18</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.sf.jopt-simple</groupId>
<artifactId>jopt-simple</artifactId>
<version>5.0.4</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency> <dependency>
<groupId>net.ME1312.Galaxi</groupId> <groupId>net.ME1312.Galaxi</groupId>
<artifactId>GalaxiEngine</artifactId> <artifactId>GalaxiEngine</artifactId>
<version>21w08b</version> <version>21w08m</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>net.ME1312.Galaxi</groupId>
<artifactId>GalaxiUI</artifactId>
<version>21w08m</version>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency> <dependency>
<groupId>net.ME1312.SubServers</groupId> <groupId>net.ME1312.SubServers</groupId>
<artifactId>SubServers.Client.Common</artifactId> <artifactId>SubServers.Client.Common</artifactId>
@ -34,7 +54,7 @@
<dependency> <dependency>
<groupId>net.ME1312.SubData</groupId> <groupId>net.ME1312.SubData</groupId>
<artifactId>Client</artifactId> <artifactId>Client</artifactId>
<version>21w05f</version> <version>21w08a</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>

View File

@ -1,6 +1,6 @@
package net.ME1312.SubServers.Host.Event; 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.Galaxi.Library.Util;
import java.util.UUID; import java.util.UUID;

View File

@ -1,6 +1,6 @@
package net.ME1312.SubServers.Host.Event; 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.Galaxi.Library.Util;
/** /**

View File

@ -1,6 +1,6 @@
package net.ME1312.SubServers.Host.Event; 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.Galaxi.Library.Util;
import java.util.UUID; import java.util.UUID;

View File

@ -1,7 +1,7 @@
package net.ME1312.SubServers.Host.Event; package net.ME1312.SubServers.Host.Event;
import net.ME1312.Galaxi.Library.Callback.Callback; 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.Util;
import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.Galaxi.Library.Version.Version;
import net.ME1312.SubServers.Client.Common.Network.API.SubServer; import net.ME1312.SubServers.Client.Common.Network.API.SubServer;

View File

@ -1,7 +1,7 @@
package net.ME1312.SubServers.Host.Event; package net.ME1312.SubServers.Host.Event;
import net.ME1312.Galaxi.Library.Callback.Callback; 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.Util;
import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.Galaxi.Library.Version.Version;
import net.ME1312.SubServers.Client.Common.Network.API.SubServer; import net.ME1312.SubServers.Client.Common.Network.API.SubServer;

View File

@ -2,7 +2,7 @@ package net.ME1312.SubServers.Host.Event;
import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Container.ContainedPair;
import net.ME1312.Galaxi.Library.Container.Pair; 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.ObjectMap;
import net.ME1312.Galaxi.Library.Map.ObjectMapValue; import net.ME1312.Galaxi.Library.Map.ObjectMapValue;
import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Util;

View File

@ -1,6 +1,6 @@
package net.ME1312.SubServers.Host.Event; 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.Galaxi.Library.Util;
import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubData.Client.SubDataClient;

View File

@ -1,6 +1,6 @@
package net.ME1312.SubServers.Host.Event; 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.Galaxi.Library.Util;
import net.ME1312.SubData.Client.DataClient; import net.ME1312.SubData.Client.DataClient;
import net.ME1312.SubData.Client.Library.DisconnectReason; import net.ME1312.SubData.Client.Library.DisconnectReason;

View File

@ -1,6 +1,6 @@
package net.ME1312.SubServers.Host.Event; 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.Galaxi.Library.Util;
import java.util.UUID; import java.util.UUID;

View File

@ -1,6 +1,6 @@
package net.ME1312.SubServers.Host.Event; 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.Galaxi.Library.Util;
/** /**

View File

@ -1,6 +1,6 @@
package net.ME1312.SubServers.Host.Event; 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.Galaxi.Library.Util;
import java.util.UUID; import java.util.UUID;

View File

@ -1,6 +1,6 @@
package net.ME1312.SubServers.Host.Event; 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.Galaxi.Library.Util;
import java.util.UUID; import java.util.UUID;

View File

@ -1,6 +1,6 @@
package net.ME1312.SubServers.Host.Event; 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.Galaxi.Library.Util;
import java.util.UUID; import java.util.UUID;

View File

@ -1,6 +1,6 @@
package net.ME1312.SubServers.Host.Event; 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.Galaxi.Library.Util;
/** /**

View File

@ -1,6 +1,6 @@
package net.ME1312.SubServers.Host.Event; 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.Galaxi.Library.Util;
import java.util.UUID; import java.util.UUID;

View File

@ -1,6 +1,6 @@
package net.ME1312.SubServers.Host.Event; 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.Galaxi.Library.Util;
/** /**

View File

@ -1,11 +1,11 @@
package net.ME1312.SubServers.Host; package net.ME1312.SubServers.Host;
import net.ME1312.Galaxi.Engine.GalaxiEngine; 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.YAMLConfig;
import net.ME1312.Galaxi.Library.Config.YAMLSection; import net.ME1312.Galaxi.Library.Config.YAMLSection;
import net.ME1312.Galaxi.Library.Container.Pair; 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.Map.ObjectMap;
import net.ME1312.Galaxi.Library.Platform; import net.ME1312.Galaxi.Library.Platform;
import net.ME1312.Galaxi.Library.UniversalFile; 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.AES;
import net.ME1312.SubData.Client.Encryption.DHE; import net.ME1312.SubData.Client.Encryption.DHE;
import net.ME1312.SubData.Client.Encryption.RSA; 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.Library.DisconnectReason;
import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubData.Client.SubDataClient;
import net.ME1312.SubServers.Host.Executable.SubCreatorImpl; import net.ME1312.SubServers.Host.Executable.SubCreatorImpl;
@ -32,6 +31,7 @@ import com.dosse.upnp.UPnP;
import org.json.JSONObject; import org.json.JSONObject;
import java.io.*; import java.io.*;
import java.lang.reflect.InvocationTargetException;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.URL; import java.net.URL;
import java.nio.charset.Charset; import java.nio.charset.Charset;
@ -113,7 +113,7 @@ public final class ExHost {
log = new Logger("SubServers"); log = new Logger("SubServers");
try { try {
info = PluginInfo.getPluginInfo(this); info = PluginInfo.load(this);
info.setLogger(log); info.setLogger(log);
if (ExHost.class.getPackage().getSpecificationTitle() != null) info.setBuild(new Version(ExHost.class.getPackage().getSpecificationTitle())); 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")); info.setIcon(ExHost.class.getResourceAsStream("/net/ME1312/SubServers/Host/Library/Files/icon.png"));

View File

@ -3,8 +3,8 @@ package net.ME1312.SubServers.Host.Executable;
import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Callback.Callback;
import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Container.Pair;
import net.ME1312.Galaxi.Library.Container.Value; import net.ME1312.Galaxi.Library.Container.Value;
import net.ME1312.Galaxi.Library.Log.LogStream; import net.ME1312.Galaxi.Log.LogStream;
import net.ME1312.Galaxi.Library.Log.Logger; import net.ME1312.Galaxi.Log.Logger;
import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubData.Client.DataClient; import net.ME1312.SubData.Client.DataClient;
import net.ME1312.SubData.Client.Library.DisconnectReason; import net.ME1312.SubData.Client.Library.DisconnectReason;

View File

@ -1,7 +1,7 @@
package net.ME1312.SubServers.Host.Library.Compatibility; package net.ME1312.SubServers.Host.Library.Compatibility;
import net.ME1312.Galaxi.Galaxi; 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 net.ME1312.Galaxi.Library.UniversalFile;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;

View File

@ -2,7 +2,7 @@ package net.ME1312.SubServers.Host.Library;
import net.ME1312.Galaxi.Engine.GalaxiEngine; import net.ME1312.Galaxi.Engine.GalaxiEngine;
import net.ME1312.Galaxi.Library.Config.YAMLConfig; 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.Galaxi.Library.Map.ObjectMap;
import net.ME1312.SubServers.Host.ExHost; import net.ME1312.SubServers.Host.ExHost;
import net.ME1312.SubServers.Host.SubAPI; import net.ME1312.SubServers.Host.SubAPI;

View File

@ -130,7 +130,7 @@ public class SubProtocol extends SubDataProtocol {
} }
private Logger getLogger(int channel) { 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 @Override

View File

@ -1,7 +1,7 @@
package net.ME1312.SubServers.Host; package net.ME1312.SubServers.Host;
import net.ME1312.Galaxi.Engine.CommandParser;
import net.ME1312.Galaxi.Engine.GalaxiEngine; import net.ME1312.Galaxi.Engine.GalaxiEngine;
import net.ME1312.Galaxi.Engine.Library.ConsoleReader;
import net.ME1312.Galaxi.Library.AsyncConsolidator; import net.ME1312.Galaxi.Library.AsyncConsolidator;
import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Callback.Callback;
import net.ME1312.Galaxi.Library.Callback.ReturnRunnable; 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.Map.ObjectMap;
import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Util;
import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.Galaxi.Library.Version.Version;
import net.ME1312.Galaxi.Plugin.Command.Command; import net.ME1312.Galaxi.Command.Command;
import net.ME1312.Galaxi.Plugin.Command.CommandSender; import net.ME1312.Galaxi.Command.CommandSender;
import net.ME1312.Galaxi.Plugin.Command.CompletionHandler; import net.ME1312.Galaxi.Command.CompletionHandler;
import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubData.Client.SubDataClient;
import net.ME1312.SubServers.Client.Common.Network.API.*; import net.ME1312.SubServers.Client.Common.Network.API.*;
import net.ME1312.SubServers.Client.Common.Network.Packet.PacketCreateServer; import net.ME1312.SubServers.Client.Common.Network.Packet.PacketCreateServer;
@ -58,7 +58,7 @@ public class SubCommand {
LinkedList<String> args = new LinkedList<String>(Arrays.asList(rargs)); LinkedList<String> args = new LinkedList<String>(Arrays.asList(rargs));
args.removeFirst(); args.removeFirst();
ConsoleReader console = GalaxiEngine.getInstance().getConsoleReader(); CommandParser console = GalaxiEngine.getInstance().getCommandProcessor();
console.runCommand(sender, console.escapeCommand(rargs[0], args.toArray(new String[0]))); console.runCommand(sender, console.escapeCommand(rargs[0], args.toArray(new String[0])));
} else { } else {
sender.sendMessage("Usage: /" + label + " <Command> [Args...]"); sender.sendMessage("Usage: /" + label + " <Command> [Args...]");
@ -68,7 +68,7 @@ public class SubCommand {
LinkedList<String> args = new LinkedList<String>(Arrays.asList(rargs)); LinkedList<String> args = new LinkedList<String>(Arrays.asList(rargs));
args.removeFirst(); 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]); return console.complete(sender, console.escapeCommand(rargs[0], args.toArray(new String[0]))).toArray(new String[0]);
}).usage("<Command>", "[Args...]").description("An alias for commands").help( }).usage("<Command>", "[Args...]").description("An alias for commands").help(
"This command is an alias for all registered commands for ease of use.", "This command is an alias for all registered commands for ease of use.",

View File

@ -30,14 +30,14 @@
<dependency> <dependency>
<groupId>net.ME1312.Galaxi</groupId> <groupId>net.ME1312.Galaxi</groupId>
<artifactId>GalaxiUtil</artifactId> <artifactId>GalaxiUtil</artifactId>
<version>21w08b</version> <version>21w08m</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.ME1312.Galaxi</groupId> <groupId>net.ME1312.Galaxi</groupId>
<artifactId>GalaxiEngine</artifactId> <artifactId>GalaxiEngine</artifactId>
<version>21w08b</version> <version>21w08m</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -57,7 +57,7 @@
<dependency> <dependency>
<groupId>net.ME1312.SubData</groupId> <groupId>net.ME1312.SubData</groupId>
<artifactId>Client</artifactId> <artifactId>Client</artifactId>
<version>21w05f</version> <version>21w08a</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>

View File

@ -85,7 +85,7 @@ public final class ExProxy extends BungeeCommon implements Listener {
super(SubAPI::getInstance); super(SubAPI::getInstance);
this.isPatched = isPatched; this.isPatched = isPatched;
this.isGalaxi = !Util.isException(() -> 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("getPluginManager"),
Util.reflect(Class.forName("net.ME1312.Galaxi.Engine.GalaxiEngine").getMethod("getInstance"), null)), Launch.class)); Util.reflect(Class.forName("net.ME1312.Galaxi.Engine.GalaxiEngine").getMethod("getInstance"), null)), Launch.class));