cleanup

Author: isXander

src/main/kotlin/org/bundleproject/bundle/Bundle.kt

@@ -70,7 +70,7 @@ class Bundle(private val gameDir: File, private val version: Version, modFolderN
      *
      * @since 0.0.1
      */
-    private suspend fun getOutdatedMods(): MutableList<Pair<Mod, RemoteMod>> {
+    private suspend fun getOutdatedMods(): MutableList<ModPair> {
         val localMods = mutableListOf<Mod>()
         for (mod in modsDir.walkTopDown()) {
             if (mod.isDirectory) continue
@@ -84,13 +84,13 @@ class Bundle(private val gameDir: File, private val version: Version, modFolderN
         val request = BulkModRequest(localMods.map { it.makeRequest() })
         val response = request.request()
 
-        val outdated = mutableListOf<Pair<Mod, RemoteMod>>()
+        val outdated = mutableListOf<ModPair>()
         for (i in localMods.indices) {
             val local = localMods[i]
             val remote = local.applyData(response[i])
 
             if (remote > local)
-                outdated.add(local to remote)
+                outdated.add(ModPair(local, remote))
         }
 
         return outdated
@@ -159,7 +159,7 @@ class Bundle(private val gameDir: File, private val version: Version, modFolderN
      *
      * @since 0.0.2
      */
-    fun updateMods(mods: List<Pair<Mod, RemoteMod>>) {
+    fun updateMods(mods: List<ModPair>) {
         launchCoroutine("Mod Updater") {
             val loading = LoadingGui(mods.size)
             loading.isVisible = true

src/main/kotlin/org/bundleproject/bundle/entities/RemoteMod.kt

@@ -12,5 +12,4 @@ class RemoteMod(
     fileName: String,
     platform: Platform,
     val downloadUrl: String,
-) : Mod(enabled, name, id, version, minecraftVersion, fileName, platform) {
-}
+) : Mod(enabled, name, id, version, minecraftVersion, fileName, platform)

src/main/kotlin/org/bundleproject/bundle/gui/UpdateOverviewGui.kt

@@ -3,6 +3,7 @@ package org.bundleproject.bundle.gui
 import org.bundleproject.bundle.Bundle
 import org.bundleproject.bundle.entities.Mod
 import org.bundleproject.bundle.entities.RemoteMod
+import org.bundleproject.bundle.utils.ModPair
 import org.bundleproject.bundle.utils.getResourceImage
 import java.awt.GridBagConstraints
 import java.awt.GridBagLayout
@@ -17,7 +18,7 @@ import javax.swing.*
  *
  * @since 0.0.2
  */
-class UpdateOverviewGui(private val bundle: Bundle, mods: MutableList<Pair<Mod, RemoteMod>>, condition: Condition? = null) : JFrame("Bundle") {
+class UpdateOverviewGui(private val bundle: Bundle, mods: MutableList<ModPair>, condition: Condition? = null) : JFrame("Bundle") {
 
     init {
         iconImage = getResourceImage("/bundle.png")
@@ -60,7 +61,7 @@ class UpdateOverviewGui(private val bundle: Bundle, mods: MutableList<Pair<Mod,
 
         val downloadButton = JButton("Update")
         downloadButton.addActionListener {
-            bundle.updateMods(mods.filter { it.second.enabled })
+            bundle.updateMods(mods.filter { it.remote.enabled })
             dispose()
             condition?.signal()
         }

src/main/kotlin/org/bundleproject/bundle/utils/ModPair.kt

@@ -0,0 +1,6 @@
+package org.bundleproject.bundle.utils
+
+import org.bundleproject.bundle.entities.Mod
+import org.bundleproject.bundle.entities.RemoteMod
+
+data class ModPair(val local: Mod, val remote: RemoteMod)