Merge with master

common/src/main/kotlin/com/lambda/core/Loader.kt

@@ -19,20 +19,8 @@ package com.lambda.core
 
 import com.lambda.Lambda
 import com.lambda.Lambda.LOG
-import com.lambda.command.CommandRegistry
-import com.lambda.friend.FriendRegistry
-import com.lambda.graphics.renderer.gui.font.LambdaEmoji
-import com.lambda.graphics.renderer.gui.font.LambdaFont
-import com.lambda.gui.GuiConfigurable
-import com.lambda.gui.HudGuiConfigurable
-import com.lambda.interaction.PlayerPacketManager
-import com.lambda.interaction.RotationManager
-import com.lambda.interaction.construction.StructureRegistry
-import com.lambda.interaction.material.ContainerManager
-import com.lambda.module.ModuleRegistry
-import com.lambda.sound.SoundRegistry
 import com.lambda.util.Communication.ascii
-import com.lambda.util.FolderRegister
+import com.lambda.util.reflections.getInstances
 import kotlin.system.measureTimeMillis
 import kotlin.time.DurationUnit
 import kotlin.time.toDuration
@@ -43,23 +31,7 @@ object Loader {
     val runtime: String
         get() = "${(System.currentTimeMillis() - started).toDuration(DurationUnit.MILLISECONDS)}"
 
-    private val loadables = listOf(
-        FolderRegister,
-        ModuleRegistry,
-        CommandRegistry,
-        RotationManager,
-        PlayerPacketManager,
-        LambdaFont.Loader,
-        LambdaEmoji.Loader,
-        GuiConfigurable,
-        HudGuiConfigurable,
-        FriendRegistry,
-        SoundRegistry,
-        TimerManager,
-        PingManager,
-        ContainerManager,
-        StructureRegistry
-    )
+    private val loadables = getInstances<Loadable> { forPackages("com.lambda") }
 
     fun initialize() {
         ascii.split("\n").forEach { LOG.info(it) }

common/src/main/kotlin/com/lambda/module/modules/player/WorldEater.kt

@@ -18,7 +18,7 @@
 package com.lambda.module.modules.player
 
 import com.lambda.event.events.RenderEvent
-import com.lambda.event.listener.SafeListener.Companion.listener
+import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.graphics.renderer.esp.builders.buildOutline
 import com.lambda.interaction.construction.blueprint.Blueprint.Companion.toStructure
 import com.lambda.interaction.construction.blueprint.StaticBlueprint.Companion.toBlueprint
@@ -66,7 +66,7 @@ object WorldEater : Module(
             BaritoneUtils.cancel()
         }
 
-        listener<RenderEvent.StaticESP> {
+        listen<RenderEvent.StaticESP> {
             it.renderer.buildOutline(Box.enclosing(pos1, pos2), Color.BLUE)
         }
     }

common/src/main/kotlin/com/lambda/task/tasks/BreakBlock.kt

@@ -104,11 +104,11 @@ class BreakBlock @Ta5kBuilder constructor(
                     }?.let {
                         clickSlot(it.index, 1, SlotActionType.THROW)
                     }
-                    return@listener
+                    return@listen
                 }
 
                 BaritoneUtils.setGoalAndPath(GoalBlock(itemDrop.blockPos))
-                return@listener
+                return@listen
             } ?: BaritoneUtils.cancel()
 
             if (isValid || !rotate || ctx.instantBreak) {
@@ -124,7 +124,7 @@ class BreakBlock @Ta5kBuilder constructor(
         }
 
         // ToDo: Find out when the stack entity is filled with the item
-        listener<WorldEvent.EntityUpdate> {
+        listen<WorldEvent.EntityUpdate> {
             if (collectDrop
                 && it.entity is ItemEntity
                 && it.entity.pos.isInRange(blockPos.toCenterPos(), 0.5)

common/src/main/kotlin/com/lambda/task/tasks/BuildTask.kt

@@ -22,7 +22,7 @@ import com.lambda.Lambda.LOG
 import com.lambda.context.SafeContext
 import com.lambda.event.events.RenderEvent
 import com.lambda.event.events.TickEvent
-import com.lambda.event.listener.SafeListener.Companion.listener
+import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.interaction.construction.blueprint.Blueprint
 import com.lambda.interaction.construction.blueprint.Blueprint.Companion.toStructure
 import com.lambda.interaction.construction.blueprint.DynamicBlueprint

common/src/main/kotlin/com/lambda/task/tasks/PlaceBlock.kt

@@ -88,16 +88,16 @@ class PlaceBlock @Ta5kBuilder constructor(
             findOutIfNeeded = true
         }
 
-        listener<MovementEvent.InputUpdate> {
-            if (state != State.PLACING) return@listener
+        listen<MovementEvent.InputUpdate> {
+            if (state != State.PLACING) return@listen
             val hitBlock = ctx.result.blockPos.blockState(world).block
             if (hitBlock in BlockUtils.interactionBlacklist) {
                 it.input.sneaking = true
             }
         }
 
-        listener<WorldEvent.BlockUpdate> {
-            if (it.pos != ctx.resultingPos) return@listener
+        listen<WorldEvent.BlockUpdate> {
+            if (it.pos != ctx.resultingPos) return@listen
 
             if (ctx.targetState.matches(it.state, it.pos, world)) {
                 finish()