diff --git a/src/main/kotlin/com/lambda/client/module/modules/chat/AntiSpam.kt b/src/main/kotlin/com/lambda/client/module/modules/chat/AntiSpam.kt index ef2c4dfba..3f2077f26 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/chat/AntiSpam.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/chat/AntiSpam.kt @@ -1,12 +1,12 @@ package com.lambda.client.module.modules.chat import com.lambda.client.LambdaMod +import com.lambda.client.event.listener.listener import com.lambda.client.module.Category import com.lambda.client.module.Module import com.lambda.client.util.text.MessageDetection import com.lambda.client.util.text.MessageSendHelper import com.lambda.client.util.text.SpamFilters -import com.lambda.client.event.listener.listener import net.minecraft.util.text.TextComponentString import net.minecraftforge.client.event.ClientChatReceivedEvent import java.util.concurrent.ConcurrentHashMap @@ -14,8 +14,8 @@ import java.util.regex.Pattern object AntiSpam : Module( name = "AntiSpam", - category = Category.CHAT, description = "Removes spam and advertising from the chat", + category = Category.CHAT, showOnArray = false ) { private val mode by setting("Mode", Mode.REPLACE) diff --git a/src/main/kotlin/com/lambda/client/module/modules/chat/ChatTimestamp.kt b/src/main/kotlin/com/lambda/client/module/modules/chat/ChatTimestamp.kt index 9d943cb18..7fec7004a 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/chat/ChatTimestamp.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/chat/ChatTimestamp.kt @@ -1,19 +1,19 @@ package com.lambda.client.module.modules.chat +import com.lambda.client.commons.interfaces.DisplayEnum import com.lambda.client.module.Category import com.lambda.client.module.Module import com.lambda.client.util.TimeUtils import com.lambda.client.util.color.EnumTextColor import com.lambda.client.util.text.format import com.lambda.client.util.threads.safeListener -import com.lambda.client.commons.interfaces.DisplayEnum import net.minecraft.util.text.TextComponentString import net.minecraftforge.client.event.ClientChatReceivedEvent object ChatTimestamp : Module( name = "ChatTimestamp", - category = Category.CHAT, description = "Shows the time a message was sent beside the message", + category = Category.CHAT, showOnArray = false ) { private val color by setting("Color", EnumTextColor.GRAY) diff --git a/src/main/kotlin/com/lambda/client/module/modules/chat/CustomChat.kt b/src/main/kotlin/com/lambda/client/module/modules/chat/CustomChat.kt index 3a75ef48c..75032a3c1 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/chat/CustomChat.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/chat/CustomChat.kt @@ -9,8 +9,8 @@ import kotlin.math.min object CustomChat : Module( name = "CustomChat", - category = Category.CHAT, description = "Add a custom ending to your message!", + category = Category.CHAT, showOnArray = false, modulePriority = 200 ) { @@ -25,7 +25,7 @@ object CustomChat : Module( } private enum class TextMode { - NAME, ON_TOP, WEBSITE, CUSTOM + NAME, ON_TOP, CUSTOM } private val modifier = newMessageModifier( @@ -57,7 +57,6 @@ object CustomChat : Module( private fun getText() = when (textMode) { TextMode.NAME -> "ʟᴀᴍʙᴅᴀ" TextMode.ON_TOP -> "ʟᴀᴍʙᴅᴀ ᴏɴ ᴛᴏᴘ" - TextMode.WEBSITE -> "ｌａｍｂｄａ－ｃｌｉｅｎｔ．ｃｏｍ" TextMode.CUSTOM -> customText } diff --git a/src/main/kotlin/com/lambda/client/module/modules/chat/ExtraChatHistory.kt b/src/main/kotlin/com/lambda/client/module/modules/chat/ExtraChatHistory.kt index aa9740888..197ce156b 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/chat/ExtraChatHistory.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/chat/ExtraChatHistory.kt @@ -8,9 +8,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo object ExtraChatHistory : Module( name = "ExtraChatHistory", - alias = arrayOf("InfiniteChat", "InfiniteChatHistory"), - category = Category.CHAT, description = "Show more messages in the chat history", + category = Category.CHAT, + alias = arrayOf("InfiniteChat", "InfiniteChatHistory"), showOnArray = false ) { private val maxMessages by setting("Max Message", 1000, 100..5000, 100) diff --git a/src/main/kotlin/com/lambda/client/module/modules/chat/FancyChat.kt b/src/main/kotlin/com/lambda/client/module/modules/chat/FancyChat.kt index 7a933c66b..cac84e18e 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/chat/FancyChat.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/chat/FancyChat.kt @@ -1,16 +1,16 @@ package com.lambda.client.module.modules.chat +import com.lambda.client.commons.utils.MathUtils import com.lambda.client.manager.managers.MessageManager.newMessageModifier import com.lambda.client.module.Category import com.lambda.client.module.Module import com.lambda.client.util.text.MessageDetection -import com.lambda.client.commons.utils.MathUtils import kotlin.math.min object FancyChat : Module( name = "FancyChat", - category = Category.CHAT, description = "Makes messages you send fancy", + category = Category.CHAT, showOnArray = false, modulePriority = 100 ) { diff --git a/src/main/kotlin/com/lambda/client/module/modules/chat/LambdaMoji.kt b/src/main/kotlin/com/lambda/client/module/modules/chat/LambdaMoji.kt index 535ae906a..dfe91b1fd 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/chat/LambdaMoji.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/chat/LambdaMoji.kt @@ -1,11 +1,11 @@ package com.lambda.client.module.modules.chat +import com.lambda.client.commons.extension.ceilToInt import com.lambda.client.manager.managers.LambdaMojiManager import com.lambda.client.module.Category import com.lambda.client.module.Module import com.lambda.client.util.graphics.GlStateUtils import com.lambda.client.util.graphics.texture.MipmapTexture -import com.lambda.client.commons.extension.ceilToInt import net.minecraft.client.renderer.GlStateManager import net.minecraft.client.renderer.Tessellator import net.minecraft.client.renderer.vertex.DefaultVertexFormats @@ -13,7 +13,7 @@ import org.lwjgl.opengl.GL11.* object LambdaMoji : Module( name = "LambdaMoji", - description = "Add emojis to chat using LambdaMoji, courtesy of the EmojiAPI.", + description = "Add emojis to chat using LambdaMoji, courtesy of the EmojiAPI", category = Category.CHAT ) { @JvmStatic diff --git a/src/main/kotlin/com/lambda/client/module/modules/chat/LoginMessage.kt b/src/main/kotlin/com/lambda/client/module/modules/chat/LoginMessage.kt index 1caaaf578..2ec412903 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/chat/LoginMessage.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/chat/LoginMessage.kt @@ -1,6 +1,7 @@ package com.lambda.client.module.modules.chat import com.lambda.client.event.events.ConnectionEvent +import com.lambda.client.event.listener.listener import com.lambda.client.module.Category import com.lambda.client.module.Module import com.lambda.client.util.MovementUtils.isMoving @@ -19,7 +20,7 @@ import java.util.concurrent.CopyOnWriteArrayList object LoginMessage : Module( name = "LoginMessage", - description = "Sends a given message(s) to public chat on login.", + description = "Sends a given message(s) to public chat on login", category = Category.CHAT, showOnArray = false, modulePriority = 150 diff --git a/src/main/kotlin/com/lambda/client/module/modules/chat/PortalChat.kt b/src/main/kotlin/com/lambda/client/module/modules/chat/PortalChat.kt index 0cb67887a..28e4dd80f 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/chat/PortalChat.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/chat/PortalChat.kt @@ -9,7 +9,7 @@ import com.lambda.client.module.Module */ object PortalChat : Module( name = "PortalChat", - category = Category.CHAT, description = "Allows you to open GUIs in portals", + category = Category.CHAT, showOnArray = false ) diff --git a/src/main/kotlin/com/lambda/client/module/modules/client/Baritone.kt b/src/main/kotlin/com/lambda/client/module/modules/client/Baritone.kt index decdad95a..c3476aebc 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/client/Baritone.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/client/Baritone.kt @@ -2,6 +2,7 @@ package com.lambda.client.module.modules.client import com.lambda.client.event.events.BaritoneSettingsInitEvent import com.lambda.client.event.events.RenderRadarEvent +import com.lambda.client.event.listener.listener import com.lambda.client.module.Category import com.lambda.client.module.Module import com.lambda.client.util.BaritoneUtils @@ -9,13 +10,12 @@ import com.lambda.client.util.color.ColorHolder import com.lambda.client.util.graphics.RenderUtils2D import com.lambda.client.util.math.Vec2d import com.lambda.client.util.threads.safeListener -import com.lambda.client.event.listener.listener import net.minecraft.util.math.BlockPos object Baritone : Module( name = "Baritone", - category = Category.CLIENT, description = "Configures Baritone settings", + category = Category.CLIENT, showOnArray = false, alwaysEnabled = true ) { diff --git a/src/main/kotlin/com/lambda/client/module/modules/client/Capes.kt b/src/main/kotlin/com/lambda/client/module/modules/client/Capes.kt index 088988061..37bc6974d 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/client/Capes.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/client/Capes.kt @@ -2,10 +2,12 @@ package com.lambda.client.module.modules.client import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.lambda.client.LambdaMod import com.lambda.client.capeapi.Cape import com.lambda.client.capeapi.CapeType import com.lambda.client.capeapi.CapeUser -import com.lambda.client.LambdaMod +import com.lambda.client.commons.extension.synchronized +import com.lambda.client.commons.utils.ConnectionUtils import com.lambda.client.gui.clickgui.LambdaClickGui import com.lambda.client.module.Category import com.lambda.client.module.Module @@ -16,8 +18,6 @@ import com.lambda.client.util.color.ColorHolder import com.lambda.client.util.color.DyeColors import com.lambda.client.util.threads.BackgroundScope import com.lambda.client.util.threads.defaultScope -import com.lambda.client.commons.extension.synchronized -import com.lambda.client.commons.utils.ConnectionUtils import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext @@ -38,8 +38,8 @@ import kotlin.math.sin object Capes : Module( name = "Capes", - category = Category.CLIENT, description = "Controls the display of Lambda capes", + category = Category.CLIENT, showOnArray = false, enabledByDefault = true ) { diff --git a/src/main/kotlin/com/lambda/client/module/modules/client/ChatSetting.kt b/src/main/kotlin/com/lambda/client/module/modules/client/ChatSetting.kt index 95b76c32f..7643a6bb7 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/client/ChatSetting.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/client/ChatSetting.kt @@ -5,8 +5,8 @@ import com.lambda.client.module.Module object ChatSetting : Module( name = "ChatSetting", - category = Category.CLIENT, description = "Configures chat message manager", + category = Category.CLIENT, showOnArray = false, alwaysEnabled = true ) { diff --git a/src/main/kotlin/com/lambda/client/module/modules/client/CommandConfig.kt b/src/main/kotlin/com/lambda/client/module/modules/client/CommandConfig.kt index 76c6e111b..acc8f7630 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/client/CommandConfig.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/client/CommandConfig.kt @@ -2,20 +2,20 @@ package com.lambda.client.module.modules.client import com.lambda.client.LambdaMod import com.lambda.client.event.events.ModuleToggleEvent +import com.lambda.client.event.listener.listener import com.lambda.client.module.Category import com.lambda.client.module.Module import com.lambda.client.util.TickTimer import com.lambda.client.util.text.MessageSendHelper import com.lambda.client.util.text.format -import com.lambda.client.event.listener.listener import net.minecraft.util.text.TextFormatting import net.minecraftforge.fml.common.gameevent.TickEvent import org.lwjgl.opengl.Display object CommandConfig : Module( name = "CommandConfig", - category = Category.CLIENT, description = "Configures client chat related stuff", + category = Category.CLIENT, showOnArray = false, alwaysEnabled = true ) { diff --git a/src/main/kotlin/com/lambda/client/module/modules/client/Configurations.kt b/src/main/kotlin/com/lambda/client/module/modules/client/Configurations.kt index 8c0e6a0e9..cd734b3cc 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/client/Configurations.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/client/Configurations.kt @@ -1,7 +1,9 @@ package com.lambda.client.module.modules.client import com.lambda.client.LambdaMod +import com.lambda.client.commons.interfaces.DisplayEnum import com.lambda.client.event.events.ConnectionEvent +import com.lambda.client.event.listener.listener import com.lambda.client.gui.AbstractLambdaGui import com.lambda.client.module.AbstractModule import com.lambda.client.module.Category @@ -20,8 +22,6 @@ import com.lambda.client.util.text.formatValue import com.lambda.client.util.threads.BackgroundScope import com.lambda.client.util.threads.defaultScope import com.lambda.client.util.threads.safeListener -import com.lambda.client.commons.interfaces.DisplayEnum -import com.lambda.client.event.listener.listener import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import net.minecraftforge.fml.common.gameevent.TickEvent @@ -40,7 +40,7 @@ internal object Configurations : AbstractModule( private const val defaultPreset = "default" private val autoSaving by setting("Auto Saving", true) - private val savingFeedBack by setting("Saving FeedBack", false, { autoSaving }) + private val savingFeedBack by setting("Log autosaves in chat", false, { autoSaving }) private val savingInterval by setting("Interval", 10, 1..30, 1, { autoSaving }, description = "Frequency of auto saving in minutes") val serverPreset by setting("Server Preset", false) private val guiPresetSetting = setting("Gui Preset", defaultPreset) diff --git a/src/main/kotlin/com/lambda/client/module/modules/client/CustomFont.kt b/src/main/kotlin/com/lambda/client/module/modules/client/CustomFont.kt index 57c1f9755..315b6e24d 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/client/CustomFont.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/client/CustomFont.kt @@ -12,8 +12,8 @@ import java.awt.GraphicsEnvironment object CustomFont : Module( name = "CustomFont", description = "Use different GUI fonts", - showOnArray = false, category = Category.CLIENT, + showOnArray = false, enabledByDefault = true ) { private const val DEFAULT_FONT_NAME = "Fira Sans" diff --git a/src/main/kotlin/com/lambda/client/module/modules/client/GuiColors.kt b/src/main/kotlin/com/lambda/client/module/modules/client/GuiColors.kt index df460d034..426800731 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/client/GuiColors.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/client/GuiColors.kt @@ -7,8 +7,8 @@ import com.lambda.client.util.color.ColorHolder object GuiColors : Module( name = "GuiColors", description = "Customize gui colors", - showOnArray = false, category = Category.CLIENT, + showOnArray = false, alwaysEnabled = true ) { private val primarySetting by setting("Primary Color", ColorHolder(108, 0, 43, 255)) diff --git a/src/main/kotlin/com/lambda/client/module/modules/client/MenuShader.kt b/src/main/kotlin/com/lambda/client/module/modules/client/MenuShader.kt index dff833bd3..ced1142da 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/client/MenuShader.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/client/MenuShader.kt @@ -15,8 +15,8 @@ import java.util.* object MenuShader : Module( name = "MenuShader", description = "Shows a shader on the main menu", - showOnArray = false, category = Category.CLIENT, + showOnArray = false, enabledByDefault = true ) { private val mode by setting("Mode", Mode.SET) diff --git a/src/main/kotlin/com/lambda/client/module/modules/client/Plugins.kt b/src/main/kotlin/com/lambda/client/module/modules/client/Plugins.kt index 3f26d8e65..899c06df1 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/client/Plugins.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/client/Plugins.kt @@ -6,8 +6,8 @@ import com.lambda.client.module.Module object Plugins : Module( name = "Plugins", description = "Config for plugins", - showOnArray = false, category = Category.CLIENT, + showOnArray = false, alwaysEnabled = true ) { private val tokenSetting by setting("Github Token", "") diff --git a/src/main/kotlin/com/lambda/client/module/modules/combat/AimBot.kt b/src/main/kotlin/com/lambda/client/module/modules/combat/AimBot.kt index 6bfe211b4..e314bb729 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/combat/AimBot.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/combat/AimBot.kt @@ -12,7 +12,7 @@ import net.minecraftforge.fml.common.gameevent.TickEvent @CombatManager.CombatModule object AimBot : Module( name = "AimBot", - description = "Automatically aims at entities for you.", + description = "Automatically aims at entities for you", category = Category.COMBAT, modulePriority = 20 ) { diff --git a/src/main/kotlin/com/lambda/client/module/modules/combat/AutoArmor.kt b/src/main/kotlin/com/lambda/client/module/modules/combat/AutoArmor.kt index 91c9c0a87..cf2242558 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/combat/AutoArmor.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/combat/AutoArmor.kt @@ -19,11 +19,10 @@ import net.minecraftforge.fml.common.gameevent.TickEvent object AutoArmor : Module( name = "AutoArmor", - category = Category.COMBAT, description = "Automatically equips armour", + category = Category.COMBAT, modulePriority = 500 ) { - private val delay by setting("Delay", 5, 1..10, 1) private val timer = TickTimer(TimeUnit.TICKS) diff --git a/src/main/kotlin/com/lambda/client/module/modules/combat/AutoEZ.kt b/src/main/kotlin/com/lambda/client/module/modules/combat/AutoEZ.kt index 0095fde13..bc22259e6 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/combat/AutoEZ.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/combat/AutoEZ.kt @@ -1,7 +1,9 @@ package com.lambda.client.module.modules.combat +import com.lambda.client.commons.extension.synchronized import com.lambda.client.event.SafeClientEvent import com.lambda.client.event.events.ConnectionEvent +import com.lambda.client.event.listener.listener import com.lambda.client.module.Category import com.lambda.client.module.Module import com.lambda.client.util.TickTimer @@ -10,8 +12,6 @@ import com.lambda.client.util.text.MessageSendHelper import com.lambda.client.util.text.MessageSendHelper.sendServerMessage import com.lambda.client.util.text.formatValue import com.lambda.client.util.threads.safeListener -import com.lambda.client.commons.extension.synchronized -import com.lambda.client.event.listener.listener import net.minecraft.entity.player.EntityPlayer import net.minecraftforge.client.event.ClientChatReceivedEvent import net.minecraftforge.fml.common.gameevent.TickEvent @@ -19,8 +19,8 @@ import java.util.* object AutoEZ : Module( name = "AutoEZ", - category = Category.COMBAT, - description = "Sends an insult in chat after killing someone" + description = "Sends an insult in chat after killing someone", + category = Category.COMBAT ) { private const val UNCHANGED = "Unchanged" private const val NAME = "\$NAME" diff --git a/src/main/kotlin/com/lambda/client/module/modules/combat/AutoMend.kt b/src/main/kotlin/com/lambda/client/module/modules/combat/AutoMend.kt index 0c7b5dea9..4042d1e71 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/combat/AutoMend.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/combat/AutoMend.kt @@ -1,7 +1,9 @@ package com.lambda.client.module.modules.combat +import com.lambda.client.commons.utils.MathUtils.reverseNumber import com.lambda.client.event.SafeClientEvent import com.lambda.client.event.events.GuiEvent +import com.lambda.client.event.listener.listener import com.lambda.client.manager.managers.FriendManager import com.lambda.client.manager.managers.PlayerPacketManager import com.lambda.client.manager.managers.PlayerPacketManager.sendPlayerPacket @@ -15,8 +17,6 @@ import com.lambda.client.util.items.swapToSlot import com.lambda.client.util.math.Vec2f import com.lambda.client.util.threads.runSafe import com.lambda.client.util.threads.safeListener -import com.lambda.client.commons.utils.MathUtils.reverseNumber -import com.lambda.client.event.listener.listener import net.minecraft.enchantment.EnchantmentHelper import net.minecraft.entity.player.EntityPlayer import net.minecraft.init.Enchantments @@ -28,10 +28,9 @@ import net.minecraftforge.fml.common.gameevent.TickEvent object AutoMend : Module( name = "AutoMend", - category = Category.COMBAT, - description = "Automatically mends armour" + description = "Automatically mends armour", + category = Category.COMBAT ) { - private val autoThrow by setting("Auto Throw", true) private val throwDelay = setting("Throw Delay", 2, 0..5, 1, description = "Number of ticks between throws to allow absorption") private val autoSwitch by setting("Auto Switch", true) diff --git a/src/main/kotlin/com/lambda/client/module/modules/combat/AutoTrap.kt b/src/main/kotlin/com/lambda/client/module/modules/combat/AutoTrap.kt index f79a72bab..2cd3c0ffd 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/combat/AutoTrap.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/combat/AutoTrap.kt @@ -1,6 +1,7 @@ package com.lambda.client.module.modules.combat import com.lambda.client.event.SafeClientEvent +import com.lambda.client.event.listener.listener import com.lambda.client.manager.managers.CombatManager import com.lambda.client.manager.managers.HotbarManager.resetHotbar import com.lambda.client.manager.managers.HotbarManager.spoofHotbar @@ -20,7 +21,6 @@ import com.lambda.client.util.threads.isActiveOrFalse import com.lambda.client.util.threads.safeListener import com.lambda.client.util.world.buildStructure import com.lambda.client.util.world.isPlaceable -import com.lambda.client.event.listener.listener import kotlinx.coroutines.Job import kotlinx.coroutines.launch import net.minecraft.init.Blocks @@ -32,8 +32,8 @@ import org.lwjgl.input.Keyboard @CombatManager.CombatModule object AutoTrap : Module( name = "AutoTrap", - category = Category.COMBAT, description = "Traps your enemies in obsidian", + category = Category.COMBAT, modulePriority = 60 ) { private val trapMode by setting("Trap Mode", TrapMode.FULL_TRAP) diff --git a/src/main/kotlin/com/lambda/client/module/modules/combat/Criticals.kt b/src/main/kotlin/com/lambda/client/module/modules/combat/Criticals.kt index 86c958d38..117ded8d5 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/combat/Criticals.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/combat/Criticals.kt @@ -1,15 +1,15 @@ package com.lambda.client.module.modules.combat +import com.lambda.client.commons.interfaces.DisplayEnum import com.lambda.client.event.SafeClientEvent import com.lambda.client.event.events.PacketEvent import com.lambda.client.event.events.PlayerAttackEvent +import com.lambda.client.event.listener.listener import com.lambda.client.mixin.extension.isInWeb import com.lambda.client.module.Category import com.lambda.client.module.Module import com.lambda.client.util.EntityUtils.isInOrAboveLiquid import com.lambda.client.util.threads.safeListener -import com.lambda.client.commons.interfaces.DisplayEnum -import com.lambda.client.event.listener.listener import net.minecraft.entity.Entity import net.minecraft.entity.EntityLivingBase import net.minecraft.init.MobEffects @@ -22,8 +22,8 @@ import net.minecraftforge.fml.common.gameevent.TickEvent object Criticals : Module( name = "Criticals", - category = Category.COMBAT, - description = "Always do critical attacks" + description = "Always do critical attacks", + category = Category.COMBAT ) { private val mode by setting("Mode", Mode.PACKET) private val jumpMotion by setting("Jump Motion", 0.25, 0.1..0.5, 0.01, { mode == Mode.MINI_JUMP }, fineStep = 0.001) diff --git a/src/main/kotlin/com/lambda/client/module/modules/combat/CrystalAura.kt b/src/main/kotlin/com/lambda/client/module/modules/combat/CrystalAura.kt index 9605cebf1..a3809183d 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/combat/CrystalAura.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/combat/CrystalAura.kt @@ -1,10 +1,13 @@ package com.lambda.client.module.modules.combat +import com.lambda.client.commons.extension.synchronized +import com.lambda.client.commons.interfaces.DisplayEnum import com.lambda.client.event.Phase import com.lambda.client.event.SafeClientEvent import com.lambda.client.event.events.OnUpdateWalkingPlayerEvent import com.lambda.client.event.events.PacketEvent import com.lambda.client.event.events.RunGameLoopEvent +import com.lambda.client.event.listener.listener import com.lambda.client.manager.managers.CombatManager import com.lambda.client.manager.managers.HotbarManager import com.lambda.client.manager.managers.HotbarManager.resetHotbar @@ -12,8 +15,8 @@ import com.lambda.client.manager.managers.HotbarManager.serverSideItem import com.lambda.client.manager.managers.HotbarManager.spoofHotbar import com.lambda.client.manager.managers.PlayerPacketManager import com.lambda.client.manager.managers.PlayerPacketManager.sendPlayerPacket -import com.lambda.client.mixin.extension.useEntityId import com.lambda.client.mixin.extension.useEntityAction +import com.lambda.client.mixin.extension.useEntityId import com.lambda.client.module.Category import com.lambda.client.module.Module import com.lambda.client.util.Bind @@ -37,9 +40,6 @@ import com.lambda.client.util.text.MessageSendHelper import com.lambda.client.util.threads.runSafeR import com.lambda.client.util.threads.safeListener import com.lambda.client.util.world.getClosestVisibleSide -import com.lambda.client.commons.extension.synchronized -import com.lambda.client.commons.interfaces.DisplayEnum -import com.lambda.client.event.listener.listener import it.unimi.dsi.fastutil.ints.Int2LongMaps import it.unimi.dsi.fastutil.ints.Int2LongOpenHashMap import net.minecraft.client.entity.EntityPlayerSP @@ -71,9 +71,9 @@ import kotlin.math.min @CombatManager.CombatModule object CrystalAura : Module( name = "CrystalAura", - alias = arrayOf("CA", "AC", "AutoCrystal"), description = "Places End Crystals to kill enemies", category = Category.COMBAT, + alias = arrayOf("CA", "AC", "AutoCrystal"), modulePriority = 80 ) { /* Settings */ diff --git a/src/main/kotlin/com/lambda/client/module/modules/combat/CrystalBasePlace.kt b/src/main/kotlin/com/lambda/client/module/modules/combat/CrystalBasePlace.kt index 38b6898f2..fff57a8a1 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/combat/CrystalBasePlace.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/combat/CrystalBasePlace.kt @@ -42,7 +42,7 @@ import java.util.* @CombatManager.CombatModule object CrystalBasePlace : Module( name = "CrystalBasePlace", - description = "Places obby for placing crystal on", + description = "Places obsidian for placing crystal on", category = Category.COMBAT, modulePriority = 90 ) { diff --git a/src/main/kotlin/com/lambda/client/module/modules/combat/HoleESP.kt b/src/main/kotlin/com/lambda/client/module/modules/combat/HoleESP.kt index ae4c484c2..8812157de 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/combat/HoleESP.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/combat/HoleESP.kt @@ -18,8 +18,8 @@ import net.minecraft.util.math.AxisAlignedBB object HoleESP : Module( name = "HoleESP", - category = Category.COMBAT, - description = "Show safe holes for crystal pvp" + description = "Show safe holes for crystal pvp", + category = Category.COMBAT ) { private val range by setting("Render Distance", 8, 4..32, 1) private val filled by setting("Filled", true) diff --git a/src/main/kotlin/com/lambda/client/module/modules/combat/HoleMiner.kt b/src/main/kotlin/com/lambda/client/module/modules/combat/HoleMiner.kt index 6e1e9bf1b..a2f27ea79 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/combat/HoleMiner.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/combat/HoleMiner.kt @@ -32,8 +32,8 @@ import net.minecraftforge.fml.common.gameevent.TickEvent @CombatManager.CombatModule object HoleMiner : Module( name = "HoleMiner", - category = Category.COMBAT, description = "Mines your opponent's hole", + category = Category.COMBAT, modulePriority = 100 ) { private val delay by setting("Delay", 2, 1..10, 1) diff --git a/src/main/kotlin/com/lambda/client/module/modules/combat/KillAura.kt b/src/main/kotlin/com/lambda/client/module/modules/combat/KillAura.kt index 2b700e5ce..6baca43f5 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/combat/KillAura.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/combat/KillAura.kt @@ -1,5 +1,6 @@ package com.lambda.client.module.modules.combat +import com.lambda.client.commons.interfaces.DisplayEnum import com.lambda.client.event.SafeClientEvent import com.lambda.client.manager.managers.CombatManager import com.lambda.client.manager.managers.HotbarManager @@ -16,7 +17,6 @@ import com.lambda.client.util.items.isWeapon import com.lambda.client.util.math.RotationUtils.faceEntityClosest import com.lambda.client.util.math.RotationUtils.getRotationToEntityClosest import com.lambda.client.util.threads.safeListener -import com.lambda.client.commons.interfaces.DisplayEnum import net.minecraft.entity.Entity import net.minecraft.entity.projectile.EntityLargeFireball import net.minecraft.util.EnumHand @@ -25,9 +25,9 @@ import net.minecraftforge.fml.common.gameevent.TickEvent @CombatManager.CombatModule object KillAura : Module( name = "KillAura", - alias = arrayOf("KA", "Aura", "TriggerBot"), - category = Category.COMBAT, description = "Hits entities around you", + category = Category.COMBAT, + alias = arrayOf("KA", "Aura", "TriggerBot"), modulePriority = 50 ) { private val mode by setting("Mode", Mode.COOLDOWN) diff --git a/src/main/kotlin/com/lambda/client/module/modules/combat/MidClickPearl.kt b/src/main/kotlin/com/lambda/client/module/modules/combat/MidClickPearl.kt index 0cf67fd6f..4a5d758ee 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/combat/MidClickPearl.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/combat/MidClickPearl.kt @@ -16,8 +16,8 @@ import org.lwjgl.input.Mouse object MidClickPearl : Module( name = "MidClickPearl", - category = Category.COMBAT, - description = "Throws a pearl automatically when you middle click in air" + description = "Throws a pearl automatically when you middle click in air", + category = Category.COMBAT ) { private var prevSlot = -1 private var startTime = -1L diff --git a/src/main/kotlin/com/lambda/client/module/modules/combat/Surround.kt b/src/main/kotlin/com/lambda/client/module/modules/combat/Surround.kt index 5cc741255..c96f31ae7 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/combat/Surround.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/combat/Surround.kt @@ -34,8 +34,8 @@ import net.minecraftforge.fml.common.gameevent.TickEvent @CombatManager.CombatModule object Surround : Module( name = "Surround", - category = Category.COMBAT, description = "Surrounds you with obsidian to take less damage", + category = Category.COMBAT, modulePriority = 200 ) { private val placeSpeed by setting("Places Per Tick", 4f, 0.25f..5f, 0.25f) diff --git a/src/main/kotlin/com/lambda/client/module/modules/misc/AntiAFK.kt b/src/main/kotlin/com/lambda/client/module/modules/misc/AntiAFK.kt index 590b9c3d8..54a835e5f 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/misc/AntiAFK.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/misc/AntiAFK.kt @@ -4,6 +4,7 @@ import baritone.api.pathing.goals.GoalXZ import com.lambda.client.event.SafeClientEvent import com.lambda.client.event.events.BaritoneSettingsInitEvent import com.lambda.client.event.events.PacketEvent +import com.lambda.client.event.listener.listener import com.lambda.client.module.Category import com.lambda.client.module.Module import com.lambda.client.setting.settings.impl.primitive.BooleanSetting @@ -14,7 +15,6 @@ import com.lambda.client.util.TimeUnit import com.lambda.client.util.text.MessageDetection import com.lambda.client.util.text.MessageSendHelper.sendServerMessage import com.lambda.client.util.threads.safeListener -import com.lambda.client.event.listener.listener import net.minecraft.network.play.server.SPacketChat import net.minecraft.util.EnumHand import net.minecraft.util.math.BlockPos @@ -28,8 +28,8 @@ import kotlin.random.Random */ object AntiAFK : Module( name = "AntiAFK", - category = Category.MISC, - description = "Prevents being kicked for AFK" + description = "Prevents being kicked for AFK", + category = Category.MISC ) { private val delay by setting("Action Delay", 50, 5..100, 5) private val variation by setting("Variation", 25, 0..50, 5) diff --git a/src/main/kotlin/com/lambda/client/module/modules/misc/AutoFish.kt b/src/main/kotlin/com/lambda/client/module/modules/misc/AutoFish.kt index 94f0f15c4..924a5ca12 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/misc/AutoFish.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/misc/AutoFish.kt @@ -16,8 +16,8 @@ import kotlin.math.abs object AutoFish : Module( name = "AutoFish", - category = Category.MISC, - description = "Automatically catch fish" + description = "Automatically catch fish", + category = Category.MISC ) { private val mode by setting("Mode", Mode.BOUNCE) private val autoCast by setting("Auto Cast", true) diff --git a/src/main/kotlin/com/lambda/client/module/modules/misc/AutoObsidian.kt b/src/main/kotlin/com/lambda/client/module/modules/misc/AutoObsidian.kt index 1168b5231..cf97ce2ab 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/misc/AutoObsidian.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/misc/AutoObsidian.kt @@ -2,9 +2,11 @@ package com.lambda.client.module.modules.misc import baritone.api.pathing.goals.Goal import baritone.api.pathing.goals.GoalNear +import com.lambda.client.commons.interfaces.DisplayEnum import com.lambda.client.event.SafeClientEvent import com.lambda.client.event.events.BlockBreakEvent import com.lambda.client.event.events.RenderWorldEvent +import com.lambda.client.event.listener.listener import com.lambda.client.manager.managers.PlayerPacketManager.sendPlayerPacket import com.lambda.client.module.Category import com.lambda.client.module.Module @@ -27,8 +29,6 @@ import com.lambda.client.util.threads.onMainThread import com.lambda.client.util.threads.onMainThreadSafe import com.lambda.client.util.threads.safeListener import com.lambda.client.util.world.* -import com.lambda.client.commons.interfaces.DisplayEnum -import com.lambda.client.event.listener.listener import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking @@ -60,8 +60,8 @@ import kotlin.math.ceil object AutoObsidian : Module( name = "AutoObsidian", - category = Category.MISC, description = "Breaks down Ender Chests to restock obsidian", + category = Category.MISC, modulePriority = 15 ) { private val fillMode by setting("Fill Mode", FillMode.TARGET_STACKS) diff --git a/src/main/kotlin/com/lambda/client/module/modules/misc/AutoSpawner.kt b/src/main/kotlin/com/lambda/client/module/modules/misc/AutoSpawner.kt index c2a836ceb..a89761a96 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/misc/AutoSpawner.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/misc/AutoSpawner.kt @@ -31,8 +31,8 @@ import net.minecraftforge.fml.common.gameevent.TickEvent */ object AutoSpawner : Module( name = "AutoSpawner", - category = Category.MISC, - description = "Automatically spawns Withers, Iron Golems and Snowmen" + description = "Automatically spawns Withers, Iron Golems and Snowmen", + category = Category.MISC ) { private val useMode by setting("Use Mode", UseMode.SPAM) private val party by setting("Party", false) @@ -237,7 +237,7 @@ object AutoSpawner : Module( rotationPlaceableX = true rotationPlaceableZ = true - // dont place on grass + // don't place on grass val block = world.getBlockState(it).block if (block is BlockTallGrass || block is BlockDeadBush) return false if (getPlaceableSide(it) == null) return false diff --git a/src/main/kotlin/com/lambda/client/module/modules/misc/BeaconSelector.kt b/src/main/kotlin/com/lambda/client/module/modules/misc/BeaconSelector.kt index ce4a5d9ac..dc7fdd577 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/misc/BeaconSelector.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/misc/BeaconSelector.kt @@ -10,8 +10,8 @@ import net.minecraft.network.play.client.CPacketCustomPayload object BeaconSelector : Module( name = "BeaconSelector", - category = Category.MISC, - description = "Choose any of the 5 beacon effects regardless of beacon base height" + description = "Choose any of the 5 beacon effects regardless of beacon base height", + category = Category.MISC ) { private var doCancelPacket = true var effect = -1 diff --git a/src/main/kotlin/com/lambda/client/module/modules/misc/BlockData.kt b/src/main/kotlin/com/lambda/client/module/modules/misc/BlockData.kt index ddbdf9180..b375a1acb 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/misc/BlockData.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/misc/BlockData.kt @@ -13,8 +13,8 @@ import org.lwjgl.input.Mouse object BlockData : Module( name = "BlockData", - category = Category.MISC, - description = "Right click blocks to display their data" + description = "Right click blocks to display their data", + category = Category.MISC ) { private val timer = TickTimer() private var lastPos = BlockPos.ORIGIN diff --git a/src/main/kotlin/com/lambda/client/module/modules/misc/DiscordRPC.kt b/src/main/kotlin/com/lambda/client/module/modules/misc/DiscordRPC.kt index 1683f0aff..0986f0888 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/misc/DiscordRPC.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/misc/DiscordRPC.kt @@ -4,8 +4,9 @@ import com.jagrosh.discordipc.IPCClient import com.jagrosh.discordipc.entities.RichPresence import com.jagrosh.discordipc.entities.pipe.PipeStatus import com.jagrosh.discordipc.exceptions.NoDiscordClientException -import com.lambda.client.capeapi.CapeType import com.lambda.client.LambdaMod +import com.lambda.client.capeapi.CapeType +import com.lambda.client.commons.utils.MathUtils import com.lambda.client.module.Category import com.lambda.client.module.Module import com.lambda.client.util.InfoCalculator @@ -20,15 +21,14 @@ import com.lambda.client.util.threads.BackgroundJob import com.lambda.client.util.threads.BackgroundScope import com.lambda.client.util.threads.runSafeR import com.lambda.client.util.threads.safeListener -import com.lambda.client.commons.utils.MathUtils import net.minecraft.client.Minecraft import net.minecraftforge.fml.common.gameevent.TickEvent import java.time.OffsetDateTime object DiscordRPC : Module( name = "DiscordRPC", - category = Category.MISC, - description = "Discord Rich Presence" + description = "Discord Rich Presence", + category = Category.MISC ) { private val line1Left by setting("Line 1 Left", LineInfo.VERSION) // details left private val line1Right by setting("Line 1 Right", LineInfo.USERNAME) // details right diff --git a/src/main/kotlin/com/lambda/client/module/modules/misc/ElytraFix.kt b/src/main/kotlin/com/lambda/client/module/modules/misc/ElytraFix.kt index edfcb814c..3aa3e6836 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/misc/ElytraFix.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/misc/ElytraFix.kt @@ -10,8 +10,8 @@ import net.minecraft.network.play.server.SPacketPlayerPosLook object ElytraFix : Module( name = "ElytraFix", - category = Category.MISC, description = "Fixes firework rubberband induced velocity desync", + category = Category.MISC ) { init { safeListener { event -> diff --git a/src/main/kotlin/com/lambda/client/module/modules/misc/EntityTools.kt b/src/main/kotlin/com/lambda/client/module/modules/misc/EntityTools.kt index 7b7e859f1..267f15e27 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/misc/EntityTools.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/misc/EntityTools.kt @@ -13,8 +13,8 @@ import org.lwjgl.input.Mouse object EntityTools : Module( name = "EntityTools", - category = Category.MISC, - description = "Right click entities to perform actions on them" + description = "Right click entities to perform actions on them", + category = Category.MISC ) { private val mode by setting("Mode", Mode.INFO) diff --git a/src/main/kotlin/com/lambda/client/module/modules/misc/LogoutLogger.kt b/src/main/kotlin/com/lambda/client/module/modules/misc/LogoutLogger.kt index 6df1606b8..206eb2a90 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/misc/LogoutLogger.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/misc/LogoutLogger.kt @@ -1,6 +1,7 @@ package com.lambda.client.module.modules.misc import com.lambda.client.event.events.ConnectionEvent +import com.lambda.client.event.listener.asyncListener import com.lambda.client.manager.managers.WaypointManager import com.lambda.client.module.Category import com.lambda.client.module.Module @@ -12,7 +13,6 @@ import com.lambda.client.util.math.CoordinateConverter.asString import com.lambda.client.util.text.MessageSendHelper import com.lambda.client.util.threads.onMainThread import com.lambda.client.util.threads.safeListener -import com.lambda.client.event.listener.asyncListener import com.mojang.authlib.GameProfile import net.minecraft.client.entity.EntityOtherPlayerMP import net.minecraft.util.math.BlockPos @@ -20,8 +20,8 @@ import net.minecraftforge.fml.common.gameevent.TickEvent object LogoutLogger : Module( name = "LogoutLogger", - category = Category.MISC, - description = "Logs when a player leaves the game" + description = "Logs when a player leaves the game", + category = Category.MISC ) { private val saveWaypoint by setting("Save Waypoint", true) private val print by setting("Print To Chat", true) diff --git a/src/main/kotlin/com/lambda/client/module/modules/misc/MidClickFriends.kt b/src/main/kotlin/com/lambda/client/module/modules/misc/MidClickFriends.kt index 50c58c360..9a8aa3dcb 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/misc/MidClickFriends.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/misc/MidClickFriends.kt @@ -15,8 +15,8 @@ import org.lwjgl.input.Mouse object MidClickFriends : Module( name = "MidClickFriends", + description = "Logs when a player leaves the game", category = Category.MISC, - description = "Middle click players to friend or unfriend them", showOnArray = false ) { private val timer = TickTimer() diff --git a/src/main/kotlin/com/lambda/client/module/modules/misc/MountBypass.kt b/src/main/kotlin/com/lambda/client/module/modules/misc/MountBypass.kt index 4cf4b133d..878ae49e3 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/misc/MountBypass.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/misc/MountBypass.kt @@ -9,8 +9,8 @@ import net.minecraft.network.play.client.CPacketUseEntity object MountBypass : Module( name = "MountBypass", - category = Category.MISC, - description = "Might allow you to mount chested animals on servers that block it" + description = "Might allow you to mount chested animals on servers that block it", + category = Category.MISC ) { init { safeListener { diff --git a/src/main/kotlin/com/lambda/client/module/modules/misc/NoSoundLag.kt b/src/main/kotlin/com/lambda/client/module/modules/misc/NoSoundLag.kt index e3ff5c0b6..72acc09ad 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/misc/NoSoundLag.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/misc/NoSoundLag.kt @@ -1,17 +1,17 @@ package com.lambda.client.module.modules.misc import com.lambda.client.event.events.PacketEvent +import com.lambda.client.event.listener.listener import com.lambda.client.module.Category import com.lambda.client.module.Module -import com.lambda.client.event.listener.listener import net.minecraft.init.SoundEvents import net.minecraft.network.play.server.SPacketSoundEffect import net.minecraft.util.SoundCategory object NoSoundLag : Module( name = "NoSoundLag", - category = Category.MISC, - description = "Prevents lag caused by sound machines" + description = "Prevents lag caused by sound machines", + category = Category.MISC ) { init { listener { diff --git a/src/main/kotlin/com/lambda/client/module/modules/misc/NoteBot.kt b/src/main/kotlin/com/lambda/client/module/modules/misc/NoteBot.kt index 83e3ae3b9..8fbb4c959 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/misc/NoteBot.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/misc/NoteBot.kt @@ -3,18 +3,18 @@ package com.lambda.client.module.modules.misc import com.lambda.client.event.SafeClientEvent import com.lambda.client.event.events.PacketEvent import com.lambda.client.event.events.RenderWorldEvent +import com.lambda.client.event.listener.listener import com.lambda.client.module.Category import com.lambda.client.module.Module +import com.lambda.client.util.FolderUtils import com.lambda.client.util.TickTimer import com.lambda.client.util.TimeUnit -import com.lambda.client.util.FolderUtils import com.lambda.client.util.text.MessageSendHelper import com.lambda.client.util.threads.defaultScope import com.lambda.client.util.threads.runSafe import com.lambda.client.util.threads.runSafeR import com.lambda.client.util.threads.safeListener import com.lambda.client.util.world.getMiningSide -import com.lambda.client.event.listener.listener import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import net.minecraft.init.Blocks @@ -41,10 +41,9 @@ import kotlin.math.roundToInt object NoteBot : Module( name = "NoteBot", - category = Category.MISC, - description = "Plays music with note blocks; put .mid or .nbs songs in .minecraft/lambda/songs" + description = "Plays music with note blocks; put .mid or .nbs songs in .minecraft/lambda/songs", + category = Category.MISC ) { - private val togglePlay = setting("Toggle Play", false) private val reloadSong = setting("Reload Song", false) private val songName by setting("Song Name", "Unchanged") diff --git a/src/main/kotlin/com/lambda/client/module/modules/misc/PingSpoof.kt b/src/main/kotlin/com/lambda/client/module/modules/misc/PingSpoof.kt index 44d964199..4d4b24ccf 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/misc/PingSpoof.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/misc/PingSpoof.kt @@ -13,8 +13,8 @@ import net.minecraft.network.play.server.SPacketKeepAlive object PingSpoof : Module( name = "PingSpoof", - category = Category.MISC, - description = "Cancels or adds delay to your ping packets" + description = "Cancels or adds delay to your ping packets", + category = Category.MISC ) { private val delay by setting("Delay", 100, 0..2000, 25) diff --git a/src/main/kotlin/com/lambda/client/module/modules/misc/StashLogger.kt b/src/main/kotlin/com/lambda/client/module/modules/misc/StashLogger.kt index a0cf4ad7f..56fa4ed60 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/misc/StashLogger.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/misc/StashLogger.kt @@ -25,8 +25,8 @@ import kotlin.math.roundToInt object StashLogger : Module( name = "StashLogger", - category = Category.MISC, - description = "Logs storage units in render distance." + description = "Logs storage units in render distance", + category = Category.MISC ) { private val saveToWaypoints by setting("Save To Waypoints", true) private val logToChat by setting("Log To Chat", true) diff --git a/src/main/kotlin/com/lambda/client/module/modules/misc/TeleportLogger.kt b/src/main/kotlin/com/lambda/client/module/modules/misc/TeleportLogger.kt index 98aa7052f..add523c75 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/misc/TeleportLogger.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/misc/TeleportLogger.kt @@ -12,8 +12,8 @@ import net.minecraftforge.fml.common.gameevent.TickEvent object TeleportLogger : Module( name = "TeleportLogger", - category = Category.MISC, - description = "Logs when a player teleports somewhere" + description = "Logs when a player teleports somewhere", + category = Category.MISC ) { private val saveToWaypoints by setting("Save To Waypoints", true) private val remove by setting("Remove In Range", true) diff --git a/src/main/kotlin/com/lambda/client/module/modules/movement/AntiHunger.kt b/src/main/kotlin/com/lambda/client/module/modules/movement/AntiHunger.kt index 0a93097f9..bbca6e3be 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/movement/AntiHunger.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/movement/AntiHunger.kt @@ -14,8 +14,8 @@ import net.minecraft.network.play.client.CPacketPlayer */ object AntiHunger : Module( name = "AntiHunger", - category = Category.MOVEMENT, - description = "Reduces hunger lost when moving around" + description = "Reduces hunger lost when moving around", + category = Category.MOVEMENT ) { private val cancelMovementState by setting("Cancel Movement State", true) diff --git a/src/main/kotlin/com/lambda/client/module/modules/movement/AutoJump.kt b/src/main/kotlin/com/lambda/client/module/modules/movement/AutoJump.kt index af74d8f0b..7797363bd 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/movement/AutoJump.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/movement/AutoJump.kt @@ -9,8 +9,8 @@ import net.minecraftforge.fml.common.gameevent.TickEvent object AutoJump : Module( name = "AutoJump", - category = Category.MOVEMENT, - description = "Automatically jumps if possible" + description = "Automatically jumps if possible", + category = Category.MOVEMENT ) { private val delay by setting("Tick Delay", 10, 0..40, 1) diff --git a/src/main/kotlin/com/lambda/client/module/modules/movement/AutoWalk.kt b/src/main/kotlin/com/lambda/client/module/modules/movement/AutoWalk.kt index 9051e5607..4c567eff2 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/movement/AutoWalk.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/movement/AutoWalk.kt @@ -1,9 +1,12 @@ package com.lambda.client.module.modules.movement import baritone.api.pathing.goals.GoalXZ +import com.lambda.client.commons.extension.floorToInt +import com.lambda.client.commons.interfaces.DisplayEnum import com.lambda.client.event.SafeClientEvent import com.lambda.client.event.events.BaritoneCommandEvent import com.lambda.client.event.events.ConnectionEvent +import com.lambda.client.event.listener.listener import com.lambda.client.module.Category import com.lambda.client.module.Module import com.lambda.client.module.modules.player.LagNotifier @@ -14,17 +17,14 @@ import com.lambda.client.util.math.Direction import com.lambda.client.util.text.MessageSendHelper import com.lambda.client.util.threads.runSafe import com.lambda.client.util.threads.safeListener -import com.lambda.client.commons.extension.floorToInt -import com.lambda.client.commons.interfaces.DisplayEnum -import com.lambda.client.event.listener.listener import net.minecraft.util.MovementInputFromOptions import net.minecraftforge.client.event.InputUpdateEvent import net.minecraftforge.fml.common.gameevent.TickEvent object AutoWalk : Module( name = "AutoWalk", - category = Category.MOVEMENT, - description = "Automatically walks somewhere" + description = "Automatically walks somewhere", + category = Category.MOVEMENT ) { private val mode = setting("Direction", AutoWalkMode.BARITONE) private val disableOnDisconnect by setting("Disable On Disconnect", true) diff --git a/src/main/kotlin/com/lambda/client/module/modules/movement/Avoid.kt b/src/main/kotlin/com/lambda/client/module/modules/movement/Avoid.kt index 5f664bc7f..21a3ed55e 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/movement/Avoid.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/movement/Avoid.kt @@ -5,8 +5,8 @@ import com.lambda.client.module.Module object Avoid : Module( name = "Avoid", - category = Category.MOVEMENT, - description = "Prevents contact with certain objects" + description = "Prevents contact with certain objects", + category = Category.MOVEMENT ) { val fire by setting("Fire", true) val cactus by setting("Cactus", true) diff --git a/src/main/kotlin/com/lambda/client/module/modules/movement/BoatFly.kt b/src/main/kotlin/com/lambda/client/module/modules/movement/BoatFly.kt index 7bef34b5b..411c2a233 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/movement/BoatFly.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/movement/BoatFly.kt @@ -24,8 +24,8 @@ import net.minecraft.util.math.Vec3d object BoatFly : Module( name = "BoatFly", - category = Category.MOVEMENT, - description = "Fly using boats" + description = "Fly using boats", + category = Category.MOVEMENT ) { private val speed by setting("Speed", 1.0f, 0.1f..50.0f, 0.1f) private val upSpeed by setting("Up Speed", 1.0f, 0.0f..10.0f, 0.1f) diff --git a/src/main/kotlin/com/lambda/client/module/modules/movement/ElytraReplace.kt b/src/main/kotlin/com/lambda/client/module/modules/movement/ElytraReplace.kt index 2ec3d34f4..328fc905a 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/movement/ElytraReplace.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/movement/ElytraReplace.kt @@ -17,7 +17,7 @@ import net.minecraftforge.fml.common.gameevent.TickEvent object ElytraReplace : Module( name = "ElytraReplace", - description = "Automatically swap and replace your chestplate and elytra.", + description = "Automatically swap and replace your chestplate and elytra", category = Category.MOVEMENT ) { private val inventoryMode by setting("Inventory", false) diff --git a/src/main/kotlin/com/lambda/client/module/modules/movement/EntitySpeed.kt b/src/main/kotlin/com/lambda/client/module/modules/movement/EntitySpeed.kt index 77fa7a0b8..449814a69 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/movement/EntitySpeed.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/movement/EntitySpeed.kt @@ -11,8 +11,8 @@ import net.minecraft.entity.passive.EntityPig object EntitySpeed : Module( name = "EntitySpeed", - category = Category.MOVEMENT, - description = "Abuse client-sided movement to shape sound barrier breaking rideables" + description = "Abuse client-sided movement to shape sound barrier breaking rideables", + category = Category.MOVEMENT ) { private val boatSpeed by setting("Boat Speed", 1.4f, 0.1f..10.0f, 0.05f) private val abstractHorseSpeed by setting("Horse Types Speed", 0.7f, 0.1f..10.0f, 0.05f) diff --git a/src/main/kotlin/com/lambda/client/module/modules/movement/FastFall.kt b/src/main/kotlin/com/lambda/client/module/modules/movement/FastFall.kt index 1e82ac8e6..eef749359 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/movement/FastFall.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/movement/FastFall.kt @@ -10,8 +10,8 @@ import net.minecraftforge.fml.common.gameevent.TickEvent object FastFall : Module( name = "FastFall", - category = Category.MOVEMENT, description = "Makes you fall faster", + category = Category.MOVEMENT, modulePriority = 50 ) { private val mode by setting("Mode", Mode.MOTION) diff --git a/src/main/kotlin/com/lambda/client/module/modules/movement/Flight.kt b/src/main/kotlin/com/lambda/client/module/modules/movement/Flight.kt index 50b3cdc87..3078cd9a9 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/movement/Flight.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/movement/Flight.kt @@ -4,6 +4,7 @@ import com.lambda.client.event.Phase import com.lambda.client.event.events.OnUpdateWalkingPlayerEvent import com.lambda.client.event.events.PacketEvent import com.lambda.client.event.events.PlayerTravelEvent +import com.lambda.client.event.listener.listener import com.lambda.client.manager.managers.PlayerPacketManager.sendPlayerPacket import com.lambda.client.module.Category import com.lambda.client.module.Module @@ -11,7 +12,6 @@ import com.lambda.client.util.MovementUtils import com.lambda.client.util.MovementUtils.calcMoveYaw import com.lambda.client.util.threads.runSafe import com.lambda.client.util.threads.safeListener -import com.lambda.client.event.listener.listener import net.minecraft.network.play.client.CPacketPlayer import net.minecraft.network.play.server.SPacketCloseWindow import kotlin.math.cos @@ -19,8 +19,8 @@ import kotlin.math.sin object Flight : Module( name = "Flight", - category = Category.MOVEMENT, description = "Makes the player fly", + category = Category.MOVEMENT, modulePriority = 500 ) { private val mode by setting("Mode", FlightMode.VANILLA) diff --git a/src/main/kotlin/com/lambda/client/module/modules/movement/NoSlowDown.kt b/src/main/kotlin/com/lambda/client/module/modules/movement/NoSlowDown.kt index 1ba1e3266..db72e04df 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/movement/NoSlowDown.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/movement/NoSlowDown.kt @@ -2,12 +2,12 @@ package com.lambda.client.module.modules.movement import com.lambda.client.event.SafeClientEvent import com.lambda.client.event.events.PacketEvent -import com.lambda.mixin.world.MixinBlockSoulSand -import com.lambda.mixin.world.MixinBlockWeb import com.lambda.client.module.Category import com.lambda.client.module.Module import com.lambda.client.util.EntityUtils.flooredPosition import com.lambda.client.util.threads.safeListener +import com.lambda.mixin.world.MixinBlockSoulSand +import com.lambda.mixin.world.MixinBlockWeb import net.minecraft.init.Blocks import net.minecraft.item.* import net.minecraft.network.play.client.CPacketPlayer @@ -23,8 +23,8 @@ import net.minecraftforge.fml.common.gameevent.TickEvent */ object NoSlowDown : Module( name = "NoSlowDown", - category = Category.MOVEMENT, - description = "Prevents being slowed down when using an item or going through cobwebs" + description = "Prevents being slowed down when using an item or going through cobwebs", + category = Category.MOVEMENT ) { private val ncpStrict by setting("NCP Strict", true) private val sneak by setting("Sneak", false) diff --git a/src/main/kotlin/com/lambda/client/module/modules/movement/SafeWalk.kt b/src/main/kotlin/com/lambda/client/module/modules/movement/SafeWalk.kt index 12aa7d8ca..1a7797cf9 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/movement/SafeWalk.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/movement/SafeWalk.kt @@ -16,8 +16,8 @@ import com.lambda.client.util.threads.runSafeR */ object SafeWalk : Module( name = "SafeWalk", - category = Category.MOVEMENT, - description = "Keeps you from walking off edges" + description = "Keeps you from walking off edges", + category = Category.MOVEMENT ) { private val checkFallDist by setting("Check Fall Distance", true, description = "Check fall distance from edge") diff --git a/src/main/kotlin/com/lambda/client/module/modules/movement/Speed.kt b/src/main/kotlin/com/lambda/client/module/modules/movement/Speed.kt index 403923ac5..f7eafbe68 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/movement/Speed.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/movement/Speed.kt @@ -30,7 +30,7 @@ import kotlin.math.sin object Speed : Module( name = "Speed", - description = "Air control and onGround speed", + description = "Move faster", category = Category.MOVEMENT, modulePriority = 100 ) { diff --git a/src/main/kotlin/com/lambda/client/module/modules/movement/Velocity.kt b/src/main/kotlin/com/lambda/client/module/modules/movement/Velocity.kt index 8cf154162..2c77f4973 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/movement/Velocity.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/movement/Velocity.kt @@ -22,9 +22,9 @@ import kotlin.math.sqrt */ object Velocity : Module( name = "Velocity", - alias = arrayOf("Knockback", "AntiKnockBack", "NoPush"), - category = Category.MOVEMENT, description = "Modify player knockback by altering velocity", + category = Category.MOVEMENT, + alias = arrayOf("Knockback", "AntiKnockBack", "NoPush") ) { private val horizontal by setting("Horizontal", 0f, -5f..5f, 0.05f) private val vertical by setting("Vertical", 0f, -5f..5f, 0.05f) diff --git a/src/main/kotlin/com/lambda/client/module/modules/player/AntiForceLook.kt b/src/main/kotlin/com/lambda/client/module/modules/player/AntiForceLook.kt index 0cb058da7..15447139b 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/player/AntiForceLook.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/player/AntiForceLook.kt @@ -10,8 +10,8 @@ import net.minecraft.network.play.server.SPacketPlayerPosLook object AntiForceLook : Module( name = "AntiForceLook", - category = Category.PLAYER, - description = "Stops server packets from turning your head" + description = "Stops server packets from turning your head", + category = Category.PLAYER ) { init { safeListener { diff --git a/src/main/kotlin/com/lambda/client/module/modules/player/Blink.kt b/src/main/kotlin/com/lambda/client/module/modules/player/Blink.kt index dea7b8737..bf04b7eda 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/player/Blink.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/player/Blink.kt @@ -3,6 +3,7 @@ package com.lambda.client.module.modules.player import com.lambda.client.event.SafeClientEvent import com.lambda.client.event.events.ConnectionEvent import com.lambda.client.event.events.PacketEvent +import com.lambda.client.event.listener.listener import com.lambda.client.mixin.extension.playerX import com.lambda.client.mixin.extension.playerY import com.lambda.client.mixin.extension.playerZ @@ -10,7 +11,6 @@ import com.lambda.client.module.Category import com.lambda.client.module.Module import com.lambda.client.util.threads.runSafe import com.lambda.client.util.threads.safeListener -import com.lambda.client.event.listener.listener import net.minecraft.client.entity.EntityOtherPlayerMP import net.minecraft.network.play.client.CPacketPlayer import net.minecraftforge.fml.common.gameevent.TickEvent @@ -18,8 +18,8 @@ import java.util.* object Blink : Module( name = "Blink", - category = Category.PLAYER, - description = "Cancels server side packets" + description = "Cancels server side packets", + category = Category.PLAYER ) { private val cancelPacket by setting("Cancel Packets", false) private val autoReset by setting("Auto Reset", true) diff --git a/src/main/kotlin/com/lambda/client/module/modules/player/BlockInteraction.kt b/src/main/kotlin/com/lambda/client/module/modules/player/BlockInteraction.kt index 1d1bedb90..cad042bfa 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/player/BlockInteraction.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/player/BlockInteraction.kt @@ -1,10 +1,10 @@ package com.lambda.client.module.modules.player +import com.lambda.client.module.Category +import com.lambda.client.module.Module import com.lambda.mixin.MixinMinecraft import com.lambda.mixin.render.MixinEntityRenderer import com.lambda.mixin.world.MixinBlockLiquid -import com.lambda.client.module.Category -import com.lambda.client.module.Module import net.minecraft.item.ItemBlock import net.minecraft.item.ItemPickaxe import net.minecraft.util.math.RayTraceResult @@ -16,9 +16,9 @@ import net.minecraft.util.math.RayTraceResult */ object BlockInteraction : Module( name = "BlockInteraction", - alias = arrayOf("LiquidInteract", "MultiTask", "NoEntityTrace", "NoMiningTrace"), + description = "Modifies block interaction", category = Category.PLAYER, - description = "Modifies block interaction" + alias = arrayOf("LiquidInteract", "MultiTask", "NoEntityTrace", "NoMiningTrace") ) { private val liquidInteract by setting("Liquid Interact", false, description = "Place block on liquid") private val multiTask by setting("Multi Task", true, description = "Breaks block and uses item at the same time") diff --git a/src/main/kotlin/com/lambda/client/module/modules/player/ChestStealer.kt b/src/main/kotlin/com/lambda/client/module/modules/player/ChestStealer.kt index 7de2f4b57..392e28e49 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/player/ChestStealer.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/player/ChestStealer.kt @@ -18,8 +18,8 @@ import net.minecraftforge.fml.common.gameevent.TickEvent object ChestStealer : Module( name = "ChestStealer", - category = Category.PLAYER, - description = "Automatically steal or store items from containers" + description = "Automatically steal or store items from containers", + category = Category.PLAYER ) { val mode by setting("Mode", Mode.TOGGLE) private val movingMode by setting("Moving Mode", MovingMode.QUICK_MOVE) diff --git a/src/main/kotlin/com/lambda/client/module/modules/player/FastBreak.kt b/src/main/kotlin/com/lambda/client/module/modules/player/FastBreak.kt index d516391e1..ba3b27025 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/player/FastBreak.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/player/FastBreak.kt @@ -16,8 +16,8 @@ import net.minecraftforge.fml.common.gameevent.TickEvent object FastBreak : Module( name = "FastBreak", - category = Category.PLAYER, - description = "Breaks block faster and nullifies the break delay" + description = "Breaks block faster and nullifies the break delay", + category = Category.PLAYER ) { private val breakDelay by setting("Break Delay", 0, 0..5, 1) private val packetMine by setting("Packet Mine", true) diff --git a/src/main/kotlin/com/lambda/client/module/modules/player/FastUse.kt b/src/main/kotlin/com/lambda/client/module/modules/player/FastUse.kt index dd2ef92c9..431c6dafe 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/player/FastUse.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/player/FastUse.kt @@ -1,11 +1,11 @@ package com.lambda.client.module.modules.player import com.lambda.client.event.events.PacketEvent +import com.lambda.client.event.listener.listener import com.lambda.client.mixin.extension.rightClickDelayTimer import com.lambda.client.module.Category import com.lambda.client.module.Module import com.lambda.client.util.threads.safeListener -import com.lambda.client.event.listener.listener import net.minecraft.init.Items import net.minecraft.item.* import net.minecraft.network.play.client.CPacketPlayerDigging @@ -20,8 +20,8 @@ import net.minecraftforge.fml.common.gameevent.TickEvent */ object FastUse : Module( name = "FastUse", - category = Category.PLAYER, - description = "Use items faster" + description = "Use items faster", + category = Category.PLAYER ) { private val delay by setting("Delay", 0, 0..10, 1) private val blocks by setting("Blocks", false) diff --git a/src/main/kotlin/com/lambda/client/module/modules/player/Freecam.kt b/src/main/kotlin/com/lambda/client/module/modules/player/Freecam.kt index 6aede2466..7c4c128ce 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/player/Freecam.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/player/Freecam.kt @@ -1,10 +1,14 @@ package com.lambda.client.module.modules.player import baritone.api.pathing.goals.GoalTwoBlocks +import com.lambda.client.commons.extension.floorToInt +import com.lambda.client.commons.extension.toRadian +import com.lambda.client.commons.interfaces.DisplayEnum import com.lambda.client.event.SafeClientEvent import com.lambda.client.event.events.ConnectionEvent import com.lambda.client.event.events.PacketEvent import com.lambda.client.event.events.PlayerAttackEvent +import com.lambda.client.event.listener.listener import com.lambda.client.module.Category import com.lambda.client.module.Module import com.lambda.client.util.BaritoneUtils @@ -18,10 +22,6 @@ import com.lambda.client.util.math.RotationUtils.getRotationTo import com.lambda.client.util.threads.onMainThreadSafe import com.lambda.client.util.threads.runSafeR import com.lambda.client.util.threads.safeListener -import com.lambda.client.commons.extension.floorToInt -import com.lambda.client.commons.extension.toRadian -import com.lambda.client.commons.interfaces.DisplayEnum -import com.lambda.client.event.listener.listener import kotlinx.coroutines.runBlocking import net.minecraft.client.entity.EntityOtherPlayerMP import net.minecraft.client.entity.EntityPlayerSP @@ -48,8 +48,8 @@ import kotlin.math.sin object Freecam : Module( name = "Freecam", - category = Category.PLAYER, - description = "Leave your body and transcend into the realm of the gods" + description = "Leave your body and transcend into the realm of the gods", + category = Category.PLAYER ) { private val directionMode by setting("Flight Mode", FlightMode.CREATIVE) private val horizontalSpeed by setting("Horizontal Speed", 20.0f, 1.0f..50.0f, 1f) diff --git a/src/main/kotlin/com/lambda/client/module/modules/player/InventoryManager.kt b/src/main/kotlin/com/lambda/client/module/modules/player/InventoryManager.kt index 8eb2c432d..78b2480b6 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/player/InventoryManager.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/player/InventoryManager.kt @@ -1,5 +1,6 @@ package com.lambda.client.module.modules.player +import com.lambda.client.commons.extension.ceilToInt import com.lambda.client.event.SafeClientEvent import com.lambda.client.event.events.PlayerTravelEvent import com.lambda.client.mixin.extension.syncCurrentPlayItem @@ -12,7 +13,6 @@ import com.lambda.client.util.TickTimer import com.lambda.client.util.TimeUnit import com.lambda.client.util.items.* import com.lambda.client.util.threads.safeListener -import com.lambda.client.commons.extension.ceilToInt import net.minecraft.client.gui.inventory.GuiContainer import net.minecraft.inventory.Slot import net.minecraft.item.ItemStack @@ -20,8 +20,8 @@ import net.minecraftforge.fml.common.gameevent.TickEvent object InventoryManager : Module( name = "InventoryManager", - category = Category.PLAYER, - description = "Manages your inventory automatically" + description = "Manages your inventory automatically", + category = Category.PLAYER ) { private val defaultEjectList = linkedSetOf( "minecraft:grass", diff --git a/src/main/kotlin/com/lambda/client/module/modules/player/NoBreakAnimation.kt b/src/main/kotlin/com/lambda/client/module/modules/player/NoBreakAnimation.kt index 264e4c04b..c90189f3d 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/player/NoBreakAnimation.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/player/NoBreakAnimation.kt @@ -14,8 +14,8 @@ import net.minecraftforge.fml.common.gameevent.TickEvent object NoBreakAnimation : Module( name = "NoBreakAnimation", - category = Category.PLAYER, - description = "Prevents block break animation server side" + description = "Prevents block break animation server side", + category = Category.PLAYER ) { private var isMining = false private var lastPos: BlockPos? = null diff --git a/src/main/kotlin/com/lambda/client/module/modules/player/NoFall.kt b/src/main/kotlin/com/lambda/client/module/modules/player/NoFall.kt index 0b281466c..d2debd413 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/player/NoFall.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/player/NoFall.kt @@ -23,8 +23,8 @@ import net.minecraftforge.fml.common.gameevent.TickEvent object NoFall : Module( name = "NoFall", - category = Category.PLAYER, - description = "Prevents fall damage" + description = "Prevents fall damage", + category = Category.PLAYER ) { private val distance by setting("Distance", 3, 1..10, 1) private val mode by setting("Mode", Mode.CATCH) diff --git a/src/main/kotlin/com/lambda/client/module/modules/player/NoPacketKick.kt b/src/main/kotlin/com/lambda/client/module/modules/player/NoPacketKick.kt index d9f667a97..e76283d32 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/player/NoPacketKick.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/player/NoPacketKick.kt @@ -1,17 +1,17 @@ package com.lambda.client.module.modules.player -import com.lambda.mixin.network.MixinNetworkManager import com.lambda.client.module.Category import com.lambda.client.module.Module import com.lambda.client.util.text.MessageSendHelper.sendWarningMessage +import com.lambda.mixin.network.MixinNetworkManager /** * @see MixinNetworkManager */ object NoPacketKick : Module( name = "NoPacketKick", - category = Category.PLAYER, description = "Suppress network exceptions and prevent getting kicked", + category = Category.PLAYER, showOnArray = false, enabledByDefault = true ) { diff --git a/src/main/kotlin/com/lambda/client/module/modules/player/NoSwing.kt b/src/main/kotlin/com/lambda/client/module/modules/player/NoSwing.kt index 8d2a1f2e9..37208a2ed 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/player/NoSwing.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/player/NoSwing.kt @@ -1,17 +1,17 @@ package com.lambda.client.module.modules.player import com.lambda.client.event.events.PacketEvent +import com.lambda.client.event.listener.listener import com.lambda.client.module.Category import com.lambda.client.module.Module import com.lambda.client.util.threads.safeListener -import com.lambda.client.event.listener.listener import net.minecraft.network.play.client.CPacketAnimation import net.minecraftforge.fml.common.gameevent.TickEvent object NoSwing : Module( name = "NoSwing", - category = Category.PLAYER, - description = "Cancels server or client swing animation" + description = "Cancels server or client swing animation", + category = Category.PLAYER ) { private val mode by setting("Mode", Mode.CLIENT) diff --git a/src/main/kotlin/com/lambda/client/module/modules/player/PacketLimiter.kt b/src/main/kotlin/com/lambda/client/module/modules/player/PacketLimiter.kt index fdcecdb56..18684a237 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/player/PacketLimiter.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/player/PacketLimiter.kt @@ -2,19 +2,19 @@ package com.lambda.client.module.modules.player import com.lambda.client.event.events.ConnectionEvent import com.lambda.client.event.events.PacketEvent +import com.lambda.client.event.listener.listener import com.lambda.client.manager.managers.TimerManager.modifyTimer import com.lambda.client.manager.managers.TimerManager.resetTimer import com.lambda.client.module.Category import com.lambda.client.module.Module -import com.lambda.client.event.listener.listener import net.minecraft.network.play.client.CPacketPlayer import net.minecraftforge.fml.common.gameevent.TickEvent import kotlin.math.min object PacketLimiter : Module( name = "PacketLimiter", - category = Category.PLAYER, description = "Adjust timer automatically to ensure not sending too many movement packets", + category = Category.PLAYER, modulePriority = 1000 ) { private val maxPacketsLong by setting("Max Packets Long", 22.0f, 10.0f..40.0f, 0.25f, diff --git a/src/main/kotlin/com/lambda/client/module/modules/player/PacketLogger.kt b/src/main/kotlin/com/lambda/client/module/modules/player/PacketLogger.kt index c3208e7a5..7276ffb5d 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/player/PacketLogger.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/player/PacketLogger.kt @@ -30,7 +30,7 @@ import java.time.format.DateTimeFormatter object PacketLogger : Module( name = "PacketLogger", - description = "Logs sent packets to a file", + description = "Logs sent packets to a file or chat", category = Category.PLAYER ) { private val showClientTicks by setting("Show Client Ticks", true, description = "Show timestamps of client ticks.") diff --git a/src/main/kotlin/com/lambda/client/module/modules/player/PortalGodMode.kt b/src/main/kotlin/com/lambda/client/module/modules/player/PortalGodMode.kt index ed537e114..e0d51a11b 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/player/PortalGodMode.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/player/PortalGodMode.kt @@ -9,8 +9,8 @@ import net.minecraft.network.play.client.CPacketConfirmTeleport object PortalGodMode : Module( name = "PortalGodMode", - category = Category.PLAYER, - description = "Don't take damage in portals" + description = "Don't take damage in portals", + category = Category.PLAYER ) { private val instantTeleport by setting("Instant Teleport", true) diff --git a/src/main/kotlin/com/lambda/client/module/modules/player/Scaffold.kt b/src/main/kotlin/com/lambda/client/module/modules/player/Scaffold.kt index cb09471a9..ad9ed31f3 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/player/Scaffold.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/player/Scaffold.kt @@ -43,8 +43,8 @@ import kotlin.math.roundToInt */ object Scaffold : Module( name = "Scaffold", - category = Category.PLAYER, description = "Places blocks under you", + category = Category.PLAYER, modulePriority = 500 ) { private val tower by setting("Tower", true) diff --git a/src/main/kotlin/com/lambda/client/module/modules/player/Timer.kt b/src/main/kotlin/com/lambda/client/module/modules/player/Timer.kt index e00a7484b..2e75079c7 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/player/Timer.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/player/Timer.kt @@ -9,8 +9,8 @@ import net.minecraftforge.fml.common.gameevent.TickEvent object Timer : Module( name = "Timer", - category = Category.PLAYER, description = "Changes your client tick speed", + category = Category.PLAYER, modulePriority = 500 ) { private val slow by setting("Slow Mode", false) diff --git a/src/main/kotlin/com/lambda/client/module/modules/player/ViewLock.kt b/src/main/kotlin/com/lambda/client/module/modules/player/ViewLock.kt index 6863e40d0..474521438 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/player/ViewLock.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/player/ViewLock.kt @@ -14,9 +14,9 @@ import kotlin.math.sign object ViewLock : Module( name = "ViewLock", - alias = arrayOf("YawLock", "PitchLock"), + description = "Locks your camera view", category = Category.PLAYER, - description = "Locks your camera view" + alias = arrayOf("YawLock", "PitchLock") ) { private val page by setting("Page", Page.YAW) diff --git a/src/main/kotlin/com/lambda/client/module/modules/player/XCarry.kt b/src/main/kotlin/com/lambda/client/module/modules/player/XCarry.kt index 3bfb4bda8..b2061eefc 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/player/XCarry.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/player/XCarry.kt @@ -9,8 +9,8 @@ import net.minecraft.network.play.client.CPacketCloseWindow object XCarry : Module( name = "XCarry", - category = Category.PLAYER, - description = "Store items in crafting slots" + description = "Store items in crafting slots", + category = Category.PLAYER ) { init { listener { diff --git a/src/main/kotlin/com/lambda/client/module/modules/render/CameraClip.kt b/src/main/kotlin/com/lambda/client/module/modules/render/CameraClip.kt index 5b2320d79..89802ae29 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/render/CameraClip.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/render/CameraClip.kt @@ -1,16 +1,16 @@ package com.lambda.client.module.modules.render -import com.lambda.mixin.render.MixinEntityRenderer import com.lambda.client.module.Category import com.lambda.client.module.Module +import com.lambda.mixin.render.MixinEntityRenderer /** * @see MixinEntityRenderer.orientCameraStoreRayTraceBlocks */ object CameraClip : Module( name = "CameraClip", - category = Category.RENDER, description = "Allows your 3rd person camera to pass through blocks", + category = Category.RENDER, showOnArray = false ) { val distance by setting("Distance", 4.0, 1.0..10.0, 0.1, description = "Distance to player") diff --git a/src/main/kotlin/com/lambda/client/module/modules/render/Chams.kt b/src/main/kotlin/com/lambda/client/module/modules/render/Chams.kt index f3107be24..f9d13b33f 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/render/Chams.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/render/Chams.kt @@ -25,8 +25,8 @@ import org.lwjgl.opengl.GL11.* object Chams : Module( name = "Chams", - category = Category.RENDER, - description = "Modify entity rendering" + description = "Modify entity rendering", + category = Category.RENDER ) { private val page by setting("Page", Page.ENTITY_TYPE) diff --git a/src/main/kotlin/com/lambda/client/module/modules/render/ContainerPreview.kt b/src/main/kotlin/com/lambda/client/module/modules/render/ContainerPreview.kt index d15d12514..53ac4006d 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/render/ContainerPreview.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/render/ContainerPreview.kt @@ -1,5 +1,6 @@ package com.lambda.client.module.modules.render +import com.lambda.client.commons.extension.ceilToInt import com.lambda.client.module.Category import com.lambda.client.module.Module import com.lambda.client.util.color.ColorHolder @@ -9,7 +10,6 @@ import com.lambda.client.util.graphics.VertexHelper import com.lambda.client.util.graphics.font.FontRenderAdapter import com.lambda.client.util.items.block import com.lambda.client.util.math.Vec2d -import com.lambda.client.commons.extension.ceilToInt import net.minecraft.client.renderer.GlStateManager import net.minecraft.init.Blocks import net.minecraft.inventory.IInventory @@ -22,8 +22,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo object ContainerPreview : Module( name = "ContainerPreview", - category = Category.RENDER, - description = "Previews shulkers and ender chests in the game GUI" + description = "Previews shulkers and ender chests in the game GUI", + category = Category.RENDER ) { private val useCustomFont by setting("Use Custom Font", false) private val backgroundColor by setting("Background Color", ColorHolder(16, 0, 16, 255)) diff --git a/src/main/kotlin/com/lambda/client/module/modules/render/ESP.kt b/src/main/kotlin/com/lambda/client/module/modules/render/ESP.kt index 650814c4e..490620eac 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/render/ESP.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/render/ESP.kt @@ -4,6 +4,7 @@ import com.lambda.client.event.Phase import com.lambda.client.event.SafeClientEvent import com.lambda.client.event.events.RenderEntityEvent import com.lambda.client.event.events.RenderWorldEvent +import com.lambda.client.event.listener.listener import com.lambda.client.mixin.extension.* import com.lambda.client.module.Category import com.lambda.client.module.Module @@ -16,7 +17,6 @@ import com.lambda.client.util.graphics.LambdaTessellator import com.lambda.client.util.graphics.ShaderHelper import com.lambda.client.util.threads.runSafe import com.lambda.client.util.threads.safeListener -import com.lambda.client.event.listener.listener import net.minecraft.client.renderer.GlStateManager import net.minecraft.client.shader.Shader import net.minecraft.entity.Entity @@ -32,8 +32,8 @@ import org.lwjgl.opengl.GL11.GL_PROJECTION object ESP : Module( name = "ESP", - category = Category.RENDER, - description = "Highlights entities" + description = "Highlights entities", + category = Category.RENDER ) { private val page by setting("Page", Page.ENTITY_TYPE) diff --git a/src/main/kotlin/com/lambda/client/module/modules/render/HungerOverlay.kt b/src/main/kotlin/com/lambda/client/module/modules/render/HungerOverlay.kt index 8bf8616fa..d6a873830 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/render/HungerOverlay.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/render/HungerOverlay.kt @@ -1,12 +1,12 @@ package com.lambda.client.module.modules.render +import com.lambda.client.commons.extension.ceilToInt import com.lambda.client.module.Category import com.lambda.client.module.Module import com.lambda.client.util.graphics.GlStateUtils import com.lambda.client.util.items.foodValue import com.lambda.client.util.items.saturation import com.lambda.client.util.threads.safeListener -import com.lambda.client.commons.extension.ceilToInt import net.minecraft.client.gui.Gui import net.minecraft.client.gui.ScaledResolution import net.minecraft.init.MobEffects @@ -21,7 +21,7 @@ import kotlin.math.min object HungerOverlay : Module( name = "HungerOverlay", - description = "Displays a helpful overlay over your hunger bar.", + description = "Displays a helpful overlay over your hunger bar", category = Category.RENDER ) { private val saturationOverlay by setting("Saturation Overlay", true) diff --git a/src/main/kotlin/com/lambda/client/module/modules/render/ItemModel.kt b/src/main/kotlin/com/lambda/client/module/modules/render/ItemModel.kt index 93cf0e8c6..61aba9f08 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/render/ItemModel.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/render/ItemModel.kt @@ -10,9 +10,9 @@ import net.minecraft.util.EnumHandSide object ItemModel : Module( name = "ItemModel", - alias = arrayOf("ViewModel", "SmallShield", "LowerOffhand"), description = "Modify hand item rendering in first person", - category = Category.RENDER + category = Category.RENDER, + alias = arrayOf("ViewModel", "SmallShield", "LowerOffhand") ) { private val mode by setting("Mode", Mode.BOTH) private val page by setting("Page", Page.POSITION) diff --git a/src/main/kotlin/com/lambda/client/module/modules/render/MapPreview.kt b/src/main/kotlin/com/lambda/client/module/modules/render/MapPreview.kt index 6b298146c..3c46ab8e8 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/render/MapPreview.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/render/MapPreview.kt @@ -1,6 +1,5 @@ package com.lambda.client.module.modules.render -import com.lambda.mixin.gui.MixinGuiScreen import com.lambda.client.module.Category import com.lambda.client.module.Module import com.lambda.client.module.modules.client.GuiColors @@ -11,6 +10,7 @@ import com.lambda.client.util.graphics.VertexHelper import com.lambda.client.util.graphics.font.FontRenderAdapter.getFontHeight import com.lambda.client.util.graphics.font.FontRenderAdapter.getStringWidth import com.lambda.client.util.math.Vec2d +import com.lambda.mixin.gui.MixinGuiScreen import net.minecraft.client.renderer.GlStateManager import net.minecraft.client.renderer.RenderHelper import net.minecraft.client.renderer.Tessellator @@ -26,8 +26,8 @@ import java.awt.Color */ object MapPreview : Module( name = "MapPreview", - category = Category.RENDER, - description = "Previews maps when hovering over them" + description = "Previews maps when hovering over them", + category = Category.RENDER ) { private val mapBackground = ResourceLocation("textures/map/map_background.png") diff --git a/src/main/kotlin/com/lambda/client/module/modules/render/NoRender.kt b/src/main/kotlin/com/lambda/client/module/modules/render/NoRender.kt index ab34d7d53..dc4cddbb1 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/render/NoRender.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/render/NoRender.kt @@ -3,11 +3,11 @@ package com.lambda.client.module.modules.render import com.lambda.client.event.Phase import com.lambda.client.event.events.PacketEvent import com.lambda.client.event.events.RenderEntityEvent +import com.lambda.client.event.listener.listener import com.lambda.client.module.Category import com.lambda.client.module.Module import com.lambda.client.util.threads.runSafe import com.lambda.client.util.threads.safeListener -import com.lambda.client.event.listener.listener import net.minecraft.block.BlockSnow import net.minecraft.client.entity.EntityOtherPlayerMP import net.minecraft.client.particle.Particle @@ -37,10 +37,9 @@ import org.lwjgl.opengl.GL11.GL_QUADS object NoRender : Module( name = "NoRender", - category = Category.RENDER, - description = "Ignore entity spawn packets" + description = "Ignore entity spawn packets", + category = Category.RENDER ) { - private val packets by setting("Cancel Packets", true) private val page by setting("Page", Page.OTHER) diff --git a/src/main/kotlin/com/lambda/client/module/modules/render/Trajectories.kt b/src/main/kotlin/com/lambda/client/module/modules/render/Trajectories.kt index a97a5235d..96edc86ba 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/render/Trajectories.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/render/Trajectories.kt @@ -31,8 +31,8 @@ import kotlin.math.sin object Trajectories : Module( name = "Trajectories", - category = Category.RENDER, - description = "Draws lines to where trajectories are going to fall" + description = "Draws lines to where trajectories are going to fall", + category = Category.RENDER ) { private val showEntity by setting("Show Entity", true) private val showBlock by setting("Show Block", false) diff --git a/src/main/kotlin/com/lambda/client/module/modules/render/WaypointRender.kt b/src/main/kotlin/com/lambda/client/module/modules/render/WaypointRender.kt index 78ab844b1..40771f1b0 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/render/WaypointRender.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/render/WaypointRender.kt @@ -30,7 +30,6 @@ object WaypointRender : Module( description = "Render saved waypoints", category = Category.RENDER ) { - private val renderMode by setting("Mode", RenderMode.BOTH) private val page by setting("Page", Page.INFO_BOX) diff --git a/src/main/kotlin/com/lambda/client/module/modules/render/Zoom.kt b/src/main/kotlin/com/lambda/client/module/modules/render/Zoom.kt index a73b24c9d..20ab0c7af 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/render/Zoom.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/render/Zoom.kt @@ -5,8 +5,8 @@ import com.lambda.client.module.Module object Zoom : Module( name = "Zoom", - category = Category.RENDER, description = "Configures FOV", + category = Category.RENDER, showOnArray = false ) { private var fov = 0f diff --git a/src/main/kotlin/com/lambda/client/plugin/PluginLoader.kt b/src/main/kotlin/com/lambda/client/plugin/PluginLoader.kt index 337e8c5e6..6381f2b80 100644 --- a/src/main/kotlin/com/lambda/client/plugin/PluginLoader.kt +++ b/src/main/kotlin/com/lambda/client/plugin/PluginLoader.kt @@ -26,7 +26,7 @@ class PluginLoader( init { // This will trigger the null checks in PluginInfo - // In order to make sure all required infos are present + // In order to make sure all required info is present info.toString() if (info.mixins.isNotEmpty()) {