Skip to content

Commit

Permalink
Remove apache compress dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
kyrptonaught committed Feb 29, 2024
1 parent 3c0ddcb commit 9045c03
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 14 deletions.
6 changes: 2 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,13 @@ dependencies {
modImplementation('maven.modrinth:no-chat-reports:Fabric-1.20.4-v2.5.0') { exclude group: "net.fabricmc.fabric-api" }

//NOTA
modImplementation include("ru.pinkgoosik:nota:0.2.0-lem-v1-1.20.1")
modImplementation include("ru.pinkgoosik:nota:0.2.0-lem-v1-1.20.1") { exclude group: "net.fabricmc.fabric-api" }

//Discord Bridge
shadow implementation("net.dv8tion:JDA:5.0.0-beta.20") { exclude module: 'opus-java' }

//Javalin
shadow implementation("io.javalin:javalin:6.1.2")

//Apache Compress
shadow implementation("org.apache.commons:commons-compress:1.26.0")
}

loom {
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
org.gradle.jvmargs=-Xmx2G
org.gradle.parallel=true

# Fabric Properties
minecraft_version=1.20.4
Expand Down
9 changes: 4 additions & 5 deletions src/main/java/net/kyrptonaught/serverutils/FileHelper.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package net.kyrptonaught.serverutils;

import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipFile;
import org.apache.commons.io.FileUtils;

import java.io.IOException;
import java.nio.file.*;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;

public class FileHelper {

Expand Down Expand Up @@ -59,8 +59,8 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
}

public static String readFileFromZip(Path zipFile, String fileName) {
try (ZipFile zip = new ZipFile(zipFile)) {
ZipArchiveEntry entry = zip.getEntry(fileName);
try(ZipFile zip = new ZipFile(zipFile.toFile())){
ZipEntry entry = zip.getEntry(fileName);

return new String(zip.getInputStream(entry).readAllBytes());
} catch (Exception e) {
Expand All @@ -84,5 +84,4 @@ public static String cleanFileName(String badFileName) {
public static boolean isCharValid(char c) {
return c >= '0' && c <= '9' || c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z' || c == '_' || c == ':' || c == '/' || c == '.' || c == '-';
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.Identifier;
import net.minecraft.world.dimension.DimensionType;
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipFile;

import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Enumeration;
import java.util.stream.Stream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;

import static net.kyrptonaught.serverutils.customMapLoader.CustomMapLoaderMod.BATTLE_MAPS;
import static net.kyrptonaught.serverutils.customMapLoader.CustomMapLoaderMod.LOBBY_MAPS;
Expand Down Expand Up @@ -84,11 +84,12 @@ public static void discoverAddons(MinecraftServer server) {
}

public static void unZipMap(Path outputPath, BaseAddon config, MapSize mapSize) {
try (ZipFile zip = new ZipFile(config.filePath)) {
Enumeration<ZipArchiveEntry> entries = zip.getEntries();
try (ZipFile zip = new ZipFile(config.filePath.toFile())) {

Enumeration<? extends ZipEntry> entries = zip.entries();

while (entries.hasMoreElements()) {
ZipArchiveEntry entry = entries.nextElement();
ZipEntry entry = entries.nextElement();
if (entry.getName().startsWith(config.getDirectoryInZip(mapSize))) {
Path newOut = outputPath.resolve(entry.getName().replace(config.getDirectoryInZip(mapSize), ""));
if (entry.isDirectory()) {
Expand Down

0 comments on commit 9045c03

Please sign in to comment.