From 47a37ac1c8c5d37b77fe8f58714a4b58055ccb76 Mon Sep 17 00:00:00 2001
From: Aspw-w <0kcabtuo0@gmail.com>
Date: Sat, 25 Mar 2023 00:09:45 +0900
Subject: [PATCH] remove watchdogshitspeed

---
 NightX.iws                                    | 30 +-------
 .../features/module/modules/movement/Speed.kt | 65 ++++------------
 .../speeds/watchdog/WatchdogSemiStrafe.kt     | 75 -------------------
 3 files changed, 16 insertions(+), 154 deletions(-)
 delete mode 100644 src/main/java/net/aspw/client/features/module/modules/movement/speeds/watchdog/WatchdogSemiStrafe.kt

diff --git a/NightX.iws b/NightX.iws
index 812727ec..b4e49346 100644
--- a/NightX.iws
+++ b/NightX.iws
@@ -6,34 +6,8 @@
   <component name="ChangeListManager">
     <list default="true" id="af093b99-5942-419c-869b-8b2d7cb4dd2a" name="変更" comment="">
       <change beforePath="$PROJECT_DIR$/NightX.iws" beforeDir="false" afterPath="$PROJECT_DIR$/NightX.iws" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/movement/speeds/watchdog/WatchdogSemiStrafe.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/movement/speeds/watchdog/WatchdogSemiStrafe.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/player/Scaffold.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/player/Scaffold.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/AStarCustomPathFinder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/AStarCustomPathFinder.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/AnimationUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/AnimationUtils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/BlinkUtils.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/BlinkUtils.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/ClientUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/ClientUtils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/MovementUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/MovementUtils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/RollingArrayLongBuffer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/RollingArrayLongBuffer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/Rotation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/Rotation.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/RotationUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/RotationUtils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/SessionUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/SessionUtils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/TimeHelper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/TimeHelper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/pathfinder/MainPathFinder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/pathfinder/MainPathFinder.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/pathfinder/Path.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/pathfinder/PathFinderBlockInfo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/pathfinder/Vec3d.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/pathfinder/Vector.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/render/BlurUtils.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/render/BlurUtils.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/render/CustomTexture.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/render/EaseUtils.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/render/EaseUtils.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/render/ParticleUtils.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/render/RenderUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/render/RenderUtils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/render/SafeVertexBuffer.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/render/UiUtils.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/render/WorldToScreen.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/render/shader/Shader.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/render/shader/Shader.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/render/shader/shaders/BackgroundShader.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mcmod.info" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mcmod.info" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/movement/Speed.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/movement/Speed.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/movement/speeds/watchdog/WatchdogSemiStrafe.kt" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/main/java/net/aspw/client/features/module/modules/movement/Speed.kt b/src/main/java/net/aspw/client/features/module/modules/movement/Speed.kt
index e5376143..3cee46e4 100644
--- a/src/main/java/net/aspw/client/features/module/modules/movement/Speed.kt
+++ b/src/main/java/net/aspw/client/features/module/modules/movement/Speed.kt
@@ -26,7 +26,10 @@ import net.aspw.client.features.module.modules.movement.speeds.vulcan.VulcanGrou
 import net.aspw.client.features.module.modules.movement.speeds.vulcan.VulcanHop1
 import net.aspw.client.features.module.modules.movement.speeds.vulcan.VulcanHop2
 import net.aspw.client.features.module.modules.movement.speeds.vulcan.VulcanYPort
-import net.aspw.client.features.module.modules.movement.speeds.watchdog.*
+import net.aspw.client.features.module.modules.movement.speeds.watchdog.WatchdogBoost
+import net.aspw.client.features.module.modules.movement.speeds.watchdog.WatchdogCustom
+import net.aspw.client.features.module.modules.movement.speeds.watchdog.WatchdogNew
+import net.aspw.client.features.module.modules.movement.speeds.watchdog.WatchdogStable
 import net.aspw.client.value.BoolValue
 import net.aspw.client.value.FloatValue
 import net.aspw.client.value.IntegerValue
