diff --git a/SubServers.Bungee/common/pom.xml b/SubServers.Bungee/common/pom.xml index 1e4a553a..72c595e9 100644 --- a/SubServers.Bungee/common/pom.xml +++ b/SubServers.Bungee/common/pom.xml @@ -28,7 +28,7 @@ net.ME1312.Galaxi GalaxiBase - 23w08b + 23w14a compile diff --git a/SubServers.Bungee/pom.xml b/SubServers.Bungee/pom.xml index 98d2fa67..7476d801 100644 --- a/SubServers.Bungee/pom.xml +++ b/SubServers.Bungee/pom.xml @@ -126,9 +126,9 @@ src/META-INF/MANIFEST.MF - - jar-with-dependencies - + + ../SubServers.Client/Common/jar-with-some-dependencies.xml + false 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 index d734abb3..2ecdeadf 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.java @@ -120,6 +120,7 @@ public class ExternalHost extends Host implements ClientHandler { if (!served.contains(server.getName())) { client.sendPacket(new PacketExAddServer((ExternalSubServer) server, (server.isRunning())?((ExternalSubLogger) server.getLogger()).getExternalAddress():null, data -> { if (data.contains(0x0002)) ((ExternalSubServer) server).started(data.getUUID(0x0002)); + else if (server.isRunning()) ((ExternalSubServer) server).stopped(false); })); } } 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 index 6966ed4c..8cdea94f 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.java @@ -158,7 +158,7 @@ public class ExternalSubServer extends SubServerImpl { } else return false; } else return false; } - private void stopped(Boolean allowrestart) { + void stopped(Boolean allowrestart) { logger.stop(); history.clear(); started = 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 index 1fb3f8a7..7375805d 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalHost.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalHost.java @@ -15,6 +15,7 @@ import net.ME1312.SubServers.Bungee.SubProxy; import com.dosse.upnp.UPnP; import com.google.common.collect.Range; +import com.google.gson.Gson; import java.io.File; import java.io.FileWriter; @@ -185,7 +186,7 @@ public class InternalHost extends Host { } if (!to.exists()) to.mkdirs(); FileWriter writer = new FileWriter(new File(to, "info.json"), false); - writer.write(info.toJSON().toString()); + writer.write(new Gson().toJson(info.get())); writer.close(); } catch (Exception e) { e.printStackTrace(); diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java index 59dca698..20579708 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java @@ -606,7 +606,7 @@ public class InternalSubCreator extends SubCreator { YAMLSection config = new YAMLSection(); FileWriter writer = new FileWriter(new File(dir, "subdata.json"), false); config.setAll(getSubData()); - writer.write(config.toJSON().toString()); + writer.write(new Gson().toJson(config.get())); writer.close(); if (!new File(dir, "subdata.rsa.key").exists() && new File("SubServers/subdata.rsa.key").exists()) { diff --git a/SubServers.Client/Bukkit/pom.xml b/SubServers.Client/Bukkit/pom.xml index 9cbbb328..5eb89e55 100644 --- a/SubServers.Client/Bukkit/pom.xml +++ b/SubServers.Client/Bukkit/pom.xml @@ -121,9 +121,9 @@ src/META-INF/MANIFEST.MF - - jar-with-dependencies - + + ../Common/jar-with-some-dependencies.xml + false diff --git a/SubServers.Client/Common/jar-with-some-dependencies.xml b/SubServers.Client/Common/jar-with-some-dependencies.xml new file mode 100644 index 00000000..d790c994 --- /dev/null +++ b/SubServers.Client/Common/jar-with-some-dependencies.xml @@ -0,0 +1,20 @@ + + + jar-with-some-dependencies + + jar + + false + + + / + true + true + runtime + + org.json:json + org.yaml:snakeyaml + + + + \ No newline at end of file diff --git a/SubServers.Client/Common/pom.xml b/SubServers.Client/Common/pom.xml index 14a45af8..8cb84a81 100644 --- a/SubServers.Client/Common/pom.xml +++ b/SubServers.Client/Common/pom.xml @@ -18,7 +18,7 @@ net.ME1312.Galaxi GalaxiBase - 23w08b + 23w14a compile @@ -84,9 +84,11 @@ SubServers.Client.Common ../../Artifacts/Modulized - - jar-with-dependencies - + + jar-with-some-dependencies.xml + + + false diff --git a/SubServers.Client/Sponge/pom.xml b/SubServers.Client/Sponge/pom.xml index 943e04d2..e94d4d09 100644 --- a/SubServers.Client/Sponge/pom.xml +++ b/SubServers.Client/Sponge/pom.xml @@ -91,9 +91,9 @@ src/META-INF/MANIFEST.MF - - jar-with-dependencies - + + ../Common/jar-with-some-dependencies.xml + false diff --git a/SubServers.Client/Universal/pom.xml b/SubServers.Client/Universal/pom.xml index 0264d9f9..71f908b5 100644 --- a/SubServers.Client/Universal/pom.xml +++ b/SubServers.Client/Universal/pom.xml @@ -44,9 +44,9 @@ MANIFEST.MF - - jar-with-dependencies - + + ../Common/jar-with-some-dependencies.xml + false diff --git a/SubServers.Host/pom.xml b/SubServers.Host/pom.xml index 1bf8a709..377b5e62 100644 --- a/SubServers.Host/pom.xml +++ b/SubServers.Host/pom.xml @@ -17,8 +17,8 @@ org.fusesource.jansi - jansi - 1.18 + jansi + 2.4.0 provided @@ -30,13 +30,13 @@ net.ME1312.Galaxi GalaxiEngine - 23w08b + 23w14a compile net.ME1312.Galaxi GalaxiUI - 23w08b + 23w14a runtime diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExAddServer.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExAddServer.java index e405097c..a29fc770 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExAddServer.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExAddServer.java @@ -34,16 +34,6 @@ public class PacketExAddServer implements PacketObjectIn, PacketObjectO this.host = host; } - /** - * New PacketExAddServer (Out) - * - * @param response Response ID - * @param tracker Receiver ID - */ - public PacketExAddServer(int response, UUID tracker) { - this(response, null, tracker); - } - /** * New PacketExAddServer (Out) * @@ -102,16 +92,16 @@ public class PacketExAddServer implements PacketObjectIn, PacketObjectO init(client.getConnection(), new SubServerImpl(host, name, enabled, port, log, dir, exec, stopcmd), running, tracker, logger); } } catch (Throwable e) { - client.sendPacket(new PacketExAddServer(2, tracker)); + client.sendPacket(new PacketExAddServer(2, null, tracker)); host.log.error.println(e); } } private void init(SubDataClient client, SubServerImpl server, UUID running, UUID tracker, Logger logger) { + client.sendPacket(new PacketExAddServer(0, running, tracker)); host.servers.put(server.getName().toLowerCase(), server); if (UPnP.isUPnPAvailable() && host.config.get().getMap("Settings").getMap("UPnP", new ObjectMap()).getBoolean("Forward-Servers", false)) UPnP.openPortTCP(server.getPort()); logger.info("Added SubServer: " + server.getName()); if (running != null) server.start(running); - client.sendPacket(new PacketExAddServer(0, tracker)); } } \ No newline at end of file diff --git a/SubServers.Sync/velocity/pom.xml b/SubServers.Sync/velocity/pom.xml index 8e11ffe2..411d3e9a 100644 --- a/SubServers.Sync/velocity/pom.xml +++ b/SubServers.Sync/velocity/pom.xml @@ -124,9 +124,9 @@ ../src/META-INF/MANIFEST.MF - - jar-with-dependencies - + + ../../SubServers.Client/Common/jar-with-some-dependencies.xml + false