diff --git a/SubServers.Bungee/pom.xml b/SubServers.Bungee/pom.xml
index 7ad737be..4f66459c 100644
--- a/SubServers.Bungee/pom.xml
+++ b/SubServers.Bungee/pom.xml
@@ -43,18 +43,6 @@
1.1
compile
-
- org.kamranzafar
- jtar
- 2.3
- compile
-
-
- org.tukaani
- xz
- 1.9
- compile
-
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 d20c9bc1..3ccbbc6a 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
@@ -12,18 +12,12 @@ import net.ME1312.SubServers.Bungee.Host.SubCreator.ServerTemplate;
import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
import net.ME1312.SubServers.Bungee.SubProxy;
-import org.kamranzafar.jtar.TarEntry;
-import org.kamranzafar.jtar.TarOutputStream;
-import org.tukaani.xz.LZMA2Options;
-import org.tukaani.xz.XZOutputStream;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.OutputStream;
import java.util.HashMap;
-
-import static org.tukaani.xz.LZMA2Options.MODE_FAST;
-import static org.tukaani.xz.XZ.CHECK_SHA256;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
/**
* External Host Template Download Packet
@@ -52,26 +46,26 @@ public class PacketExDownloadTemplates implements PacketIn, PacketStreamOut {
try {
if (client.getBlockSize() < DataSize.MBB) client.tempBlockSize(DataSize.MBB);
HashMap map = Util.getDespiteException(() -> Util.reflect(ExternalSubCreator.class.getDeclaredField("templates"), ((ExternalHost) client.getHandler()).getCreator()), new HashMap<>());
- TarOutputStream tar = new TarOutputStream(new XZOutputStream(stream, new LZMA2Options(MODE_FAST), CHECK_SHA256));
File dir = new UniversalFile(plugin.dir, "SubServers:Templates");
+ ZipOutputStream zip = new ZipOutputStream(stream);
byte[] buffer = new byte[4096];
for (String file : Util.searchDirectory(dir)) {
int index = file.indexOf(File.separatorChar);
if (index != -1 && !map.containsKey(file.substring(0, index).toLowerCase())) {
- tar.putNextEntry(new TarEntry(new File(dir, file), file.replace(File.separatorChar, '/')));
+ zip.putNextEntry(new ZipEntry(file.replace(File.separatorChar, '/')));
FileInputStream in = new FileInputStream(dir.getAbsolutePath() + File.separator + file);
int len;
while ((len = in.read(buffer)) != -1) {
- tar.write(buffer, 0, len);
+ zip.write(buffer, 0, len);
}
in.close();
}
}
- tar.close();
+ zip.close();
Util.isException(() -> Util.reflect(ExternalSubCreator.class.getDeclaredField("enableRT"), host.getCreator(), true));
} catch (Exception e) {
diff --git a/SubServers.Host/pom.xml b/SubServers.Host/pom.xml
index d41139ab..3827f615 100644
--- a/SubServers.Host/pom.xml
+++ b/SubServers.Host/pom.xml
@@ -51,18 +51,6 @@
1.1
compile
-
- org.kamranzafar
- jtar
- 2.3
- compile
-
-
- org.tukaani
- xz
- 1.9
- compile
-
diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExDownloadTemplates.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExDownloadTemplates.java
index c977bccb..49d692f4 100644
--- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExDownloadTemplates.java
+++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExDownloadTemplates.java
@@ -9,13 +9,11 @@ import net.ME1312.SubData.Client.SubDataSender;
import net.ME1312.SubServers.Host.ExHost;
import net.ME1312.SubServers.Host.SubAPI;
-import org.kamranzafar.jtar.TarEntry;
-import org.kamranzafar.jtar.TarInputStream;
-import org.tukaani.xz.XZInputStream;
-
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
/**
* External Host Template Download Packet
@@ -48,11 +46,11 @@ public class PacketExDownloadTemplates implements PacketOut, PacketStreamIn {
try {
dir.mkdirs();
- TarInputStream tar = new TarInputStream(new XZInputStream(stream));
+ ZipInputStream zip = new ZipInputStream(stream);
byte[] buffer = new byte[4096];
- TarEntry entry;
- while ((entry = tar.getNextEntry()) != null) {
+ ZipEntry entry;
+ while ((entry = zip.getNextEntry()) != null) {
File newFile = new File(dir + File.separator + entry.getName().replace('/', File.separatorChar));
if (newFile.exists()) {
if (newFile.isDirectory()) {
@@ -71,12 +69,12 @@ public class PacketExDownloadTemplates implements PacketOut, PacketStreamIn {
FileOutputStream fos = new FileOutputStream(newFile);
int len;
- while ((len = tar.read(buffer)) != -1) {
+ while ((len = zip.read(buffer)) != -1) {
fos.write(buffer, 0, len);
}
fos.close();
}
- tar.close();
+ zip.close();
host.creator.load(true);
host.log.info.println(((first)?"":"New ") + "Remote Template Files Downloaded");