feat: Kill ESP round box mode

SkidderMC · Jul 25, 2024 · 590c927 · 590c927
1 parent 9d054e4
commit 590c927
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 19 deletions.
diff --git a/src/main/java/net/ccbluex/liquidbounce/FDPClient.kt b/src/main/java/net/ccbluex/liquidbounce/FDPClient.kt
@@ -59,9 +59,8 @@ object FDPClient {
     const val CLIENT_NAME = "FDPClient"
     const val CLIENT_AUTHOR = "Zywl 1zuna"
     const val CLIENT_CLOUD = "https://cloud.liquidbounce.net/LiquidBounce"
-    const val FDP_CLOUD = "https://fdpinfo.github.io/cloud/"
     const val CLIENT_WEBSITE = "fdpinfo.github.io"
-    const val CLIENT_VERSION = "B1"
+    const val CLIENT_VERSION = "b2"
 
     val clientVersionText = gitInfo["git.build.version"]?.toString() ?: "unknown"
     val clientVersionNumber = clientVersionText.substring(1).toIntOrNull() ?: 0 // version format: "b<VERSION>" on legacy

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/KillAura.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/KillAura.kt
@@ -42,8 +42,6 @@ import net.ccbluex.liquidbounce.utils.inventory.InventoryUtils
 import net.ccbluex.liquidbounce.utils.inventory.InventoryUtils.serverOpenInventory
 import net.ccbluex.liquidbounce.utils.inventory.ItemUtils.isConsumingItem
 import net.ccbluex.liquidbounce.utils.misc.RandomUtils.nextInt
-import net.ccbluex.liquidbounce.utils.render.RenderUtils.drawEntityBox
-import net.ccbluex.liquidbounce.utils.render.RenderUtils.drawPlatform
 import net.ccbluex.liquidbounce.utils.timing.MSTimer
 import net.ccbluex.liquidbounce.utils.timing.TimeUtils.randomClickDelay
 import net.ccbluex.liquidbounce.value.BoolValue
@@ -74,7 +72,6 @@ import net.minecraft.util.EnumFacing
 import net.minecraft.util.MovingObjectPosition
 import net.minecraft.world.WorldSettings
 import org.lwjgl.input.Keyboard
-import java.awt.Color
 import kotlin.math.max
 
 object KillAura : Module("KillAura", Category.COMBAT, Keyboard.KEY_R, hideModule = false) {
@@ -291,8 +288,6 @@ object KillAura : Module("KillAura", Category.COMBAT, Keyboard.KEY_R, hideModule
     )
 
     // Visuals
-    private val mark by ListValue("Mark", arrayOf("None", "Platform", "Box"), "Platform", subjective = true)
-    private val boxOutline by BoolValue("Outline", true, subjective = true) { mark == "Box" }
     private val fakeSharp by BoolValue("FakeSharp", true, subjective = true)
 
     /**
@@ -494,16 +489,6 @@ object KillAura : Module("KillAura", Category.COMBAT, Keyboard.KEY_R, hideModule
             attackTimer.reset()
             attackDelay = randomClickDelay(minCPS, maxCPS)
         }
-
-        val hittableColor = if (hittable) Color(37, 126, 255, 70) else Color(255, 0, 0, 70)
-
-        if (targetMode != "Multi") {
-            when (mark.lowercase()) {
-                "none" -> return
-                "platform" -> drawPlatform(target!!, hittableColor)
-                "box" -> drawEntityBox(target!!, hittableColor, boxOutline)
-            }
-        }
     }
 
     /**

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/KillESP.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/KillESP.kt
@@ -8,6 +8,7 @@ package net.ccbluex.liquidbounce.features.module.modules.combat
 import net.ccbluex.liquidbounce.event.*
 import net.ccbluex.liquidbounce.features.module.Category
 import net.ccbluex.liquidbounce.features.module.Module
+
 import net.ccbluex.liquidbounce.handler.combat.CombatManager
 import net.ccbluex.liquidbounce.utils.render.ColorUtils
 import net.ccbluex.liquidbounce.utils.render.RenderUtils
@@ -24,14 +25,15 @@ import java.util.*
 
 object KillESP : Module("KillESP", Category.COMBAT) {
 
-    private val modeValue by ListValue("Mode", arrayOf("Box", "Head", "Mark"), "Crystal")
+    private val modeValue by ListValue("Mode", arrayOf("Box", "RoundBox", "Head", "Mark"), "Mark")
     private val colorRedValue by IntegerValue("R", 0, 0.. 255)
     private val colorGreenValue by IntegerValue("G", 160, 0..255)
     private val colorBlueValue by IntegerValue("B", 255, 0.. 255)
     private val alphaValue by IntegerValue("Alpha", 255, 0.. 255)
     private val killLightningBoltValue by BoolValue("LightningBolt", true)
     private val rainbow by BoolValue("RainBow", false)
     private val hurt by BoolValue("HurtTime", true)
+    private val boxOutline by BoolValue("Outline", true, subjective = true) { modeValue == "RoundBox" }
 
     private val targetList = HashMap<EntityLivingBase, Long>()
     private val combat = CombatManager
@@ -101,14 +103,23 @@ object KillESP : Module("KillESP", Category.COMBAT) {
                 if ((hurt && entityLivingBase.hurtTime > 3)) Color(255, 50, 50, 75) else color
             )
 
+            "roundbox" -> RenderUtils.drawEntityBox(
+                entityLivingBase,
+                if (hurt && entityLivingBase.hurtTime > 3)
+                    Color(37, 126, 255, 70)
+                else
+                    Color(255, 0, 0, 70),
+                boxOutline
+            )
+
             "head" -> RenderUtils.drawPlatformESP(
                 entityLivingBase,
                 if ((hurt && entityLivingBase.hurtTime > 3)) Color(255, 50, 50, 75) else color
             )
 
             "mark" -> RenderUtils.drawPlatform(
                 entityLivingBase,
-                if ((hurt && entityLivingBase.hurtTime > 3)) Color(255, 50, 50, 75) else color
+                if ((hurt && entityLivingBase.hurtTime > 3)) Color(37, 126, 255, 70) else Color(255, 0, 0, 70)
             )
         }
     }