Cleanup

Avanatiker · Avanatiker · commit 02082bce27fb · 2024-03-12T04:19:22.000+01:00
diff --git a/common/src/main/kotlin/com/lambda/config/Configurable.kt b/common/src/main/kotlin/com/lambda/config/Configurable.kt
@@ -2,6 +2,7 @@ package com.lambda.config
 
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
+import com.lambda.Lambda
 import com.lambda.Lambda.LOG
 import com.lambda.config.settings.StringSetting
 import com.lambda.config.settings.collections.ListSetting
@@ -11,14 +12,13 @@ import com.lambda.config.settings.comparable.BooleanSetting
 import com.lambda.config.settings.comparable.EnumSetting
 import com.lambda.config.settings.complex.BlockPosSetting
 import com.lambda.config.settings.complex.BlockSetting
+import com.lambda.config.settings.complex.ColorSetting
 import com.lambda.config.settings.complex.KeyBindSetting
 import com.lambda.config.settings.numeric.*
 import com.lambda.util.KeyCode
 import com.lambda.util.Nameable
 import net.minecraft.block.Block
 import net.minecraft.util.math.BlockPos
-import com.lambda.Lambda
-import com.lambda.config.settings.complex.ColorSetting
 import java.awt.Color
 
 /**
diff --git a/common/src/main/kotlin/com/lambda/config/Configuration.kt b/common/src/main/kotlin/com/lambda/config/Configuration.kt
@@ -5,14 +5,13 @@ import com.google.gson.JsonObject
 import com.google.gson.JsonParser
 import com.lambda.Lambda.LOG
 import com.lambda.Lambda.gson
-import com.lambda.event.EventFlow
 import com.lambda.event.EventFlow.lambdaScope
 import com.lambda.event.events.ClientEvent
 import com.lambda.event.listener.UnsafeListener.Companion.unsafeListener
+import com.lambda.module.ModuleConfig
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.io.File
-import com.lambda.module.ModuleConfig
 
 /**
  * Represents a compound of [Configurable] objects whose [AbstractSetting]s
@@ -81,7 +80,6 @@ abstract class Configuration : Jsonable {
             runCatching { load(primary) }
                 .onSuccess {
                     LOG.info("$configName config loaded")
-                    EventFlow.post(ClientEvent.ConfigLoaded(this@Configuration))
                 }
                 .onFailure { LOG.error("Failed to load $configName config, loading backup", it) }
                 .recoverCatching {
@@ -102,7 +100,6 @@ abstract class Configuration : Jsonable {
             runCatching { save() }
                 .onSuccess {
                     LOG.info("$configName config saved")
-                    EventFlow.post(ClientEvent.ConfigSaved(this@Configuration))
                 }
                 .onFailure { LOG.error("Failed to save $configName config", it) }
         }
diff --git a/common/src/main/kotlin/com/lambda/config/Jsonable.kt b/common/src/main/kotlin/com/lambda/config/Jsonable.kt
@@ -1,7 +1,7 @@
 package com.lambda.config
 
-import com.google.gson.JsonElement
 import com.google.gson.Gson
+import com.google.gson.JsonElement
 
 
 /**
diff --git a/common/src/main/kotlin/com/lambda/context/ClientContext.kt b/common/src/main/kotlin/com/lambda/context/ClientContext.kt
@@ -1,10 +1,10 @@
 package com.lambda.context
 
+import net.minecraft.client.MinecraftClient
 import net.minecraft.client.network.ClientPlayNetworkHandler
 import net.minecraft.client.network.ClientPlayerEntity
 import net.minecraft.client.network.ClientPlayerInteractionManager
 import net.minecraft.client.world.ClientWorld
-import net.minecraft.client.MinecraftClient
 
 /**
  * A class extending the [AbstractContext] in the [MinecraftClient].
diff --git a/common/src/main/kotlin/com/lambda/context/SafeContext.kt b/common/src/main/kotlin/com/lambda/context/SafeContext.kt
@@ -1,10 +1,10 @@
 package com.lambda.context
 
+import net.minecraft.client.MinecraftClient
 import net.minecraft.client.network.ClientPlayNetworkHandler
 import net.minecraft.client.network.ClientPlayerEntity
 import net.minecraft.client.network.ClientPlayerInteractionManager
 import net.minecraft.client.world.ClientWorld
-import net.minecraft.client.MinecraftClient
 
 /**
  * A class extending the [AbstractContext] in the [MinecraftClient].
@@ -23,7 +23,7 @@ import net.minecraft.client.MinecraftClient
  *     // ...
  * }
  * ```
- * 
+ *
  * @property world The world in which the player is currently located.
  * @property player The player entity.
  * @property interaction The interaction manager for the player.
diff --git a/common/src/main/kotlin/com/lambda/event/cancellable/Cancellable.kt b/common/src/main/kotlin/com/lambda/event/cancellable/Cancellable.kt
@@ -5,8 +5,8 @@ import java.util.concurrent.atomic.AtomicBoolean
 /**
  * Used as delegate for [ICancellable] events.
  *
- * A `Cancellable` event is a type of [ICancellable] that can be cancelled.
- * It has a [cancelSignal] which is an [AtomicBoolean] that indicates whether the event has been canceled.
+ * A [Cancellable] event is a type of [ICancellable] that can be cancelled.
+ * It has a [cancelSignal] which is an [AtomicBoolean] that indicates whether the event has been [cancel]ed.
  *
  * @property cancelSignal The signal that indicates whether the event has been canceled.
  */
