improve tower

improve itemRenderer add none mode to Timer
xia-mc · Jul 18, 2024 · 7b8b29a · 7b8b29a
1 parent 882ffd3
commit 7b8b29a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/src/main/java/keystrokesmod/mixins/impl/render/MixinItemRenderer.java b/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;

diff --git a/src/main/java/keystrokesmod/module/impl/movement/Timer.java b/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

diff --git a/src/main/java/keystrokesmod/module/impl/world/tower/HypixelBTower.java b/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)
@@ -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);
     }
 }