Grim NoWeb NoLiquid && IntaveReduce

.github/workflows/build.yml

@@ -21,7 +21,7 @@ jobs:
         id: vars
         run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
       - name: Build
-        run: chmod +x ./gradlew && ./gradlew setupCiWorkspace && ./gradlew build
+        run: ./gradlew build
       - name: Rename build artifacts
         run: mv build/libs/FDPClient-*.jar build/libs/FDPClient-build.jar
       - name: Upload build artifacts

src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/Velocity.kt

@@ -859,6 +859,7 @@ object Velocity : Module() {
                     }
 
                     "intavereduce" -> {
+                        if (!hasReceivedVelocity) return
                         if ((hurtTimeMode.get() == "Single" && player.hurtTime == hurtTime.get()) || (hurtTimeMode.get() == "Range" && player.hurtTime in minHurtTime.get()..maxHurtTime.get())) {
                             if (System.currentTimeMillis() - lastAttackTime <= 8000) {
                                 player.motionX *= reduceFactor.get()

src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/jesus/other/NoFluidJesus.kt

@@ -1,6 +1,34 @@
 package net.ccbluex.liquidbounce.features.module.modules.movement.jesus.other
 
+import net.ccbluex.liquidbounce.event.EventTarget
+import net.ccbluex.liquidbounce.event.UpdateEvent
 import net.ccbluex.liquidbounce.features.module.modules.movement.jesus.JesusMode
+import net.ccbluex.liquidbounce.features.value.BoolValue
+import net.ccbluex.liquidbounce.utils.PacketUtils
+import net.ccbluex.liquidbounce.utils.block.BlockUtils
+import net.minecraft.init.Blocks.lava
+import net.minecraft.init.Blocks.water
+import net.minecraft.network.play.client.C07PacketPlayerDigging
+import net.minecraft.util.EnumFacing
 
 class NoFluidJesus : JesusMode("NoFluid") {
+    private val grim = BoolValue("Grim", false)
+
+    @EventTarget
+    override fun onUpdate(event: UpdateEvent) {
+        if (grim.get()) {
+            val searchBlocks = BlockUtils.searchBlocks(2, setOf(water, lava))
+            for (block in searchBlocks) {
+                val blockpos = block.key
+                //TODO:only do this for blocks that player touched
+                PacketUtils.sendPacket(
+                    C07PacketPlayerDigging(
+                        C07PacketPlayerDigging.Action.STOP_DESTROY_BLOCK,
+                        blockpos,
+                        EnumFacing.DOWN
+                    )
+                )
+            }
+        }
+    }
 }

src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/nowebs/other/GrimAC.kt

@@ -3,29 +3,24 @@ package net.ccbluex.liquidbounce.features.module.modules.movement.nowebs.other
 import net.ccbluex.liquidbounce.event.EventTarget
 import net.ccbluex.liquidbounce.features.module.modules.movement.nowebs.NoWebMode
 import net.ccbluex.liquidbounce.features.value.BoolValue
+import net.ccbluex.liquidbounce.utils.PacketUtils.sendPacket
+import net.ccbluex.liquidbounce.utils.block.BlockUtils
 import net.minecraft.init.Blocks
+import net.minecraft.init.Blocks.web
 import net.minecraft.network.play.client.C07PacketPlayerDigging
+import net.minecraft.network.play.client.C07PacketPlayerDigging.Action
 import net.minecraft.util.BlockPos
 import net.minecraft.util.EnumFacing
 
 class GrimAC : NoWebMode("GrimAC") {
-    private val breakeronworld = BoolValue("BreakerOnWorld",true)
 
     @EventTarget
     override fun onUpdate() {
+        val searchBlocks = BlockUtils.searchBlocks(2, setOf(web))
         mc.thePlayer.isInWeb = false
-    }
-
-    @EventTarget
-    override fun blockPos(pos: BlockPos) {
-        if (breakeronworld.get()) mc.theWorld.setBlockState(pos, Blocks.air.defaultState)
-
-        val start = C07PacketPlayerDigging(C07PacketPlayerDigging.Action.START_DESTROY_BLOCK,pos,EnumFacing.DOWN)
-        val abort = C07PacketPlayerDigging(C07PacketPlayerDigging.Action.ABORT_DESTROY_BLOCK,pos,EnumFacing.DOWN)
-        val finsh = C07PacketPlayerDigging(C07PacketPlayerDigging.Action.STOP_DESTROY_BLOCK,pos,EnumFacing.DOWN)
-
-        mc.netHandler.addToSendQueue(start)
-        mc.netHandler.addToSendQueue(abort)
-        mc.netHandler.addToSendQueue(finsh)
+        for (block in searchBlocks) {
+            val blockpos = block.key
+            sendPacket(C07PacketPlayerDigging(Action.STOP_DESTROY_BLOCK,blockpos, EnumFacing.DOWN))
+        }
     }
 }

src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/speeds/matrix/Matrix7Speed.kt

@@ -2,36 +2,34 @@ package net.ccbluex.liquidbounce.features.module.modules.movement.speeds.matrix
 
 import net.ccbluex.liquidbounce.event.EventTarget
 import net.ccbluex.liquidbounce.features.module.modules.movement.speeds.SpeedMode
-import net.ccbluex.liquidbounce.features.value.BoolValue
 import net.ccbluex.liquidbounce.utils.MovementUtils
 import net.minecraft.client.settings.GameSettings
 
 class Matrix7Speed : SpeedMode("Matrix7") {
-    private val timer = BoolValue("GroundTimer",false)
 
     override fun onDisable() {
-        mc.timer.timerSpeed = 1f
+        mc.thePlayer.speedInAir = 0.02f
     }
+
     @EventTarget
     override fun onUpdate() {
         mc.thePlayer.motionY -= 0.00348
         mc.thePlayer.jumpMovementFactor = 0.026f
         mc.gameSettings.keyBindJump.pressed = GameSettings.isKeyDown(mc.gameSettings.keyBindJump)
-        if (mc.thePlayer.onGround) {
-            mc.gameSettings.keyBindJump.pressed = false
-            if (MovementUtils.isMoving) {
+        if (MovementUtils.isMoving) {
+            if (mc.thePlayer.onGround) {
+                mc.gameSettings.keyBindJump.pressed = false
                 mc.thePlayer.jump()
-                if (timer.get()) {
-                    mc.timer.timerSpeed = 1.35f
-                }
                 MovementUtils.strafe()
+            } else {
+                if (MovementUtils.getSpeed() < 0.19f) {
+                    MovementUtils.strafe()
+                }
             }
-        } else {
-            if (mc.timer.timerSpeed != 1f) {
-                mc.timer.timerSpeed = 1f
-            }
-            if (MovementUtils.getSpeed() < 0.19f) {
-                MovementUtils.strafe()
+            if (mc.thePlayer.fallDistance <= 0.4 && mc.thePlayer.moveStrafing == 0f) {
+                mc.thePlayer.speedInAir = 0.02035f
+            } else {
+                mc.thePlayer.speedInAir = 0.02f
             }
         }
     }