Merge branch 'dev' into feat/Notifications

src/main/java/keystrokesmod/mixins/impl/render/MixinItemRenderer.java

@@ -83,6 +83,9 @@ public void renderItemInFirstPerson(final float partialTicks, @NotNull CallbackI
 
             ItemStack itemToRender = SlotHandler.getRenderHeldItem();
             if (itemToRender != null) {
+                if (itemToRender != SlotHandler.getHeldItem())
+                    animationProgression = 0.0F;
+
                 EnumAction enumaction = itemToRender.getItemUseAction();
                 final int itemInUseCount = thePlayer.getItemInUseCount();
                 boolean useItem = itemInUseCount > 0;

src/main/java/keystrokesmod/module/impl/movement/Phase.java

@@ -11,6 +11,7 @@
 import keystrokesmod.module.setting.impl.SliderSetting;
 import net.minecraft.network.play.server.S02PacketChat;
 import net.minecraft.network.play.server.S08PacketPlayerPosLook;
+import net.minecraft.util.BlockPos;
 import net.minecraftforge.event.world.WorldEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import org.jetbrains.annotations.NotNull;
@@ -23,6 +24,7 @@ public class Phase extends Module {
     private final ButtonSetting cancelS08;
     private final ButtonSetting waitingBreakBlock;
     private final SliderSetting autoDisable;
+    private final ButtonSetting exceptGround;
 
     private int phaseTime;
 
@@ -40,6 +42,7 @@ public Phase() {
         this.registerSetting(cancelS08 = new ButtonSetting("Cancel S06", false));
         this.registerSetting(waitingBreakBlock = new ButtonSetting("waiting break block", false));
         this.registerSetting(autoDisable = new SliderSetting("Auto disable", 6, 1, 20, 1, "ticks"));
+        this.registerSetting(exceptGround = new ButtonSetting("Except ground", false));
     }
 
     @Override
@@ -94,8 +97,11 @@ public void onPreMotion(PreMotionEvent event) {
 
     @SubscribeEvent
     public void onBlockAABB(BlockAABBEvent event) {
-        if (this.phase)
+        if (this.phase) {
+            if (exceptGround.isToggled() && event.getBlockPos().equals(new BlockPos(mc.thePlayer).down()))
+                return;
             event.setBoundingBox(null);
+        }
     }
 
     @SubscribeEvent

src/main/java/keystrokesmod/module/impl/movement/Speed.java

@@ -17,6 +17,7 @@
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.network.play.client.C0BPacketEntityAction;
 import net.minecraft.network.play.server.S08PacketPlayerPosLook;
+import net.minecraft.network.play.server.S12PacketEntityVelocity;
 import net.minecraft.potion.Potion;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.BlockPos;
@@ -34,7 +35,7 @@ public class Speed extends Module {
     private final ButtonSetting sneakDisable;
     private final ButtonSetting stopMotion;
     private final ButtonSetting stopSprint;
-    private final String[] modes = new String[]{"Hypixel A", "BlocksMC", "Vulcan", "GrimAC", "Hypixel B", "Hypixel C"};
+    private final String[] modes = new String[]{"Hypixel A", "BlocksMC", "Vulcan", "GrimAC", "Hypixel B", "Hypixel C", "Polar"};
     private int offGroundTicks = 0;
     public static int ticksSinceVelocity = Integer.MAX_VALUE;
 
@@ -46,13 +47,17 @@ public class Speed extends Module {
     private boolean reset;
     private double speed;
 
+    public TimerUtil timeUtil = new TimerUtil();
+    public int ticks = 0;
+    private boolean start = false;
+
     public Speed() {
         super("Speed", Module.category.movement);
         this.registerSetting(mode = new ModeSetting("Mode", modes, 0));
         this.registerSetting(vulcan$lowHop = new SliderSetting("Low hop", 2, 0, 4, 1, "ticks", new ModeOnly(mode, 2)));
         ModeOnly grimAC = new ModeOnly(mode, 3);
         this.registerSetting(grimAC$boost = new SliderSetting("Boost", 4, 0, 10, 1, grimAC));
-        this.registerSetting(autoJump = new ButtonSetting("Auto jump", false, grimAC));
+        this.registerSetting(autoJump = new ButtonSetting("Auto jump", false, new ModeOnly(mode, 3, 6)));
         this.registerSetting(liquidDisable = new ButtonSetting("Disable in liquid", true));
         this.registerSetting(sneakDisable = new ButtonSetting("Disable while sneaking", true));
         this.registerSetting(stopMotion = new ButtonSetting("Stop motion", false));
@@ -84,6 +89,8 @@ public void onPreMotion(PreMotionEvent event) {
     @Override
     public void onEnable() {
         ticksSinceVelocity = Integer.MAX_VALUE;
+        ticks = 0;
+        start = false;
     }
 
     @SubscribeEvent
@@ -201,6 +208,30 @@ public void onUpdate() {
                 double boost = grimAC$boost.getInput() / 100 * collisions;
                 mc.thePlayer.addVelocity(-Math.sin(yaw) * boost, 0.0, Math.cos(yaw) * boost);
                 break;
+            case 6:
+                if (mc.thePlayer.onGround && autoJump.isToggled() && MoveUtil.isMoving()) {
+                    mc.thePlayer.jump();
+                }
+
+                if (start) {
+
+                    if (this.timeUtil.hasTimeElapsed(20)) {
+                        start = false;
+                    }
+
+                    if (mc.thePlayer.motionY <= -0.10) {
+                        ticks++;
+                        if (ticks % 2 == 0) {
+                            mc.thePlayer.motionY = -0.1;
+                        } else {
+                            mc.thePlayer.motionY = -0.16;
+                        }
+                        mc.thePlayer.jumpMovementFactor = 0.0265f;
+                    } else {
+                        ticks = 0;
+                    }
+                }
+                break;
         }
     }
 
@@ -295,8 +326,25 @@ public void onPlayerInput(PrePlayerInputEvent event) {
 
     @SubscribeEvent
     public void onReceivePacket(@NotNull ReceivePacketEvent event) {
-        if (event.getPacket() instanceof S08PacketPlayerPosLook) {
-            speed = 0;
+        if (noAction()) return;
+
+        switch ((int) mode.getInput()) {
+            case 1:
+                if (event.getPacket() instanceof S08PacketPlayerPosLook) {
+                    speed = 0;
+                }
+                break;
+            case 6:
+                if (event.getPacket() instanceof S12PacketEntityVelocity) {
+
+                    S12PacketEntityVelocity s = (S12PacketEntityVelocity) event.getPacket();
+
+                    if (s.getEntityID() == mc.thePlayer.getEntityId()) {
+                        start = true;
+                        timeUtil.reset();
+                    }
+
+                }
         }
     }
 

src/main/java/keystrokesmod/module/impl/movement/Timer.java

@@ -29,9 +29,9 @@ public class Timer extends Module {
 
     public Timer() {
         super("Timer", Module.category.movement, 0);
-        this.registerSetting(mode = new ModeSetting("Mode", new String[]{"Normal", "Balance", "Hypixel"}, 0));
+        this.registerSetting(mode = new ModeSetting("Mode", new String[]{"Normal", "Balance", "Hypixel", "None"}, 0));
         final ModeOnly mode1 = new ModeOnly(mode, 1);
-        this.registerSetting(speed = new SliderSetting("Speed", 1.00, 0.01, 10.0, 0.01, new ModeOnly(mode, 0, 1)));
+        this.registerSetting(speed = new SliderSetting("Speed", 1.00, 0.01, 10.0, 0.05, new ModeOnly(mode, 0, 1)));
         this.registerSetting(slowTimer = new SliderSetting("Slow timer", 0, 0, 1, 0.01, "x", mode1));
         this.registerSetting(maxBalance = new SliderSetting("Max balance", 1000, 0, 3000, 10, "ms", mode1));
         this.registerSetting(costMultiplier = new SliderSetting("Cost multiplier", 1, 0.5, 5, 0.05, "x", mode1));
@@ -128,14 +128,7 @@ private void reset() {
 
     @Override
     public String getInfo() {
-        switch ((int) mode.getInput()) {
-            case 0:
-                return String.valueOf(speed.getInput());
-            case 1:
-                return String.valueOf(balance);
-            default:
-                return mode.getOptions()[(int) mode.getInput()];
-        }
+        return String.valueOf(Utils.getTimer().timerSpeed);
     }
 
     @Override

src/main/java/keystrokesmod/module/impl/other/RotationHandler.java

@@ -55,10 +55,18 @@ public static void setMovementYaw(float movementYaw) {
     }
 
     public static void setRotationYaw(float rotationYaw) {
+        if (AimSimulator.yawEquals(rotationYaw, mc.thePlayer.rotationYaw)) {
+            RotationHandler.rotationYaw = null;
+            return;
+        }
         RotationHandler.rotationYaw = rotationYaw;
     }
 
     public static void setRotationPitch(float rotationPitch) {
+        if (rotationPitch == mc.thePlayer.rotationPitch) {
+            RotationHandler.rotationPitch = null;
+            return;
+        }
         RotationHandler.rotationPitch = rotationPitch;
     }
 
@@ -95,8 +103,8 @@ public void onPreMotion(MoveInputEvent event) {
             float viewPitch = RotationUtils.normalize(mc.thePlayer.rotationPitch);
             switch ((int) smoothBack.getInput()) {
                 case 0:
-                    setRotationYaw(viewYaw);
-                    setRotationPitch(viewPitch);
+                    rotationYaw = null;
+                    rotationPitch = null;
                     break;
                 case 1:
                     setRotationYaw(AimSimulator.rotMove(viewYaw, getRotationYaw(), (float) aimSpeed.getInput()));
@@ -108,7 +116,7 @@ public void onPreMotion(MoveInputEvent event) {
         if (AimSimulator.yawEquals(getRotationYaw(), mc.thePlayer.rotationYaw)) rotationYaw = null;
         if (getRotationPitch() == mc.thePlayer.rotationPitch) rotationPitch = null;
 
-        RotationEvent rotationEvent = new RotationEvent(getRotationYaw(), getRotationPitch(), getMoveFix());
+        RotationEvent rotationEvent = new RotationEvent(getRotationYaw(), getRotationPitch(), MoveFix.values()[(int) defaultMoveFix.getInput()]);
         MinecraftForge.EVENT_BUS.post(rotationEvent);
         isSet = rotationEvent.isSet() || rotationYaw != null || rotationPitch != null;
         if (isSet) {
@@ -155,7 +163,10 @@ public void onPreMotion(MoveInputEvent event) {
                 case STRICT:
                     movementYaw = getRotationYaw();
                     break;
-                    }
+            }
+        } else {
+            movementYaw = null;
+            moveFix = null;
         }
     }
 

src/main/java/keystrokesmod/module/impl/player/NoFall.java

@@ -67,7 +67,6 @@ public void onUpdate() {
     public void onPacketSend(@NotNull SendPacketEvent event) {
         if (mode.getInput() == 5) {
             if (event.getPacket() instanceof C03PacketPlayer && mc.thePlayer.fallDistance > minFallDistance.getInput()) {
-                Utils.sendMessage(String.format("currentMod: %s  hasMod: %s", currentModCount, hasModCount));
                 if (currentModCount > maxModCount.get(hasModCount % maxModCount.size())) {
                     return;
                 }
@@ -121,7 +120,7 @@ public void onPreMotionEvent(PreMotionEvent event) {
                 } catch (Exception exception) {
                     Utils.sendMessage("&cFailed to get fall distance.");
                 }
-                if (extra$fallDistance > minFallDistance.getInput()) {
+                if (extra$fallDistance - mc.thePlayer.motionY > minFallDistance.getInput()) {
                     Utils.getTimer().timerSpeed = (float) 0.5;
                     mc.getNetHandler().addToSendQueue(new C03PacketPlayer(true));
                     try {

src/main/java/keystrokesmod/module/impl/render/HUD.java

@@ -35,7 +35,7 @@
 import java.util.List;
 
 public class HUD extends Module {
-    public static final String VERSION = "1.16.1-Dev";
+    public static final String VERSION = "1.17.0";
     public static final HashMap<String, ResourceLocation> WATERMARK = new HashMap<>();
     public static ModeSetting theme;
 //    public static SliderSetting font;

src/main/java/keystrokesmod/module/impl/world/tower/HypixelBTower.java

@@ -1,9 +1,11 @@
 package keystrokesmod.module.impl.world.tower;
 
+import keystrokesmod.Raven;
 import keystrokesmod.event.PreMotionEvent;
 import keystrokesmod.event.PreUpdateEvent;
 import keystrokesmod.module.ModuleManager;
 import keystrokesmod.module.impl.world.Tower;
+import keystrokesmod.module.setting.impl.ButtonSetting;
 import keystrokesmod.module.setting.impl.SubMode;
 import keystrokesmod.script.classes.Vec3;
 import keystrokesmod.utility.MoveUtil;
@@ -18,6 +20,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;
+import java.util.concurrent.TimeUnit;
 
 import static keystrokesmod.module.ModuleManager.tower;
 
@@ -40,8 +43,11 @@ public class HypixelBTower extends SubMode<Tower> {
     private int offGroundTicks = 0;
     private BlockPos deltaPlace = BlockPos.ORIGIN;
 
+    private final ButtonSetting onlyWhileMoving;
+
     public HypixelBTower(String name, @NotNull Tower parent) {
         super(name, parent);
+        this.registerSetting(onlyWhileMoving = new ButtonSetting("Only while moving", true));
     }
 
     @SubscribeEvent(priority = EventPriority.LOW)
@@ -51,7 +57,7 @@ public void onPreUpdate(PreUpdateEvent event) {
         else
             offGroundTicks++;
 
-        if (blockPlaceRequest) {
+        if (blockPlaceRequest && !Utils.isMoving()) {
             MovingObjectPosition lastScaffoldPlace = ModuleManager.scaffold.placeBlock;
             if (lastScaffoldPlace == null)
                 return;
@@ -62,20 +68,20 @@ public void onPreUpdate(PreUpdateEvent event) {
             Triple<BlockPos, EnumFacing, Vec3> placeSide = optionalPlaceSide.get();
 
 
-            ModuleManager.scaffold.place(
+            Raven.getExecutor().schedule(() -> ModuleManager.scaffold.place(
                     new MovingObjectPosition(placeSide.getRight().toVec3(), placeSide.getMiddle(), placeSide.getLeft()),
                     false
-            );
+            ), 50, TimeUnit.MILLISECONDS);
 //            ModuleManager.scaffold.tower$noBlockPlace = true;
             blockPlaceRequest = false;
         }
     }
 
     @SubscribeEvent
     public void onPreMotion(PreMotionEvent event) {
-        if (!tower.canTower()) return;
+        if (onlyWhileMoving.isToggled() && !MoveUtil.isMoving()) return;
 
-        if (!Utils.jumpDown()) {
+        if (!tower.canTower()) {
             this.Io = mc.thePlayer.rotationYaw;
             this.er = 100;
         } else {
@@ -171,6 +177,6 @@ public void onEnable() {
 
     public void et() {
         this.Iq = (int)Math.floor(mc.thePlayer.posY);
-        deltaPlace = new BlockPos(0, 0, 1);
+        deltaPlace = new BlockPos(0, 1, 1);
     }
 }