Merge branch 'master' into feature/taskflow

Author: Avanatiker

common/src/main/kotlin/com/lambda/brigadier/CommandExecution.kt

@@ -55,6 +55,11 @@ sealed class CommandResult {
             return Failure(Communication.LogLevel.ERROR.text(message))
         }
 
+        /** Creates a [CommandResult.Failure] with the given throwable [t]. */
+        fun failure(t: Throwable): Failure {
+            return failure(t.message ?: "An error occurred")
+        }
+
         /**
          * Creates a [CommandResult.Failure] with the given error [message].
          */

common/src/main/kotlin/com/lambda/command/commands/ConfigCommand.kt

@@ -1,10 +1,12 @@
 package com.lambda.command.commands
 
+import com.lambda.brigadier.CommandResult.Companion.success
 import com.lambda.brigadier.argument.literal
-import com.lambda.brigadier.execute
+import com.lambda.brigadier.executeWithResult
 import com.lambda.brigadier.required
 import com.lambda.command.LambdaCommand
 import com.lambda.config.Configuration
+import com.lambda.util.Communication.info
 import com.lambda.util.primitives.extension.CommandBuilder
 
 object ConfigCommand : LambdaCommand(
@@ -15,17 +17,21 @@ object ConfigCommand : LambdaCommand(
 ) {
     override fun CommandBuilder.create() {
         required(literal("save")) {
-            execute {
-                Configuration.configurations.forEach {
-                    it.trySave()
+            executeWithResult {
+                Configuration.configurations.forEach { config ->
+                    config.trySave(true)
                 }
+                this@ConfigCommand.info("Saved ${Configuration.configurations.size} configuration files.")
+                return@executeWithResult success()
             }
         }
         required(literal("load")) {
-            execute {
-                Configuration.configurations.forEach {
-                    it.tryLoad()
+            executeWithResult {
+                Configuration.configurations.forEach { config ->
+                    config.tryLoad()
                 }
+                this@ConfigCommand.info("Loaded ${Configuration.configurations.size} configuration files.")
+                return@executeWithResult success()
             }
         }
     }

common/src/main/kotlin/com/lambda/config/Configuration.kt

@@ -6,15 +6,12 @@ import com.google.gson.JsonParser
 import com.lambda.Lambda.LOG
 import com.lambda.Lambda.gson
 import com.lambda.config.configurations.ModuleConfig
-import com.lambda.event.EventFlow.lambdaScope
 import com.lambda.event.events.ClientEvent
 import com.lambda.event.listener.UnsafeListener.Companion.unsafeListener
 import com.lambda.threading.runIO
 import com.lambda.util.Communication.info
 import com.lambda.util.Communication.logError
 import com.lambda.util.StringUtils.capitalize
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import java.io.File
 import java.time.Duration
 import kotlin.concurrent.fixedRateTimer
@@ -104,38 +101,37 @@ abstract class Configuration : Jsonable {
                 .onSuccess {
                     val message = "${configName.capitalize()} config loaded."
                     LOG.info(message)
-                    this@Configuration.info(message)
+                    info(message)
                 }
                 .onFailure {
                     var message: String
                     runCatching { load(backup) }
                         .onSuccess {
                             message = "${configName.capitalize()} config loaded from backup"
                             LOG.info(message)
-                            this@Configuration.info(message)
+                            info(message)
                         }
                         .onFailure { error ->
                             message =
                                 "Failed to load ${configName.capitalize()} config from backup, unrecoverable error"
                             LOG.error(message, error)
-                            this@Configuration.logError(message)
+                            logError(message)
                         }
                 }
         }
     }
 
-    fun trySave() {
+    fun trySave(logToChat: Boolean = false) {
         runIO {
             runCatching { save() }
                 .onSuccess {
                     val message = "Saved ${configName.capitalize()} config."
                     LOG.info(message)
-                    this@Configuration.info(message)
+                    if (logToChat) info(message)
                 }
                 .onFailure {
                     val message = "Failed to save ${configName.capitalize()} config"
-                    LOG.error(message, it)
-                    this@Configuration.logError(message)
+                    logError(message)
                 }
         }
     }

common/src/main/kotlin/com/lambda/config/settings/NumericSetting.kt

@@ -1,6 +1,8 @@
 package com.lambda.config.settings
 
 import com.lambda.config.AbstractSetting
+import java.text.NumberFormat
+import java.util.*
 import kotlin.reflect.KProperty
 
 /**
@@ -27,7 +29,9 @@ abstract class NumericSetting<T>(
     description,
     visibility
 ) where T : Number, T : Comparable<T> {
-    override fun toString() = "$value$unit"
+    private val formatter = NumberFormat.getNumberInstance(Locale.getDefault())
+
+    override fun toString() = "${formatter.format(value)}$unit"
 
     override operator fun setValue(thisRef: Any?, property: KProperty<*>, valueIn: T) {
         value = valueIn.coerceIn(range)

common/src/main/kotlin/com/lambda/event/events/PacketEvent.kt

@@ -6,8 +6,6 @@ import com.lambda.event.callback.Cancellable
 import com.lambda.event.callback.ICancellable
 import com.lambda.event.events.PacketEvent.Receive
 import com.lambda.event.events.PacketEvent.Send
-import com.lambda.event.events.PacketEvent.Send.Post
-import com.lambda.event.events.PacketEvent.Send.Pre
 import net.minecraft.network.packet.Packet
 
 /**