Merge branch 'master' into 1.21.5

Author: emyfops

src/main/kotlin/com/lambda/config/Configurable.kt

@@ -292,7 +292,7 @@ abstract class Configurable(
         description: String = "",
         unit: String = "",
         visibility: () -> Boolean = { true },
-    ) = DoubleSetting(name, defaultValue, range, step, description, visibility, unit).register()
+    ) = DoubleSetting(name, defaultValue, range, step, description, unit, visibility).register()
 
     /**
      * Creates a [FloatSetting] with the provided parameters and adds it to the [settings].
@@ -317,7 +317,7 @@ abstract class Configurable(
         description: String = "",
         unit: String = "",
         visibility: () -> Boolean = { true },
-    ) = FloatSetting(name, defaultValue, range, step, description, visibility, unit).register()
+    ) = FloatSetting(name, defaultValue, range, step, description, unit, visibility).register()
 
     /**
      * Creates an [IntegerSetting] with the provided parameters and adds it to the [settings].
@@ -342,7 +342,7 @@ abstract class Configurable(
         description: String = "",
         unit: String = "",
         visibility: () -> Boolean = { true },
-    ) = IntegerSetting(name, defaultValue, range, step, description, visibility, unit).register()
+    ) = IntegerSetting(name, defaultValue, range, step, description, unit, visibility).register()
 
     /**
      * Creates a [LongSetting] with the provided parameters and adds it to the [settings].
@@ -367,7 +367,7 @@ abstract class Configurable(
         description: String = "",
         unit: String = "",
         visibility: () -> Boolean = { true },
-    ) = LongSetting(name, defaultValue, range, step, description, visibility, unit).register()
+    ) = LongSetting(name, defaultValue, range, step, description, unit, visibility).register()
 
     /**
      * Creates a [KeyBindSetting] with the provided parameters and adds it to the [settings].

src/main/kotlin/com/lambda/config/groups/Targeting.kt

@@ -24,6 +24,7 @@ import com.lambda.interaction.request.rotation.Rotation.Companion.dist
 import com.lambda.interaction.request.rotation.Rotation.Companion.rotation
 import com.lambda.interaction.request.rotation.Rotation.Companion.rotationTo
 import com.lambda.threading.runSafe
+import com.lambda.util.extension.fullHealth
 import com.lambda.util.math.distSq
 import com.lambda.util.world.fastEntitySearch
 import net.minecraft.client.network.ClientPlayerEntity
@@ -201,7 +202,7 @@ abstract class Targeting(
         /**
          * Prioritizes entities based on their health.
          */