diff --git a/common/src/main/kotlin/com/lambda/event/events/ClientEvent.kt b/common/src/main/kotlin/com/lambda/event/events/ClientEvent.kt
@@ -1,13 +1,9 @@
 package com.lambda.event.events
 
-import com.lambda.config.Configuration
 import com.lambda.event.Event
-import com.lambda.module.Module
 
 
 abstract class ClientEvent : Event {
     data object Shutdown : ClientEvent()
     data object Startup : ClientEvent()
-    data class ConfigLoaded(val configuration: Configuration) : ClientEvent()
-    data class ConfigSaved(val configuration: Configuration) : ClientEvent()
 }
diff --git a/common/src/main/kotlin/com/lambda/event/events/KeyPressEvent.kt b/common/src/main/kotlin/com/lambda/event/events/KeyPressEvent.kt
@@ -1,8 +1,8 @@
 package com.lambda.event.events
 
+import com.lambda.event.EventFlow
 import com.lambda.event.cancellable.Cancellable
 import com.lambda.event.cancellable.ICancellable
-import com.lambda.event.EventFlow
 
 /**
  * A class representing a [KeyPressEvent] in the event system ([EventFlow]).
diff --git a/common/src/main/kotlin/com/lambda/event/events/PacketEvent.kt b/common/src/main/kotlin/com/lambda/event/events/PacketEvent.kt
@@ -1,10 +1,16 @@
 package com.lambda.event.events
 
 import com.lambda.event.Event
+import com.lambda.event.EventFlow
 import com.lambda.event.cancellable.Cancellable
 import com.lambda.event.cancellable.ICancellable
+import com.lambda.event.events.PacketEvent.Receive
+import com.lambda.event.events.PacketEvent.Receive.Post
+import com.lambda.event.events.PacketEvent.Receive.Pre
+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
-import com.lambda.event.EventFlow
 
 /**
  * An abstract class representing a [PacketEvent] in the [EventFlow].
diff --git a/common/src/main/kotlin/com/lambda/event/events/TickEvent.kt b/common/src/main/kotlin/com/lambda/event/events/TickEvent.kt
@@ -2,6 +2,8 @@ package com.lambda.event.events
 
 import com.lambda.event.Event
 import com.lambda.event.EventFlow
+import com.lambda.event.events.TickEvent.Post
+import com.lambda.event.events.TickEvent.Pre
 
 /**
  * An abstract class representing a [TickEvent] in the [EventFlow].
diff --git a/common/src/main/kotlin/com/lambda/event/listener/SafeListener.kt b/common/src/main/kotlin/com/lambda/event/listener/SafeListener.kt
@@ -3,9 +3,9 @@ package com.lambda.event.listener
 import com.lambda.context.SafeContext
 import com.lambda.event.Event
 import com.lambda.event.EventFlow
+import com.lambda.event.Muteable
 import com.lambda.task.Task
 import com.lambda.threading.runSafe
-import com.lambda.event.Muteable
 
 
 /**
diff --git a/common/src/main/kotlin/com/lambda/event/listener/UnsafeListener.kt b/common/src/main/kotlin/com/lambda/event/listener/UnsafeListener.kt
@@ -2,9 +2,9 @@ package com.lambda.event.listener
 
 import com.lambda.event.Event
 import com.lambda.event.EventFlow
+import com.lambda.event.Muteable
 import com.lambda.event.listener.SafeListener.Companion.concurrentListener
 import com.lambda.event.listener.SafeListener.Companion.listener
-import com.lambda.event.Muteable
 
 /**
  * An [UnsafeListener] is a specialized type of [Listener] that operates without a [SafeContext].
diff --git a/common/src/main/kotlin/com/lambda/module/Module.kt b/common/src/main/kotlin/com/lambda/module/Module.kt
@@ -1,19 +1,19 @@
 package com.lambda.module
 
+import com.lambda.config.AbstractSetting
 import com.lambda.config.Configurable
+import com.lambda.config.Configuration
+import com.lambda.config.settings.comparable.BooleanSetting
+import com.lambda.config.settings.numeric.DoubleSetting
 import com.lambda.event.Muteable
 import com.lambda.event.events.KeyPressEvent
+import com.lambda.event.listener.Listener
+import com.lambda.event.listener.SafeListener
 import com.lambda.event.listener.SafeListener.Companion.listener
+import com.lambda.event.listener.UnsafeListener
 import com.lambda.module.tag.ModuleTag
 import com.lambda.util.KeyCode
 import com.lambda.util.Nameable
-import com.lambda.config.AbstractSetting
-import com.lambda.config.Configuration
-import com.lambda.event.listener.Listener
-import com.lambda.event.listener.SafeListener
-import com.lambda.event.listener.UnsafeListener
-import com.lambda.config.settings.comparable.BooleanSetting
-import com.lambda.config.settings.numeric.DoubleSetting
 
 /**
  * A [Module] is a feature or tool for the utility mod.
diff --git a/common/src/main/kotlin/com/lambda/module/ModuleConfig.kt b/common/src/main/kotlin/com/lambda/module/ModuleConfig.kt
@@ -1,6 +1,8 @@
 package com.lambda.module
 
 import com.lambda.config.Configuration
+import com.lambda.module.ModuleConfig.configName
+import com.lambda.module.ModuleConfig.primary
 import com.lambda.util.FolderRegister
 import java.io.File
 
diff --git a/common/src/main/kotlin/com/lambda/module/ModuleRegistry.kt b/common/src/main/kotlin/com/lambda/module/ModuleRegistry.kt
@@ -2,6 +2,7 @@ package com.lambda.module
 
 import com.lambda.event.events.ClientEvent
 import com.lambda.event.listener.UnsafeListener.Companion.unsafeListener
+import com.lambda.module.ModuleRegistry.modules
 import com.lambda.util.Eager
 import org.reflections.Reflections
 import org.reflections.scanners.Scanners
diff --git a/common/src/main/kotlin/com/lambda/module/modules/BoringModule.kt b/common/src/main/kotlin/com/lambda/module/modules/BoringModule.kt
@@ -25,6 +25,7 @@ object BoringModule : Module(
         mapOf("One" to 1, "Two" to 2, "Three" to 3, "Four" to 4, "Five" to 5)
     )
     private val boringEnum by setting("Boring Enum", BoringEnum.ONE)
+
     //private val blockSetting by setting("Boring Block", Blocks.STONE) // Registries are not initialized yet
     private val blockPosSetting by setting("Boring BlockPos", BlockPos(420, 69, 1337))
 //    private val blockListSetting by setting("Boring Block List", listOf(Blocks.STONE, Blocks.DIRT, Blocks.GRASS_BLOCK))
diff --git a/common/src/main/kotlin/com/lambda/util/FolderRegister.kt b/common/src/main/kotlin/com/lambda/util/FolderRegister.kt
@@ -1,5 +1,8 @@
 package com.lambda.util
 
+import com.lambda.util.FolderRegister.config
+import com.lambda.util.FolderRegister.lambda
+import com.lambda.util.FolderRegister.minecraft
 import dev.architectury.platform.Platform
 import java.io.File
 

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ import java.util.concurrent.atomic.AtomicBoolean`
`5`	`5`	`/**`
`6`	`6`	`* Used as delegate for [ICancellable] events.`
`7`	`7`	`*`
`8`		- * A `Cancellable` event is a type of [ICancellable] that can be cancelled.
`9`		`- * It has a [cancelSignal] which is an [AtomicBoolean] that indicates whether the event has been canceled.`
	`8`	`+ * A [Cancellable] event is a type of [ICancellable] that can be cancelled.`
	`9`	`+ * It has a [cancelSignal] which is an [AtomicBoolean] that indicates whether the event has been [cancel]ed.`
`10`	`10`	`*`
`11`	`11`	`* @property cancelSignal The signal that indicates whether the event has been canceled.`
`12`	`12`	`*/`