Skip to content
This repository was archived by the owner on Dec 30, 2022. It is now read-only.

Commit 6e023fa

Browse files
committed
Code cleanup
Signed-off-by: DeathsGun <deathsgun@protonmail.com>
1 parent 81d30d0 commit 6e023fa

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

src/main/kotlin/xyz/deathsgun/modmanager/update/UpdateManager.kt

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import xyz.deathsgun.modmanager.api.provider.IModUpdateProvider
4141
import xyz.deathsgun.modmanager.api.provider.Sorting
4242
import xyz.deathsgun.modmanager.models.FabricMetadata
4343
import xyz.deathsgun.modmanager.state.ModState
44+
import java.io.File
4445
import java.math.BigInteger
4546
import java.net.URI
4647
import java.net.http.HttpClient
@@ -325,11 +326,7 @@ class UpdateManager {
325326
FileUtils.listFiles(FabricLoader.getInstance().gameDir.resolve("mods").toFile(), arrayOf("jar"), true)
326327
return try {
327328
for (jar in jars) {
328-
val jarFile = ZipFile(jar)
329-
val fabricEntry = jarFile.getEntry("fabric.mod.json")
330-
val data = jarFile.getInputStream(fabricEntry).bufferedReader().use { it.readText() }
331-
val meta = json.decodeFromString<FabricMetadata>(data)
332-
jarFile.close()
329+
val meta = openFabricMeta(jar)
333330
if (meta.id == container.id) {
334331
return jar.toPath()
335332
}
@@ -340,17 +337,12 @@ class UpdateManager {
340337
}
341338
}
342339

343-
@OptIn(ExperimentalSerializationApi::class)
344-
fun findJarByMod(mod: Mod): Path? {
340+
private fun findJarByMod(mod: Mod): Path? {
345341
val jars =
346342
FileUtils.listFiles(FabricLoader.getInstance().gameDir.resolve("mods").toFile(), arrayOf("jar"), true)
347343
return try {
348344
for (jar in jars) {
349-
val jarFile = ZipFile(jar)
350-
val fabricEntry = jarFile.getEntry("fabric.mod.json")
351-
val data = jarFile.getInputStream(fabricEntry).bufferedReader().use { it.readText() }
352-
val meta = json.decodeFromString<FabricMetadata>(data)
353-
jarFile.close()
345+
val meta = openFabricMeta(jar)
354346
if (meta.id == mod.id || meta.id == mod.slug || meta.id == mod.slug.replace("-", "") ||
355347
meta.custom.modmanager[ModManager.modManager.config.defaultProvider] == mod.id ||
356348
meta.id.replace("_", "-") == mod.id ||
@@ -365,6 +357,16 @@ class UpdateManager {
365357
}
366358
}
367359

360+
@OptIn(ExperimentalSerializationApi::class)
361+
private fun openFabricMeta(file: File): FabricMetadata {
362+
val jarFile = ZipFile(file)
363+
val fabricEntry = jarFile.getEntry("fabric.mod.json")
364+
val data = jarFile.getInputStream(fabricEntry).bufferedReader().use { it.readText() }
365+
val meta = json.decodeFromString<FabricMetadata>(data)
366+
jarFile.close()
367+
return meta
368+
}
369+
368370
private fun getIdBy(metadata: ModMetadata): Map<String, String>? {
369371
if (!metadata.containsCustomValue("modmanager")) {
370372
return null
@@ -382,7 +384,7 @@ class UpdateManager {
382384
if (deletableMods.isEmpty()) {
383385
return
384386
}
385-
logger.info("Deleting {} mods on the next start.", deletableMods.size)
387+
logger.info("Deleting {} mods on the next start", deletableMods.size)
386388
val configFile = FabricLoader.getInstance().configDir.resolve(".modmanager.delete.json")
387389
val data = json.encodeToString(deletableMods)
388390
Files.writeString(configFile, data, Charsets.UTF_8)

0 commit comments

Comments
 (0)