Merge branch 'main' into develop

unimined · Aug 22, 2024 · 2fb420c · 2fb420c
2 parents c05be31 + 7eea9ba
commit 2fb420c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -6,3 +6,4 @@ org.gradle.parallel=true
 maven_group=xyz.wagyourtail.unimined
 archives_base_name=unimined
 version=1.4.0
+
diff --git a/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/MinecraftProvider.kt b/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/MinecraftProvider.kt
@@ -805,13 +805,10 @@ open class MinecraftProvider(project: Project, sourceSet: SourceSet) : Minecraft
             javaVersion = minecraftData.metadata.javaVersion
             workingDir = defaultWorkingDir
             classpath = sourceSet.runtimeClasspath
-            minecraftData.minecraftServer.path.openZipFileSystem().use {
+            minecraftData.minecraftServer.path.readZipInputStreamFor("META-INF/MANIFEST.MF", false) {
                 val properties = Properties()
-                val metainf = it.getPath("META-INF/MANIFEST.MF")
-                if (metainf.exists()) {
-                    metainf.inputStream().use { properties.load(it) }
-                    mainClass.set(properties.getProperty("Main-Class"))
-                }
+                properties.load(it)
+                mainClass.set(properties.getProperty("Main-Class"))
             }
             args = mutableListOf("nogui")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,3 +6,4 @@ org.gradle.parallel=true
		maven_group=xyz.wagyourtail.unimined
		archives_base_name=unimined
		version=1.4.0