MushMC Disabler, Stuck Command

add mushdisabler add stuck command add silentview civbreak support add semistrafe speed add bufferabuse flight
Aspw-w · Mar 25, 2023 · d6282b8 · d6282b8
1 parent 47a37ac
commit d6282b8
Show file tree

Hide file tree

Showing 21 changed files with 288 additions and 52 deletions.
diff --git a/NightX.iws b/NightX.iws
@@ -5,9 +5,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="af093b99-5942-419c-869b-8b2d7cb4dd2a" name="変更" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/command/commands/StuckCommand.kt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/movement/speeds/ncp/NCPSemiStrafe.kt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/utils/WorldUtils.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/NightX.iws" beforeDir="false" afterPath="$PROJECT_DIR$/NightX.iws" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/downloads.json" beforeDir="false" afterPath="$PROJECT_DIR$/downloads.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/Client.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/Client.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/command/CommandManager.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/command/CommandManager.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/combat/KillAura.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/combat/KillAura.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/exploit/CivBreak.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/exploit/CivBreak.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/exploit/Disabler.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/exploit/Disabler.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/movement/Flight.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/movement/Flight.kt" 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" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/movement/speeds/ncp/Boost.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/movement/speeds/ncp/NCPBoost.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/movement/speeds/ncp/Frame.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/movement/speeds/ncp/NCPFrame.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/movement/speeds/ncp/MiJump.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/movement/speeds/ncp/NCPMiniJump.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/movement/speeds/ncp/OnGround.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/movement/speeds/ncp/NCPOnGround.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/movement/speeds/ncp/YPort.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/movement/speeds/other/YPort.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/movement/speeds/ncp/YPort2.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/movement/speeds/other/YPort2.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/visual/SilentView.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/modules/visual/SilentView.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/injection/forge/mixins/entity/MixinEntityPlayerSP.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/injection/forge/mixins/entity/MixinEntityPlayerSP.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mcmod.info" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mcmod.info" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -38,8 +56,8 @@
     <option name="RECENT_TEMPLATES">
       <list>
         <option value="Interface" />
-        <option value="Class" />
         <option value="Kotlin Class" />
+        <option value="Class" />
       </list>
     </option>
   </component>
@@ -53,7 +71,7 @@
     <option name="stateVersion" value="1" />
   </component>
   <component name="ProblemsViewState">
-    <option name="selectedTabId" value="ProjectErrors" />
+    <option name="selectedTabId" value="CurrentFile" />
   </component>
   <component name="ProjectCodeStyleSettingsMigration">
     <option name="version" value="2" />
@@ -74,21 +92,21 @@
       <recent name="de.enzaxd.viaforge.platform" />
     </key>
     <key name="MoveKotlinTopLevelDeclarationsDialog.RECENTS_KEY">
+      <recent name="net.aspw.client.features.module.modules.movement.speeds.ncp" />
       <recent name="net.aspw.client.features.module.modules.player" />
       <recent name="net.aspw.client.features.module.modules.other" />
       <recent name="net.aspw.client.features.module.modules.combat" />
       <recent name="net.aspw.client.features.module.modules.visual" />
-      <recent name="net.aspw.client.features.special" />
     </key>
     <key name="ExtractSuperBase.RECENT_KEYS">
       <recent name="de.enzaxd.viaforge.platform" />
     </key>
     <key name="CopyKotlinDeclarationDialog.RECENTS_KEY">
+      <recent name="net.aspw.client.features.command.commands" />
+      <recent name="net.aspw.client.features.module.modules.combat" />
+      <recent name="net.aspw.client.features.module.modules.movement.speeds.other" />
       <recent name="net.aspw.client.features.module.modules.movement.speeds.matrix" />
       <recent name="net.aspw.client.features.module.modules.visual" />
-      <recent name="net.aspw.client.features.module.modules.exploit" />
-      <recent name="net.aspw.client.features.module.modules.movement.speeds.watchdog" />
-      <recent name="net.aspw.client.features.command.commands" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
       <recent name="net.aspw.client.features.module.modules.client" />

diff --git a/downloads.json b/downloads.json
@@ -63,7 +63,7 @@
         "content_type": "application/octet-stream",
         "state": "uploaded",
         "size": 18335769,
-        "download_count": 511,
+        "download_count": 591,
         "created_at": "2023-03-21T11:06:55Z",
         "updated_at": "2023-03-21T11:07:12Z",
         "browser_download_url": "https://github.com/Aspw-w/NightX-Client/releases/download/B41/nightx-release-b41.jar"
