From 66f845967aa358c235173570d07ca3d8128bc712 Mon Sep 17 00:00:00 2001
From: jackh <austin@gmai.com>
Date: Wed, 29 Jan 2025 13:39:26 -0700
Subject: [PATCH] t

---
 .../module/impl/player/Scaffold.java          | 31 +++++++++++--------
 .../module/impl/player/Tower.java             |  6 ++--
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/main/java/keystrokesmod/module/impl/player/Scaffold.java b/src/main/java/keystrokesmod/module/impl/player/Scaffold.java
index c0e9907..bea602b 100644
--- a/src/main/java/keystrokesmod/module/impl/player/Scaffold.java
+++ b/src/main/java/keystrokesmod/module/impl/player/Scaffold.java
@@ -166,7 +166,7 @@ public class Scaffold extends Module {
         if (Utils.keysDown() && usingFastScaffold() && fastScaffold.getInput() >= 1 && !ModuleManager.tower.canTower() && !ModuleManager.LongJump.function) { // jump mode
             if (mc.thePlayer.onGround && Utils.isMoving()) {
                 if (scaffoldTicks > 1) {
-                    rotateForward = true;
+                    rotateForward();
                     mc.thePlayer.jump();
                     Utils.setSpeed(getSpeed(getSpeedLevel()) - Utils.randomizeDouble(0.001, 0.0001));
                     if (fastScaffold.getInput() == 5 || fastScaffold.getInput() == 2 && firstKeepYPlace) {
@@ -239,10 +239,6 @@ public class Scaffold extends Module {
             targetBlock = null;
         }
 
-        if (ModuleUtils.inAirTicks >= 1) {
-            rotateForward = false;
-        }
-
         switch ((int) rotation.getInput()) {
             case 1:
                 e.setRotations(mc.thePlayer.rotationYaw - hardcodedYaw(), 81.150F);
@@ -261,12 +257,12 @@ public class Scaffold extends Module {
 
                 float minPitch = 78.650f;
 
-                float firstStraight = 126.50f;
-                float secondStraight = 128.50f;
-                float thirdStraight = 132.50f;
-                float firstDiag = 133.50f;
-                float secondDiag = 134.50f;
-                float thirdDiag = 135.50f;
+                float firstStraight = 127.50f;
+                float secondStraight = 129.50f;
+                float thirdStraight = 133.50f;
+                float firstDiag = 134.50f;
+                float secondDiag = 135.50f;
+                float thirdDiag = 136.50f;
                 float fourthDiag = 138f;
 
                 //first straight
@@ -538,6 +534,9 @@ public class Scaffold extends Module {
         //Utils.print("" + mc.thePlayer.rotationYaw + " " + mc.thePlayer.rotationPitch);
 
         //jump facing forward
+        if (ModuleUtils.inAirTicks >= 1) {
+            rotateForward = false;
+        }
         if (rotateForward && jumpFacingForward.isToggled()) {
             if (rotation.getInput() > 0) {
                 if (!rotatingForward) {
@@ -547,6 +546,7 @@ public class Scaffold extends Module {
                 float forwardYaw = (mc.thePlayer.rotationYaw - hardcodedYaw() - 180 - (float) Utils.randomizeInt(-5, 5));
                 e.setYaw(forwardYaw);
                 e.setPitch(10 - (float) Utils.randomizeDouble(1, 5));
+                Utils.print("Forward");
             }
         }
         else {
@@ -592,13 +592,13 @@ public class Scaffold extends Module {
 
             hasSwapped = true;
             int mode = (int) fastScaffold.getInput();
-            if (rotation.getInput() == 0 || rotation.getInput() == 2 || (rotation.getInput() > 0 && (rotationDelay == 0 && !rotateForward || !jumpFacingForward.isToggled()))) {
+            if (rotation.getInput() == 0 || rotationDelay == 0) {
                 placeBlock(0, 0);
             }
             if (ModuleManager.tower.placeExtraBlock) {
                 placeBlock(0, -1);
             }
-            if (fastScaffoldKeepY && !ModuleManager.tower.canTower()) {
+            if (fastScaffoldKeepY && !ModuleManager.tower.canTower() && rotationDelay == 0) {
                 ++keepYTicks;
                 if ((int) mc.thePlayer.posY > (int) startYPos) {
                     switch (mode) {
@@ -718,6 +718,11 @@ public class Scaffold extends Module {
         return difference;
     }
 
+    public void rotateForward() {
+        rotateForward = true;
+        rotatingForward = false;
+    }
+
     public boolean blockAbove() {
         return !(BlockUtils.getBlock(new BlockPos(mc.thePlayer.posX, mc.thePlayer.posY + 2, mc.thePlayer.posZ)) instanceof BlockAir);
     }
diff --git a/src/main/java/keystrokesmod/module/impl/player/Tower.java b/src/main/java/keystrokesmod/module/impl/player/Tower.java
index 3ac1d52..be11260 100644
--- a/src/main/java/keystrokesmod/module/impl/player/Tower.java
+++ b/src/main/java/keystrokesmod/module/impl/player/Tower.java
@@ -50,7 +50,7 @@ public class Tower extends Module {
         super("Tower", category.player);
         this.registerSetting(towerMove = new SliderSetting("Tower Move", 0, towerMoveModes));
         this.registerSetting(verticalTower = new SliderSetting("Vertical Tower", 0, verticalTowerModes));
-        this.registerSetting(slowedSpeed = new SliderSetting("Slowed speed", 2, 0, 9, 0.1));
+        this.registerSetting(slowedSpeed = new SliderSetting("Slowed speed", "%", 0, 0, 100, 1));
         this.registerSetting(slowedTicks = new SliderSetting("Slowed ticks", 1, 0, 20, 1));
         this.registerSetting(disableWhileHurt = new ButtonSetting("Disable while hurt", false));
 
@@ -74,6 +74,7 @@ public class Tower extends Module {
                     if (tower) {
                         if (ModuleUtils.inAirTicks == 6) {
                             e.setPosY(e.getPosY() + 0.000383527);
+                            ModuleManager.scaffold.rotateForward();
                         }
                     }
                     break;
@@ -195,7 +196,8 @@ public class Tower extends Module {
         else {
             if (wasTowering && slowedTicks.getInput() > 0 && modulesEnabled()) {
                 if (slowTicks++ < slowedTicks.getInput()) {
-                    Utils.setSpeed(Math.max(slowedSpeed.getInput() * 0.1 - 0.25, 0));
+                    mc.thePlayer.motionX *= slowedSpeed.getInput() / 100;
+                    mc.thePlayer.motionZ *= slowedSpeed.getInput() / 100;
                 }
                 else {
                     slowTicks = 0;