Merge remote-tracking branch 'origin/master' into feature/taskflow

Author: Avanatiker

common/src/main/kotlin/com/lambda/command/CommandRegistry.kt

@@ -7,20 +7,19 @@ import org.reflections.Reflections
 import org.reflections.scanners.Scanners
 import org.reflections.util.ConfigurationBuilder
 
+/**
+ * The [CommandRegistry] object is responsible for managing all [LambdaCommand] instances in the system.
+ */
 object CommandRegistry : Configurable(LambdaConfig), Loadable {
     override val name = "command"
 
     val prefix by setting("prefix", ';')
     val commands = mutableSetOf<LambdaCommand>()
 
-    private val paths = mutableSetOf("com.lambda.command.commands")
-
-    fun injectPath(path: String) = paths.add(path)
-
     override fun load(): String {
         Reflections(
             ConfigurationBuilder()
-                .forPackages(*paths.toTypedArray())
+                .forPackage("com.lambda.command.commands")
                 .setScanners(Scanners.SubTypes)
         ).getSubTypesOf(LambdaCommand::class.java).forEach { commandClass ->
             commandClass.declaredFields.find {

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

@@ -31,13 +31,17 @@ import java.awt.Color
  *
  * @property settings A set of [AbstractSetting]s that this configurable manages.
  */
-abstract class Configurable(configuration: Configuration) : Jsonable, Nameable {
+abstract class Configurable(
+    private val configuration: Configuration
+) : Jsonable, Nameable {
     val settings = mutableSetOf<AbstractSetting<*>>()
 
     init {
-        configuration.configurables.add(this) // ToDo: Find non-leaking solution
+        register()
     }
 
+    private fun register() = configuration.configurables.add(this)
+
     override fun toJson() =
         JsonObject().apply {
             settings.forEach { setting ->

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

@@ -16,6 +16,9 @@ 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
+
 
 /**
  * Represents a compound of [Configurable] objects whose [AbstractSetting]s
@@ -48,7 +51,18 @@ abstract class Configuration : Jsonable {
     }
 
     // Avoid context-leaking warning
-    private fun register() = configurations.add(this)
+    private fun register() {
+        fixedRateTimer(
+            daemon = true,
+            name = "Scheduler-config-${configName}",
+            initialDelay = Duration.ofMinutes(5).toMillis(),
+            period = Duration.ofMinutes(5).toMillis()
+        ) {
+            trySave()
+        }
+
+        configurations.add(this)
+    }
 
     override fun toJson() =
         JsonObject().apply {
@@ -93,17 +107,16 @@ abstract class Configuration : Jsonable {
                     this@Configuration.info(message)
                 }
                 .onFailure {
-                    var message = "Failed to load ${configName.capitalize()} config, loading backup"
-                    LOG.error(message, it)
-                    this@Configuration.logError(message)
+                    var message: String
                     runCatching { load(backup) }
                         .onSuccess {
                             message = "${configName.capitalize()} config loaded from backup"
                             LOG.info(message)
                             this@Configuration.info(message)
                         }
                         .onFailure { error ->
-                            message = "Failed to load ${configName.capitalize()} config from backup, unrecoverable error"
+                            message =
+                                "Failed to load ${configName.capitalize()} config from backup, unrecoverable error"
                             LOG.error(message, error)
                             this@Configuration.logError(message)
                         }

common/src/main/kotlin/com/lambda/config/configurations/FriendConfig.kt

@@ -4,6 +4,6 @@ import com.lambda.config.Configuration
 import com.lambda.util.FolderRegister
 
 object FriendConfig : Configuration() {
-    override val configName = "friends"
+    override val configName get() = "friends"
     override val primary = FolderRegister.config.resolve("$configName.json")
 }

common/src/main/kotlin/com/lambda/config/configurations/GuiConfig.kt

@@ -4,6 +4,6 @@ import com.lambda.config.Configuration
 import com.lambda.util.FolderRegister
 
 object GuiConfig : Configuration() {
-    override val configName = "gui"
+    override val configName get() = "gui"
     override val primary = FolderRegister.config.resolve("$configName.json")
 }

common/src/main/kotlin/com/lambda/config/configurations/LambdaConfig.kt

@@ -4,6 +4,6 @@ import com.lambda.config.Configuration
 import com.lambda.util.FolderRegister
 
 object LambdaConfig : Configuration() {
-    override val configName = "lambda"
+    override val configName get() = "lambda"
     override val primary = FolderRegister.config.resolve("$configName.json")
-}
+}

common/src/main/kotlin/com/lambda/config/configurations/ModuleConfig.kt

@@ -15,6 +15,6 @@ import com.lambda.util.FolderRegister
  * @property primary The primary file where the configuration is saved.
  */
 object ModuleConfig : Configuration() {
-    override val configName = "modules"
+    override val configName get() = "modules"
     override val primary = FolderRegister.config.resolve("$configName.json")
 }

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

@@ -43,4 +43,4 @@ abstract class PacketEvent : Event {
         class Pre(val packet: Packet<*>) : Receive(), ICancellable by Cancellable()
         class Post(val packet: Packet<*>) : Receive()
     }
-}
+}

common/src/main/kotlin/com/lambda/module/ModuleRegistry.kt

@@ -1,30 +1,23 @@
 package com.lambda.module
 
 import com.lambda.core.Loadable
-import com.lambda.module.ModuleRegistry.modules
 import org.reflections.Reflections
 import org.reflections.scanners.Scanners
 import org.reflections.util.ConfigurationBuilder
 
 /**
  * The [ModuleRegistry] object is responsible for managing all [Module] instances in the system.
- *
- * @property modules A set of all [Module] instances in the system.
  */
 object ModuleRegistry : Loadable {
     val modules = mutableSetOf<Module>()
 
     val moduleNames: Set<String>
         get() = modules.map { it.name }.toSet()
 
-    private val paths = mutableSetOf("com.lambda.module.modules")
-
-    fun injectPath(path: String) = paths.add(path)
-
     override fun load(): String {
         Reflections(
             ConfigurationBuilder()
-                .forPackages(*paths.toTypedArray())
+                .forPackages("com.lambda.module.modules")
                 .addScanners(Scanners.SubTypes)
         ).getSubTypesOf(Module::class.java).forEach { moduleClass ->
             moduleClass.declaredFields.find {

fabric/src/main/kotlin/com/lambda/fabric/LambdaFabric.kt

@@ -1,10 +1,10 @@
 package com.lambda.fabric
 
-import net.fabricmc.api.ClientModInitializer
 import com.lambda.Lambda
 import com.lambda.Lambda.LOG
 import com.lambda.Lambda.MOD_NAME
 import com.lambda.Lambda.VERSION
+import net.fabricmc.api.ClientModInitializer
 
 object LambdaFabric : ClientModInitializer {
     override fun onInitializeClient() {