Merge branch 'master' into feature/packetmine-rewrite

Author: beanbag44

common/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.

common/src/main/kotlin/com/lambda/module/modules/client/ClickGui.kt

@@ -42,7 +42,8 @@ import kotlin.math.hypot
 object ClickGui : Module(
     name = "ClickGui",
     description = "sexy again",
-    defaultTags = setOf(ModuleTag.CLIENT)
+    defaultTags = setOf(ModuleTag.CLIENT),
+    defaultKeybind = KeyCode.Y
 ) {
     val titleBarHeight by setting("Title Bar Height", 18.0, 10.0..25.0, 0.1)
     val moduleHeight by setting("Module Height", 16.0, 10.0..25.0, 0.1)

common/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
@@ -113,7 +114,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({ dimensionName }),
         FPS({ "${mc.currentFps} FPS" });

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

@@ -30,6 +30,7 @@ import com.lambda.util.Communication.prefix
 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.fullHealth
 import com.lambda.util.player.SlotUtils.combined
 import com.lambda.util.text.*
 import com.lambda.util.world.fastEntitySearch
@@ -154,7 +155,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")
@@ -184,10 +185,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("!")

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

@@ -36,8 +36,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(

common/src/main/kotlin/com/lambda/util/combat/DamageUtils.kt

@@ -91,6 +91,13 @@ object DamageUtils {
         return source.scale(world, player, player.fallDamage(distance, multiplier))
     }
 
+    /**
+     * Calculates the fall damage for the given entity
+     *
+     * @param distance The fall distance
+     * @param multiplier The fall damage multiplier
+     * @return The calculated fall damage
+     */
     fun LivingEntity.fallDamage(distance: Double, multiplier: Double): Double {
         if (type.isIn(FALL_DAMAGE_IMMUNE)) return 0.0