From 071e0bceab7342cb7dd085a11acb490c9c2fc2d1 Mon Sep 17 00:00:00 2001 From: ME1312 Date: Mon, 27 May 2019 15:33:52 -0400 Subject: [PATCH] Update SubData --- SubServers.Bungee/pom.xml | 6 +++--- .../src/net/ME1312/SubServers/Bungee/SubCommand.java | 5 ++++- SubServers.Client/Bukkit/pom.xml | 4 ++-- .../src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java | 1 + SubServers.Client/Sponge/pom.xml | 4 ++-- .../src/net/ME1312/SubServers/Client/Sponge/SubPlugin.java | 1 + SubServers.Host/pom.xml | 4 ++-- SubServers.Sync/pom.xml | 6 +++--- .../src/net/ME1312/SubServers/Sync/SubCommand.java | 5 ++++- 9 files changed, 22 insertions(+), 14 deletions(-) diff --git a/SubServers.Bungee/pom.xml b/SubServers.Bungee/pom.xml index d68063c9..e2ef985d 100644 --- a/SubServers.Bungee/pom.xml +++ b/SubServers.Bungee/pom.xml @@ -30,19 +30,19 @@ net.ME1312.Galaxi GalaxiUtil - 19w21a + 19w22a compile net.ME1312.Galaxi GalaxiEngine - 19w21a + 19w22a provided net.ME1312.SubData Server - 19w20g + 19w22a compile diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java index 8b0b67f7..ba73f583 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java @@ -12,6 +12,7 @@ import net.ME1312.SubData.Server.ClientHandler; import net.ME1312.SubServers.Bungee.Library.Compatibility.GalaxiInfo; import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger; import net.ME1312.SubServers.Bungee.Network.Packet.PacketExCheckPermission; +import net.md_5.bungee.BungeeCord; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.chat.ClickEvent; @@ -107,14 +108,16 @@ public final class SubCommand extends CommandX { } Version galaxi = GalaxiInfo.getVersion(); + Version bungee = Util.getDespiteException(() -> (Version) BungeeCord.class.getMethod("getBuildVersion").invoke(plugin), null); Version galaxibuild = GalaxiInfo.getSignature(); + Version bungeebuild = Util.getDespiteException(() -> (Version) BungeeCord.class.getMethod("getBuildSignature").invoke(plugin), null); sender.sendMessage("SubServers > These are the platforms and versions that are running SubServers.Bungee:"); sender.sendMessage(" " + System.getProperty("os.name") + ((!System.getProperty("os.name").toLowerCase().startsWith("windows"))?' ' + System.getProperty("os.version"):"") + ((osarch != null)?" [" + osarch + ']':"") + ','); sender.sendMessage(" Java " + System.getProperty("java.version") + ((javaarch != null)?" [" + javaarch + ']':"") + ','); if (galaxi != null) Util.isException(() -> sender.sendMessage(" GalaxiEngine v" + galaxi.toExtendedString() + ((galaxibuild != null)?" (" + galaxibuild + ')':"") + ',')); - sender.sendMessage(" " + plugin.getBungeeName() + ((plugin.isGalaxi)?" v":" ") + plugin.getVersion() + ((plugin.isPatched)?" [Patched]":"") + ','); + sender.sendMessage(" " + plugin.getBungeeName() + ((plugin.isGalaxi)?" v":" ") + ((bungee != null)?bungee:plugin.getVersion()) + ((bungeebuild != null)?" (" + bungeebuild + ')':"") + ((plugin.isPatched)?" [Patched]":"") + ','); sender.sendMessage(" SubServers.Bungee v" + SubPlugin.version.toExtendedString() + ((plugin.api.getWrapperBuild() != null)?" (" + plugin.api.getWrapperBuild() + ')':"")); sender.sendMessage(""); new Thread(() -> { diff --git a/SubServers.Client/Bukkit/pom.xml b/SubServers.Client/Bukkit/pom.xml index a0ebc590..a539d379 100644 --- a/SubServers.Client/Bukkit/pom.xml +++ b/SubServers.Client/Bukkit/pom.xml @@ -48,13 +48,13 @@ net.ME1312.Galaxi GalaxiUtil - 19w21a + 19w22a compile net.ME1312.SubData Client - 19w20g + 19w22a compile diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java index 8178346e..e7e638f6 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java @@ -74,6 +74,7 @@ public final class SubPlugin extends JavaPlugin { new UniversalFile(new File(System.getProperty("user.dir")), "subdata.json").delete(); } if (new UniversalFile(new File(System.getProperty("user.dir")), "subdata.rsa.key").exists()) { + if (new UniversalFile(getDataFolder(), "subdata.rsa.key").exists()) new UniversalFile(getDataFolder(), "subdata.rsa.key").delete(); Files.move(new UniversalFile(new File(System.getProperty("user.dir")), "subdata.rsa.key").toPath(), new UniversalFile(getDataFolder(), "subdata.rsa.key").toPath()); } diff --git a/SubServers.Client/Sponge/pom.xml b/SubServers.Client/Sponge/pom.xml index 03269f48..e84a05c1 100644 --- a/SubServers.Client/Sponge/pom.xml +++ b/SubServers.Client/Sponge/pom.xml @@ -30,13 +30,13 @@ net.ME1312.Galaxi GalaxiUtil - 19w21a + 19w22a compile net.ME1312.SubData Client - 19w20g + 19w22a compile diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubPlugin.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubPlugin.java index ea16eec7..5ed80337 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubPlugin.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubPlugin.java @@ -90,6 +90,7 @@ public final class SubPlugin { new UniversalFile(new File(System.getProperty("user.dir")), "subdata.json").delete(); } if (new UniversalFile(new File(System.getProperty("user.dir")), "subdata.rsa.key").exists()) { + if (new UniversalFile(dir, "subdata.rsa.key").exists()) new UniversalFile(dir, "subdata.rsa.key").delete(); Files.move(new UniversalFile(new File(System.getProperty("user.dir")), "subdata.rsa.key").toPath(), new UniversalFile(dir, "subdata.rsa.key").toPath()); } diff --git a/SubServers.Host/pom.xml b/SubServers.Host/pom.xml index 4020aabe..3c079c61 100644 --- a/SubServers.Host/pom.xml +++ b/SubServers.Host/pom.xml @@ -20,13 +20,13 @@ net.ME1312.Galaxi GalaxiEngine - 19w21a + 19w22a compile net.ME1312.SubData Client - 19w20g + 19w22a compile diff --git a/SubServers.Sync/pom.xml b/SubServers.Sync/pom.xml index ce34fab5..c87d3d5f 100644 --- a/SubServers.Sync/pom.xml +++ b/SubServers.Sync/pom.xml @@ -30,19 +30,19 @@ net.ME1312.Galaxi GalaxiUtil - 19w21a + 19w22a compile net.ME1312.Galaxi GalaxiEngine - 19w21a + 19w22a provided net.ME1312.SubData Client - 19w20g + 19w22a compile diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java index 78597307..a1a22d25 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java @@ -14,6 +14,7 @@ import net.ME1312.SubServers.Sync.Network.API.*; import net.ME1312.SubServers.Sync.Network.Packet.*; import net.ME1312.SubServers.Sync.Server.ServerContainer; import net.ME1312.SubServers.Sync.Server.SubServerContainer; +import net.md_5.bungee.BungeeCord; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.chat.ClickEvent; @@ -108,14 +109,16 @@ public final class SubCommand extends CommandX { } Version galaxi = GalaxiInfo.getVersion(); + Version bungee = Util.getDespiteException(() -> (Version) BungeeCord.class.getMethod("getBuildVersion").invoke(plugin), null); Version galaxibuild = GalaxiInfo.getSignature(); + Version bungeebuild = Util.getDespiteException(() -> (Version) BungeeCord.class.getMethod("getBuildSignature").invoke(plugin), null); sender.sendMessage("SubServers > These are the platforms and versions that are running SubServers.Sync:"); sender.sendMessage(" " + System.getProperty("os.name") + ((!System.getProperty("os.name").toLowerCase().startsWith("windows"))?' ' + System.getProperty("os.version"):"") + ((osarch != null)?" [" + osarch + ']':"") + ','); sender.sendMessage(" Java " + System.getProperty("java.version") + ((javaarch != null)?" [" + javaarch + ']':"") + ','); if (galaxi != null) Util.isException(() -> sender.sendMessage("GalaxiEngine v" + galaxi.toExtendedString() + ((galaxibuild != null)?" (" + galaxibuild + ')':"") + ',')); - sender.sendMessage(" " + plugin.getBungeeName() + ((plugin.isGalaxi)?" v":" ") + plugin.getVersion() + ((plugin.isPatched)?" [Patched]":"") + ','); + sender.sendMessage(" " + plugin.getBungeeName() + ((plugin.isGalaxi)?" v":" ") + ((bungee != null)?bungee:plugin.getVersion()) + ((bungeebuild != null)?" (" + bungeebuild + ')':"") + ((plugin.isPatched)?" [Patched]":"") + ','); sender.sendMessage(" SubServers.Sync v" + SubPlugin.version.toExtendedString() + ((plugin.api.getWrapperBuild() != null)?" (" + plugin.api.getWrapperBuild() + ')':"")); sender.sendMessage(""); new Thread(() -> {