SubData API updates & usage optimizations

ME1312 · Jan 30, 2021 · b0340b4 · b0340b4
1 parent 6d32f1b
commit b0340b4
Show file tree

Hide file tree

Showing 13 changed files with 9 additions and 16 deletions.
diff --git a/SubServers.Bungee/pom.xml b/SubServers.Bungee/pom.xml
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>net.ME1312.SubData</groupId>
             <artifactId>Server</artifactId>
-            <version>21w05b</version>
+            <version>21w05d</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>

diff --git a/...ers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDownloadTemplates.java b/...ers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDownloadTemplates.java
@@ -38,10 +38,8 @@ public PacketExDownloadTemplates(SubProxy plugin, ExternalHost host) {
     @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
@@ -30,7 +30,6 @@ protected SubProtocol() {
 
         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
@@ -62,7 +62,7 @@
         <dependency>
             <groupId>net.ME1312.SubData</groupId>
             <artifactId>Client</artifactId>
-            <version>21w05b</version>
+            <version>21w05d</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>

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
@@ -36,7 +36,6 @@ protected SubProtocol() {
 
         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
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>net.ME1312.SubData</groupId>
             <artifactId>Client</artifactId>
-            <version>21w05b</version>
+            <version>21w05d</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/SubServers.Client/Sponge/pom.xml b/SubServers.Client/Sponge/pom.xml
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>net.ME1312.SubData</groupId>
             <artifactId>Client</artifactId>
-            <version>21w05b</version>
+            <version>21w05d</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>

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
@@ -39,7 +39,6 @@ protected SubProtocol() {
 
         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
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>net.ME1312.SubData</groupId>
             <artifactId>Client</artifactId>
-            <version>21w05b</version>
+            <version>21w05d</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>

diff --git 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 void start() {
         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<Pair<DisconnectReason, DataClient>>() {
                 @Override
                 public void run(Pair<DisconnectReason, DataClient> client) {
@@ -95,7 +95,7 @@ public void run() {
                                     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
@@ -34,7 +34,6 @@ protected SubProtocol() {
 
         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
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>net.ME1312.SubData</groupId>
             <artifactId>Client</artifactId>
-            <version>21w05b</version>
+            <version>21w05d</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>

diff --git 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 @@ protected SubProtocol() {
 
         setName("SubServers 2");
         addVersion(new Version("2.16a+"));
-        setBlockSize(DataSize.MB);
 
 
         // 00-0F: Object Link Packets