should crash if the install fails now, closes BloodyMods#40

EnigmaticaModpacks · Oct 17, 2021 · f112743 · f112743
1 parent 67dfcea
commit f112743
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/main/kotlin/atm/bloodworkxgaming/serverstarter/FileManager.kt b/src/main/kotlin/atm/bloodworkxgaming/serverstarter/FileManager.kt
@@ -20,6 +20,9 @@ class FileManager(private val configFile: ConfigFile, private val internetManage
 
         val failList = mutableListOf<AdditionalFile>()
         fallbackList.parallelStream().forEach { file -> handleAdditionalFile(file, failList) }
+        if (failList.isNotEmpty()) {
+            throw RuntimeException("Could not download all additional files! [$failList]")
+        }
     }
 
     private fun handleAdditionalFile(file: AdditionalFile, fallbackList: MutableList<AdditionalFile>) {
@@ -49,6 +52,7 @@ class FileManager(private val configFile: ConfigFile, private val internetManage
                 }
             } catch (e: IOException) {
                 LOGGER.error("Error while copying local file", e)
+                throw e
             }
         }
     }

diff --git a/src/main/kotlin/atm/bloodworkxgaming/serverstarter/LoaderManager.kt b/src/main/kotlin/atm/bloodworkxgaming/serverstarter/LoaderManager.kt
@@ -71,7 +71,6 @@ class LoaderManager(private val configFile: ConfigFile, private val internetMana
                 } catch (e: InterruptedException) {
                     e.printStackTrace()
                 }
-
             }
 
         } while (shouldRestart)
@@ -183,6 +182,7 @@ class LoaderManager(private val configFile: ConfigFile, private val internetMana
             internetManager.downloadToFile(configFile.install.spongeBootstrapper, downloadFile)
         } catch (e: IOException) {
             LOGGER.error("Error while downloading bootstrapper", e)
+            throw e
         }
 
         return filename
@@ -199,7 +199,7 @@ class LoaderManager(private val configFile: ConfigFile, private val internetMana
 
                 props["level-name"] as String?
             } catch (e: FileNotFoundException) {
-                "world"
+                null
             }
 
             val filename =

diff --git a/src/main/kotlin/atm/bloodworkxgaming/serverstarter/packtype/curse/CursePackType.kt b/src/main/kotlin/atm/bloodworkxgaming/serverstarter/packtype/curse/CursePackType.kt
@@ -117,6 +117,7 @@ open class CursePackType(private val configFile: ConfigFile, internetManager: In
             }
         } catch (e: IOException) {
             LOGGER.error("Could not unzip files", e)
+            throw e
         }
 
         LOGGER.info("Done unzipping the files.")