Fixed #173, Various bug fixes and removed useless modules (#174)

* Removed AntiBot (why was this in an anarchy utility mod?)

* Added Outline option to clickGui, Added shadow option to customFont, removed customFont option from Nametags

* Added ElytraFix removed EndTeleport

* Clean up

Co-authored-by: Constructor <[email protected]>

Author: czho

src/main/kotlin/com/lambda/client/gui/hudgui/elements/world/TextRadar.kt

@@ -3,7 +3,6 @@ package com.lambda.client.gui.hudgui.elements.world
 import com.lambda.client.event.SafeClientEvent
 import com.lambda.client.gui.hudgui.LabelHud
 import com.lambda.client.manager.managers.FriendManager
-import com.lambda.client.module.modules.combat.AntiBot
 import com.lambda.client.util.AsyncCachedValue
 import com.lambda.client.util.color.ColorGradient
 import com.lambda.client.util.color.ColorHolder
@@ -47,7 +46,6 @@ internal object TextRadar : LabelHud(
             val list = world.playerEntities.toList().asSequence()
                 .filter { it != null && !it.isDead && it.health > 0.0f }
                 .filter { it != player && it != mc.renderViewEntity }
-                .filter { !AntiBot.isBot(it) }
                 .filter { friend || !FriendManager.isFriend(it.name) }
                 .map { it to player.getDistance(it) }
                 .filter { it.second <= range }

src/main/kotlin/com/lambda/client/gui/rgui/component/BindButton.kt

@@ -1,6 +1,7 @@
 package com.lambda.client.gui.rgui.component
 
 import com.lambda.client.module.modules.client.ClickGUI
+import com.lambda.client.module.modules.client.CustomFont
 import com.lambda.client.module.modules.client.GuiColors
 import com.lambda.client.setting.settings.impl.other.BindSetting
 import com.lambda.client.util.graphics.VertexHelper
@@ -42,6 +43,6 @@ class BindButton(
         protectedWidth = FontRenderAdapter.getStringWidth(valueText, 0.75f).toDouble()
         val posX = (renderWidth - protectedWidth - 2.0f).toFloat()
         val posY = renderHeight - 2.0f - FontRenderAdapter.getFontHeight(0.75f)
-        FontRenderAdapter.drawString(valueText, posX, posY, color = GuiColors.text, scale = 0.75f)
+        FontRenderAdapter.drawString(valueText, posX, posY, color = GuiColors.text, drawShadow = CustomFont.shadow, scale = 0.75f)
     }
 }

src/main/kotlin/com/lambda/client/gui/rgui/component/EnumSlider.kt

@@ -1,6 +1,7 @@
 package com.lambda.client.gui.rgui.component
 
 import com.lambda.client.module.modules.client.ClickGUI
+import com.lambda.client.module.modules.client.CustomFont
 import com.lambda.client.module.modules.client.GuiColors
 import com.lambda.client.setting.settings.impl.primitive.EnumSetting
 import com.lambda.client.util.graphics.VertexHelper
@@ -49,6 +50,6 @@ class EnumSlider(val setting: EnumSetting<*>) : Slider(setting.name, 0.0, settin
         super.onRender(vertexHelper, absolutePos)
         val posX = (renderWidth - protectedWidth - 2.0f).toFloat()
         val posY = renderHeight - 2.0f - FontRenderAdapter.getFontHeight(0.75f)
-        FontRenderAdapter.drawString(valueText, posX, posY, color = GuiColors.text, scale = 0.75f)
+        FontRenderAdapter.drawString(valueText, posX, posY, color = GuiColors.text, drawShadow = CustomFont.shadow, scale = 0.75f)
     }
 }

src/main/kotlin/com/lambda/client/gui/rgui/component/SettingSlider.kt

@@ -1,6 +1,7 @@
 package com.lambda.client.gui.rgui.component
 
 import com.lambda.client.module.modules.client.ClickGUI
+import com.lambda.client.module.modules.client.CustomFont
 import com.lambda.client.module.modules.client.GuiColors
 import com.lambda.client.setting.settings.impl.number.FloatSetting
 import com.lambda.client.setting.settings.impl.number.IntegerSetting
@@ -136,7 +137,7 @@ class SettingSlider(val setting: NumberSetting<*>) : Slider(setting.name, 0.0, s
         if (!listening) {
             val posX = (renderWidth - protectedWidth - 2.0f).toFloat()
             val posY = renderHeight - 2.0f - FontRenderAdapter.getFontHeight(0.75f)
-            FontRenderAdapter.drawString(valueText, posX, posY, color = GuiColors.text, scale = 0.75f)
+            FontRenderAdapter.drawString(valueText, posX, posY, color = GuiColors.text, drawShadow = CustomFont.shadow, scale = 0.75f)
         }
     }
 }

src/main/kotlin/com/lambda/client/gui/rgui/component/Slider.kt

@@ -2,6 +2,7 @@ package com.lambda.client.gui.rgui.component
 
 import com.lambda.client.gui.rgui.InteractiveComponent
 import com.lambda.client.module.modules.client.ClickGUI
