1 files changed, 23 insertions, 2 deletions
diff --git a/src/main/kotlin/util/ErrorUtil.kt b/src/main/kotlin/util/ErrorUtil.kt
index 190381d..3db4ecd 100644
--- a/src/main/kotlin/util/ErrorUtil.kt
+++ b/src/main/kotlin/util/ErrorUtil.kt
@@ -29,15 +29,31 @@ object ErrorUtil {
 
 	inline fun softError(message: String, exception: Throwable) {
 		if (aggressiveErrors) throw IllegalStateException(message, exception)
-		else Firmament.logger.error(message, exception)
+		else logError(message, exception)
+	}
+
+	fun logError(message: String, exception: Throwable) {
+		Firmament.logger.error(message, exception)
+	}
+	fun logError(message: String) {
+		Firmament.logger.error(message)
 	}
 
 	inline fun softError(message: String) {
 		if (aggressiveErrors) error(message)
-		else Firmament.logger.error(message)
+		else logError(message)
+	}
+
+	fun <T> Result<T>.intoCatch(message: String): Catch<T> {
+		return this.map { Catch.succeed(it) }.getOrElse {
+			softError(message, it)
+			Catch.fail(it)
+		}
 	}
 
 	class Catch<T> private constructor(val value: T?, val exc: Throwable?) {
+		fun orNull(): T? = value
+
 		inline fun or(block: (exc: Throwable) -> T): T {
 			contract {
 				callsInPlace(block, InvocationKind.AT_MOST_ONCE)
@@ -73,4 +89,9 @@ object ErrorUtil {
 		return nullable
 	}
 
+	fun softUserError(string: String) {
+		if (TestUtil.isInTest)
+			error(string)
+		MC.sendChat(tr("firmament.usererror", "Firmament encountered a user caused error: $string"))
+	}
 }