@@ -137,7 +137,7 @@
         "content_type": "application/octet-stream",
         "state": "uploaded",
         "size": 18433715,
-        "download_count": 610,
+        "download_count": 611,
         "created_at": "2023-03-18T07:10:12Z",
         "updated_at": "2023-03-18T07:10:18Z",
         "browser_download_url": "https://github.com/Aspw-w/NightX-Client/releases/download/B40/nightx-release-b40.jar"
@@ -309,7 +309,7 @@
         "content_type": "application/octet-stream",
         "state": "uploaded",
         "size": 15958826,
-        "download_count": 611,
+        "download_count": 617,
         "created_at": "2023-03-05T00:47:35Z",
         "updated_at": "2023-03-05T00:47:49Z",
         "browser_download_url": "https://github.com/Aspw-w/NightX-Client/releases/download/B38/nightx-release-b38.jar"
@@ -1047,7 +1047,7 @@
         "content_type": "application/octet-stream",
         "state": "uploaded",
         "size": 17751854,
-        "download_count": 753,
+        "download_count": 754,
         "created_at": "2023-01-03T06:11:17Z",
         "updated_at": "2023-01-03T06:11:22Z",
         "browser_download_url": "https://github.com/Aspw-w/NightX-Client/releases/download/B30/nightx-release-b30.jar"

