It's supposed to be better;

DMorest · Mar 5, 2023 · 24f4cf5 · 24f4cf5
1 parent e8a9eda
commit 24f4cf5
Show file tree

Hide file tree

Showing 36 changed files with 170 additions and 87 deletions.
diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/Animations.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/Animations.kt
@@ -22,12 +22,12 @@ object Animations : Module() {
 
     val invModeValue = ListValue("InvMode", arrayOf("None", "Slide", "Zoom"), "Zoom")
     val invEaseModeValue = EaseUtils.getEnumEasingList("InvEase")
-    val invEaseOrderModeValue = EaseUtils.getEnumEasingOrderList("InvEaseOrder")
+    val invEaseOrderModeValue = EaseUtils.getEnumEasingOrderList("InvEaseOrder").displayable { !invEaseModeValue.equals("NONE") }
     val invTimeValue = IntegerValue("InvTime", 500, 0, 1000).displayable { !invModeValue.equals("None") }
     private val tabShowPlayerSkinValue = BoolValue("TabShowPlayerSkin", true)
     val tabModeValue = ListValue("TabMode", arrayOf("None", "UpSlide", "DownSlide", "Zoom"), "Zoom")
     val tabEaseModeValue = EaseUtils.getEnumEasingList("TabEase")
-    val tabEaseOrderModeValue = EaseUtils.getEnumEasingOrderList("TabEaseOrder")
+    val tabEaseOrderModeValue = EaseUtils.getEnumEasingOrderList("TabEaseOrder").displayable { !tabEaseModeValue.equals("NONE") }
     val tabTimeValue = IntegerValue("TabTime", 500, 0, 1000).displayable { !tabModeValue.equals("None") }
     val translateXValue = FloatValue("TranslateX", 0.0f, 0.0f, 1.5f)
     val translateYValue = FloatValue("TranslateY", 0.0f, 0.0f, 0.5f)

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/HUD.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/HUD.kt
@@ -47,10 +47,10 @@ object HUD : Module() {
     val rainbowSpeedValue = IntegerValue("RainbowSpeed", 1500, 500, 7000)
     val arraylistXAxisAnimSpeedValue = IntegerValue("ArraylistXAxisAnimSpeed", 10, 5, 20)
     val arraylistXAxisAnimTypeValue = EaseUtils.getEnumEasingList("ArraylistXAxisAnimType")
-    val arraylistXAxisAnimOrderValue = EaseUtils.getEnumEasingOrderList("ArraylistXAxisHotbarAnimOrder")
+    val arraylistXAxisAnimOrderValue = EaseUtils.getEnumEasingOrderList("ArraylistXAxisHotbarAnimOrder").displayable { !arraylistXAxisAnimTypeValue.equals("NONE") }
     val arraylistYAxisAnimSpeedValue = IntegerValue("ArraylistYAxisAnimSpeed", 10, 5, 20)
     val arraylistYAxisAnimTypeValue = EaseUtils.getEnumEasingList("ArraylistYAxisAnimType")
-    val arraylistYAxisAnimOrderValue = EaseUtils.getEnumEasingOrderList("ArraylistYAxisHotbarAnimOrder")
+    val arraylistYAxisAnimOrderValue = EaseUtils.getEnumEasingOrderList("ArraylistYAxisHotbarAnimOrder").displayable { !arraylistYAxisAnimTypeValue.equals("NONE") }
     val fontEpsilonValue = FloatValue("FontVectorEpsilon", 0.5f, 0f, 1.5f)
     private val buttonValue = ListValue("Button", arrayOf("Better", "RGBRounded", "Wolfram", "Rounded", "Hyperium", "RGB", "Badlion", "Flat", "FLine", "Rise", "Vanilla"), "Rounded")
 

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/HotbarSettings.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/HotbarSettings.kt
@@ -43,7 +43,7 @@ object HotbarSettings : Module() {
     val hotbarAlphaValue = IntegerValue("HotbarAlpha", 70, 0, 255)
     val hotbarEaseValue = BoolValue("HotbarEase", true)
     private val BlurValue = BoolValue("Blur", false)
-    private val BlurAmount = FloatValue("BlurAmount", 10F, 1F, 100F)
+    private val BlurAmount = FloatValue("BlurAmount", 10F, 1F, 100F).displayable { BlurValue.get() }
     private val ItemCountValue = BoolValue("ItemColorCount", false)
     val ItemFontValue = ListValue("ItemFont", arrayOf("MiSans", "Minecraft"), "Minecraft")
     private val hotbarAnimSpeedValue = IntegerValue("HotbarAnimSpeed", 10, 5, 20).displayable { hotbarEaseValue.get() }

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/AutoClicker.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/AutoClicker.kt
@@ -37,15 +37,15 @@ class AutoClicker : Module() {
                 set(minCPS)
             }
         }
-    }
+    }.displayable { modeValue.equals("Normal") }
     private val normalMinCPSValue: IntegerValue = object : IntegerValue("Normal-MinCPS", 5, 1, 40) {
         override fun onChanged(oldValue: Int, newValue: Int) {
             val maxCPS = normalMaxCPSValue.get()
             if (maxCPS < newValue) {
                 set(maxCPS)
             }
         }
-    }
+    }.displayable { modeValue.equals("Normal") }
     private val normalLegitJitterValue = BoolValue("Normal-LegitJitterCPS", false).displayable { modeValue.equals("Normal") }
 
     private val normalRightValue = BoolValue("Normal-Right", true).displayable { modeValue.equals("Normal") }

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/AutoWeapon.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/AutoWeapon.kt
@@ -25,7 +25,7 @@ import net.minecraft.network.play.client.C09PacketHeldItemChange
 class AutoWeapon : Module() {
     private val onlySwordValue = BoolValue("OnlySword", false)
     private val silentValue = BoolValue("SpoofItem", false)
-    private val ticksValue = IntegerValue("SpoofTicks", 10, 1, 20)
+    private val ticksValue = IntegerValue("SpoofTicks", 10, 1, 20).displayable { silentValue.get() }
 
     private var attackEnemy = false
     private var spoofedSlot = 0

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/BowAimbot.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/BowAimbot.kt
@@ -28,7 +28,7 @@ class BowAimbot : Module() {
     private val silentValue = BoolValue("Silent", true)
     private val predictValue = BoolValue("Predict", true)
     private val throughWallsValue = BoolValue("ThroughWalls", false)
-    private val predictSizeValue = FloatValue("PredictSize", 2F, 0.1F, 5F)
+    private val predictSizeValue = FloatValue("PredictSize", 2F, 0.1F, 5F).displayable { predictValue.get() }
     private val priorityValue = ListValue("Priority", arrayOf("Health", "Distance", "Direction"), "Direction")
     private val markValue = BoolValue("Mark", true)
 

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/BowAura.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/BowAura.kt
@@ -32,7 +32,7 @@ class BowAura : Module() {
     private val silentValue = BoolValue("Silent", true)
     private val predictValue = BoolValue("Predict", true)
     private val throughWallsValue = BoolValue("ThroughWalls", false)
-    private val predictSizeValue = FloatValue("PredictSize", 2F, 0.1F, 5F)
+    private val predictSizeValue = FloatValue("PredictSize", 2F, 0.1F, 5F).displayable { predictValue.get() }
     private val priorityValue = ListValue("Priority", arrayOf("Health", "Distance", "Direction"), "Direction")
     private val maxDistance = FloatValue("MaxDistance",100F,5F,200F)
     private val markValue = BoolValue("Mark", true)

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/Criticals.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/Criticals.kt
@@ -216,5 +216,13 @@ class Criticals : Module() {
      * 读取mode中的value并和本体中的value合并
      * 所有的value必须在这个之前初始化
      */
-    override val values = super.values.toMutableList().also { modes.map { mode -> mode.values.forEach { value -> it.add(value.displayable { modeValue.equals(mode.modeName) }) } } }
+    override val values = super.values.toMutableList().also {
+        modes.map {
+            mode -> mode.values.forEach { value ->
+                //it.add(value.displayable { modeValue.equals(mode.modeName) })
+                val displayableFunction = value.displayableFunction
+                it.add(value.displayable { displayableFunction.invoke() && modeValue.equals(mode.modeName) })
+            }
+        }
+    }
 }
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
@@ -63,7 +63,7 @@ class KillAura : Module() {
 
             attackDelay = getAttackDelay(minCpsValue.get(), this.get())
         }
-    }
+    }.displayable {!simulateCooldown.get()}
 
     private val minCpsValue: IntegerValue = object : IntegerValue("MinCPS", 8, 1, 20) {
         override fun onChanged(oldValue: Int, newValue: Int) {
@@ -72,7 +72,7 @@ class KillAura : Module() {
 
             attackDelay = getAttackDelay(this.get(), maxCpsValue.get())
         }
-    }
+    }.displayable {!simulateCooldown.get()}
 
     private val hurtTimeValue = IntegerValue("HurtTime", 10, 0, 10)
     private val simulateCooldown = BoolValue("SimulateCooldown", false)
@@ -166,13 +166,13 @@ class KillAura : Module() {
 
     // Random Value
     private val randomCenterModeValue = ListValue("RandomCenter", arrayOf("Off", "Cubic", "Horizonal", "Vertical"), "Off")
-    private val randomCenRangeValue = FloatValue("RandomRange", 0.0f, 0.0f, 1.2f)
+    private val randomCenRangeValue = FloatValue("RandomRange", 0.0f, 0.0f, 1.2f).displayable { !randomCenterModeValue.equals("Off") }
 
     // Keep Rotate
     private val rotationRevValue = BoolValue("RotationReverse", false).displayable { !rotationModeValue.equals("None") }
-    private val rotationRevTickValue = IntegerValue("RotationReverseTick", 5, 1, 20).displayable { !rotationModeValue.equals("None") }
+    private val rotationRevTickValue = IntegerValue("RotationReverseTick", 5, 1, 20).displayable { !rotationModeValue.equals("None") && rotationRevValue.get() }
     private val keepDirectionValue = BoolValue("KeepDirection", true).displayable { !rotationModeValue.equals("None") }
-    private val keepDirectionTickValue = IntegerValue("KeepDirectionTick", 15, 1, 20).displayable { !rotationModeValue.equals("None") }
+    private val keepDirectionTickValue = IntegerValue("KeepDirectionTick", 15, 1, 20).displayable { !rotationModeValue.equals("None") && keepDirectionValue.get() }
 
     // Strafe
     private val silentRotationValue = BoolValue("SilentRotation", true).displayable { !rotationModeValue.equals("None") }
@@ -224,7 +224,7 @@ class KillAura : Module() {
     private val fakeSwingValue = BoolValue("FakeSwing", true).displayable { failRateValue.get() != 0f }
     private val noInventoryAttackValue = ListValue("NoInvAttack", arrayOf("Spoof", "CancelRun", "Off"), "Off")
 
-    private val noInventoryDelayValue = IntegerValue("NoInvDelay", 200, 0, 500)
+    private val noInventoryDelayValue = IntegerValue("NoInvDelay", 200, 0, 500).displayable { !noInventoryAttackValue.equals("Off") }
     private val switchDelayValue = IntegerValue("SwitchDelay", 15, 1, 2000).displayable { targetModeValue.equals("Switch") }
     private val limitedMultiTargetsValue = IntegerValue("LimitedMultiTargets", 0, 0, 50).displayable { targetModeValue.equals("Multi") }
 

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/SuperKnockback.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/SuperKnockback.kt
@@ -22,7 +22,7 @@ import net.minecraft.network.play.client.C0BPacketEntityAction
 class SuperKnockback : Module() {
     private val hurtTimeValue = IntegerValue("HurtTime", 10, 0, 10)
     private val modeValue = ListValue("Mode", arrayOf("ExtraPacket", "WTap", "Packet"), "ExtraPacket")
-    private val WtapDelay = IntegerValue("WTapDelay", 6, 1, 10)
+    private val WtapDelay = IntegerValue("WTapDelay", 6, 1, 10).displayable { modeValue.equals("WTap") }
     private val onlyMoveValue = BoolValue("OnlyMove", false)
     private val onlyGroundValue = BoolValue("OnlyGround", false)
     private val delayValue = IntegerValue("Delay", 0, 0, 500)

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/Velocity.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/Velocity.kt
@@ -42,9 +42,9 @@ class Velocity : Module() {
             if (state) onEnable()
         }
     }
-    val horizontalValue = FloatValue("Horizontal", 0F, -2F, 2F)
-    val verticalValue = FloatValue("Vertical", 0F, -2F, 2F)
-    val chanceValue = IntegerValue("Chance", 100, 0, 100)
+    val horizontalValue = FloatValue("Horizontal", 0F, -2F, 2F).displayable { modeValue.equals("Simple") || modeValue.equals("Tick") }
+    val verticalValue = FloatValue("Vertical", 0F, -2F, 2F).displayable { modeValue.equals("Simple") || modeValue.equals("Tick") }
+    val chanceValue = IntegerValue("Chance", 100, 0, 100).displayable { modeValue.equals("Simple") }
     val velocityTickValue = IntegerValue("VelocityTick", 1, 0, 10).displayable { modeValue.equals("Tick") || modeValue.equals("OldSpartan")}
     val onlyGroundValue = BoolValue("OnlyGround", false)
     val onlyCombatValue = BoolValue("OnlyCombat", false)
@@ -185,5 +185,13 @@ class Velocity : Module() {
      * 读取mode中的value并和本体中的value合并
      * 所有的value必须在这个之前初始化
      */
-    override val values = super.values.toMutableList().also { modes.map { mode -> mode.values.forEach { value -> it.add(value.displayable { modeValue.equals(mode.modeName) }) } } }
+    override val values = super.values.toMutableList().also {
+        modes.map {
+            mode -> mode.values.forEach { value ->
+                //it.add(value.displayable { modeValue.equals(mode.modeName) })
+                val displayableFunction = value.displayableFunction
+                it.add(value.displayable { displayableFunction.invoke() && modeValue.equals(mode.modeName) })
+            }
+        }
+    }
 }
diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/exploit/Disabler.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/exploit/Disabler.kt
@@ -145,10 +145,12 @@ class Disabler : Module() {
 
     private val modeValue: List<Value<*>> get() = settings
 
-    override val values = modeValue.toMutableList().also {
-        modes.map { mode ->
-            mode.values.forEach { value ->
-                it.add(value.displayable { getValue(mode.modeName)?.value == true })
+    override val values = super.values.toMutableList().also {
+        modes.map {
+            mode -> mode.values.forEach { value ->
+                //it.add(value.displayable { modeValue.equals(mode.modeName) })
+                val displayableFunction = value.displayableFunction
+                it.add(value.displayable { displayableFunction.invoke() && modeValue.equals(mode.modeName) })
             }
         }
     }

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/exploit/Phase.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/exploit/Phase.kt
@@ -91,5 +91,13 @@ class Phase : Module() {
     override val tag: String
         get() = modeValue.get()
 
-    override val values = super.values.toMutableList().also { modes.map { mode -> mode.values.forEach { value -> it.add(value.displayable { modeValue.equals(mode.modeName) }) } } }
+    override val values = super.values.toMutableList().also {
+        modes.map {
+            mode -> mode.values.forEach { value ->
+                //it.add(value.displayable { modeValue.equals(mode.modeName) })
+                val displayableFunction = value.displayableFunction
+                it.add(value.displayable { displayableFunction.invoke() && modeValue.equals(mode.modeName) })
+            }
+        }
+    }
 }
diff --git a/...luex/liquidbounce/features/module/modules/exploit/disablers/other/PacketInvadeDisabler.kt b/...luex/liquidbounce/features/module/modules/exploit/disablers/other/PacketInvadeDisabler.kt
@@ -12,7 +12,7 @@ import net.minecraft.network.play.client.C0FPacketConfirmTransaction
 class PacketInvadeDisabler : DisablerMode("PacketInvade") {
     private val modifyC00Value = BoolValue("${valuePrefix}ModifyC00", true)
     /*private val modifyC0FValue = BoolValue("${valuePrefix}ModifyC0F", true)*/
-    private val modifyModeValue = ListValue("${valuePrefix}ModifyMode", arrayOf("Disturb", "InvalidDisturb", "Invalid", "Drift"), "Drift")
+    private val modifyModeValue = ListValue("${valuePrefix}ModifyMode", arrayOf("Disturb", "InvalidDisturb", "Invalid", "Drift"), "Drift").displayable { modifyC00Value.get() }
     private val disturbAmountValue = IntegerValue("${valuePrefix}ModifyAmount", 128, 1, 256)
     private val negativeValue = BoolValue("${valuePrefix}Negative", true)
     override fun onPacket(event: PacketEvent) {

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/misc/AntiBot.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/misc/AntiBot.kt
@@ -57,7 +57,7 @@ object AntiBot : Module() {
     private val fastDamageValue = BoolValue("FastDamage", false)
     private val fastDamageTicksValue = IntegerValue("FastDamageTicks", 5, 1, 20).displayable { fastDamageValue.get() }
     private val removeFromWorld = BoolValue("RemoveFromWorld", false)
-    private val removeIntervalValue = IntegerValue("Remove-Interval", 20, 1, 100)
+    private val removeIntervalValue = IntegerValue("Remove-Interval", 20, 1, 100).displayable { removeFromWorld.get() }
     private val debugValue = BoolValue("Debug", false)
     private val alwaysInRadiusValue = BoolValue("AlwaysInRadius", false)
     private val alwaysRadiusValue = FloatValue("AlwaysInRadiusBlocks", 20f, 5f, 30f).displayable { alwaysInRadiusValue.get() }

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/Fly.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/Fly.kt
@@ -48,7 +48,7 @@ class Fly : Module() {
     private val markValue = ListValue("Mark", arrayOf("Up", "Down", "Off"), "Up")
     private val fakeDamageValue = BoolValue("FakeDamage", false)
     private val viewBobbingValue = BoolValue("ViewBobbing", false)
-    private val viewBobbingYawValue = FloatValue("ViewBobbingYaw", 0.1f, 0f, 0.5f)
+    private val viewBobbingYawValue = FloatValue("ViewBobbingYaw", 0.1f, 0f, 0.5f).displayable { viewBobbingValue.get() }
     val legacyWarningValue = BoolValue("LegacyWarn", false)
 
     var launchX = 0.0
@@ -158,5 +158,13 @@ class Fly : Module() {
      * 读取mode中的value并和本体中的value合并
      * 所有的value必须在这个之前初始化
      */
-    override val values = super.values.toMutableList().also { modes.map { mode -> mode.values.forEach { value -> it.add(value.displayable { modeValue.equals(mode.modeName) }) } } }
+    override val values = super.values.toMutableList().also {
+        modes.map {
+            mode -> mode.values.forEach { value ->
+                //it.add(value.displayable { modeValue.equals(mode.modeName) })
+                val displayableFunction = value.displayableFunction
+                it.add(value.displayable { displayableFunction.invoke() && modeValue.equals(mode.modeName) })
+            }
+        }
+    }
 }
diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/Glide.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/Glide.kt
@@ -42,7 +42,7 @@ class Glide : Module() {
     // Visuals
     private val fakeDamageValue = BoolValue("FakeDamage", false)
     private val viewBobbingValue = BoolValue("ViewBobbing", false)
-    private val viewBobbingYawValue = FloatValue("ViewBobbingYaw", 0.1f, 0f, 0.5f)
+    private val viewBobbingYawValue = FloatValue("ViewBobbingYaw", 0.1f, 0f, 0.5f).displayable { viewBobbingValue.get() }
 
     var launchX = 0.0
     var launchY = 0.0
@@ -131,5 +131,13 @@ class Glide : Module() {
      * 读取mode中的value并和本体中的value合并
      * 所有的value必须在这个之前初始化
      */
-    override val values = super.values.toMutableList().also { modes.map { mode -> mode.values.forEach { value -> it.add(value.displayable { modeValue.equals(mode.modeName) }) } } }
+    override val values = super.values.toMutableList().also {
+        modes.map {
+            mode -> mode.values.forEach { value ->
+                //it.add(value.displayable { modeValue.equals(mode.modeName) })
+                val displayableFunction = value.displayableFunction
+                it.add(value.displayable { displayableFunction.invoke() && modeValue.equals(mode.modeName) })
+            }
+        }
+    }
 }
diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/Jesus.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/Jesus.kt
@@ -110,5 +110,13 @@ class Jesus : Module() {
      * 读取mode中的value并和本体中的value合并
      * 所有的value必须在这个之前初始化
      */
-    override val values = super.values.toMutableList().also { modes.map { mode -> mode.values.forEach { value -> it.add(value.displayable { modeValue.equals(mode.modeName) }) } } }
+    override val values = super.values.toMutableList().also {
+        modes.map {
+            mode -> mode.values.forEach { value ->
+                //it.add(value.displayable { modeValue.equals(mode.modeName) })
+                val displayableFunction = value.displayableFunction
+                it.add(value.displayable { displayableFunction.invoke() && modeValue.equals(mode.modeName) })
+            }
+        }
+    }
 }
diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/LongJump.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/LongJump.kt
@@ -127,5 +127,13 @@ class LongJump : Module() {
      * 读取mode中的value并和本体中的value合并
      * 所有的value必须在这个之前初始化
      */
-    override val values = super.values.toMutableList().also { modes.map { mode -> mode.values.forEach { value -> it.add(value.displayable { modeValue.equals(mode.modeName) }) } } }
+    override val values = super.values.toMutableList().also {
+        modes.map {
+            mode -> mode.values.forEach { value ->
+                //it.add(value.displayable { modeValue.equals(mode.modeName) })
+                val displayableFunction = value.displayableFunction
+                it.add(value.displayable { displayableFunction.invoke() && modeValue.equals(mode.modeName) })
+            }
+        }
+    }
 }