@@ -70,7 +73,6 @@ class Speed : Module() {
         WatchdogBoost(),
         WatchdogStable(),
         WatchdogCustom(),
-        WatchdogSemiStrafe(),
         VanillaBhop(),
         SpartanYPort(),
         SpectreBHop(),
@@ -221,7 +223,7 @@ class Speed : Module() {
 
     val hypixelModeValue: ListValue = object : ListValue(
         "Watchdog-Mode",
-        arrayOf("New", "SemiStrafe", "Boost", "Stable", "Custom"),
+        arrayOf("New", "Boost", "Stable", "Custom"),
         "New",
         { typeValue.get().equals("watchdog", ignoreCase = true) }) {
         override fun onChange(oldValue: String, newValue: String) {
@@ -388,43 +390,28 @@ class Speed : Module() {
         modeName.equals(
             "watchdogcustom",
             ignoreCase = true
-        ) && !modeName.equals("watchdognew", ignoreCase = true) && !modeName.equals(
-            "watchdogsemistrafe",
-            ignoreCase = true
-        ) || modeName.equals(
+        ) && !modeName.equals("watchdognew", ignoreCase = true) || modeName.equals(
             "watchdogcustom",
             ignoreCase = true
-        ) && !modeName.equals(
-            "watchdogsemistrafe",
-            ignoreCase = true
         )
     }
     val smoothStrafe = BoolValue("SmoothStrafe", true) {
         modeName.equals(
             "watchdogcustom",
             ignoreCase = true
-        ) && !modeName.equals("watchdognew", ignoreCase = true) && !modeName.equals(
-            "watchdogsemistrafe",
-            ignoreCase = true
-        )
+        ) && !modeName.equals("watchdognew", ignoreCase = true)
     }
     val customSpeedValue =
         FloatValue("StrSpeed", 0.42f, 0.2f, 2f) {
             modeName.equals(
                 "watchdogcustom",
                 ignoreCase = true
-            ) && !modeName.equals("watchdognew", ignoreCase = true) && !modeName.equals(
-                "watchdogsemistrafe",
-                ignoreCase = true
-            )
+            ) && !modeName.equals("watchdognew", ignoreCase = true)
         }
     val motionYValue = FloatValue("MotionY", 0.42f, 0f, 2f) {
         modeName.equals("watchdogcustom", ignoreCase = true) && !modeName.equals(
             "watchdognew",
             ignoreCase = true
-        ) && !modeName.equals(
-            "watchdogsemistrafe",
-            ignoreCase = true
         )
     }
 
@@ -493,9 +480,6 @@ class Speed : Module() {
         ) && !modeName.equals(
             "watchdogcustom",
             ignoreCase = true
-        ) && !modeName.equals(
-            "watchdogsemistrafe",
-            ignoreCase = true
         )
     }
 
@@ -507,9 +491,6 @@ class Speed : Module() {
         ) && !modeName.equals(
             "watchdognew",
             ignoreCase = true
-        ) && !modeName.equals(
-            "watchdogsemistrafe",
-            ignoreCase = true
         )
     }
 
@@ -518,10 +499,7 @@ class Speed : Module() {
         typeValue.get().equals("watchdog", ignoreCase = true) && !modeName.equals(
             "watchdognew",
             ignoreCase = true
-        ) && !modeName.equals("watchdogcustom", ignoreCase = true) && !modeName.equals(
-            "watchdogsemistrafe",
-            ignoreCase = true
-        )
+        ) && !modeName.equals("watchdogcustom", ignoreCase = true)
     }
 
     @JvmField
@@ -529,10 +507,7 @@ class Speed : Module() {
         typeValue.get().equals("watchdog", ignoreCase = true) && !modeName.equals(
             "watchdognew",
             ignoreCase = true
-        ) && !modeName.equals("watchdogcustom", ignoreCase = true) && !modeName.equals(
-            "watchdogsemistrafe",
-            ignoreCase = true
-        )
+        ) && !modeName.equals("watchdogcustom", ignoreCase = true)
     }
 
     @JvmField
@@ -540,10 +515,7 @@ class Speed : Module() {
         typeValue.get().equals("watchdog", ignoreCase = true) && !modeName.equals(
             "watchdognew",
             ignoreCase = true
-        ) && !modeName.equals("watchdogcustom", ignoreCase = true) && !modeName.equals(
-            "watchdogsemistrafe",
-            ignoreCase = true
-        )
+        ) && !modeName.equals("watchdogcustom", ignoreCase = true)
     }
 
     @JvmField
