diff --git a/src/main/java/net/aspw/client/Client.kt b/src/main/java/net/aspw/client/Client.kt index 718abb59..3c403371 100644 --- a/src/main/java/net/aspw/client/Client.kt +++ b/src/main/java/net/aspw/client/Client.kt @@ -31,11 +31,11 @@ import net.minecraft.util.ResourceLocation object Client { // Client information - const val isInDevelopment = true + const val isInDevelopment = false const val CLIENT_BEST = "NightX" const val CLIENT_FOLDER = "NightWare" - const val CLIENT_VERSION = "Beta B80" + const val CLIENT_VERSION = "Release B80" const val CLIENT_CREATOR = "As_pw" const val CLIENT_WEBSITE = "https://aspw-w.github.io/NightX-Web" const val CLIENT_ANNOUNCEMENT = "$CLIENT_WEBSITE/database/announcement.txt" diff --git a/src/main/java/net/aspw/client/features/module/impl/exploit/Disabler.kt b/src/main/java/net/aspw/client/features/module/impl/exploit/Disabler.kt index e1c45f62..f27bbd6f 100644 --- a/src/main/java/net/aspw/client/features/module/impl/exploit/Disabler.kt +++ b/src/main/java/net/aspw/client/features/module/impl/exploit/Disabler.kt @@ -56,6 +56,7 @@ class Disabler : Module() { private val vanilladesync = BoolValue("Vanilla-Desync", false) private val silentaccept = BoolValue("Silent-Accept", false) private val shotbow = BoolValue("ShotBow", false) + private val watchdogflag = BoolValue("Watchdog-Flag", false) private val funcraftstaff = BoolValue("Funcraft-Staff", false) private val blockdrop = BoolValue("BlockDrop", false) private val grim = BoolValue("Grim", false) @@ -226,6 +227,7 @@ class Disabler : Module() { private var alrSprint = false private var expectedSetback = false + private var flagged = false private var packetCount = 0 @@ -325,6 +327,7 @@ class Disabler : Module() { } override fun onDisable() { + flagged = false pre = false Client.moduleManager.getModule(VulcanEatCore::class.java)?.state = false pendingFlagApplyPacket = false @@ -371,6 +374,14 @@ class Disabler : Module() { mc.timer.timerSpeed = 1F } + @EventTarget + fun onTeleport(event: TeleportEvent) { + if (watchdogflag.get()) { + debug("Flagged") + flagged = true + } + } + @EventTarget fun onWorld(event: WorldEvent) { if (oldwatchdog2.get()) { @@ -378,6 +389,9 @@ class Disabler : Module() { inCage = true } + if (watchdogflag.get()) + flagged = false + if (vulcancombat.get()) { BlinkUtils.clearPacket(packetType = "C0FPacketConfirmTransaction") currentTrans = 0 @@ -537,6 +551,34 @@ class Disabler : Module() { fun onPacket(event: PacketEvent) { val packet = event.packet + if (watchdogflag.get()) { + if (packet is C03PacketPlayer && flagged) { + debug("Sent Fix Packet") + event.cancelEvent() + PacketUtils.sendPacketNoEvent( + C06PacketPlayerPosLook( + packet.x, + packet.y, + packet.z, + packet.yaw, + packet.pitch, + packet.onGround + ) + ) + PacketUtils.sendPacketNoEvent( + C06PacketPlayerPosLook( + mc.thePlayer.posX, + mc.thePlayer.posY, + mc.thePlayer.posZ, + mc.thePlayer.rotationYaw, + mc.thePlayer.rotationPitch, + mc.thePlayer.onGround + ) + ) + flagged = false + } + } + if (boat.get()) { if (mc.thePlayer.ridingEntity != null) { canModify = true diff --git a/src/main/java/net/aspw/client/features/module/impl/movement/InvMove.kt b/src/main/java/net/aspw/client/features/module/impl/movement/InvMove.kt index 5929f760..8c8cc8c4 100644 --- a/src/main/java/net/aspw/client/features/module/impl/movement/InvMove.kt +++ b/src/main/java/net/aspw/client/features/module/impl/movement/InvMove.kt @@ -4,7 +4,6 @@ import net.aspw.client.event.* import net.aspw.client.features.module.Module import net.aspw.client.features.module.ModuleCategory import net.aspw.client.features.module.ModuleInfo -import net.aspw.client.util.MovementUtils import net.aspw.client.value.BoolValue import net.aspw.client.value.ListValue import net.minecraft.client.gui.GuiChat @@ -20,7 +19,6 @@ class InvMove : Module() { val modeValue = ListValue("Mode", arrayOf("Vanilla", "Silent", "Blink"), "Silent") private val noDetectableValue = BoolValue("NoDetectable", false) - private val noMoveClicksValue = BoolValue("NoMoveClicks", false) private val playerPackets = mutableListOf() @@ -47,12 +45,6 @@ class InvMove : Module() { } } - @EventTarget - fun onClick(event: ClickWindowEvent) { - if (noMoveClicksValue.get() && MovementUtils.isMoving()) - event.cancelEvent() - } - @EventTarget fun onPacket(event: PacketEvent) { val packet = event.packet diff --git a/src/main/java/net/aspw/client/features/module/impl/movement/speeds/watchdog/WatchdogGround.kt b/src/main/java/net/aspw/client/features/module/impl/movement/speeds/watchdog/WatchdogGround.kt index 0b9ecfc6..04a599ec 100644 --- a/src/main/java/net/aspw/client/features/module/impl/movement/speeds/watchdog/WatchdogGround.kt +++ b/src/main/java/net/aspw/client/features/module/impl/movement/speeds/watchdog/WatchdogGround.kt @@ -31,7 +31,13 @@ class WatchdogGround : SpeedMode("WatchdogGround") { if (mc.thePlayer.isPotionActive(Potion.moveSpeed)) { MovementUtils.strafe(0.58f) } else { - MovementUtils.strafe(0.466f) + MovementUtils.strafe(0.46f) + } + } else if (mc.thePlayer.fallDistance > 0.1 && mc.thePlayer.hurtTime != 0) { + if (mc.thePlayer.isPotionActive(Potion.moveSpeed)) { + MovementUtils.strafe(0.18f) + } else { + MovementUtils.strafe(0.14f) } } }