diff --git a/SubServers.Bungee/pom.xml b/SubServers.Bungee/pom.xml index 4f66459c..1b8ce2c2 100644 --- a/SubServers.Bungee/pom.xml +++ b/SubServers.Bungee/pom.xml @@ -34,7 +34,7 @@ net.ME1312.SubData Server - 21w26c + 21w33a compile diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Launch.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Launch.java index fddf4643..64cb4449 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Launch.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Launch.java @@ -23,6 +23,7 @@ public final class Launch { @SuppressWarnings({"deprecation", "unchecked"}) public static void main(String[] args) throws Exception { System.setProperty("jdk.lang.Process.allowAmbiguousCommands", "true"); + System.setProperty("jdk.util.jar.enableMultiRelease", "force"); System.setProperty("apple.laf.useScreenMenuBar", "true"); if (Util.getDespiteException(() -> Class.forName("net.md_5.bungee.BungeeCord") == null, true)) { @@ -65,7 +66,7 @@ public final class Launch { if (net.md_5.bungee.BungeeCord.class.getPackage().getSpecificationVersion() != null) { Date date = (new SimpleDateFormat("yyyyMMdd")).parse(net.md_5.bungee.BungeeCord.class.getPackage().getSpecificationVersion()); Calendar line = Calendar.getInstance(); - line.add(3, -4); + line.add(Calendar.WEEK_OF_YEAR, -8); if (date.before(line.getTime())) { System.out.println("*** Warning: BungeeCord is outdated ***"); System.out.println("*** Please download a new build from: ***"); diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/ConfigUpdater.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/ConfigUpdater.java index f92dccb7..cf4d8f3c 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/ConfigUpdater.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/ConfigUpdater.java @@ -6,6 +6,8 @@ import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubServers.Client.Bukkit.SubAPI; +import org.bukkit.Bukkit; + import java.io.File; import java.io.IOException; import java.text.SimpleDateFormat; @@ -36,7 +38,7 @@ public class ConfigUpdater { if (!existing.contains("Settings") || !existing.getMap("Settings").contains("Version")) { i++; - System.out.println("SubServers > Created ./plugins/SubServers-Client-Bukkit/config.yml"); + Bukkit.getLogger().info("SubServers > Created ./plugins/SubServers-Client-Bukkit/config.yml"); } else { if (was.compareTo(new Version("19w17a")) <= 0) { if (existing.getMap("Settings", new YAMLSection()).contains("Ingame-Access")) @@ -49,7 +51,7 @@ public class ConfigUpdater { // i++ //} - if (i > 0) System.out.println("SubServers > Updated ./plugins/SubServers-Client-Bukkit/config.yml (" + i + " pass" + ((i != 1)?"es":"") + ")"); + if (i > 0) Bukkit.getLogger().info("SubServers > Updated ./plugins/SubServers-Client-Bukkit/config.yml (" + i + " pass" + ((i != 1)?"es":"") + ")"); } if (i > 0) { 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 c8830541..ba749328 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 @@ -103,20 +103,20 @@ public final class SubPlugin extends JavaPlugin { subprotocol.registerCipher("AES-192", new AES(192, config.get().getMap("Settings").getMap("SubData").getRawString("Password"))); subprotocol.registerCipher("AES-256", new AES(256, config.get().getMap("Settings").getMap("SubData").getRawString("Password"))); - System.out.println("SubData > AES Encryption Available"); + Bukkit.getLogger().info("SubData > AES Encryption Available"); } if (new UniversalFile(dir, "subdata.rsa.key").exists()) { try { subprotocol.registerCipher("RSA", new RSA(new UniversalFile(dir, "subdata.rsa.key"))); - System.out.println("SubData > RSA Encryption Available"); + Bukkit.getLogger().info("SubData > RSA Encryption Available"); } catch (Exception e) { e.printStackTrace(); } } reconnect = true; - System.out.println("SubData > "); - System.out.println("SubData > Connecting to /" + config.get().getMap("Settings").getMap("SubData").getRawString("Address", "127.0.0.1:4391")); + Bukkit.getLogger().info("SubData > "); + Bukkit.getLogger().info("SubData > Connecting to /" + config.get().getMap("Settings").getMap("SubData").getRawString("Address", "127.0.0.1:4391")); connect(null); gui = new DefaultUIHandler(this); diff --git a/SubServers.Client/Common/pom.xml b/SubServers.Client/Common/pom.xml index 43ed0a57..4facfaf7 100644 --- a/SubServers.Client/Common/pom.xml +++ b/SubServers.Client/Common/pom.xml @@ -24,7 +24,7 @@ net.ME1312.SubData Client - 21w26c + 21w33a compile diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Launch.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Launch.java index 451cadd4..dce7623b 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Launch.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Launch.java @@ -13,6 +13,7 @@ public final class Launch { */ public static void main(String[] args) throws Exception { System.setProperty("jdk.lang.Process.allowAmbiguousCommands", "true"); + System.setProperty("jdk.util.jar.enableMultiRelease", "force"); System.setProperty("apple.laf.useScreenMenuBar", "true"); boolean exists = false; try { diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Launch.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Launch.java index 3916b691..a686b214 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Launch.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Launch.java @@ -23,6 +23,7 @@ public final class Launch { */ @SuppressWarnings({"deprecation", "unchecked"}) public static void main(String[] args) throws Exception { + System.setProperty("jdk.util.jar.enableMultiRelease", "force"); System.setProperty("apple.laf.useScreenMenuBar", "true"); if (Util.getDespiteException(() -> Class.forName("net.md_5.bungee.BungeeCord") == null, true)) { @@ -65,7 +66,7 @@ public final class Launch { if (net.md_5.bungee.BungeeCord.class.getPackage().getSpecificationVersion() != null) { Date date = (new SimpleDateFormat("yyyyMMdd")).parse(net.md_5.bungee.BungeeCord.class.getPackage().getSpecificationVersion()); Calendar line = Calendar.getInstance(); - line.add(3, -4); + line.add(Calendar.WEEK_OF_YEAR, -8); if (date.before(line.getTime())) { System.out.println("*** Warning: BungeeCord is outdated ***"); System.out.println("*** Please download a new build from: ***");