@@ -551,20 +523,14 @@ class Speed : Module() {
         typeValue.get().equals("watchdog", ignoreCase = true) && !modeName.equals(
             "watchdognew",
             ignoreCase = true
-        ) && !modeName.equals("watchdogcustom", ignoreCase = true) && !modeName.equals(
-            "watchdogsemistrafe",
-            ignoreCase = true
-        )
+        ) && !modeName.equals("watchdogcustom", ignoreCase = true)
     }
 
     @JvmField
     val baseTimerValue = FloatValue("BaseTimer", 1.5f, 1f, 3f) {
         modeName.equals(
             "watchdogboost",
-            ignoreCase = true && !modeName.equals("watchdognew", ignoreCase = true) && !modeName.equals(
-                "watchdogsemistrafe",
-                ignoreCase = true
-            )
+            ignoreCase = true && !modeName.equals("watchdognew", ignoreCase = true)
         )
     }
 
@@ -573,10 +539,7 @@ class Speed : Module() {
         FloatValue("BaseMultiplierTimer", 1f, 0f, 3f) {
             modeName.equals(
                 "watchdogboost",
-                ignoreCase = true && !modeName.equals("watchdognew", ignoreCase = true) && !modeName.equals(
-                    "watchdogsemistrafe",
-                    ignoreCase = true
-                )
+                ignoreCase = true && !modeName.equals("watchdognew", ignoreCase = true)
             )
         }
 
diff --git a/src/main/java/net/aspw/client/features/module/modules/movement/speeds/watchdog/WatchdogSemiStrafe.kt b/src/main/java/net/aspw/client/features/module/modules/movement/speeds/watchdog/WatchdogSemiStrafe.kt
deleted file mode 100644
index 297638f3..00000000
--- a/src/main/java/net/aspw/client/features/module/modules/movement/speeds/watchdog/WatchdogSemiStrafe.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-package net.aspw.client.features.module.modules.movement.speeds.watchdog
-
-import net.aspw.client.Client
-import net.aspw.client.event.EventState
-import net.aspw.client.event.JumpEvent
-import net.aspw.client.event.MotionEvent
-import net.aspw.client.event.MoveEvent
-import net.aspw.client.features.module.modules.movement.Speed
-import net.aspw.client.features.module.modules.movement.speeds.SpeedMode
-import net.aspw.client.utils.MovementUtils
-import net.aspw.client.utils.PacketUtils
-import net.minecraft.network.play.client.C07PacketPlayerDigging
-import net.minecraft.potion.Potion
-import net.minecraft.util.BlockPos
-import net.minecraft.util.EnumFacing
-
-class WatchdogSemiStrafe : SpeedMode("WatchdogSemiStrafe") {
-    private var groundTick = 0
-    override fun onJump(event: JumpEvent) {
-        if (mc.thePlayer != null && MovementUtils.isMoving())
-            event.cancelEvent()
-    }
-
-    override fun onEnable() {
-        Client.moduleManager.getModule(
-            Speed::class.java
-        ) ?: return
-        super.onEnable()
-    }
-
-    override fun onMotion(eventMotion: MotionEvent) {
-        val speed = Client.moduleManager.getModule(
-            Speed::class.java
-        )
-        if (speed == null || eventMotion.eventState !== EventState.PRE || mc.thePlayer.isInWater) return
-        if (MovementUtils.isMoving()) {
-            PacketUtils.sendPacketNoEvent(
-                C07PacketPlayerDigging(
-                    C07PacketPlayerDigging.Action.STOP_DESTROY_BLOCK,
-                    BlockPos(-1, -1, -1),
-                    EnumFacing.UP
-                )
-            )
-            groundTick++
-            if (mc.thePlayer.onGround) {
-                if (groundTick >= 0) {
-                    mc.thePlayer.motionY = 0.41999998688698
-                }
-            } else {
-                if (mc.thePlayer.moveForward != 0f) {
-                    if (mc.thePlayer.isPotionActive(Potion.moveSpeed)) {
-                        MovementUtils.strafe(0.11f)
-                    } else {
-                        MovementUtils.strafe(0.04f)
-                    }
-                    mc.thePlayer.jumpMovementFactor = 0.2f
-                }
-                if (mc.thePlayer.moveForward == 0f) {
-                    if (mc.thePlayer.isPotionActive(Potion.moveSpeed)) {
-                        MovementUtils.strafe(0.05f)
-                    } else {
-                        MovementUtils.strafe(0.01f)
-                    }
-                    mc.thePlayer.jumpMovementFactor = 0.2f
-                }
-            }
-        } else {
-            groundTick = 0
-        }
-    }
-
-    override fun onUpdate() {}
-    override fun onMotion() {}
-    override fun onMove(event: MoveEvent) {}
-}
\ No newline at end of file