+import com.lambda.client.module.modules.client.CustomFont
 import com.lambda.client.module.modules.client.GuiColors
 import com.lambda.client.module.modules.client.Tooltips
 import com.lambda.client.util.TimedFlag
@@ -75,7 +76,7 @@ open class Slider(
                 val newWidth = lineWidth + wordWidth
 
                 lineWidth = if (newWidth > 169.0f) {
-                    displayDescription.addLine(stringBuilder.toString())
+                    displayDescription.addLine(stringBuilder.toString(), color = GuiColors.text)
                     stringBuilder.clear()
                     -spaceWidth + wordWidth
                 } else {
@@ -86,7 +87,7 @@ open class Slider(
                 stringBuilder.append(' ')
             }
 
-            if (stringBuilder.isNotEmpty()) displayDescription.addLine(stringBuilder.toString())
+            if (stringBuilder.isNotEmpty()) displayDescription.addLine(stringBuilder.toString(), color = GuiColors.text)
         }
     }
 
@@ -121,7 +122,7 @@ open class Slider(
         }*/
         val text = if (isBold) TextFormatting.BOLD format componentName else componentName
 
-        FontRenderAdapter.drawString(text, 1.5f, 1.0f, color = GuiColors.text)
+        FontRenderAdapter.drawString(text, 1.5f, 1.0f, CustomFont.shadow, color = GuiColors.text)
         //GlStateUtils.popScissor()
     }
 
