From ad54aff17cf15265a989bb219200c3df8f8fd472 Mon Sep 17 00:00:00 2001 From: beanbag44 Date: Tue, 22 Jul 2025 15:48:26 +0100 Subject: [PATCH 1/2] use module command names for commands and spaces for separate words in module names --- .../com/lambda/command/commands/ModuleCommand.kt | 6 +++--- .../main/kotlin/com/lambda/module/ModuleRegistry.kt | 3 +++ .../com/lambda/module/modules/client/ClickGui.kt | 2 +- .../com/lambda/module/modules/client/GuiSettings.kt | 2 +- .../com/lambda/module/modules/client/LambdaMoji.kt | 2 +- .../com/lambda/module/modules/client/RenderSettings.kt | 2 +- .../com/lambda/module/modules/client/TaskFlowModule.kt | 2 +- .../com/lambda/module/modules/combat/AutoDisconnect.kt | 2 +- .../com/lambda/module/modules/combat/AutoTotem.kt | 2 +- .../com/lambda/module/modules/combat/CrystalAura.kt | 2 +- .../com/lambda/module/modules/combat/FakePlayer.kt | 2 +- .../com/lambda/module/modules/combat/KillAura.kt | 2 +- .../com/lambda/module/modules/debug/BaritoneTest.kt | 2 +- .../com/lambda/module/modules/debug/BlockTest.kt | 2 +- .../com/lambda/module/modules/debug/ContainerTest.kt | 2 +- .../kotlin/com/lambda/module/modules/debug/FallTest.kt | 2 +- .../com/lambda/module/modules/debug/InventoryDebug.kt | 10 ++++++++-- .../com/lambda/module/modules/debug/RenderTest.kt | 2 +- .../com/lambda/module/modules/debug/SettingTest.kt | 2 +- .../com/lambda/module/modules/debug/TimerTest.kt | 6 +----- .../com/lambda/module/modules/movement/BackTrack.kt | 2 +- .../com/lambda/module/modules/movement/ElytraFly.kt | 2 +- .../lambda/module/modules/movement/EntityControl.kt | 2 +- .../com/lambda/module/modules/movement/NoFall.kt | 2 +- .../com/lambda/module/modules/movement/SafeWalk.kt | 2 +- .../com/lambda/module/modules/movement/TargetStrafe.kt | 2 +- .../com/lambda/module/modules/movement/TickShift.kt | 2 +- .../com/lambda/module/modules/network/PacketDelay.kt | 4 +--- .../com/lambda/module/modules/network/PacketLimiter.kt | 7 +++++-- .../com/lambda/module/modules/network/PacketLogger.kt | 2 +- .../com/lambda/module/modules/network/ServerSpoof.kt | 2 +- .../com/lambda/module/modules/player/ClickFriend.kt | 2 +- .../com/lambda/module/modules/player/FastBreak.kt | 2 +- .../com/lambda/module/modules/player/HighwayTools.kt | 2 +- .../com/lambda/module/modules/player/InventoryMove.kt | 2 +- .../lambda/module/modules/player/InventoryTweaks.kt | 4 ++-- .../com/lambda/module/modules/player/MapDownloader.kt | 2 +- .../com/lambda/module/modules/player/PortalGui.kt | 2 +- .../com/lambda/module/modules/player/WorldEater.kt | 4 ++-- .../com/lambda/module/modules/render/BlockESP.kt | 4 ++-- .../com/lambda/module/modules/render/CameraTweaks.kt | 2 +- .../com/lambda/module/modules/render/ExtraTab.kt | 2 +- .../com/lambda/module/modules/render/MapPreview.kt | 2 +- .../com/lambda/module/modules/render/NoRender.kt | 2 +- .../com/lambda/module/modules/render/StorageESP.kt | 2 +- 45 files changed, 63 insertions(+), 57 deletions(-) diff --git a/common/src/main/kotlin/com/lambda/command/commands/ModuleCommand.kt b/common/src/main/kotlin/com/lambda/command/commands/ModuleCommand.kt index 1b19f4478..0fbf1cdb5 100644 --- a/common/src/main/kotlin/com/lambda/command/commands/ModuleCommand.kt +++ b/common/src/main/kotlin/com/lambda/command/commands/ModuleCommand.kt @@ -76,7 +76,7 @@ object ModuleCommand : LambdaCommand( required(string("module name")) { moduleName -> suggests { _, builder -> ModuleRegistry.modules.map { - it.name + it.commandName }.forEach { builder.suggest(it) } @@ -86,7 +86,7 @@ object ModuleCommand : LambdaCommand( executeWithResult { val name = moduleName().value() val module = ModuleRegistry.modules.find { - it.name.equals(name, true) + it.commandName.equals(name, true) } ?: return@executeWithResult failure(buildText { styled(Color.RED) { literal("Module ") @@ -97,7 +97,7 @@ object ModuleCommand : LambdaCommand( } val similarModules = StringUtils.findSimilarStrings( name, - ModuleRegistry.moduleNames, + ModuleRegistry.moduleCommandNames, 3 ) if (similarModules.isEmpty()) return@buildText diff --git a/common/src/main/kotlin/com/lambda/module/ModuleRegistry.kt b/common/src/main/kotlin/com/lambda/module/ModuleRegistry.kt index 96289c41e..cbc74265e 100644 --- a/common/src/main/kotlin/com/lambda/module/ModuleRegistry.kt +++ b/common/src/main/kotlin/com/lambda/module/ModuleRegistry.kt @@ -30,6 +30,9 @@ object ModuleRegistry : Loadable { val moduleNames: Set get() = modules.map { it.name }.toSet() + val moduleCommandNames: Set + get() = modules.map { it.commandName }.toSet() + override fun load(): String { return "Loaded ${modules.size} modules with ${modules.sumOf { it.settings.size }} settings" } diff --git a/common/src/main/kotlin/com/lambda/module/modules/client/ClickGui.kt b/common/src/main/kotlin/com/lambda/module/modules/client/ClickGui.kt index 38feec830..9004cc7a0 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/client/ClickGui.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/client/ClickGui.kt @@ -40,7 +40,7 @@ import java.awt.Color import kotlin.math.hypot object ClickGui : Module( - name = "ClickGui", + name = "Click Gui", description = "sexy again", defaultTags = setOf(ModuleTag.CLIENT), defaultKeybind = KeyCode.Y diff --git a/common/src/main/kotlin/com/lambda/module/modules/client/GuiSettings.kt b/common/src/main/kotlin/com/lambda/module/modules/client/GuiSettings.kt index cb314c591..780065afb 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/client/GuiSettings.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/client/GuiSettings.kt @@ -29,7 +29,7 @@ import com.lambda.module.tag.ModuleTag import java.awt.Color object GuiSettings : Module( - name = "GuiSettings", + name = "Gui Settings", description = "Visual behaviour configuration", defaultTags = setOf(ModuleTag.CLIENT) ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/client/LambdaMoji.kt b/common/src/main/kotlin/com/lambda/module/modules/client/LambdaMoji.kt index 8ce70690d..e59268fd8 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/client/LambdaMoji.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/client/LambdaMoji.kt @@ -32,7 +32,7 @@ import java.awt.Color // This is the worst code I have ever wrote in my life object LambdaMoji : Module( - name = "LambdaMoji", + name = "Lambda-Moji", description = "", defaultTags = setOf(ModuleTag.CLIENT, ModuleTag.RENDER), enabledByDefault = true, diff --git a/common/src/main/kotlin/com/lambda/module/modules/client/RenderSettings.kt b/common/src/main/kotlin/com/lambda/module/modules/client/RenderSettings.kt index b7f228fb2..a641bae89 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/client/RenderSettings.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/client/RenderSettings.kt @@ -24,7 +24,7 @@ import com.lambda.module.tag.ModuleTag import java.awt.Color object RenderSettings : Module( - name = "RenderSettings", + name = "Render Settings", description = "Renderer configuration", defaultTags = setOf(ModuleTag.CLIENT) ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/client/TaskFlowModule.kt b/common/src/main/kotlin/com/lambda/module/modules/client/TaskFlowModule.kt index a815c7149..153204af1 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/client/TaskFlowModule.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/client/TaskFlowModule.kt @@ -26,7 +26,7 @@ import com.lambda.module.tag.ModuleTag import com.lambda.util.world.raycast.InteractionMask object TaskFlowModule : Module( - name = "TaskFlow", + name = "Task Flow", description = "Settings for task automation", defaultTags = setOf(ModuleTag.CLIENT, ModuleTag.AUTOMATION) ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/combat/AutoDisconnect.kt b/common/src/main/kotlin/com/lambda/module/modules/combat/AutoDisconnect.kt index c0a3c75c3..600d0831d 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/combat/AutoDisconnect.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/combat/AutoDisconnect.kt @@ -44,7 +44,7 @@ import net.minecraft.text.Text import java.awt.Color object AutoDisconnect : Module( - name = "AutoDisconnect", + name = "Auto Disconnect", description = "Automatically disconnects when in danger or on low health", defaultTags = setOf(ModuleTag.COMBAT) ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/combat/AutoTotem.kt b/common/src/main/kotlin/com/lambda/module/modules/combat/AutoTotem.kt index 6adce890c..fb327bd50 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/combat/AutoTotem.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/combat/AutoTotem.kt @@ -38,7 +38,7 @@ import net.minecraft.entity.player.PlayerEntity import net.minecraft.item.Items object AutoTotem : Module( - name = "AutoTotem", + name = "Auto Totem", description = "Swaps the your off-hand item to a totem", defaultTags = setOf(ModuleTag.COMBAT, ModuleTag.PLAYER), ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/combat/CrystalAura.kt b/common/src/main/kotlin/com/lambda/module/modules/combat/CrystalAura.kt index 01c626dcc..cabde293b 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/combat/CrystalAura.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/combat/CrystalAura.kt @@ -62,7 +62,7 @@ import kotlin.math.max import kotlin.time.Duration.Companion.milliseconds object CrystalAura : Module( - name = "CrystalAura", + name = "Crystal Aura", description = "Automatically attacks entities with crystals", defaultTags = setOf(ModuleTag.COMBAT), ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/combat/FakePlayer.kt b/common/src/main/kotlin/com/lambda/module/modules/combat/FakePlayer.kt index ab10068f4..51315d3a4 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/combat/FakePlayer.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/combat/FakePlayer.kt @@ -35,7 +35,7 @@ import java.util.* import kotlin.time.Duration.Companion.seconds object FakePlayer : Module( - name = "FakePlayer", + name = "Fake Player", description = "Spawns a fake player", defaultTags = setOf(ModuleTag.COMBAT), ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/combat/KillAura.kt b/common/src/main/kotlin/com/lambda/module/modules/combat/KillAura.kt index b3d13ae5b..87223d475 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/combat/KillAura.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/combat/KillAura.kt @@ -47,7 +47,7 @@ import net.minecraft.util.Hand import net.minecraft.util.math.Vec3d object KillAura : Module( - name = "KillAura", + name = "Kill Aura", description = "Attacks entities", defaultTags = setOf(ModuleTag.COMBAT, ModuleTag.RENDER) ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/debug/BaritoneTest.kt b/common/src/main/kotlin/com/lambda/module/modules/debug/BaritoneTest.kt index 87696ef9d..8c786b740 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/debug/BaritoneTest.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/debug/BaritoneTest.kt @@ -25,7 +25,7 @@ import com.lambda.module.Module import com.lambda.module.tag.ModuleTag object BaritoneTest : Module( - name = "BaritoneTest", + name = "Baritone Test", description = "Test Baritone", defaultTags = setOf(ModuleTag.DEBUG) ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/debug/BlockTest.kt b/common/src/main/kotlin/com/lambda/module/modules/debug/BlockTest.kt index 1b051f8fc..dbbb24a19 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/debug/BlockTest.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/debug/BlockTest.kt @@ -28,7 +28,7 @@ import net.minecraft.util.math.Vec3i import java.awt.Color object BlockTest : Module( - name = "BlockTest", + name = "Block Test", description = "BlockTest", defaultTags = setOf(ModuleTag.DEBUG), ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/debug/ContainerTest.kt b/common/src/main/kotlin/com/lambda/module/modules/debug/ContainerTest.kt index a6208e029..e5e02e6ef 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/debug/ContainerTest.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/debug/ContainerTest.kt @@ -27,7 +27,7 @@ import com.lambda.task.tasks.AcquireMaterial.Companion.acquire import net.minecraft.item.Items object ContainerTest : Module( - name = "ContainerTest", + name = "Container Test", description = "Test container", defaultTags = setOf(ModuleTag.DEBUG) ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/debug/FallTest.kt b/common/src/main/kotlin/com/lambda/module/modules/debug/FallTest.kt index 36e3b125d..2577d0ec3 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/debug/FallTest.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/debug/FallTest.kt @@ -26,7 +26,7 @@ import com.lambda.util.combat.DamageUtils.fallDamage import com.lambda.util.combat.DamageUtils.isFallDeadly object FallTest : Module( - name = "FallTest", + name = "Fall Test", defaultTags = setOf(ModuleTag.DEBUG), ) { init { diff --git a/common/src/main/kotlin/com/lambda/module/modules/debug/InventoryDebug.kt b/common/src/main/kotlin/com/lambda/module/modules/debug/InventoryDebug.kt index 4408c4f14..1817939d5 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/debug/InventoryDebug.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/debug/InventoryDebug.kt @@ -25,12 +25,18 @@ import com.lambda.module.Module import com.lambda.module.tag.ModuleTag import com.lambda.util.Communication.info import com.lambda.util.DynamicReflectionSerializer.dynamicString -import net.minecraft.network.packet.c2s.play.* +import net.minecraft.network.packet.c2s.play.ClickSlotC2SPacket +import net.minecraft.network.packet.c2s.play.CloseHandledScreenC2SPacket +import net.minecraft.network.packet.c2s.play.CraftRequestC2SPacket +import net.minecraft.network.packet.c2s.play.CreativeInventoryActionC2SPacket +import net.minecraft.network.packet.c2s.play.PickFromInventoryC2SPacket +import net.minecraft.network.packet.c2s.play.SlotChangedStateC2SPacket +import net.minecraft.network.packet.c2s.play.UpdateSelectedSlotC2SPacket import net.minecraft.network.packet.s2c.play.InventoryS2CPacket import net.minecraft.network.packet.s2c.play.UpdateSelectedSlotS2CPacket object InventoryDebug : Module( - name = "InventoryDebug", + name = "Inventory Debug", description = "Debugs the inventory", defaultTags = setOf(ModuleTag.DEBUG) ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/debug/RenderTest.kt b/common/src/main/kotlin/com/lambda/module/modules/debug/RenderTest.kt index dc52b3bea..22e8de190 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/debug/RenderTest.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/debug/RenderTest.kt @@ -30,7 +30,7 @@ import net.minecraft.util.math.Box import java.awt.Color object RenderTest : Module( - name = "Render:shrimp:Test:canned_food:", + name = "Render:shrimp: Test:canned_food:", description = "RenderTest", defaultTags = setOf(ModuleTag.DEBUG) ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/debug/SettingTest.kt b/common/src/main/kotlin/com/lambda/module/modules/debug/SettingTest.kt index dad299d2e..767e1fd23 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/debug/SettingTest.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/debug/SettingTest.kt @@ -26,7 +26,7 @@ import net.minecraft.util.math.BlockPos import java.awt.Color object SettingTest : Module( - name = "SettingTest", + name = "Setting Test", defaultTags = setOf(ModuleTag.DEBUG) ) { // CharSetting diff --git a/common/src/main/kotlin/com/lambda/module/modules/debug/TimerTest.kt b/common/src/main/kotlin/com/lambda/module/modules/debug/TimerTest.kt index cfbd81e45..d9c7c3e98 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/debug/TimerTest.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/debug/TimerTest.kt @@ -23,13 +23,9 @@ import com.lambda.event.listener.SafeListener.Companion.listenConcurrently import com.lambda.module.Module import com.lambda.module.tag.ModuleTag import com.lambda.util.Communication.info -import com.lambda.util.KeyCode -import net.minecraft.block.Blocks -import net.minecraft.util.math.BlockPos -import java.awt.Color object TimerTest : Module( - name = "TimerTest", + name = "Timer Test", defaultTags = setOf(ModuleTag.DEBUG) ) { private var last = 0L diff --git a/common/src/main/kotlin/com/lambda/module/modules/movement/BackTrack.kt b/common/src/main/kotlin/com/lambda/module/modules/movement/BackTrack.kt index 55847529c..430ca9e97 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/movement/BackTrack.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/movement/BackTrack.kt @@ -45,7 +45,7 @@ import java.awt.Color import java.util.concurrent.ConcurrentLinkedDeque object BackTrack : Module( - name = "BackTrack", + name = "Back Track", description = "Gives reach advantage by delaying your packets", defaultTags = setOf(ModuleTag.MOVEMENT) ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/movement/ElytraFly.kt b/common/src/main/kotlin/com/lambda/module/modules/movement/ElytraFly.kt index 0c6970eb7..1cc3ae812 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/movement/ElytraFly.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/movement/ElytraFly.kt @@ -27,7 +27,7 @@ import com.lambda.util.player.MovementUtils.addSpeed import net.minecraft.sound.SoundEvents object ElytraFly : Module( - name = "ElytraFly", + name = "Elytra Fly", description = "Allows you to fly with an elytra", defaultTags = setOf(ModuleTag.MOVEMENT, ModuleTag.GRIM) ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/movement/EntityControl.kt b/common/src/main/kotlin/com/lambda/module/modules/movement/EntityControl.kt index d585730af..d51f3a4f0 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/movement/EntityControl.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/movement/EntityControl.kt @@ -27,7 +27,7 @@ import net.minecraft.entity.passive.AbstractHorseEntity import net.minecraft.network.packet.c2s.play.PlayerInteractEntityC2SPacket object EntityControl : Module( - name = "EntityControl", + name = "Entity Control", description = "Control mountable entities", defaultTags = setOf(ModuleTag.MOVEMENT) ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/movement/NoFall.kt b/common/src/main/kotlin/com/lambda/module/modules/movement/NoFall.kt index 193f431c1..ea439a264 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/movement/NoFall.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/movement/NoFall.kt @@ -35,7 +35,7 @@ import net.minecraft.util.math.Direction import net.minecraft.util.math.Vec3d object NoFall : Module( - name = "NoFall", + name = "No Fall", description = "Reduces fall damage", defaultTags = setOf(ModuleTag.MOVEMENT) ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/movement/SafeWalk.kt b/common/src/main/kotlin/com/lambda/module/modules/movement/SafeWalk.kt index 3238ea124..58ea92ff9 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/movement/SafeWalk.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/movement/SafeWalk.kt @@ -26,7 +26,7 @@ import com.lambda.util.player.MovementUtils.motionZ import net.minecraft.entity.LivingEntity object SafeWalk : Module( - name = "SafeWalk", + name = "Safe Walk", description = "Keeps you at the edge", defaultTags = setOf(ModuleTag.MOVEMENT, ModuleTag.GRIM) ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/movement/TargetStrafe.kt b/common/src/main/kotlin/com/lambda/module/modules/movement/TargetStrafe.kt index 4c118ce55..d32278044 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/movement/TargetStrafe.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/movement/TargetStrafe.kt @@ -30,7 +30,7 @@ import com.lambda.util.player.MovementUtils.mergeFrom import kotlin.math.pow object TargetStrafe : Module( - name = "TargetStrafe", + name = "Target Strafe", description = "Automatically strafes around entities", defaultTags = setOf(ModuleTag.MOVEMENT) ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/movement/TickShift.kt b/common/src/main/kotlin/com/lambda/module/modules/movement/TickShift.kt index ea9b301bc..dcc8384b6 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/movement/TickShift.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/movement/TickShift.kt @@ -35,7 +35,7 @@ import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket import net.minecraft.network.packet.s2c.play.EntityVelocityUpdateS2CPacket object TickShift : Module( - name = "TickShift", + name = "Tick Shift", description = "Smort tickshift for smort anticheats", defaultTags = setOf(ModuleTag.MOVEMENT) ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/network/PacketDelay.kt b/common/src/main/kotlin/com/lambda/module/modules/network/PacketDelay.kt index 2c1673991..854682c1c 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/network/PacketDelay.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/network/PacketDelay.kt @@ -30,14 +30,12 @@ import com.lambda.util.PacketUtils.handlePacketSilently import com.lambda.util.PacketUtils.sendPacketSilently import com.lambda.util.ServerPacket import kotlinx.coroutines.delay -import net.minecraft.network.listener.ClientPacketListener -import net.minecraft.network.listener.ServerPacketListener import net.minecraft.network.packet.Packet import net.minecraft.network.packet.c2s.common.KeepAliveC2SPacket import java.util.concurrent.ConcurrentLinkedDeque object PacketDelay : Module( - name = "PacketDelay", + name = "Packet Delay", description = "Delays packets client-bound & server-bound", defaultTags = setOf(ModuleTag.NETWORK), ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/network/PacketLimiter.kt b/common/src/main/kotlin/com/lambda/module/modules/network/PacketLimiter.kt index 729e8a718..7338f08ba 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/network/PacketLimiter.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/network/PacketLimiter.kt @@ -24,12 +24,15 @@ import com.lambda.module.tag.ModuleTag import com.lambda.util.Communication.info import com.lambda.util.collections.LimitedDecayQueue import net.minecraft.network.packet.c2s.common.CommonPongC2SPacket -import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket.* +import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket.Full +import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket.LookAndOnGround +import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket.OnGroundOnly +import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket.PositionAndOnGround import net.minecraft.network.packet.c2s.play.TeleportConfirmC2SPacket // ToDo: HUD info object PacketLimiter : Module( - name = "PacketLimiter", + name = "Packet Limiter", description = "Limits the amount of packets sent to the server", defaultTags = setOf(ModuleTag.NETWORK) ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/network/PacketLogger.kt b/common/src/main/kotlin/com/lambda/module/modules/network/PacketLogger.kt index c33dfc85a..6cd9ae54a 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/network/PacketLogger.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/network/PacketLogger.kt @@ -42,7 +42,7 @@ import java.time.format.DateTimeFormatter import kotlin.io.path.pathString object PacketLogger : Module( - name = "PacketLogger", + name = "Packet Logger", description = "Serializes network traffic and persists it for later analysis", defaultTags = setOf(ModuleTag.NETWORK, ModuleTag.DEBUG) ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/network/ServerSpoof.kt b/common/src/main/kotlin/com/lambda/module/modules/network/ServerSpoof.kt index ecad05382..6046046b7 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/network/ServerSpoof.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/network/ServerSpoof.kt @@ -35,7 +35,7 @@ import net.minecraft.text.ClickEvent import java.awt.Color object ServerSpoof : Module( - name = "ServerSpoof", + name = "Server Spoof", description = "Decide yourself if you want to accept the server resource pack.", defaultTags = setOf(ModuleTag.NETWORK) ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/player/ClickFriend.kt b/common/src/main/kotlin/com/lambda/module/modules/player/ClickFriend.kt index d9a5b8a60..f117250d1 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/player/ClickFriend.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/player/ClickFriend.kt @@ -37,7 +37,7 @@ import org.lwjgl.glfw.GLFW.GLFW_MOD_SHIFT import org.lwjgl.glfw.GLFW.GLFW_MOD_SUPER object ClickFriend : Module( - name = "ClickFriend", + name = "Click Friend", description = "Add or remove friends with a single click", defaultTags = setOf(ModuleTag.PLAYER) ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/player/FastBreak.kt b/common/src/main/kotlin/com/lambda/module/modules/player/FastBreak.kt index 04fd3e50a..cb4a39d00 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/player/FastBreak.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/player/FastBreak.kt @@ -37,7 +37,7 @@ import net.minecraft.util.math.Box import java.awt.Color object FastBreak : Module( - name = "FastBreak", + name = "Fast Break", description = "Break blocks faster.", defaultTags = setOf( ModuleTag.PLAYER, ModuleTag.WORLD diff --git a/common/src/main/kotlin/com/lambda/module/modules/player/HighwayTools.kt b/common/src/main/kotlin/com/lambda/module/modules/player/HighwayTools.kt index 5979ca874..8e391e1c0 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/player/HighwayTools.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/player/HighwayTools.kt @@ -42,7 +42,7 @@ import net.minecraft.util.math.EightWayDirection import net.minecraft.util.math.Vec3i object HighwayTools : Module( - name = "HighwayTools", + name = "Highway Tools", description = "Auto highway builder", defaultTags = setOf(ModuleTag.PLAYER, ModuleTag.AUTOMATION) ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/player/InventoryMove.kt b/common/src/main/kotlin/com/lambda/module/modules/player/InventoryMove.kt index ad4b2eb9c..45a946a36 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/player/InventoryMove.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/player/InventoryMove.kt @@ -42,7 +42,7 @@ import net.minecraft.client.network.ClientPlayerEntity import org.lwjgl.glfw.GLFW.* object InventoryMove : Module( - name = "InventoryMove", + name = "Inventory Move", description = "Allows you to move with GUIs opened", defaultTags = setOf(ModuleTag.PLAYER, ModuleTag.MOVEMENT) ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/player/InventoryTweaks.kt b/common/src/main/kotlin/com/lambda/module/modules/player/InventoryTweaks.kt index 3242b8ffb..9b23e096b 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/player/InventoryTweaks.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/player/InventoryTweaks.kt @@ -23,8 +23,8 @@ import com.lambda.event.events.PlayerEvent import com.lambda.event.listener.SafeListener.Companion.listen import com.lambda.module.Module import com.lambda.module.tag.ModuleTag -import com.lambda.task.Task import com.lambda.task.RootTask.run +import com.lambda.task.Task import com.lambda.task.tasks.BuildTask.Companion.breakAndCollectBlock import com.lambda.task.tasks.OpenContainer import com.lambda.task.tasks.PlaceContainer @@ -35,7 +35,7 @@ import net.minecraft.screen.slot.SlotActionType import net.minecraft.util.math.BlockPos object InventoryTweaks : Module( - name = "InventoryTweaks", + name = "Inventory Tweaks", defaultTags = setOf(ModuleTag.PLAYER) ) { private val instantShulker by setting("Instant Shulker", true, description = "Right-click shulker boxes in your inventory to instantly place them and open them.") diff --git a/common/src/main/kotlin/com/lambda/module/modules/player/MapDownloader.kt b/common/src/main/kotlin/com/lambda/module/modules/player/MapDownloader.kt index 6184d4c64..967e8ef6f 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/player/MapDownloader.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/player/MapDownloader.kt @@ -34,7 +34,7 @@ import java.awt.image.BufferedImage import javax.imageio.ImageIO object MapDownloader : Module( - name = "MapDownloader", + name = "Map Downloader", description = "Save map data to your computer", defaultTags = setOf(ModuleTag.PLAYER), ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/player/PortalGui.kt b/common/src/main/kotlin/com/lambda/module/modules/player/PortalGui.kt index 170ea24bf..32c352d7f 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/player/PortalGui.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/player/PortalGui.kt @@ -21,7 +21,7 @@ import com.lambda.module.Module import com.lambda.module.tag.ModuleTag object PortalGui : Module( - name = "PortalGui", + name = "Portal Gui", description = "Allows you to open guis in portals", defaultTags = setOf(ModuleTag.PLAYER), ) diff --git a/common/src/main/kotlin/com/lambda/module/modules/player/WorldEater.kt b/common/src/main/kotlin/com/lambda/module/modules/player/WorldEater.kt index c3303369a..1991b1805 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/player/WorldEater.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/player/WorldEater.kt @@ -25,8 +25,8 @@ import com.lambda.interaction.construction.blueprint.StaticBlueprint.Companion.t import com.lambda.interaction.construction.verify.TargetState import com.lambda.module.Module import com.lambda.module.tag.ModuleTag -import com.lambda.task.Task import com.lambda.task.RootTask.run +import com.lambda.task.Task import com.lambda.task.tasks.BuildTask.Companion.build import com.lambda.util.BaritoneUtils import net.minecraft.util.math.BlockBox @@ -35,7 +35,7 @@ import net.minecraft.util.math.Box import java.awt.Color object WorldEater : Module( - name = "WorldEater", + name = "World Eater", description = "Eats the world", defaultTags = setOf(ModuleTag.PLAYER, ModuleTag.AUTOMATION) ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/render/BlockESP.kt b/common/src/main/kotlin/com/lambda/module/modules/render/BlockESP.kt index 006241337..25b600266 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/render/BlockESP.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/render/BlockESP.kt @@ -28,8 +28,8 @@ import com.lambda.module.Module import com.lambda.module.tag.ModuleTag import com.lambda.threading.runSafe import com.lambda.util.extension.blockColor -import com.lambda.util.extension.outlineShape import com.lambda.util.extension.getBlockState +import com.lambda.util.extension.outlineShape import com.lambda.util.world.fastVectorOf import com.lambda.util.world.toBlockPos import net.minecraft.block.BlockState @@ -39,7 +39,7 @@ import net.minecraft.util.math.BlockPos import java.awt.Color object BlockESP : Module( - name = "BlockESP", + name = "Block ESP", description = "Render block ESP", defaultTags = setOf(ModuleTag.RENDER) ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/render/CameraTweaks.kt b/common/src/main/kotlin/com/lambda/module/modules/render/CameraTweaks.kt index d555330c1..33fb16f34 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/render/CameraTweaks.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/render/CameraTweaks.kt @@ -21,7 +21,7 @@ import com.lambda.module.Module import com.lambda.module.tag.ModuleTag object CameraTweaks : Module( - name = "CameraTweaks", + name = "Camera Tweaks", description = "Adjusts camera settings", defaultTags = setOf(ModuleTag.RENDER) ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/render/ExtraTab.kt b/common/src/main/kotlin/com/lambda/module/modules/render/ExtraTab.kt index 3815cfed4..c19baead7 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/render/ExtraTab.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/render/ExtraTab.kt @@ -21,7 +21,7 @@ import com.lambda.module.Module import com.lambda.module.tag.ModuleTag object ExtraTab : Module( - name = "ExtraTab", + name = "Extra Tab", description = "Adds more tabs to the main menu", defaultTags = setOf(ModuleTag.RENDER) ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/render/MapPreview.kt b/common/src/main/kotlin/com/lambda/module/modules/render/MapPreview.kt index 31d83709b..061a6e903 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/render/MapPreview.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/render/MapPreview.kt @@ -32,7 +32,7 @@ import net.minecraft.util.Identifier object MapPreview : Module( - name = "MapPreview", + name = "Map Preview", description = "Preview maps in your inventory", defaultTags = setOf(ModuleTag.RENDER) ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/render/NoRender.kt b/common/src/main/kotlin/com/lambda/module/modules/render/NoRender.kt index e8957585b..8b7440f4c 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/render/NoRender.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/render/NoRender.kt @@ -21,7 +21,7 @@ import com.lambda.module.Module import com.lambda.module.tag.ModuleTag object NoRender : Module( - name = "NoRender", + name = "No Render", description = "Disables rendering of certain things", defaultTags = setOf(ModuleTag.RENDER) ) { diff --git a/common/src/main/kotlin/com/lambda/module/modules/render/StorageESP.kt b/common/src/main/kotlin/com/lambda/module/modules/render/StorageESP.kt index b8fbf036f..671a39b79 100644 --- a/common/src/main/kotlin/com/lambda/module/modules/render/StorageESP.kt +++ b/common/src/main/kotlin/com/lambda/module/modules/render/StorageESP.kt @@ -55,7 +55,7 @@ import net.minecraft.util.math.BlockPos import java.awt.Color object StorageESP : Module( - name = "StorageESP", + name = "Storage ESP", description = "Render storage blocks/entities", defaultTags = setOf(ModuleTag.RENDER), ) { From 6bee3ebbbaf1b0c74583261ab459b441bd9b82e0 Mon Sep 17 00:00:00 2001 From: beanbag44 Date: Tue, 22 Jul 2025 16:09:33 +0100 Subject: [PATCH 2/2] search, suggest, and fill by command name too --- .../main/kotlin/com/lambda/command/commands/ConfigCommand.kt | 5 +---- .../main/kotlin/com/lambda/command/commands/ModuleCommand.kt | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/common/src/main/kotlin/com/lambda/command/commands/ConfigCommand.kt b/common/src/main/kotlin/com/lambda/command/commands/ConfigCommand.kt index 88a41af3c..f842e3131 100644 --- a/common/src/main/kotlin/com/lambda/command/commands/ConfigCommand.kt +++ b/common/src/main/kotlin/com/lambda/command/commands/ConfigCommand.kt @@ -28,9 +28,6 @@ import com.lambda.command.LambdaCommand import com.lambda.config.Configuration import com.lambda.util.Communication.info import com.lambda.util.extension.CommandBuilder -import com.lambda.util.text.buildText -import com.lambda.util.text.highlighted -import com.lambda.util.text.literal object ConfigCommand : LambdaCommand( name = "config", @@ -69,7 +66,7 @@ object ConfigCommand : LambdaCommand( required(string("setting")) { setting -> suggests { ctx, builder -> val conf = config(ctx).value() - Configuration.configurableByName(conf)?.let { configurable -> + Configuration.configurableByCommandName(conf)?.let { configurable -> configurable.settings.forEach { builder.suggest(it.commandName) } diff --git a/common/src/main/kotlin/com/lambda/command/commands/ModuleCommand.kt b/common/src/main/kotlin/com/lambda/command/commands/ModuleCommand.kt index 0fbf1cdb5..6a5c3837f 100644 --- a/common/src/main/kotlin/com/lambda/command/commands/ModuleCommand.kt +++ b/common/src/main/kotlin/com/lambda/command/commands/ModuleCommand.kt @@ -63,9 +63,9 @@ object ModuleCommand : LambdaCommand( literal("Enabled Modules: ") } joinToText(enabled) { - clickEvent(suggestCommand("$prefix${input} ${it.name}")) { + clickEvent(suggestCommand("$prefix${input} ${it.commandName}")) { styled(if (it.isEnabled) Color.GREEN else Color.RED) { - literal(it.name) + literal(it.commandName) } } }