Skip to content

Commit

Permalink
remove watchdogshitspeed
Browse files Browse the repository at this point in the history
  • Loading branch information
@Aspw-w
Aspw-w committed Mar 24, 2023
1 parent ded4997 commit 47a37ac
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 154 deletions.
30 changes: 2 additions & 28 deletions NightX.iws
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
65 changes: 14 additions & 51 deletions src/main/java/net/aspw/client/features/module/modules/movement/Speed.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -70,7 +73,6 @@ class Speed : Module() {
WatchdogBoost(),
WatchdogStable(),
WatchdogCustom(),
WatchdogSemiStrafe(),
VanillaBhop(),
SpartanYPort(),
SpectreBHop(),
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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
)
}

Expand Down Expand Up @@ -493,9 +480,6 @@ class Speed : Module() {
) && !modeName.equals(
"watchdogcustom",
ignoreCase = true
) && !modeName.equals(
"watchdogsemistrafe",
ignoreCase = true
)
}

Expand All @@ -507,9 +491,6 @@ class Speed : Module() {
) && !modeName.equals(
"watchdognew",
ignoreCase = true
) && !modeName.equals(
"watchdogsemistrafe",
ignoreCase = true
)
}

Expand All @@ -518,53 +499,38 @@ 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 moveSpeedValue = FloatValue("MoveSpeed", 1.7f, 1f, 1.7f) {
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 jumpYValue = FloatValue("JumpY", 0.42f, 0f, 1f) {
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 baseStrengthValue = FloatValue("BaseMultiplier", 1f, 0.5f, 1f) {
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)
)
}

Expand All @@ -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)
)
}

Expand Down
75 changes: 0 additions & 75 deletions ...va/net/aspw/client/features/module/modules/movement/speeds/watchdog/WatchdogSemiStrafe.kt
View file

This file was deleted.

0 comments on commit 47a37ac

Please sign in to comment.