diff --git a/src/main/java/net/aspw/client/Client.kt b/src/main/java/net/aspw/client/Client.kt
@@ -20,7 +20,7 @@ object Client {
     const val CLIENT_BEST = "NightX"
     const val CLIENT_COLORED = "§lN§fightX"
     const val CLIENT_FOLDER = "NightX"
-    const val CLIENT_VERSION = "Beta B42"
+    const val CLIENT_VERSION = "Release B42"
     const val CLIENT_CREATOR = "CCBlueX, Exit-scammed, As_pw, Zywl"
     const val CLIENT_DISCORD = "https://nightx.api-minecraft.net/s/rgul30dkqw"
     const val CLIENT_FONTS = "https://nightx.api-minecraft.net/s/pe6o0ytkot"

diff --git a/src/main/java/net/aspw/client/features/command/CommandManager.kt b/src/main/java/net/aspw/client/features/command/CommandManager.kt
@@ -44,6 +44,7 @@ class CommandManager {
         registerCommand(LoginCommand())
         registerCommand(ClipCommand())
         registerCommand(RepeatCommand())
+        registerCommand(StuckCommand())
     }
 
     /**

diff --git a/src/main/java/net/aspw/client/features/command/commands/StuckCommand.kt b/src/main/java/net/aspw/client/features/command/commands/StuckCommand.kt
@@ -0,0 +1,27 @@
+package net.aspw.client.features.command.commands
+
+import net.aspw.client.Client
+import net.aspw.client.features.command.Command
+import net.aspw.client.features.module.modules.visual.Hud
+import net.aspw.client.utils.PacketUtils
+import net.aspw.client.visual.hud.element.elements.Notification
+import net.minecraft.network.play.client.C03PacketPlayer.C04PacketPlayerPosition
+
+
+class StuckCommand : Command("stuck", emptyArray()) {
+    /**
+     * Execute commands with provided [args]
+     */
+    override fun execute(args: Array<String>) {
+        if (Client.moduleManager.getModule(Hud::class.java)?.flagSoundValue!!.get()) {
+            Client.tipSoundManager.popSound.asyncPlay(90f)
+        }
+        PacketUtils.sendPacketNoEvent(C04PacketPlayerPosition(mc.thePlayer.posX, -1.0, mc.thePlayer.posZ, false))
+        Client.hud.addNotification(
+            Notification(
+                "You are stuck!",
+                Notification.Type.INFO
+            )
+        )
+    }
+}
diff --git a/src/main/java/net/aspw/client/features/module/modules/combat/KillAura.kt b/src/main/java/net/aspw/client/features/module/modules/combat/KillAura.kt
@@ -847,6 +847,7 @@ class KillAura : Module() {
         if (swingValue.get() && ViaForge.getInstance().version <= 47) {
             if (tickTimer.hasTimePassed(5)) {
                 mc.thePlayer.swingItem()
+                tickTimer.reset()
             } else {
                 PacketUtils.sendPacketNoEvent(C0APacketAnimation())
             }
@@ -857,15 +858,12 @@ class KillAura : Module() {
         if (swingValue.get() && ViaForge.getInstance().version > 47) {
             if (tickTimer.hasTimePassed(5)) {
                 mc.thePlayer.swingItem()
+                tickTimer.reset()
             } else {
                 PacketUtils.sendPacketNoEvent(C0APacketAnimation())
             }
         }
 
-        if (tickTimer.hasTimePassed(6)) {
-            tickTimer.reset()
-        }
-
         if (keepSprintValue.get() && mc.playerController.currentGameType != WorldSettings.GameType.SPECTATOR) {
             mc.thePlayer.attackTargetEntityWithCurrentItem(entity)
         }

diff --git a/src/main/java/net/aspw/client/features/module/modules/exploit/CivBreak.kt b/src/main/java/net/aspw/client/features/module/modules/exploit/CivBreak.kt
@@ -23,9 +23,10 @@ class CivBreak : Module() {
 
     private var blockPos: BlockPos? = null
     private var enumFacing: EnumFacing? = null
+    var isBreaking = false
 
     private val range = FloatValue("Range", 5F, 1F, 6F)
-    private val rotationsValue = BoolValue("Rotations", true)
+    val rotationsValue = BoolValue("Rotations", true)
     private val visualSwingValue = BoolValue("VisualSwing", true)
     private val airResetValue = BoolValue("Air-Reset", false)
     private val rangeResetValue = BoolValue("Range-Reset", false)
@@ -40,9 +41,14 @@ class CivBreak : Module() {
         enumFacing = event.enumFacing
     }
 
+    override fun onEnable() {
+        isBreaking = false
+    }
+
     override fun onDisable() {
         blockPos ?: return
         blockPos = null
+        isBreaking = false
     }
 
     @EventTarget
@@ -61,9 +67,14 @@ class CivBreak : Module() {
         }
 
         if (blockPos !== null) {
+            isBreaking = true
             event.onGround = true
         }
 
+        if (blockPos == null) {
+            isBreaking = false
+        }
+
         when (event.eventState) {
             EventState.PRE -> if (rotationsValue.get()) {
                 RotationUtils.setTargetRotation((RotationUtils.faceBlock(pos) ?: return).rotation)

diff --git a/src/main/java/net/aspw/client/features/module/modules/exploit/Disabler.kt b/src/main/java/net/aspw/client/features/module/modules/exploit/Disabler.kt
@@ -31,10 +31,7 @@ import net.minecraft.network.PacketBuffer
 import net.minecraft.network.play.INetHandlerPlayServer
 import net.minecraft.network.play.client.*
 import net.minecraft.network.play.client.C03PacketPlayer.*
-import net.minecraft.network.play.server.S02PacketChat
-import net.minecraft.network.play.server.S07PacketRespawn
-import net.minecraft.network.play.server.S08PacketPlayerPosLook
-import net.minecraft.network.play.server.S3EPacketTeams
+import net.minecraft.network.play.server.*
 import net.minecraft.util.BlockPos
 import net.minecraft.util.EnumFacing
 import java.awt.Color
@@ -73,6 +70,7 @@ class Disabler : Module() {
     private val input = BoolValue("Input", false)
     private val spectate = BoolValue("Spectate", false)
     private val cubecraft = BoolValue("Cubecraft", false)
+    private val mushmc = BoolValue("MushMC", false)
     private val buzzsemi = BoolValue("Buzz-Semi", false)
     private val vulcancombat = BoolValue("Vulcan-Combat", false)
     private val vulcanstrafe = BoolValue("Vulcan-Strafe", false)
@@ -815,6 +813,14 @@ class Disabler : Module() {
             }
         }
 
+        if (mushmc.get()) {
+            if (packet is C16PacketClientStatus || packet is C0APacketAnimation || packet is S42PacketCombatEvent || packet is S3EPacketTeams) {
+                event.cancelEvent()
+                debug("funny packet")
+            }
+            mc.thePlayer.capabilities.isCreativeMode = true
+        }
+
         if (cubecraft.get()) {
             if (packet is C03PacketPlayer && mc.currentScreen == null) {
                 PacketUtils.sendPacketNoEvent(

diff --git a/src/main/java/net/aspw/client/features/module/modules/movement/Flight.kt b/src/main/java/net/aspw/client/features/module/modules/movement/Flight.kt
@@ -59,6 +59,7 @@ class Flight : Module() {
             "AAC3.3.13",
             "AAC5-Vanilla",
             "Exploit",
+            "BufferAbuse",
             "Zoom",
             "ShotBow",
             "Zonecraft",
@@ -106,11 +107,13 @@ class Flight : Module() {
             .equals("aac5-vanilla", ignoreCase = true) || modeValue.get()
             .equals("bugspartan", ignoreCase = true) || modeValue.get()
             .equals("keepalive", ignoreCase = true) || modeValue.get().equals("derp", ignoreCase = true)
+                || modeValue.get().equals("bufferabuse", ignoreCase = true)
     }
     private val vanillaVSpeedValue = FloatValue("V-Speed", 0.6f, 0f, 5f) {
         modeValue.get().equals("motion", ignoreCase = true) || modeValue.get()
             .equals("blockdrop", ignoreCase = true) || modeValue.get()
             .equals("desync", ignoreCase = true) || modeValue.get().equals("bugspartan", ignoreCase = true)
+                || modeValue.get().equals("bufferabuse", ignoreCase = true)
     }
     private val vanillaMotionYValue = FloatValue("Y-Motion", 0f, -1f, 1f) {
         modeValue.get().equals("motion", ignoreCase = true)
@@ -704,6 +707,18 @@ class Flight : Module() {
         if (mc.thePlayer == null) return
         noFlag = false
         val mode = modeValue.get()
+        if (mode.equals("BufferAbuse")) {
+            PacketUtils.sendPacketNoEvent(
+                C06PacketPlayerPosLook(
+                    mc.thePlayer.posX,
+                    mc.thePlayer.posY - WorldUtils.distanceToGround(),
+                    mc.thePlayer.posZ,
+                    -1f,
+                    0f,
+                    false
+                )
+            )
+        }
         if (mode.equals("Minemora")) {
             tick = 0
             try {
@@ -791,6 +806,12 @@ class Flight : Module() {
         val vanillaVSpeed = vanillaVSpeedValue.get()
         mc.thePlayer.noClip = false
         when (modeValue.get().lowercase(Locale.getDefault())) {
+            "bufferabuse" -> {
+                if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
+                    mc.gameSettings.keyBindSneak.pressed = false
+                }
+            }
+
             "matrix" -> {
                 if (boostMotion == 0) {
                     val yaw = Math.toRadians(mc.thePlayer.rotationYaw.toDouble())
@@ -1697,6 +1718,15 @@ class Flight : Module() {
         if (bobbingValue.get()) {
             mc.thePlayer.cameraYaw = bobbingAmountValue.get()
         }
+        if (modeValue.get().equals("bufferabuse", ignoreCase = true)) {
+            if (WorldUtils.getBlockBellow() != BlockPos.ORIGIN && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
+                mc.thePlayer.setPosition(mc.thePlayer.posX, WorldUtils.getBlockBellow().y.toDouble(), mc.thePlayer.posZ)
+            }
+            if (mc.thePlayer.movementInput.jump)
+                mc.thePlayer.motionY = vanillaVSpeedValue.get().toDouble()
+            else mc.thePlayer.motionY = 0.0
+            MovementUtils.strafe(vanillaSpeedValue.get())
+        }
         if (modeValue.get().equals("boosthypixel", ignoreCase = true)) {
             when (event.eventState) {
                 EventState.PRE -> {
@@ -2003,6 +2033,11 @@ class Flight : Module() {
         val packet = event.packet
         val mode = modeValue.get()
         if (noPacketModify) return
+        if (mode.equals("bufferabuse", ignoreCase = true)) {
+            if (packet is C03PacketPlayer) {
+                event.cancelEvent()
+            }
+        }
         if (mode.equals("matrix", ignoreCase = true)) {
             if (mc.currentScreen == null && packet is S08PacketPlayerPosLook) {
                 TransferUtils.noMotionSet = true
@@ -2193,10 +2228,10 @@ class Flight : Module() {
         if (packet is S08PacketPlayerPosLook && mode.equals("exploit", ignoreCase = true) && wdState == 3) {
             wdState = 4
             if (boostTimer.hasTimePassed(8000L)) {
-                Client.hud.addNotification(Notification("Exploit activated.", Notification.Type.SUCCESS))
+                Client.hud.addNotification(Notification("Exploit Activated!", Notification.Type.SUCCESS))
                 boostTimer.reset()
             } else {
-                Client.hud.addNotification(Notification("Exploit activated.", Notification.Type.SUCCESS))
+                Client.hud.addNotification(Notification("Exploit Activated!", Notification.Type.SUCCESS))
             }
             if (fakeDmgValue.get() && mc.thePlayer != null) mc.thePlayer.handleStatusUpdate(2.toByte())
         }