From 1bd1835629ce714c4da0a2937d50bcffdc8db2f6 Mon Sep 17 00:00:00 2001 From: Walter Oggioni Date: Tue, 1 Nov 2022 11:13:07 +0800 Subject: [PATCH] fixed bootstrap bug on Windows --- .../java/net/woggioni/envelope/Launcher.java | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/launcher/src/main/java/net/woggioni/envelope/Launcher.java b/launcher/src/main/java/net/woggioni/envelope/Launcher.java index 2bf6755..5d1088d 100644 --- a/launcher/src/main/java/net/woggioni/envelope/Launcher.java +++ b/launcher/src/main/java/net/woggioni/envelope/Launcher.java @@ -15,15 +15,12 @@ import java.util.ArrayList; import java.util.Enumeration; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Properties; import java.util.function.Consumer; import java.util.jar.Attributes; import java.util.jar.JarEntry; import java.util.jar.Manifest; -import static java.util.jar.JarFile.MANIFEST_NAME; - public class Launcher { @SneakyThrows @@ -73,26 +70,7 @@ public class Launcher { } } JarFile currentJar = findCurrentJar(); - URL manifestResource = null; - Enumeration enumeration = Launcher.class.getClassLoader().getResources(MANIFEST_NAME); - while (enumeration.hasMoreElements()) { - URL candidate = enumeration.nextElement(); - URL subUrl = new URL(candidate.getFile()); - String candidatePath = subUrl.getPath(); - int i = candidatePath.indexOf("!/"); - candidatePath = candidatePath.substring(0, i); - if (Objects.equals(currentJar.getName(), candidatePath)) { - manifestResource = candidate; - break; - } - } - if (Objects.isNull(manifestResource)) { - throw new RuntimeException("Launcher manifest not found"); - } - Manifest mf = new Manifest(); - try (InputStream is = manifestResource.openStream()) { - mf.read(is); - } + Manifest mf = currentJar.getManifest(); Attributes mainAttributes = mf.getMainAttributes(); String mainClassName = mainAttributes.getValue(Constants.ManifestAttributes.MAIN_CLASS);