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

errormsgs

Browse Source
This commit is contained in:
minjaesong
2022-06-26 20:04:52 +09:00
parent bb2641a523
commit 6e4677352d
4 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/runConfigurations/Terrarum.xml generated
View File

@@ -1,7 +1,7 @@
<component name="ProjectRunConfigurationManager"> <component name="ProjectRunConfigurationManager">
<configuration default="false" name="Terrarum" type="JarApplication"> <configuration default="false" name="Terrarum" type="JarApplication">
<option name="JAR_PATH" value="$PROJECT_DIR$/out/TerrarumBuild.jar" /> <option name="JAR_PATH" value="$PROJECT_DIR$/out/TerrarumBuild.jar" />
<option name="VM_PARAMETERS" value="-ea" /> <option name="VM_PARAMETERS" value="-ea -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="ALTERNATIVE_JRE_PATH" value="17" /> <option name="ALTERNATIVE_JRE_PATH" value="17" />

1
.idea/runConfigurations/Terrarum__no_DEV_MODE_.xml generated
View File

@@ -1,6 +1,7 @@
<component name="ProjectRunConfigurationManager"> <component name="ProjectRunConfigurationManager">
<configuration default="false" name="Terrarum (no DEV MODE)" type="JarApplication"> <configuration default="false" name="Terrarum (no DEV MODE)" type="JarApplication">
<option name="JAR_PATH" value="$PROJECT_DIR$/out/TerrarumBuild.jar" /> <option name="JAR_PATH" value="$PROJECT_DIR$/out/TerrarumBuild.jar" />
<option name="VM_PARAMETERS" value="-Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="ALTERNATIVE_JRE_PATH" value="17" /> <option name="ALTERNATIVE_JRE_PATH" value="17" />

13
src/net/torvald/terrarum/GameCrashHandler.kt
View File

@@ -58,6 +58,7 @@ p {
pre { pre {
font-faminy: monospaced; font-faminy: monospaced;
font-size: 11px;
color: #801; color: #801;
border: 1px solid #801; border: 1px solid #801;
border-radius: 3px; border-radius: 3px;
@@ -139,7 +140,7 @@ emph {
printStream.println("<h3>Module Info</h3>") printStream.println("<h3>Module Info</h3>")
printStream.println("<h4>Load Order</h4>") printStream.println("<h4>Load Order</h4>")
printStream.println("<ol>${ModMgr.loadOrder.joinToString(separator = "") { "<li>" + printStream.println("<ol>${ModMgr.loadOrder.joinToString(separator = "") { "<li>" +
"$it <small>(" + "$it&ensp;<small>(" +
"${moduleMetaToText(ModMgr.moduleInfo[it] ?: ModMgr.moduleInfoErrored[it])}" + "${moduleMetaToText(ModMgr.moduleInfo[it] ?: ModMgr.moduleInfoErrored[it])}" +
")</small></li>" } ")</small></li>" }
}</ol>") }</ol>")
@@ -150,7 +151,7 @@ emph {
printStream.println("<h4>Module Errors</h4>") printStream.println("<h4>Module Errors</h4>")
System.err.println("== Module Errors ==") System.err.println("== Module Errors ==")
it.forEach { it.forEach {
printStream.println("<p>From Module '<strong>${it.moduleName}</strong>' (${it.type}):</p>") printStream.println("<p>From Module <strong>${it.moduleName}</strong> (${it.type.toHTML()}):</p>")
printStream.println("<pre>") printStream.println("<pre>")
it.cause?.printStackTrace(printStream) it.cause?.printStackTrace(printStream)
printStream.println("</pre>") printStream.println("</pre>")
@@ -172,4 +173,10 @@ emph {
textArea.text = "<html><style type=\"text/css\">$css</style><body>$htmlSB</body></html>" textArea.text = "<html><style type=\"text/css\">$css</style><body>$htmlSB</body></html>"
} }
} private fun ModMgr.LoadErrorType.toHTML() = when(this) {
ModMgr.LoadErrorType.YOUR_FAULT -> "caused by the module"
ModMgr.LoadErrorType.MY_FAULT -> "caused by the game"
ModMgr.LoadErrorType.NOT_EVEN_THERE -> "dependency not satisfied"
}
}

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

@@ -267,7 +267,14 @@ object ModMgr {
catch (noSuchModule: FileNotFoundException) { catch (noSuchModule: FileNotFoundException) {
printmsgerr(this, "No such module: $moduleName, skipping...") printmsgerr(this, "No such module: $moduleName, skipping...")
logError(LoadErrorType.NOT_EVEN_THERE, moduleName) logError(LoadErrorType.NOT_EVEN_THERE, moduleName, noSuchModule)
moduleInfo.remove(moduleName)?.let { moduleInfoErrored[moduleName] = it }
}
catch (noSuchModule2: ModuleDependencyNotSatisfied) {
printmsgerr(this, noSuchModule2.message)
logError(LoadErrorType.NOT_EVEN_THERE, moduleName, noSuchModule2)
moduleInfo.remove(moduleName)?.let { moduleInfoErrored[moduleName] = it } moduleInfo.remove(moduleName)?.let { moduleInfoErrored[moduleName] = it }
} }