Movement Recorder fixes

JellyLabScripts · Dec 22, 2023 · 4b56ed2 · 4b56ed2
1 parent d8c5531
commit 4b56ed2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -4,5 +4,5 @@ baseGroup=com.jelly.farmhelperv2
 mcVersion=1.8.9
 modid=farmhelperv2
 modName=FarmHelper
-version=2.2.9-pre2
+version=2.2.9-pre3
 shouldRelease=true
diff --git a/src/main/java/com/jelly/farmhelperv2/feature/impl/MovRecPlayer.java b/src/main/java/com/jelly/farmhelperv2/feature/impl/MovRecPlayer.java
@@ -33,7 +33,6 @@ public class MovRecPlayer implements IFeature {
     private static MovRecPlayer instance;
     private static boolean isMovementPlaying = false;
     private static boolean isMovementReading = false;
-    private static boolean attackKeyPressed = false;
     private static int currentDelay = 0;
     private static int playingIndex = 0;
     private static float yawDifference = 0;
@@ -180,7 +179,6 @@ public void resetStatesAfterMacroDisabled() {
         currentDelay = 0;
         isMovementPlaying = false;
         isMovementReading = false;
-        attackKeyPressed = false;
         recordingName = "";
         resetTimers();
     }
@@ -237,7 +235,6 @@ public void onTickPlayMovement(TickEvent.ClientTickEvent event) {
             currentDelay++;
             return;
         }
-        attackKeyPressed = false;
         playingIndex++;
         currentDelay = 0;
         if (playingIndex >= movements.size()) {
@@ -259,10 +256,9 @@ private void setPlayerMovement(Movement movement) {
         if (mc.thePlayer.capabilities.allowFlying && mc.thePlayer.capabilities.isFlying != movement.fly)
             mc.thePlayer.capabilities.isFlying = movement.fly;
         KeyBinding.setKeyBindState(mc.gameSettings.keyBindJump.getKeyCode(), movement.jump);
-        if (movement.attack && !attackKeyPressed) {
+        if (movement.attack && currentDelay == 0)
             KeyBindUtils.leftClick();
-            attackKeyPressed = true;
-        }
+        KeyBinding.setKeyBindState(mc.gameSettings.keyBindAttack.getKeyCode(), movement.attack);
     }
 
     public static class Movement {