-        HEALTH({ it.health.toDouble() }),
+        HEALTH({ it.fullHealth }),
 
         /**
          * Prioritizes entities based on their angle relative to the player's field of view.

src/main/kotlin/com/lambda/config/settings/NumericSetting.kt

@@ -31,8 +31,8 @@ abstract class NumericSetting<T>(
     open val range: ClosedRange<T>,
     open val step: T,
     description: String,
-    visibility: () -> Boolean,
     val unit: String,
+    visibility: () -> Boolean
 ) : AbstractSetting<T>(
     value,
     TypeToken.get(value::class.java).type,

src/main/kotlin/com/lambda/config/settings/numeric/DoubleSetting.kt

@@ -36,15 +36,15 @@ class DoubleSetting(
     override val range: ClosedRange<Double>,
     override val step: Double,
     description: String,
-    visibility: () -> Boolean,
     unit: String,
+    visibility: () -> Boolean
 ) : NumericSetting<Double>(
     defaultValue,
     range,
     step,
     description,
-    visibility,
-    unit
+    unit,
+    visibility
 ) {
     override val layout: ImGuiBuilder.() -> Unit
         get() =

src/main/kotlin/com/lambda/config/settings/numeric/FloatSetting.kt

@@ -35,15 +35,15 @@ class FloatSetting(
     override val range: ClosedRange<Float>,
     override val step: Float = 1f,
     description: String,
-    visibility: () -> Boolean,
     unit: String,
+    visibility: () -> Boolean
 ) : NumericSetting<Float>(
     defaultValue,
     range,
     step,
     description,
-    visibility,
-    unit
+    unit,
+    visibility
 ) {
     override val layout: ImGuiBuilder.() -> Unit
         get() =

src/main/kotlin/com/lambda/config/settings/numeric/IntegerSetting.kt

@@ -35,15 +35,15 @@ class IntegerSetting(
     override val range: ClosedRange<Int>,
     override val step: Int = 1,
     description: String,
-    visibility: () -> Boolean,
     unit: String,
+    visibility: () -> Boolean
 ) : NumericSetting<Int>(
     defaultValue,
     range,
     step,
     description,
-    visibility,
-    unit
+    unit,
+    visibility
 ) {
     override val layout: ImGuiBuilder.() -> Unit
         get() =

src/main/kotlin/com/lambda/config/settings/numeric/LongSetting.kt

@@ -35,15 +35,15 @@ class LongSetting(
     override val range: ClosedRange<Long>,
     override val step: Long = 1,
     description: String,
-    visibility: () -> Boolean,
     unit: String,
+    visibility: () -> Boolean
 ) : NumericSetting<Long>(
     defaultValue,
     range,
     step,
     description,
-    visibility,
-    unit
+    unit,
+    visibility
 ) {
     var intValue = value.toInt()
 

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

@@ -31,6 +31,7 @@ import com.lambda.threading.runConcurrent
 import com.lambda.util.Communication.warn
 import com.lambda.util.Nameable
 import com.lambda.util.extension.dimensionName
+import com.lambda.util.extension.fullHealth
 import com.lambda.util.extension.worldName
 import dev.cbyrne.kdiscordipc.KDiscordIPC
 import dev.cbyrne.kdiscordipc.core.packet.inbound.impl.AuthenticatePacket
@@ -116,7 +117,7 @@ object Discord : Module(
         VERSION({ Lambda.VERSION }),
         WORLD({ worldName }),
         USERNAME({ mc.session.username }),
-        HEALTH({ "${player.health} HP" }),
+        HEALTH({ "${player.fullHealth} HP" }),
         HUNGER({ "${player.hungerManager.foodLevel} Hunger" }),
         DIMENSION({ world.dimensionName }),
         FPS({ "${mc.currentFps} FPS" });

src/main/kotlin/com/lambda/module/modules/combat/AutoDisconnect.kt

@@ -31,6 +31,7 @@ import com.lambda.util.Formatting.string
 import com.lambda.util.combat.CombatUtils.hasDeadlyCrystal
 import com.lambda.util.combat.DamageUtils.isFallDeadly
 import com.lambda.util.extension.tickDelta
+import com.lambda.util.extension.fullHealth
 import com.lambda.util.player.SlotUtils.combined
 import com.lambda.util.text.buildText
 import com.lambda.util.text.color
@@ -161,7 +162,7 @@ object AutoDisconnect : Module(
         literal(" on ")
         highlighted(Communication.currentTime())
         literal(" with ")
-        highlighted(player.health.string)
+        highlighted(player.fullHealth.string)
         literal(" health.")
         if (player.isSubmergedInWater) {
             literal("\n")
@@ -191,10 +192,10 @@ object AutoDisconnect : Module(
 
     enum class Reason(val check: () -> Boolean, val generateReason: SafeContext.() -> Text?) {
         HEALTH({ health }, {
-            if (player.health < minimumHealth) {
+            if (player.fullHealth < minimumHealth) {
                 buildText {
                     literal("Health ")
-                    highlighted(player.health.string)
+                    highlighted(player.fullHealth.string)
                     literal(" below minimum of ")
                     highlighted("$minimumHealth")
                     literal("!")

src/main/kotlin/com/lambda/module/modules/network/PacketLimiter.kt

@@ -39,8 +39,8 @@ object PacketLimiter : Module(
     private var packetQueue = LimitedDecayQueue<PacketEvent.Send.Pre>(99, 1000)
     private val limit by setting("Limit", 99, 1..100, 1, "The maximum amount of packets to send per given time interval", unit = " packets")
         .onValueChange { _, to -> packetQueue.setSizeLimit(to) }
-    
-    private val interval by setting("Duration", 1000L, 1L..1000L, 50L, "The interval / duration in milliseconds to limit packets for", unit = " ms")
+
+    private val interval by setting("Duration", 4000L, 1L..10000L, 50L, "The interval / duration in milliseconds to limit packets for", unit = " ms")
         .onValueChange { _, to -> packetQueue.setDecayTime(to) }
 
     private val defaultIgnorePackets = setOf(