@@ -157,7 +158,8 @@ open class Slider(
             glTranslatef(posX, posY, 696.0f)
 
             RenderUtils2D.drawRectFilled(vertexHelper, posEnd = Vec2d(textWidth, textHeight).plus(4.0), color = GuiColors.backGround.apply { a = (a * alpha).toInt() })
-            RenderUtils2D.drawRectOutline(vertexHelper, posEnd = Vec2d(textWidth, textHeight).plus(4.0), lineWidth = 2.0f, color = GuiColors.primary.apply { a = (a * alpha).toInt() })
+            if(ClickGUI.outline)
+                RenderUtils2D.drawRectOutline(vertexHelper, posEnd = Vec2d(textWidth, textHeight).plus(4.0), lineWidth = ClickGUI.outlineSize, color = GuiColors.primary.apply { a = (a * alpha).toInt() })
 
             displayDescription.draw(Vec2d(2.0, 2.0), 2, alpha)
 

src/main/kotlin/com/lambda/client/gui/rgui/windows/BasicWindow.kt

@@ -25,8 +25,23 @@ open class BasicWindow(
 
     override fun onRender(vertexHelper: VertexHelper, absolutePos: Vec2f) {
         super.onRender(vertexHelper, absolutePos)
-        RenderUtils2D.drawRoundedRectFilled(vertexHelper, Vec2d(0.0, 0.0), Vec2f(renderWidth, renderHeight).toVec2d(), ClickGUI.radius, color = GuiColors.backGround)
-        RenderUtils2D.drawRoundedRectOutline(vertexHelper, Vec2d(0.0, 0.0), Vec2f(renderWidth, renderHeight).toVec2d(), ClickGUI.radius, lineWidth = 2.5f, color = GuiColors.primary)
+        RenderUtils2D.drawRoundedRectFilled(
+            vertexHelper,
+            Vec2d(0.0, 0.0),
+            Vec2f(renderWidth, renderHeight).toVec2d(),
+            ClickGUI.radius,
+            color = GuiColors.backGround
+        )
+        if (ClickGUI.outline) {
+            RenderUtils2D.drawRoundedRectOutline(
+                vertexHelper,
+                Vec2d(0.0, 0.0),
+                Vec2f(renderWidth, renderHeight).toVec2d(),
+                ClickGUI.radius,
+                lineWidth = ClickGUI.outlineSize,
+                color = GuiColors.primary
+            )
+        }
     }
 
 }

src/main/kotlin/com/lambda/client/gui/rgui/windows/TitledWindow.kt

@@ -1,5 +1,6 @@
 package com.lambda.client.gui.rgui.windows
 
+import com.lambda.client.module.modules.client.CustomFont
 import com.lambda.client.module.modules.client.GuiColors
 import com.lambda.client.util.graphics.VertexHelper
 import com.lambda.client.util.graphics.font.FontRenderAdapter
@@ -22,6 +23,6 @@ open class TitledWindow(
 
     override fun onRender(vertexHelper: VertexHelper, absolutePos: Vec2f) {
         super.onRender(vertexHelper, absolutePos)
-        FontRenderAdapter.drawString(componentName, 3.0f, 3.0f, color = GuiColors.text)
+        FontRenderAdapter.drawString(componentName, 3.0f, 3.0f, color = GuiColors.text, drawShadow = CustomFont.shadow)
     }
 }

src/main/kotlin/com/lambda/client/module/modules/client/ClickGUI.kt

@@ -21,6 +21,8 @@ object ClickGUI : Module(
     private val scaleSetting = setting("Scale", 100, 50..400, 5)
     val radius by setting("Radius", 4.0, 0.0..10.0, 0.2)
     val blur by setting("Blur", 0.0f, 0.0f..1.0f, 0.05f)
+    val outline by setting("Outline", true)
+    val outlineSize by setting("Outline Size", 2.5f, 0.5f..3.5f,0.5f)
     val darkness by setting("Darkness", 0.25f, 0.0f..1.0f, 0.05f)
     val fadeInTime by setting("Fade In Time", 0.25f, 0.0f..1.0f, 0.05f)
     val fadeOutTime by setting("Fade Out Time", 0.1f, 0.0f..1.0f, 0.05f)

src/main/kotlin/com/lambda/client/module/modules/client/CustomFont.kt

@@ -22,6 +22,7 @@ object CustomFont : Module(
         getMatchingFontName(value) ?: getMatchingFontName(prev) ?: DEFAULT_FONT_NAME
     })
     private val sizeSetting by setting("Size", 1.0f, 0.5f..2.0f, 0.05f)
+    private val shadowSetting by setting("Shadow", false)
     private val gapSetting by setting("Gap", 0.0f, -10f..10f, 0.5f)
     private val lineSpaceSetting by setting("Line Space", 0.0f, -10f..10f, 0.05f)
     private val baselineOffsetSetting by setting("Baseline Offset", 0.0f, -10.0f..10.0f, 0.05f)
@@ -33,6 +34,7 @@ object CustomFont : Module(
     val lineSpace get() = size * (lineSpaceSetting * 0.05f + 0.77f)
     val lodBias get() = lodBiasSetting * 0.25f - 0.5f
     val baselineOffset get() = baselineOffsetSetting * 2.0f - 4.5f
+    val shadow get() = shadowSetting
 
     /** Available fonts on the system */
     val availableFonts: Map<String, String> by AsyncCachedValue(5L, TimeUnit.SECONDS) {

src/main/kotlin/com/lambda/client/module/modules/combat/AntiBot.kt

@@ -90,7 +90,6 @@ object AutoLog : Module(
     private fun SafeClientEvent.checkPlayers(): Boolean {
         for (entity in world.loadedEntityList) {
             if (entity !is EntityPlayer) continue
-            if (AntiBot.isBot(entity)) continue
             if (entity.isFakeOrSelf) continue
             if (player.getDistance(entity) > playerDistance) continue
             if (!friends && FriendManager.isFriend(entity.name)) continue

src/main/kotlin/com/lambda/client/module/modules/combat/AutoLog.kt

@@ -206,7 +206,6 @@ object AutoMend : Module(
         for (entity in mc.world.loadedEntityList) {
             if (entity !is EntityPlayer) continue
             if (entity.isFakeOrSelf) continue
-            if (AntiBot.isBot(entity)) continue
             if (mc.player.getDistance(entity) > pauseNearbyRadius) continue
             if (FriendManager.isFriend(entity.name)) continue
             return true

src/main/kotlin/com/lambda/client/module/modules/combat/AutoMend.kt

@@ -216,19 +216,17 @@ object CombatSetting : Module(
     fun getPrediction(entity: Entity) = CombatManager.target?.let {
         if (motionPrediction) {
             val ticks = if (pingSync) (InfoCalculator.ping() / 25f).ceilToInt() else ticksAhead
-            CombatManager.motionTracker.getPositionAndBBAhead(ticks) ?: it.positionVector to it.entityBoundingBox
+            CombatManager.motionTracker.getPositionAndBBAhead(ticks) ?: (it.positionVector to it.entityBoundingBox)
         } else {
             it.positionVector to it.entityBoundingBox
         }
-    } ?: entity.positionVector to entity.entityBoundingBox
+    } ?: (entity.positionVector to entity.entityBoundingBox)
     /* End of crystal damage calculation */
 
     /* Targeting */
     private fun SafeClientEvent.getTargetList(): LinkedList<EntityLivingBase> {
         val targetList = LinkedList<EntityLivingBase>()
         for (entity in getCacheList()) {
-            if (AntiBot.isBot(entity)) continue
-
             if (!tamed
                 && (entity is EntityTameable && entity.isTamed
                     || entity is AbstractHorse && entity.isTame)) continue

src/main/kotlin/com/lambda/client/module/modules/combat/CombatSetting.kt

@@ -0,0 +1,24 @@
+package com.lambda.client.module.modules.misc
+
+import net.minecraft.entity.item.EntityFireworkRocket
+import net.minecraft.network.play.server.SPacketPlayerPosLook
+import com.lambda.client.event.events.PacketEvent
+import com.lambda.client.module.Category
+import com.lambda.client.module.Module
+import com.lambda.client.util.threads.safeListener
+
+object ElytraFix: Module(
+    name = "ElytraFix",
+    category = Category.MISC,
+    description = "Fixes firework rubberband induced velocity desync",
+) {
+    init {
+        safeListener<PacketEvent.Receive> { event ->
+            if (event.packet is SPacketPlayerPosLook && player.isElytraFlying) {
+                world.getLoadedEntityList().filterIsInstance<EntityFireworkRocket>().forEach {
+                    world.removeEntity(it)
+                }
+            }
+        }
+    }
+}