curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-13 12:04:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

mod dependency version checking

Browse Source
This commit is contained in:
minjaesong
2022-01-02 23:54:22 +09:00
parent caa9b84cb2
commit 8502b51396
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/net/torvald/terrarum/ModMgr.kt
View File

@@ -147,24 +147,26 @@ object ModMgr {
val releaseDate = modMetadata.getProperty("releasedate") val releaseDate = modMetadata.getProperty("releasedate")
val version = modMetadata.getProperty("version") val version = modMetadata.getProperty("version")
val jar = modMetadata.getProperty("jar") val jar = modMetadata.getProperty("jar")
val dependency = modMetadata.getProperty("dependency").split(Regex(""";[ ]*""")).toTypedArray() val dependency = modMetadata.getProperty("dependency").split(Regex(""";[ ]*""")).filter { it.isNotEmpty() }.toTypedArray()
val isDir = FileSystems.getDefault().getPath("$modDir/$moduleName").toFile().isDirectory val isDir = FileSystems.getDefault().getPath("$modDir/$moduleName").toFile().isDirectory
val versionNumeral = version.split('.') val versionNumeral = version.split('.')
val versionNumber = versionNumeral.toVersionNumber() val versionNumber = versionNumeral.toVersionNumber()
dependency.forEach { dependency.forEach { nameAndVersionStr ->
val (moduleName, moduleVersionStr) = it.split(' ') val (moduleName, moduleVersionStr) = nameAndVersionStr.split(' ')
val numbers = moduleVersionStr.split('.') val numbers = moduleVersionStr.split('.')
val checkVersionNumber = numbers.toVersionNumber() // version number required val checkVersionNumber = numbers.toVersionNumber() // version number required
var operator = numbers.last().last() // can be '+', '*', or a number var operator = numbers.last().last() // can be '+', '*', or a number
val checkAgainst = moduleInfo[moduleName]?.version // version number of what's installed val checkAgainstStr = moduleInfo[moduleName]?.version ?: throw ModuleDependencyNotSatisfied(nameAndVersionStr, "(module not installed)")
?: throw ModuleDependencyNotSatisfied(it, "(module not installed)") val checkAgainst =checkAgainstStr.split('.').toVersionNumber() // version number of what's installed
// TODO make version number check here (hint: use moduleInfo)
when (operator) {
'+', '*' -> if (checkVersionNumber > checkAgainst) throw ModuleDependencyNotSatisfied(nameAndVersionStr, "$moduleName $checkAgainstStr")
else -> if (checkVersionNumber != checkAgainst) throw ModuleDependencyNotSatisfied(nameAndVersionStr, "$moduleName $checkAgainstStr")
}
} }