From b0340b498ee13c6193cabb15d9b2bbd84e3ca1cb Mon Sep 17 00:00:00 2001 From: ME1312 Date: Fri, 29 Jan 2021 19:06:23 -0500 Subject: [PATCH] SubData API updates & usage optimizations --- SubServers.Bungee/pom.xml | 2 +- .../Bungee/Network/Packet/PacketExDownloadTemplates.java | 4 +--- .../src/net/ME1312/SubServers/Bungee/Network/SubProtocol.java | 1 - SubServers.Client/Bukkit/pom.xml | 2 +- .../ME1312/SubServers/Client/Bukkit/Network/SubProtocol.java | 1 - SubServers.Client/Common/pom.xml | 2 +- SubServers.Client/Sponge/pom.xml | 2 +- .../ME1312/SubServers/Client/Sponge/Network/SubProtocol.java | 1 - SubServers.Host/pom.xml | 2 +- .../net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java | 4 ++-- .../src/net/ME1312/SubServers/Host/Network/SubProtocol.java | 1 - SubServers.Sync/pom.xml | 2 +- .../src/net/ME1312/SubServers/Sync/Network/SubProtocol.java | 1 - 13 files changed, 9 insertions(+), 16 deletions(-) diff --git a/SubServers.Bungee/pom.xml b/SubServers.Bungee/pom.xml index 2fac0776..86bf69a1 100644 --- a/SubServers.Bungee/pom.xml +++ b/SubServers.Bungee/pom.xml @@ -50,7 +50,7 @@ net.ME1312.SubData Server - 21w05b + 21w05d compile true diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDownloadTemplates.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDownloadTemplates.java index 06793cc0..587283a0 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDownloadTemplates.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDownloadTemplates.java @@ -38,10 +38,8 @@ public class PacketExDownloadTemplates implements PacketIn, PacketStreamOut { @Override public void send(SubDataClient client, OutputStream stream) throws Throwable { try { - int initial = client.getBlockSize(); - client.setBlockSize(DataSize.MBB); + if (client.getBlockSize() < DataSize.MBB) client.tempBlockSize(DataSize.MBB); Util.zip(new UniversalFile(plugin.dir, "SubServers:Templates"), stream); - client.setBlockSize(initial); stream.close(); Util.isException(() -> Util.reflect(ExternalSubCreator.class.getDeclaredField("enableRT"), host.getCreator(), true)); diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubProtocol.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubProtocol.java index 29c5cc9d..979f7d95 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubProtocol.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubProtocol.java @@ -30,7 +30,6 @@ public class SubProtocol extends SubDataProtocol { setName("SubServers 2"); setVersion(new Version("2.16a+")); - setBlockSize(DataSize.MB); // 00-0F: Object Link Packets diff --git a/SubServers.Client/Bukkit/pom.xml b/SubServers.Client/Bukkit/pom.xml index 72c65380..48c7a2bd 100644 --- a/SubServers.Client/Bukkit/pom.xml +++ b/SubServers.Client/Bukkit/pom.xml @@ -62,7 +62,7 @@ net.ME1312.SubData Client - 21w05b + 21w05d compile true diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubProtocol.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubProtocol.java index 3698cba7..0d6689be 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubProtocol.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubProtocol.java @@ -36,7 +36,6 @@ public class SubProtocol extends SubDataProtocol { setName("SubServers 2"); addVersion(new Version("2.16a+")); - setBlockSize(DataSize.MB); // 00-0F: Object Link Packets diff --git a/SubServers.Client/Common/pom.xml b/SubServers.Client/Common/pom.xml index ef1e2c94..09de4269 100644 --- a/SubServers.Client/Common/pom.xml +++ b/SubServers.Client/Common/pom.xml @@ -26,7 +26,7 @@ net.ME1312.SubData Client - 21w05b + 21w05d provided diff --git a/SubServers.Client/Sponge/pom.xml b/SubServers.Client/Sponge/pom.xml index 5abceeb2..9f2cf100 100644 --- a/SubServers.Client/Sponge/pom.xml +++ b/SubServers.Client/Sponge/pom.xml @@ -44,7 +44,7 @@ net.ME1312.SubData Client - 21w05b + 21w05d compile true diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/SubProtocol.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/SubProtocol.java index e7c97ece..1431af79 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/SubProtocol.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/SubProtocol.java @@ -39,7 +39,6 @@ public class SubProtocol extends SubDataProtocol { setName("SubServers 2"); addVersion(new Version("2.16a+")); - setBlockSize(DataSize.MB); // 00-0F: Object Link Packets diff --git a/SubServers.Host/pom.xml b/SubServers.Host/pom.xml index 8b349a25..6af3f73b 100644 --- a/SubServers.Host/pom.xml +++ b/SubServers.Host/pom.xml @@ -34,7 +34,7 @@ net.ME1312.SubData Client - 21w05b + 21w05d compile true diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java index 6afcd5f1..889b83aa 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java @@ -78,7 +78,7 @@ public class SubLoggerImpl { Process process = this.process; ExHost host = SubAPI.getInstance().getInternals(); if (logn) Util.isException(() -> { - channel = (SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0].openChannel(); + channel = (SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0].newChannel(); channel.on.closed(new Callback>() { @Override public void run(Pair client) { @@ -95,7 +95,7 @@ public class SubLoggerImpl { if (!started || SubLoggerImpl.this.process == null || process != SubLoggerImpl.this.process || !process.isAlive()) { timer.cancel(); } else try { - SubDataClient open = (SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0].openChannel(); + SubDataClient open = (SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0].newChannel(); open.on.closed(run); channel = open; timer.cancel(); diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubProtocol.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubProtocol.java index 0564a97b..3f15c0f1 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubProtocol.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubProtocol.java @@ -34,7 +34,6 @@ public class SubProtocol extends SubDataProtocol { setName("SubServers 2"); addVersion(new Version("2.16a+")); - setBlockSize(DataSize.MB); // 00-0F: Object Link Packets diff --git a/SubServers.Sync/pom.xml b/SubServers.Sync/pom.xml index 68aa9bcc..c2d4120d 100644 --- a/SubServers.Sync/pom.xml +++ b/SubServers.Sync/pom.xml @@ -57,7 +57,7 @@ net.ME1312.SubData Client - 21w05b + 21w05d compile true diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/SubProtocol.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/SubProtocol.java index 375f377b..9e5c809c 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/SubProtocol.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/SubProtocol.java @@ -43,7 +43,6 @@ public class SubProtocol extends SubDataProtocol { setName("SubServers 2"); addVersion(new Version("2.16a+")); - setBlockSize(DataSize.MB); // 00-0F: Object Link Packets