Compare commits

..
2 Commits
Author SHA1 Message Date
Martin Robertz 9d600169ac update 2024-12-22 01:38:26 +01:00
charagarlnad 4e7eb37f3f use ZipFile instead of ZipInputStream in ClassDiscoverer (#25) 2024-12-20 15:18:04 +01:00
4 changed files with 15 additions and 18 deletions

No files matched your search

Binary file not shown.
+1 -1
View File
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
+1 -1
View File
@@ -17,7 +17,7 @@ pluginManagement {
} }
plugins { plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.29' id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.30'
} }
@@ -1,13 +1,13 @@
package codechicken.core; package codechicken.core;
import java.io.File; import java.io.File;
import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream; import java.util.zip.ZipFile;
import net.minecraft.launchwrapper.Launch; import net.minecraft.launchwrapper.Launch;
@@ -114,21 +114,18 @@ public class ClassDiscoverer {
} }
private void readFromZipFile(File file) throws IOException { private void readFromZipFile(File file) throws IOException {
FileInputStream fileinputstream = new FileInputStream(file); try (ZipFile zipFile = new ZipFile(file)) {
ZipInputStream zipinputstream = new ZipInputStream(fileinputstream); Enumeration<? extends ZipEntry> zipEntries = zipFile.entries();
do { while (zipEntries.hasMoreElements()) {
ZipEntry zipentry = zipinputstream.getNextEntry(); ZipEntry zipentry = zipEntries.nextElement();
if (zipentry == null) { String fullname = zipentry.getName().replace('\\', '/');
break; int pos = fullname.lastIndexOf('/');
String name = pos == -1 ? fullname : fullname.substring(pos + 1);
if (!zipentry.isDirectory() && matcher.matches(name)) {
checkAddClass(fullname);
}
} }
String fullname = zipentry.getName().replace('\\', '/'); }
int pos = fullname.lastIndexOf('/');
String name = pos == -1 ? fullname : fullname.substring(pos + 1);
if (!zipentry.isDirectory() && matcher.matches(name)) {
checkAddClass(fullname);
}
} while (true);
fileinputstream.close();
} }
private void readFromDirectory(File directory, File basedirectory) { private void readFromDirectory(File directory, File basedirectory) {