Merge remote-tracking branch 'origin/main'

SkidderMC · Apr 1, 2024 · 8694849 · 8694849
2 parents 91c5878 + 6dc3c37
commit 8694849
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/...et/ccbluex/liquidbounce/features/module/modules/combat/velocitys/other/HypixelVelocity.kt b/...et/ccbluex/liquidbounce/features/module/modules/combat/velocitys/other/HypixelVelocity.kt
@@ -6,17 +6,28 @@
 package net.ccbluex.liquidbounce.features.module.modules.combat.velocitys.other
 
 import net.ccbluex.liquidbounce.event.PacketEvent
+import net.ccbluex.liquidbounce.event.UpdateEvent
 import net.ccbluex.liquidbounce.features.module.modules.combat.velocitys.VelocityMode
 import net.minecraft.network.play.server.S12PacketEntityVelocity
 import net.ccbluex.liquidbounce.utils.misc.RandomUtils
 
 class HypixelVelocity : VelocityMode("Hypixel") {
 
+    private var offGroundTicks = 0
+
     override fun onVelocityPacket(event: PacketEvent) {
         val packet = event.packet
         if(packet is S12PacketEntityVelocity) {
-          event.cancelEvent()
-          mc.thePlayer.motionY = packet.getMotionY().toDouble() / 8000.0
+            event.cancelEvent()
+            if (offGroundTicks < 5) mc.thePlayer.motionY = packet.getMotionY().toDouble() / 8000.0
+        }
+    }
+
+    override fun onUpdate(event: UpdateEvent) {
+        if (mc.thePlayer.onGround) {
+            offGroundTicks = 0
+        } else {
+            offGroundTicks ++
         }
     }
 }
diff --git a/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/item/MixinItemRenderer.java b/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/item/MixinItemRenderer.java
@@ -189,10 +189,11 @@ public void renderItemInFirstPerson(float partialTicks) {
                         this.transformFirstPersonItem(f, f1);
                         break;
                     case BLOCK:
+                        GL11.glTranslated(fDPClient$animations.getTranslateXValue().get(), fDPClient$animations.getTranslateYValue().get(), fDPClient$animations.getTranslateZValue().get());
                         GlStateManager.rotate(fDPClient$animations.getRotateXValue().get(), 1.0F, 0.0F, 0.0F);
                         GlStateManager.rotate(fDPClient$animations.getRotateYValue().get(), 0.0F, 1.0F, 0.0F);
                         GlStateManager.rotate(fDPClient$animations.getRotateZValue().get(), 0.0F, 0.0F, 1.0F);
-                        GL11.glTranslated(fDPClient$animations.getTranslateXValue().get(), fDPClient$animations.getTranslateYValue().get(), fDPClient$animations.getTranslateZValue().get());
+
                         switch (fDPClient$animations.getBlockingModeValue().get()) {
                             case "1.7": {
                                 transformFirstPersonItem(f, f1);