diff --git a/README.md b/README.md
index abb27edf..38b664ac 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# ![https://s3.postimg.cc/dikyxlz5v/Sub_Banner.png](https://s3.postimg.cc/dikyxlz5v/Sub_Banner.png)
[![Build Status](https://src.me1312.net/jenkins/job/SubServers%20Platform/badge/icon)](https://src.me1312.net/jenkins/job/SubServers%20Platform/)
-[![Release Verison](https://img.shields.io/github/release/ME1312/SubServers-2/all.svg)](https://github.com/ME1312/SubServers-2/releases) [![Snapshot Verison](https://img.shields.io/badge/dynamic/xml.svg?label=snapshot&url=https%3A%2F%2Fsrc.me1312.net%2Fmaven%2Fnet%2FME1312%2FSubServers%2FSubServers.Bungee%2Fmaven-metadata.xml&query=%2F%2Fversioning%2Frelease&colorB=blue)](https://src.me1312.net/jenkins/job/SubServers%20Platform/) [![Discord](https://img.shields.io/discord/307936188134850560.svg)](https://discord.gg/gKWpT2K)
+[![Release Verison](https://img.shields.io/github/release/ME1312/SubServers-2/all.svg)](https://github.com/ME1312/SubServers-2/releases) [![Snapshot Verison](https://img.shields.io/badge/dynamic/xml.svg?label=snapshot&url=https%3A%2F%2Fsrc.me1312.net%2Fmaven%2Fnet%2FME1312%2FSubServers%2FSubServers.Bungee%2Fmaven-metadata.xml&query=%2F%2Fversioning%2Frelease&colorB=blue)](https://src.me1312.net/jenkins/job/SubServers%20Platform/)
SubServers 2 is a rewrite of SubServers, the Server Management Platform.
> [https://www.spigotmc.org/resources/subservers-bungee.11264/](https://www.spigotmc.org/resources/subservers-bungee.11264/)
> [https://www.spigotmc.org/resources/subservers-host.38833/](https://www.spigotmc.org/resources/subservers-host.38833/)
diff --git a/SubServers.Client/Combo/MANIFEST.MF b/SubServers.Client/Universal/MANIFEST.MF
similarity index 100%
rename from SubServers.Client/Combo/MANIFEST.MF
rename to SubServers.Client/Universal/MANIFEST.MF
diff --git a/SubServers.Client/Combo/pom.xml b/SubServers.Client/Universal/pom.xml
similarity index 97%
rename from SubServers.Client/Combo/pom.xml
rename to SubServers.Client/Universal/pom.xml
index f6d3b0f5..057ffec6 100644
--- a/SubServers.Client/Combo/pom.xml
+++ b/SubServers.Client/Universal/pom.xml
@@ -3,7 +3,7 @@
4.0.0
net.ME1312.SubServers
- SubServers.Client.Combo
+ SubServers.Client.Universal
-PLACEHOLDER
jar
diff --git a/SubServers.Client/pom.xml b/SubServers.Client/pom.xml
index bb516a3b..8bd3d917 100644
--- a/SubServers.Client/pom.xml
+++ b/SubServers.Client/pom.xml
@@ -8,8 +8,8 @@
pom
- Combo
Bukkit
Sponge
+ Universal
\ No newline at end of file
diff --git a/SubServers.Host/pom.xml b/SubServers.Host/pom.xml
index ace7467f..f9e09d70 100644
--- a/SubServers.Host/pom.xml
+++ b/SubServers.Host/pom.xml
@@ -20,7 +20,7 @@
net.ME1312.Galaxi
GalaxiEngine
- 18w49a
+ 18w51a
compile
diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubReloadEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubReloadEvent.java
deleted file mode 100644
index 09504455..00000000
--- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubReloadEvent.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package net.ME1312.SubServers.Host.Event;
-
-import net.ME1312.Galaxi.Library.Event.Event;
-import net.ME1312.Galaxi.Library.Util;
-import net.ME1312.SubServers.Host.ExHost;
-
-/**
- * SubServers.Host Reload Event Class
- */
-public class SubReloadEvent extends Event {
-
- /**
- * SubServers.Host Reload Event
- *
- * @param host SubServers.Host
- */
- public SubReloadEvent(ExHost host) {
- if (Util.isNull(host)) throw new NullPointerException();
- }
-}
diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java b/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java
index 8c809385..9d9c41b5 100644
--- a/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java
+++ b/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java
@@ -2,6 +2,8 @@ package net.ME1312.SubServers.Host;
import com.dosse.upnp.UPnP;
import net.ME1312.Galaxi.Engine.GalaxiEngine;
+import net.ME1312.Galaxi.Engine.GalaxiOption;
+import net.ME1312.Galaxi.Event.GalaxiReloadEvent;
import net.ME1312.Galaxi.Library.Config.YAMLConfig;
import net.ME1312.Galaxi.Library.Config.YAMLSection;
import net.ME1312.Galaxi.Library.Log.Logger;
@@ -12,7 +14,6 @@ import net.ME1312.Galaxi.Library.Version.Version;
import net.ME1312.Galaxi.Library.Version.VersionType;
import net.ME1312.Galaxi.Plugin.Plugin;
import net.ME1312.Galaxi.Plugin.PluginInfo;
-import net.ME1312.SubServers.Host.Event.SubReloadEvent;
import net.ME1312.SubServers.Host.Executable.SubCreator;
import net.ME1312.SubServers.Host.Executable.SubServer;
import net.ME1312.SubServers.Host.Library.*;
@@ -268,7 +269,7 @@ public final class ExHost {
InetAddress.getByName(config.get().getSection("Settings").getSection("SubData").getString("Address", "127.0.0.1:4391").split(":")[0]),
Integer.parseInt(config.get().getSection("Settings").getSection("SubData").getString("Address", "127.0.0.1:4391").split(":")[1]), cipher);
- engine.getPluginManager().executeEvent(new SubReloadEvent(this));
+ engine.getPluginManager().executeEvent(new GalaxiReloadEvent(engine));
}
private void loadDefaults() {
diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java b/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java
index 98ef6156..6efd9454 100644
--- a/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java
+++ b/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java
@@ -1,12 +1,12 @@
package net.ME1312.SubServers.Host;
import net.ME1312.Galaxi.Engine.GalaxiEngine;
-import net.ME1312.Galaxi.Engine.PluginManager;
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.Plugin.PluginManager;
import net.ME1312.SubServers.Host.Library.TextColor;
import net.ME1312.SubServers.Host.Network.API.*;
import net.ME1312.SubServers.Host.Network.Packet.*;