mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-08-03 16:49:15 +07:00
Code Issues Packages Projects Releases Wiki Activity

Remove Mod Checks from running during startup (#13528)

Browse Source 
* Do not run RulesetValidator on every installed Mod on every RulesetCache.loadRulesets

* Remove altogether...

* Oops, how embarrassing, me leaving in obsolete imports
This commit is contained in:
SomeTroglodyte
2025-07-05 23:06:31 +02:00
committed by GitHub
parent bfc8a54d0e
commit 4f9ca56781
1 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/src/com/unciv/models/ruleset/RulesetCache.kt
View File

@ -7,13 +7,10 @@ import com.unciv.logic.UncivShowableException
import com.unciv.logic.map.MapParameters
import com.unciv.models.metadata.BaseRuleset
import com.unciv.models.metadata.GameParameters
import com.unciv.models.ruleset.validation.RulesetError
import com.unciv.models.ruleset.validation.RulesetErrorList
import com.unciv.models.ruleset.validation.RulesetErrorSeverity
import com.unciv.models.ruleset.validation.UniqueValidator
import com.unciv.models.ruleset.validation.getRelativeTextDistance
import com.unciv.utils.Log
import com.unciv.utils.debug
/** Loading mods is expensive, so let's only do it once and
* save all of the loaded rulesets somewhere for later use
@ -54,32 +51,14 @@ object RulesetCache : HashMap<String, Ruleset>() {
modRuleset.load(modFolder.child("jsons"))
modRuleset.folderLocation = modFolder
newRulesets[modRuleset.name] = modRuleset
debug("Mod loaded successfully: %s", modRuleset.name)
if (Log.shouldLog()) {
val modLinksErrors = modRuleset.getErrorList()
// For extension mods which use references to base ruleset objects, the parameter type
// errors are irrelevant - the checker ran without a base ruleset
val logFilter: (RulesetError) -> Boolean =
if (modRuleset.modOptions.isBaseRuleset) {
{ it.errorSeverityToReport > RulesetErrorSeverity.WarningOptionsOnly }
} else {
{ it.errorSeverityToReport > RulesetErrorSeverity.WarningOptionsOnly &&
!it.text.contains(UniqueValidator.whichDoesNotFitParameterType) }
}
if (modLinksErrors.any(logFilter)) {
debug(
"checkModLinks errors: %s",
modLinksErrors.getErrorText(logFilter)
)
}
}
Log.debug("Mod loaded successfully: %s", modRuleset.name)
} catch (ex: Exception) {
errorLines += "Exception loading mod '${modFolder.name()}':"
errorLines += " ${ex.localizedMessage}"
errorLines += " ${ex.cause?.localizedMessage}"
}
}
if (Log.shouldLog()) for (line in errorLines) debug(line)
if (Log.shouldLog()) for (line in errorLines) Log.debug(line)
}
// We save the 'old' cache values until we're ready to replace everything, so that the cache isn't empty while we try to load ruleset files