mirror of
https://github.com/packwiz/packwiz-installer.git
synced 2025-10-17 00:14:33 +02:00
Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
fa9fe18215 | ||
|
01dcc09a78 | ||
|
a8f8444d45 | ||
|
d98baaf832 |
@@ -101,7 +101,7 @@ class Main(args: Array<String>) {
|
||||
cmd.getOptionValue("multimc-folder")?.let{ PackwizFilePath(it.toPath()) } ?: PackwizFilePath("..".toPath())
|
||||
}
|
||||
val manifestFile = ui.wrap("Invalid manifest file path") {
|
||||
packFolder / (cmd.getOptionValue("meta-file") ?: "manifest.json")
|
||||
packFolder / (cmd.getOptionValue("meta-file") ?: "packwiz.json")
|
||||
}
|
||||
|
||||
// Start update process!
|
||||
@@ -135,6 +135,12 @@ class Main(args: Array<String>) {
|
||||
options.addOption("g", "no-gui", false, "Don't display a GUI to show update progress")
|
||||
options.addOption("h", "help", false, "Display this message") // Implemented in packwiz-installer-bootstrap!
|
||||
}
|
||||
|
||||
@JvmStatic
|
||||
fun main(args: Array<String>) {
|
||||
Log.info("packwiz-installer was started without packwiz-installer-bootstrap. Use the bootstrapper for automatic updates! (Disregard this message if you have your own update mechanism)")
|
||||
Main(args)
|
||||
}
|
||||
}
|
||||
|
||||
// Actual main() is in RequiresBootstrap!
|
||||
|
@@ -97,6 +97,16 @@ fun resolveCfMetadata(mods: List<IndexFile.File>, packFolder: PackwizFilePath, c
|
||||
}
|
||||
}
|
||||
|
||||
// Some file types don't show up in the API at all! (e.g. shaderpacks)
|
||||
// Add unresolved files to manualDownloadMods
|
||||
for ((fileId, file) in fileIdMap) {
|
||||
if (file.linkedFile != null) {
|
||||
if (file.linkedFile!!.resolvedUpdateData["curseforge"] == null) {
|
||||
manualDownloadMods[(file.linkedFile!!.update["curseforge"] as CurseForgeUpdateData).projectId] = Pair(file, fileId)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (manualDownloadMods.isNotEmpty()) {
|
||||
val reqModsData = GetModsRequest(manualDownloadMods.keys.toList())
|
||||
val reqMods = Request.Builder()
|
||||
|
@@ -21,7 +21,14 @@ data class Hash<T>(val type: HashFormat<T>, val value: T) {
|
||||
|
||||
object UInt: Encoding<kotlin.UInt> {
|
||||
override fun encodeToString(value: kotlin.UInt) = value.toString()
|
||||
override fun decodeFromString(str: String) = str.toUInt()
|
||||
override fun decodeFromString(str: String) =
|
||||
try {
|
||||
str.toUInt()
|
||||
} catch (e: NumberFormatException) {
|
||||
// Old packwiz.json values are signed; if they are negative they should be parsed as signed integers
|
||||
// and reinterpreted as unsigned integers
|
||||
str.toInt().toUInt()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user