From e9633da3dcfb2433a5383839b18cc15ee367eb2c Mon Sep 17 00:00:00 2001 From: XeContrast <1683481541@qq.com> Date: Sun, 18 Aug 2024 12:37:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=86=99Step=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0KillAura=E5=9C=A8=E6=94=BB=E5=87=BB=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=E5=8F=96=E6=B6=88=E7=96=BE=E8=B7=91=E7=9A=84=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E5=A2=9E=E5=8A=A0hypixel=E7=9A=84StepMode?= =?UTF-8?q?=EF=BC=8C=E5=A4=A7=E6=94=B9=E5=8F=8D=E5=AE=A2=E6=9C=8D=E5=B9=B6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0Hypixel=20mode=EF=BC=8C=E4=BF=AE=E6=94=B9Hypi?= =?UTF-8?q?xelNewHop=E7=9A=84=E8=B7=B3=E8=B7=83=E5=80=BC=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0RawInput=E6=A8=A1=E5=9D=97=E4=BB=A5=E4=BE=BF=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=BC=A0=E6=A0=87=E7=AA=81=E7=84=B6=E4=B9=B1=E9=A3=9E?= =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/modules/client/RawInput.kt | 52 ++ .../module/modules/combat/FightBot.kt | 2 +- .../module/modules/combat/KillAura.kt | 12 + .../features/module/modules/movement/Step.kt | 613 +++--------------- .../module/modules/movement/StepTest.kt | 128 ---- .../movement/speeds/other/HypixelNewHop.kt | 2 +- .../module/modules/movement/steps/StepMode.kt | 6 +- .../modules/movement/steps/anticheat/AAC.kt | 32 + .../movement/steps/anticheat/AAC440.kt | 112 ++++ .../movement/steps/anticheat/Matrix.kt | 42 ++ .../movement/steps/anticheat/Matrix670.kt | 205 ++++++ .../modules/movement/steps/anticheat/NCP.kt | 30 + .../movement/steps/anticheat/NCPNew.kt | 104 +++ .../movement/steps/anticheat/OldNCP.kt | 20 + .../movement/steps/anticheat/Spartan.kt | 50 ++ .../modules/movement/steps/anticheat/Verus.kt | 31 + .../movement/steps/anticheat/Vulcan.kt | 65 ++ .../modules/movement/steps/server/BlocksMC.kt | 48 ++ .../modules/movement/steps/server/Hypixel.kt | 74 +++ .../movement/steps/server/Rewinside.kt | 39 ++ .../movement/steps/vanilla/JumpStep.kt | 8 +- .../movement/steps/vanilla/VanillaStep.kt | 5 +- .../module/modules/other/AntiExploit.kt | 5 +- .../module/modules/other/AntiStaff.kt | 292 ++++++++- .../module/modules/other/PacketDebugger.kt | 26 +- .../forge/mixins/client/MixinMinecraft.java | 30 +- .../mixins/entity/MixinEntityPlayerSP.java | 6 +- .../network/MixinC17PacketCustomPayload.java | 2 +- .../mixins/network/MixinNetworkManager.java | 1 + .../ui/client/hud/element/Element.kt | 4 +- .../client/hud/element/elements/Arraylist.kt | 12 +- .../liquidbounce/utils/RawMouseHelper.kt | 13 + 32 files changed, 1347 insertions(+), 724 deletions(-) create mode 100644 src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/RawInput.kt delete mode 100644 src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/StepTest.kt create mode 100644 src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/AAC.kt create mode 100644 src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/AAC440.kt create mode 100644 src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/Matrix.kt create mode 100644 src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/Matrix670.kt create mode 100644 src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/NCP.kt create mode 100644 src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/NCPNew.kt create mode 100644 src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/OldNCP.kt create mode 100644 src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/Spartan.kt create mode 100644 src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/Verus.kt create mode 100644 src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/Vulcan.kt create mode 100644 src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/server/BlocksMC.kt create mode 100644 src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/server/Hypixel.kt create mode 100644 src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/server/Rewinside.kt create mode 100644 src/main/java/net/ccbluex/liquidbounce/utils/RawMouseHelper.kt diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/RawInput.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/RawInput.kt new file mode 100644 index 0000000..48c819a --- /dev/null +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/RawInput.kt @@ -0,0 +1,52 @@ +package net.ccbluex.liquidbounce.features.module.modules.client + +import net.ccbluex.liquidbounce.features.module.Module +import net.ccbluex.liquidbounce.features.module.ModuleCategory +import net.ccbluex.liquidbounce.features.module.ModuleInfo +import net.ccbluex.liquidbounce.utils.RawMouseHelper +import net.java.games.input.Controller +import net.java.games.input.ControllerEnvironment +import net.java.games.input.Mouse +import net.minecraft.client.Minecraft +import net.minecraftforge.fml.common.event.FMLInitializationEvent + +@ModuleInfo("RawInput", category = ModuleCategory.CLIENT) +object RawInput : Module() { + var mouse: Mouse? = null + private lateinit var controllers: Array + var dx: Int = 0 + var dy: Int = 0 + + fun init(event: FMLInitializationEvent?) { + Minecraft.getMinecraft().mouseHelper = RawMouseHelper() + controllers = ControllerEnvironment.getDefaultEnvironment().controllers + + val inputThread = Thread { + while (true) { + var i = 0 + while (i < controllers.size && mouse == null) { + if (controllers[i].type === Controller.Type.MOUSE) { + controllers[i].poll() + if ((controllers[i] as Mouse).x.pollData.toDouble() != 0.0 || (controllers[i] as Mouse).y.pollData.toDouble() != 0.0) mouse = + controllers[i] as Mouse + } + i++ + } + if (mouse != null) { + mouse!!.poll() + + dx += mouse!!.x.pollData.toInt() + dy += mouse!!.y.pollData.toInt() + } + try { + Thread.sleep(1) + } catch (e: InterruptedException) { + // TODO Auto-generated catch block + e.printStackTrace() + } + } + } + inputThread.name = "inputThread" + inputThread.start() + } +} \ No newline at end of file diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/FightBot.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/FightBot.kt index 0e8f3e7..7f7fb87 100644 --- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/FightBot.kt +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/FightBot.kt @@ -13,8 +13,8 @@ import net.ccbluex.liquidbounce.event.UpdateEvent import net.ccbluex.liquidbounce.features.module.Module import net.ccbluex.liquidbounce.features.module.ModuleCategory import net.ccbluex.liquidbounce.features.module.ModuleInfo -import net.ccbluex.liquidbounce.features.module.modules.other.Teams import net.ccbluex.liquidbounce.features.module.modules.movement.Step +import net.ccbluex.liquidbounce.features.module.modules.other.Teams import net.ccbluex.liquidbounce.features.value.BoolValue import net.ccbluex.liquidbounce.features.value.FloatValue import net.ccbluex.liquidbounce.features.value.ListValue diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/KillAura.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/KillAura.kt index 7a0b88f..e2e3f38 100644 --- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/KillAura.kt +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/KillAura.kt @@ -90,6 +90,7 @@ object KillAura : Module() { private val attackTimingValue = ListValue("AttackTiming", arrayOf("All", "Pre", "Post"), "All").displayable { attackDisplay.get() } val sprintmode = ListValue("SprintMode", arrayOf("KeepSprint","Ground","StopSprint","StopMotion","Normal"),"KeepSprint").displayable { attackDisplay.get() } + val stopsprint = BoolValue("StopSprintWhenC02",false).displayable { !sprintmode.equals("StopSprint") } private val hitselectValue = BoolValue("HitSelect", false).displayable { attackDisplay.get() } private val hitselectRangeValue = FloatValue( @@ -448,6 +449,8 @@ object KillAura : Module() { // Fake block status var blockingStatus = false + var attack = false + val displayBlocking: Boolean get() = blockingStatus || (((autoBlockValue.equals("Fake") || (alwaysBlockDisplayValue.get() && autoBlockValue.equals( "Range" @@ -516,6 +519,7 @@ object KillAura : Module() { attackTickTimes.clear() clicks = 0 canSwing = false + attack = false stopBlocking() if (autoBlockPacketValue.equals("HoldKey") || autoBlockPacketValue.equals("KeyBlock")) { @@ -766,6 +770,14 @@ object KillAura : Module() { } } + @EventTarget + fun onPacket(event: PacketEvent) { + val packet = event.packet + if (stopsprint.get() && !sprintmode.equals("StopSprint")) { + attack = packet is C02PacketUseEntity + } + } + @EventTarget fun onStrafe(event: StrafeEvent) { if (rotationStrafeValue.equals("Vanilla") && discoveredTargets.isNotEmpty()) { diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/Step.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/Step.kt index c5e6e66..652e401 100644 --- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/Step.kt +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/Step.kt @@ -1,65 +1,58 @@ -/* - * FDPClient Hacked Client - * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. - * https://github.com/SkidderMC/FDPClient/ - */ package net.ccbluex.liquidbounce.features.module.modules.movement import net.ccbluex.liquidbounce.event.* import net.ccbluex.liquidbounce.features.module.Module import net.ccbluex.liquidbounce.features.module.ModuleCategory import net.ccbluex.liquidbounce.features.module.ModuleInfo -import net.ccbluex.liquidbounce.utils.MovementUtils -import net.ccbluex.liquidbounce.utils.timer.MSTimer +import net.ccbluex.liquidbounce.features.module.modules.movement.steps.StepMode import net.ccbluex.liquidbounce.features.value.BoolValue import net.ccbluex.liquidbounce.features.value.FloatValue import net.ccbluex.liquidbounce.features.value.IntegerValue import net.ccbluex.liquidbounce.features.value.ListValue -import net.minecraft.network.play.client.C03PacketPlayer +import net.ccbluex.liquidbounce.utils.ClassUtils +import net.ccbluex.liquidbounce.utils.timer.MSTimer import net.minecraft.stats.StatList -import net.minecraft.init.Blocks -import net.minecraft.item.ItemStack -import net.minecraft.network.play.client.C08PacketPlayerBlockPlacement -import kotlin.math.ceil -import kotlin.math.cos -import kotlin.math.sin import kotlin.math.sqrt -@ModuleInfo(name = "Step", category = ModuleCategory.MOVEMENT) +@ModuleInfo("StepTest", category = ModuleCategory.MOVEMENT) object Step : Module() { + var isStep = false + var stepX = 0.0 + var stepY = 0.0 + var stepZ = 0.0 + + var ncpNextStep = 0 + var spartanSwitch = false + var isAACStep = false + var wasTimer = false + var lastOnGround = false + var canStep = false + val timer = MSTimer() + var high = 0.0f + var doncheck = false + var off = false //你麻痹不每个设置一个直接狗日的不工作了 + private val modes = ClassUtils.resolvePackage("${this.javaClass.`package`.name}.steps", StepMode::class.java) + .map { it.newInstance() as StepMode } + .sortedBy { it.modeName } + + private val mode: StepMode + get() = modes.find { modeValue.equals(it.modeName) } ?: throw NullPointerException() // this should not happen + + val modeValue: ListValue = object : ListValue("Mode", modes.map { it.modeName }.toTypedArray(), "Vanilla") { + override fun onChange(oldValue: String, newValue: String) { + if (state) onDisable() + } - /** - * OPTIONS - */ + override fun onChanged(oldValue: String, newValue: String) { + if (state) onEnable() + } + } - val modeValue = ListValue("Mode", arrayOf("Vanilla", "Jump", "Matrix6.7.0", - "NCP", "NCPNew", "OldNCP", - "OldAAC", "AAC4.4.0", - "Spartan", "Rewinside", "Vulcan", "Verus", "BlocksMC"), "NCP") - private val heightValue = FloatValue("Height", 1F, 0.6F, 10F) - private val jumpHeightValue = FloatValue("JumpMotion", 0.42F, 0.37F, 0.42F).displayable { modeValue.equals("Jump") || modeValue.equals("TimerJump") } - private val delayValue = IntegerValue("Delay", 0, 0, 500) + val heightValue = FloatValue("Height", 1F, 0.6F, 10F) + val delayValue = IntegerValue("Delay", 0, 0, 500) private val timerValue = FloatValue("Timer", 1F, 0.05F, 1F).displayable { !modeValue.equals("Matrix6.7.0") && !modeValue.equals("Verus") } private val timerDynValue = BoolValue("UseDynamicTimer", false).displayable { !modeValue.equals("Matrix6.7.0") && !modeValue.equals("Verus")} - /** - * VALUES - */ - - private var isStep = false - private var stepX = 0.0 - private var stepY = 0.0 - private var stepZ = 0.0 - - private var ncpNextStep = 0 - private var spartanSwitch = false - private var isAACStep = false - private var wasTimer = false - private var lastOnGround = false - private var canStep = false - - private val timer = MSTimer() - override fun onDisable() { mc.thePlayer ?: return @@ -70,508 +63,98 @@ object Step : Module() { lastOnGround = mc.thePlayer.onGround } - @EventTarget - fun onUpdate(event: UpdateEvent) { - if (wasTimer) { - mc.timer.timerSpeed = 1.0F - wasTimer = false - } - if (mc.thePlayer.isCollidedHorizontally && mc.thePlayer.onGround && lastOnGround) { - canStep = true - if(modeValue.equals("AAC4.4.0") || modeValue.equals("NCPNew") || modeValue.equals("Matrix6.7.0")) { - mc.thePlayer.stepHeight = heightValue.get() - } - }else { - canStep = false - mc.thePlayer.stepHeight = 0.6F - } - - lastOnGround = mc.thePlayer.onGround - - val mode = modeValue.get() - - - // Motion steps - when { - mode.equals("jump", true) && mc.thePlayer.isCollidedHorizontally && mc.thePlayer.onGround - && !mc.gameSettings.keyBindJump.isKeyDown -> { - fakeJump() - mc.thePlayer.motionY = jumpHeightValue.get().toDouble() - } - - } + override fun onEnable() { + high = 0f + doncheck = false + off = false } - - @EventTarget fun onStep(event: StepEvent) { mc.thePlayer ?: return - val mode = modeValue.get() - - if (event.eventState == EventState.PRE) { - if (mode.equals("AAC4.4.0", ignoreCase = true) || mode.equals("NCPNew", ignoreCase = true) || modeValue.equals("Matrix6.7.0")) { - if (event.stepHeight > 0.6F && !canStep) return - if (event.stepHeight <= 0.6F) return + if (!mc.thePlayer.onGround || !timer.hasTimePassed(delayValue.get().toLong())) { + mc.thePlayer.stepHeight = 0.6F + event.stepHeight = 0.6F + return + } + if (doncheck || mc.thePlayer.entityBoundingBox.minY - stepY > 0.6) { + if (timerValue.get() < 1.0) { + wasTimer = true + mc.timer.timerSpeed = timerValue.get() + if (timerDynValue.get()) { + mc.timer.timerSpeed = (mc.timer.timerSpeed / sqrt(mc.thePlayer.entityBoundingBox.minY - stepY)).toFloat() + } } - - // Set step to default in some cases - if (!mc.thePlayer.onGround || !timer.hasTimePassed(delayValue.get().toLong()) || - mode.equals("Jump", ignoreCase = true) || mode.equals("MotionNCP", ignoreCase = true) || - mode.equals("LAAC", ignoreCase = true) || mode.equals("AAC3.3.4", ignoreCase = true) || - mode.equals("TimerJump", ignoreCase = true)) { - mc.thePlayer.stepHeight = 0.6F - event.stepHeight = 0.6F + mode.onStep(event) + } + if (event.eventState == EventState.PRE) { + if (off) { + mc.thePlayer.stepHeight = 0.6f + event.stepHeight = 0.6f return } - // Set step height val height = heightValue.get() // Detect possible step - + mc.thePlayer.stepHeight = height event.stepHeight = height - + if (event.stepHeight > 0.6F) { isStep = true stepX = mc.thePlayer.posX stepY = mc.thePlayer.posY stepZ = mc.thePlayer.posZ } - - } else { - if (!isStep) { // Check if step - return - } - - if (mc.thePlayer.entityBoundingBox.minY - stepY > 0.6) { // Check if full block step - if (timerValue.get()<1.0) { - wasTimer = true - mc.timer.timerSpeed = timerValue.get() - if (timerDynValue.get()) { - mc.timer.timerSpeed = (mc.timer.timerSpeed / sqrt(mc.thePlayer.entityBoundingBox.minY - stepY)).toFloat() - } - } - when { - mode.equals("NCP", ignoreCase = true) || mode.equals("OldAAC", ignoreCase = true) -> { - fakeJump() - - // Half legit step (1 packet missing) [COULD TRIGGER TOO MANY PACKETS] - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + 0.41999998688698, stepZ, false)) - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + 0.7531999805212, stepZ, false)) - timer.reset() - } - - mode.equals("AAC4.4.0", ignoreCase = true) -> { - val rstepHeight = mc.thePlayer.entityBoundingBox.minY - stepY - fakeJump() - timer.reset() - when { - rstepHeight >= 1.0 - 0.015625 && rstepHeight < 1.5 - 0.015625 -> { - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + 0.4, stepZ, false)) - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + 0.7, stepZ, false)) - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + 0.9, stepZ, false)) - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + 1.0, stepZ, true)) - } - rstepHeight >= 1.5 - 0.015625 && rstepHeight < 2.0 - 0.015625 -> { - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + 0.42, stepZ, false)) - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + 0.7718, stepZ, false)) - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + 1.0556, stepZ, false)) - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + 1.2714, stepZ, false)) - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + 1.412, stepZ, false)) - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + 1.50, stepZ, true)) - } - rstepHeight >= 2.0 - 0.015625 -> { - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + 0.45, stepZ, false)) - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + 0.84375, stepZ, false)) - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + 1.18125, stepZ, false)) - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + 1.4625, stepZ, false)) - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + 1.6875, stepZ, false)) - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + 1.85625, stepZ, false)) - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + 1.96875, stepZ, false)) - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX + mc.thePlayer.motionX * 0.5, - stepY + 2.0000, stepZ + mc.thePlayer.motionZ * 0.5, true)) - } - } - /* - AAC4 Step Code By Co丶Dynamic - NO SKIDDER PLEASE - */ - - /* - BRUH it's useful - don't remove it - */ - } - - mode.equals("NCPNew", ignoreCase = true) -> { - val rstepHeight = mc.thePlayer.entityBoundingBox.minY - stepY - fakeJump() - when { - rstepHeight > 2.019 -> { - val stpPacket = arrayOf(0.425, 0.821, 0.699, 0.599, 1.022, 1.372, 1.652, 1.869, 2.019, 1.919) - stpPacket.forEach { - mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + it, stepZ, false)) - } - mc.thePlayer.motionX = 0.0 - mc.thePlayer.motionZ = 0.0 - } - - rstepHeight <= 2.019 && rstepHeight > 1.869 -> { - val stpPacket = arrayOf(0.425, 0.821, 0.699, 0.599, 1.022, 1.372, 1.652, 1.869) - stpPacket.forEach { - mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + it, stepZ, false)) - } - mc.thePlayer.motionX = 0.0 - mc.thePlayer.motionZ = 0.0 - } - - rstepHeight <= 1.869 && rstepHeight > 1.5 -> { - val stpPacket = arrayOf(0.425, 0.821, 0.699, 0.599, 1.022, 1.372, 1.652) - stpPacket.forEach { - mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + it, stepZ, false)) - } - mc.thePlayer.motionX = 0.0 - mc.thePlayer.motionZ = 0.0 - } - - rstepHeight <= 1.5 && rstepHeight > 1.015 -> { - val stpPacket = arrayOf(0.42, 0.7532, 1.01, 1.093, 1.015) - stpPacket.forEach { - mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + it, stepZ, false)) - } - } - - rstepHeight <= 1.015 && rstepHeight > 0.875 -> { - val stpPacket = arrayOf(0.41999998688698, 0.7531999805212) - stpPacket.forEach { - mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + it, stepZ, false)) - } - } - - rstepHeight <= 0.875 && rstepHeight > 0.6 -> { - val stpPacket = arrayOf(0.39, 0.6938) - stpPacket.forEach { - mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + it, stepZ, false)) - } - } - } - timer.reset() - } - - mode.equals("Verus", ignoreCase = true) -> { - val rstepHeight = mc.thePlayer.entityBoundingBox.minY - stepY - mc.timer.timerSpeed = 1f / ceil(rstepHeight * 2.0).toFloat() - var stpHight = 0.0 - fakeJump() - repeat ((ceil(rstepHeight * 2.0) - 1.0).toInt()) { - stpHight += 0.5 - mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, stepY + stpHight, stepZ, true)) - } - wasTimer = true - } - - mode.equals("Vulcan", ignoreCase = true) -> { - val rstepHeight = mc.thePlayer.entityBoundingBox.minY - stepY - fakeJump() - when { - rstepHeight > 2.0 -> { - val stpPacket = arrayOf(0.5, 1.0, 1.5, 2.0) - stpPacket.forEach { - mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + it, stepZ, true)) - } - } - - rstepHeight <= 2.0 && rstepHeight > 1.5 -> { - val stpPacket = arrayOf(0.5, 1.0, 1.5) - stpPacket.forEach { - mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + it, stepZ, true)) - } - } - - rstepHeight <= 1.5 && rstepHeight > 1.0 -> { - val stpPacket = arrayOf(0.5, 1.0) - stpPacket.forEach { - mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + it, stepZ, true)) - } - } - - rstepHeight <= 1.0 && rstepHeight > 0.6 -> { - val stpPacket = arrayOf(0.5) - stpPacket.forEach { - mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + it, stepZ, true)) - } - } - } - timer.reset() - } - - mode.equals("Matrix6.7.0", ignoreCase = true) -> { - val rstepHeight = mc.thePlayer.entityBoundingBox.minY - stepY - fakeJump() - when { - rstepHeight <= 3.0042 && rstepHeight > 2.95 -> { - val stpPacket = arrayOf(0.41951, 0.75223, 0.99990, 1.42989, 1.77289, 2.04032, 2.23371, 2.35453, 2.40423) - stpPacket.forEach { - if(it in 0.9..1.01) { - mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + it, stepZ, true)) - }else { - mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + it, stepZ, false)) - } - } - mc.timer.timerSpeed = 0.11f - wasTimer = true - } - - rstepHeight <= 2.95 && rstepHeight > 2.83 -> { - val stpPacket = arrayOf(0.41951, 0.75223, 0.99990, 1.42989, 1.77289, 2.04032, 2.23371, 2.35453) - stpPacket.forEach { - if(it in 0.9..1.01) { - mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + it, stepZ, true)) - }else { - mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + it, stepZ, false)) - } - } - mc.timer.timerSpeed = 0.12f - wasTimer = true - } - - rstepHeight <= 2.83 && rstepHeight > 2.64 -> { - val stpPacket = arrayOf(0.41951, 0.75223, 0.99990, 1.42989, 1.77289, 2.04032, 2.23371) - stpPacket.forEach { - if(it in 0.9..1.01) { - mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + it, stepZ, true)) - }else { - mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + it, stepZ, false)) - } - } - mc.timer.timerSpeed = 0.13f - wasTimer = true - } - - rstepHeight <= 2.64 && rstepHeight > 2.37 -> { - val stpPacket = arrayOf(0.41951, 0.75223, 0.99990, 1.42989, 1.77289, 2.04032) - stpPacket.forEach { - if(it in 0.9..1.01) { - mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + it, stepZ, true)) - }else { - mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + it, stepZ, false)) - } - } - mc.timer.timerSpeed = 0.14f - wasTimer = true - } - - rstepHeight <= 2.37 && rstepHeight > 2.02 -> { - val stpPacket = arrayOf(0.41951, 0.75223, 0.99990, 1.42989, 1.77289) - stpPacket.forEach { - if(it in 0.9..1.01) { - mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + it, stepZ, true)) - }else { - mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + it, stepZ, false)) - } - } - mc.timer.timerSpeed = 0.16f - wasTimer = true - } - - rstepHeight <= 2.02 && rstepHeight > 1.77 -> { - val stpPacket = arrayOf(0.41951, 0.75223, 0.99990, 1.42989) - stpPacket.forEach { - if(it in (0.9..1.01)) { - mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + it, stepZ, true)) - }else { - mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + it, stepZ, false)) - } - } - mc.timer.timerSpeed = 0.21f - wasTimer = true - } - - rstepHeight <= 1.77 && rstepHeight > 1.6 -> { - val stpPacket = arrayOf(0.41999998688698, 0.7531999805212, 1.17319996740818) - stpPacket.forEach { - if(it in (0.753..0.754)) { - mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + it, stepZ, true)) - }else { - mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + it, stepZ, false)) - } - } - mc.timer.timerSpeed = 0.28f - wasTimer = true - } - - rstepHeight <= 1.6 && rstepHeight > 1.3525 -> { - val stpPacket = arrayOf(0.41999998688698, 0.7531999805212, 1.001335979112147) - stpPacket.forEach { - mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + it, stepZ, false)) - } - mc.timer.timerSpeed = 0.28f - wasTimer = true - } - - rstepHeight <= 1.3525 && rstepHeight > 1.02 -> { - val stpPacket = arrayOf(0.41999998688698, 0.7531999805212) - stpPacket.forEach { - mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + it, stepZ, false)) - } - mc.timer.timerSpeed = 0.34f - wasTimer = true - } - - rstepHeight <= 1.02 && rstepHeight > 0.6 -> { - val stpPacket = arrayOf(0.41999998688698) - stpPacket.forEach { - mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + it, stepZ, false)) - } - mc.timer.timerSpeed = 0.5f - wasTimer = true - } - } - timer.reset() - } - - mode.equals("Spartan", ignoreCase = true) -> { - fakeJump() - - if (spartanSwitch) { - // Vanilla step (3 packets) [COULD TRIGGER TOO MANY PACKETS] - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + 0.41999998688698, stepZ, false)) - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + 0.7531999805212, stepZ, false)) - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + 1.001335979112147, stepZ, false)) - } else { // Force step - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + 0.6, stepZ, false)) - } - - // Spartan allows one unlegit step so just swap between legit and unlegit - spartanSwitch = !spartanSwitch - - // Reset timer - timer.reset() - } - - - - mode.equals("Rewinside", ignoreCase = true) -> { - fakeJump() - - // Vanilla step (3 packets) [COULD TRIGGER TOO MANY PACKETS] - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + 0.41999998688698, stepZ, false)) - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + 0.7531999805212, stepZ, false)) - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + 1.001335979112147, stepZ, false)) - - // Reset timer - timer.reset() - } - mode.equals("BlocksMC", ignoreCase = true) -> { - fakeJump() - - val pos = mc.thePlayer.position.add(0.0, -1.5, 0.0) - - mc.netHandler.addToSendQueue( - C08PacketPlayerBlockPlacement(pos, 1, - ItemStack(Blocks.stone.getItem(mc.theWorld, pos)), 0.0F, 0.5F + Math.random().toFloat() * 0.44.toFloat(), 0.0F) - ) - - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + 0.41999998688698, stepZ, false)) - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + 0.7531999805212, stepZ, false)) - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, - stepY + 1, stepZ, true)) - - // Reset timer - timer.reset() - } - } - } - - isStep = false - stepX = 0.0 - stepY = 0.0 - stepZ = 0.0 } } - @EventTarget(ignoreCondition = true) - fun onPacket(event: PacketEvent) { - val packet = event.packet + @EventTarget + fun onMotion(event: MotionEvent) { + mode.onMotion(event) + } - if (packet is C03PacketPlayer && isStep && modeValue.equals("OldNCP")) { - packet.y += 0.07 - isStep = false + @EventTarget + fun onUpdate(event: UpdateEvent) { + if (wasTimer) { + mc.timer.timerSpeed = 1.0F + wasTimer = false } + if (mc.thePlayer.isCollidedHorizontally && mc.thePlayer.onGround && lastOnGround) { + canStep = true + } else { + canStep = false + mc.thePlayer.stepHeight = 0.6F + } + mode.onUpdate(event) } - // There could be some anti cheats which tries to detect step by checking for achievements and stuff - private fun fakeJump() { - mc.thePlayer.isAirBorne = true - mc.thePlayer.triggerAchievement(StatList.jumpStat) + @EventTarget + fun onJump(event: JumpEvent) { + mode.onJump(event) } - private fun couldStep(): Boolean { - val yaw = MovementUtils.direction - val x = -sin(yaw) * 0.32 - val z = cos(yaw) * 0.32 - - return mc.theWorld.getCollisionBoxes(mc.thePlayer.entityBoundingBox.offset(x, 1.001335979112147, z)) - .isEmpty() + @EventTarget + fun onPacket(event: PacketEvent) { + mode.onPacket(event) } override val tag: String get() = modeValue.get() -} + + fun fakeJump() { + mc.thePlayer.isAirBorne = true + mc.thePlayer.triggerAchievement(StatList.jumpStat) + } + + override val values = super.values.toMutableList().also { + modes.map { mode -> + mode.values.forEach { value -> + //it.add(value.displayable { modeValue.equals(mode.modeName) }) + val displayableFunction = value.displayableFunction + it.add(value.displayable { displayableFunction.invoke() && modeValue.equals(mode.modeName) }) + } + } + } +} \ No newline at end of file diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/StepTest.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/StepTest.kt deleted file mode 100644 index cea4e73..0000000 --- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/StepTest.kt +++ /dev/null @@ -1,128 +0,0 @@ -package net.ccbluex.liquidbounce.features.module.modules.movement - -import net.ccbluex.liquidbounce.event.* -import net.ccbluex.liquidbounce.features.module.Module -import net.ccbluex.liquidbounce.features.module.ModuleCategory -import net.ccbluex.liquidbounce.features.module.ModuleInfo -import net.ccbluex.liquidbounce.features.module.modules.movement.steps.StepMode -import net.ccbluex.liquidbounce.features.value.BoolValue -import net.ccbluex.liquidbounce.features.value.FloatValue -import net.ccbluex.liquidbounce.features.value.IntegerValue -import net.ccbluex.liquidbounce.features.value.ListValue -import net.ccbluex.liquidbounce.utils.ClassUtils -import net.ccbluex.liquidbounce.utils.MinecraftInstance.Companion.mc -import net.ccbluex.liquidbounce.utils.timer.MSTimer -import net.minecraft.stats.StatList -import net.minecraft.util.BlockPos - -@ModuleInfo("StepTest", category = ModuleCategory.MOVEMENT) -object StepTest : Module() { - var isStep = false - var stepX = 0.0 - var stepY = 0.0 - var stepZ = 0.0 - - var ncpNextStep = 0 - var spartanSwitch = false - var isAACStep = false - var wasTimer = false - var lastOnGround = false - var canStep = false - val timer = MSTimer() - var high = 0.0f - var off = false //你麻痹不每个设置一个直接狗日的不工作了 - private val modes = ClassUtils.resolvePackage("${this.javaClass.`package`.name}.steps", StepMode::class.java) - .map { it.newInstance() as StepMode } - .sortedBy { it.modeName } - val heightValue = FloatValue("Height", 1F, 0.6F, 10F) - val delayValue = IntegerValue("Delay", 0, 0, 500) - - private val mode: StepMode - get() = modes.find { modeValue.equals(it.modeName) } ?: throw NullPointerException() // this should not happen - - private val modeValue: ListValue = object : ListValue("Mode", modes.map { it.modeName }.toTypedArray(), "Vanilla") { - override fun onChange(oldValue: String, newValue: String) { - if (state) onDisable() - } - - override fun onChanged(oldValue: String, newValue: String) { - if (state) onEnable() - } - } - - override fun onDisable() { - mc.thePlayer ?: return - - // Change step height back to default (0.5 is default) - mc.thePlayer.stepHeight = 0.6F - mc.timer.timerSpeed = 1.0F - wasTimer = false - lastOnGround = mc.thePlayer.onGround - } - - override fun onEnable() { - high = 0f - off = false - } - - @EventTarget - fun onStep(event: StepEvent) { - mc.thePlayer ?: return - if (!mc.thePlayer.onGround || !timer.hasTimePassed(delayValue.get().toLong())) { - mc.thePlayer.stepHeight = 0.6F - event.stepHeight = 0.6F - return - } - if (event.eventState == EventState.PRE) { - if (off) { - mc.thePlayer.stepHeight = 0.6f - event.stepHeight = 0.6f - return - } - // Set step height - val height = heightValue.get() - - // Detect possible step - - mc.thePlayer.stepHeight = height - event.stepHeight = height - - if (event.stepHeight > 0.6F) { - isStep = true - stepX = mc.thePlayer.posX - stepY = mc.thePlayer.posY - stepZ = mc.thePlayer.posZ - } - } else { - mode.onStep(event) - } - } - - @EventTarget - fun onUpdate(event: UpdateEvent) { - mode.onUpdate(event) - } - - @EventTarget - fun onJump(event: JumpEvent) { - mode.onJump(event) - } - - override val tag: String - get() = modeValue.get() - - fun fakeJump() { - mc.thePlayer.isAirBorne = true - mc.thePlayer.triggerAchievement(StatList.jumpStat) - } - - override val values = super.values.toMutableList().also { - modes.map { mode -> - mode.values.forEach { value -> - //it.add(value.displayable { modeValue.equals(mode.modeName) }) - val displayableFunction = value.displayableFunction - it.add(value.displayable { displayableFunction.invoke() && modeValue.equals(mode.modeName) }) - } - } - } -} \ No newline at end of file diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/speeds/other/HypixelNewHop.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/speeds/other/HypixelNewHop.kt index 0f554e4..a01a1df 100644 --- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/speeds/other/HypixelNewHop.kt +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/speeds/other/HypixelNewHop.kt @@ -16,7 +16,7 @@ class HypixelNewHop : SpeedMode("NewHypixelHop") { player.jump() } else { player.jump() - MovementUtils.strafe(0.4f) + MovementUtils.strafe(0.48f) } } } diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/StepMode.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/StepMode.kt index 7fe659a..f8f9263 100644 --- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/StepMode.kt +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/StepMode.kt @@ -2,7 +2,7 @@ package net.ccbluex.liquidbounce.features.module.modules.movement.steps import net.ccbluex.liquidbounce.FDPClient import net.ccbluex.liquidbounce.event.* -import net.ccbluex.liquidbounce.features.module.modules.movement.StepTest +import net.ccbluex.liquidbounce.features.module.modules.movement.Step import net.ccbluex.liquidbounce.features.value.Value import net.ccbluex.liquidbounce.utils.ClassUtils import net.ccbluex.liquidbounce.utils.MinecraftInstance @@ -10,8 +10,8 @@ import net.ccbluex.liquidbounce.utils.MinecraftInstance abstract class StepMode(val modeName: String) : MinecraftInstance() { protected val valuePrefix = "$modeName-" - protected val step: StepTest - get() = FDPClient.moduleManager[StepTest::class.java]!! + protected val step: Step + get() = FDPClient.moduleManager[Step::class.java]!! open val values: List> get() = ClassUtils.getValues(this.javaClass, this) diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/AAC.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/AAC.kt new file mode 100644 index 0000000..185775b --- /dev/null +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/AAC.kt @@ -0,0 +1,32 @@ +package net.ccbluex.liquidbounce.features.module.modules.movement.steps.anticheat + +import net.ccbluex.liquidbounce.event.EventState +import net.ccbluex.liquidbounce.event.StepEvent +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.fakeJump +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepX +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepY +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepZ +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.timer +import net.ccbluex.liquidbounce.features.module.modules.movement.steps.StepMode +import net.minecraft.network.play.client.C03PacketPlayer + +class AAC : StepMode("AAC") { + override fun onStep(event: StepEvent) { + if (event.eventState == EventState.PRE) { + + } else { + fakeJump() + + // Half legit step (1 packet missing) [COULD TRIGGER TOO MANY PACKETS] + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 0.41999998688698, stepZ, false)) + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 0.7531999805212, stepZ, false)) + timer.reset() + } + } +} \ No newline at end of file diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/AAC440.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/AAC440.kt new file mode 100644 index 0000000..0170a82 --- /dev/null +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/AAC440.kt @@ -0,0 +1,112 @@ +package net.ccbluex.liquidbounce.features.module.modules.movement.steps.anticheat + +import net.ccbluex.liquidbounce.event.EventState +import net.ccbluex.liquidbounce.event.StepEvent +import net.ccbluex.liquidbounce.event.UpdateEvent +import net.ccbluex.liquidbounce.features.module.modules.movement.Step +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.canStep +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.fakeJump +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepX +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepY +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepZ +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.timer +import net.ccbluex.liquidbounce.features.module.modules.movement.steps.StepMode +import net.minecraft.network.play.client.C03PacketPlayer + +class AAC440 : StepMode("AAC4.4.0") { + override fun onUpdate(event: UpdateEvent) { + Step.off = false + Step.doncheck = false + } + + override fun onStep(event: StepEvent) { + if (event.eventState == EventState.PRE) { + if (event.stepHeight > 0.6F && !canStep) return + if (event.stepHeight <= 0.6F) return + } else { + val rstepHeight = mc.thePlayer.entityBoundingBox.minY - stepY + fakeJump() + timer.reset() + when { + rstepHeight >= 1.0 - 0.015625 && rstepHeight < 1.5 - 0.015625 -> { + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 0.4, stepZ, false)) + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 0.7, stepZ, false)) + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 0.9, stepZ, false)) + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 1.0, stepZ, true)) + } + rstepHeight >= 1.5 - 0.015625 && rstepHeight < 2.0 - 0.015625 -> { + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 0.42, stepZ, false)) + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 0.7718, stepZ, false)) + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 1.0556, stepZ, false)) + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 1.2714, stepZ, false)) + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 1.412, stepZ, false)) + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 1.50, stepZ, true)) + } + rstepHeight >= 2.0 - 0.015625 -> { + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 0.45, stepZ, false)) + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 0.84375, stepZ, false)) + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 1.18125, stepZ, false)) + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 1.4625, stepZ, false)) + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 1.6875, stepZ, false)) + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 1.85625, stepZ, false)) + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 1.96875, stepZ, false)) + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX + mc.thePlayer.motionX * 0.5, + stepY + 2.0000, stepZ + mc.thePlayer.motionZ * 0.5, true)) + } + } + } + } +} \ No newline at end of file diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/Matrix.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/Matrix.kt new file mode 100644 index 0000000..47d5a1e --- /dev/null +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/Matrix.kt @@ -0,0 +1,42 @@ +package net.ccbluex.liquidbounce.features.module.modules.movement.steps.anticheat + +import net.ccbluex.liquidbounce.event.EventState +import net.ccbluex.liquidbounce.event.StepEvent +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.fakeJump +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepX +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepY +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepZ +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.timer +import net.ccbluex.liquidbounce.features.module.modules.movement.steps.StepMode +import net.minecraft.network.play.client.C03PacketPlayer + +class Matrix : StepMode("Matrix") { + override fun onStep(event: StepEvent) { + if (event.eventState == EventState.PRE) else { + fakeJump() + + // Vanilla step (3 packets) [COULD TRIGGER TOO MANY PACKETS] + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 0.41999998688698, stepZ, false + ) + ) + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 0.7531999805212, stepZ, false + ) + ) + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 1.001335979112147, stepZ, false + ) + ) + + // Reset timer + timer.reset() + } + } +} \ No newline at end of file diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/Matrix670.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/Matrix670.kt new file mode 100644 index 0000000..569dabf --- /dev/null +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/Matrix670.kt @@ -0,0 +1,205 @@ +package net.ccbluex.liquidbounce.features.module.modules.movement.steps.anticheat + +import net.ccbluex.liquidbounce.event.EventState +import net.ccbluex.liquidbounce.event.StepEvent +import net.ccbluex.liquidbounce.event.UpdateEvent +import net.ccbluex.liquidbounce.features.module.modules.movement.Step +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.fakeJump +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepX +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepY +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepZ +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.timer +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.wasTimer +import net.ccbluex.liquidbounce.features.module.modules.movement.steps.StepMode +import net.minecraft.network.play.client.C03PacketPlayer + +class Matrix670 : StepMode("Matrix6.7.0") { + override fun onUpdate(event: UpdateEvent) { + Step.off = false + Step.doncheck = false + if (mc.thePlayer.isCollidedHorizontally && mc.thePlayer.onGround && Step.lastOnGround) { + mc.thePlayer.stepHeight = Step.heightValue.get() + } + } + + override fun onStep(event: StepEvent) { + if (event.eventState == EventState.PRE) { + if (event.stepHeight > 0.6F && !Step.canStep) return + if (event.stepHeight <= 0.6F) return + } else { + val rstepHeight = mc.thePlayer.entityBoundingBox.minY - stepY + fakeJump() + when { + rstepHeight <= 3.0042 && rstepHeight > 2.95 -> { + val stpPacket = arrayOf(0.41951, 0.75223, 0.99990, 1.42989, 1.77289, 2.04032, 2.23371, 2.35453, 2.40423) + stpPacket.forEach { + if(it in 0.9..1.01) { + mc.thePlayer.sendQueue.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + it, stepZ, true)) + }else { + mc.thePlayer.sendQueue.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + it, stepZ, false)) + } + } + mc.timer.timerSpeed = 0.11f + wasTimer = true + } + + rstepHeight <= 2.95 && rstepHeight > 2.83 -> { + val stpPacket = arrayOf(0.41951, 0.75223, 0.99990, 1.42989, 1.77289, 2.04032, 2.23371, 2.35453) + stpPacket.forEach { + if(it in 0.9..1.01) { + mc.thePlayer.sendQueue.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + it, stepZ, true)) + }else { + mc.thePlayer.sendQueue.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + it, stepZ, false)) + } + } + mc.timer.timerSpeed = 0.12f + wasTimer = true + } + + rstepHeight <= 2.83 && rstepHeight > 2.64 -> { + val stpPacket = arrayOf(0.41951, 0.75223, 0.99990, 1.42989, 1.77289, 2.04032, 2.23371) + stpPacket.forEach { + if(it in 0.9..1.01) { + mc.thePlayer.sendQueue.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + it, stepZ, true)) + }else { + mc.thePlayer.sendQueue.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + it, stepZ, false)) + } + } + mc.timer.timerSpeed = 0.13f + wasTimer = true + } + + rstepHeight <= 2.64 && rstepHeight > 2.37 -> { + val stpPacket = arrayOf(0.41951, 0.75223, 0.99990, 1.42989, 1.77289, 2.04032) + stpPacket.forEach { + if(it in 0.9..1.01) { + mc.thePlayer.sendQueue.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + it, stepZ, true)) + }else { + mc.thePlayer.sendQueue.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + it, stepZ, false)) + } + } + mc.timer.timerSpeed = 0.14f + wasTimer = true + } + + rstepHeight <= 2.37 && rstepHeight > 2.02 -> { + val stpPacket = arrayOf(0.41951, 0.75223, 0.99990, 1.42989, 1.77289) + stpPacket.forEach { + if(it in 0.9..1.01) { + mc.thePlayer.sendQueue.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + it, stepZ, true)) + }else { + mc.thePlayer.sendQueue.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + it, stepZ, false)) + } + } + mc.timer.timerSpeed = 0.16f + wasTimer = true + } + + rstepHeight <= 2.02 && rstepHeight > 1.77 -> { + val stpPacket = arrayOf(0.41951, 0.75223, 0.99990, 1.42989) + stpPacket.forEach { + if(it in (0.9..1.01)) { + mc.thePlayer.sendQueue.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + it, stepZ, true)) + }else { + mc.thePlayer.sendQueue.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + it, stepZ, false)) + } + } + mc.timer.timerSpeed = 0.21f + wasTimer = true + } + + rstepHeight <= 1.77 && rstepHeight > 1.6 -> { + val stpPacket = arrayOf(0.41999998688698, 0.7531999805212, 1.17319996740818) + stpPacket.forEach { + if(it in (0.753..0.754)) { + mc.thePlayer.sendQueue.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + it, stepZ, true)) + }else { + mc.thePlayer.sendQueue.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + it, stepZ, false)) + } + } + mc.timer.timerSpeed = 0.28f + wasTimer = true + } + + rstepHeight <= 1.6 && rstepHeight > 1.3525 -> { + val stpPacket = arrayOf(0.41999998688698, 0.7531999805212, 1.001335979112147) + stpPacket.forEach { + mc.thePlayer.sendQueue.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + it, stepZ, false)) + } + mc.timer.timerSpeed = 0.28f + wasTimer = true + } + + rstepHeight <= 1.3525 && rstepHeight > 1.02 -> { + val stpPacket = arrayOf(0.41999998688698, 0.7531999805212) + stpPacket.forEach { + mc.thePlayer.sendQueue.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + it, stepZ, false)) + } + mc.timer.timerSpeed = 0.34f + wasTimer = true + } + + rstepHeight <= 1.02 && rstepHeight > 0.6 -> { + val stpPacket = arrayOf(0.41999998688698) + stpPacket.forEach { + mc.thePlayer.sendQueue.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + it, stepZ, false)) + } + mc.timer.timerSpeed = 0.5f + wasTimer = true + } + } + timer.reset() + } + } +} \ No newline at end of file diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/NCP.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/NCP.kt new file mode 100644 index 0000000..1d08025 --- /dev/null +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/NCP.kt @@ -0,0 +1,30 @@ +package net.ccbluex.liquidbounce.features.module.modules.movement.steps.anticheat + +import net.ccbluex.liquidbounce.event.EventState +import net.ccbluex.liquidbounce.event.StepEvent +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.fakeJump +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepX +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepY +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepZ +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.timer +import net.ccbluex.liquidbounce.features.module.modules.movement.steps.StepMode +import net.minecraft.network.play.client.C03PacketPlayer + +class NCP : StepMode("NCP") { + override fun onStep(event: StepEvent) { + if (event.eventState == EventState.PRE) {} else { + fakeJump() + + // Half legit step (1 packet missing) [COULD TRIGGER TOO MANY PACKETS] + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 0.41999998688698, stepZ, false)) + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 0.7531999805212, stepZ, false)) + timer.reset() + } + } +} \ No newline at end of file diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/NCPNew.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/NCPNew.kt new file mode 100644 index 0000000..f3c6741 --- /dev/null +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/NCPNew.kt @@ -0,0 +1,104 @@ +package net.ccbluex.liquidbounce.features.module.modules.movement.steps.anticheat + +import net.ccbluex.liquidbounce.event.EventState +import net.ccbluex.liquidbounce.event.StepEvent +import net.ccbluex.liquidbounce.event.UpdateEvent +import net.ccbluex.liquidbounce.features.module.modules.movement.Step +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.canStep +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.fakeJump +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.heightValue +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.lastOnGround +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepX +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepY +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepZ +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.timer +import net.ccbluex.liquidbounce.features.module.modules.movement.steps.StepMode +import net.minecraft.network.play.client.C03PacketPlayer + +class NCPNew : StepMode("NCPNew") { + override fun onUpdate(event: UpdateEvent) { + Step.off = false + Step.doncheck = false + if (mc.thePlayer.isCollidedHorizontally && mc.thePlayer.onGround && lastOnGround) { + mc.thePlayer.stepHeight = heightValue.get() + } + } + + override fun onStep(event: StepEvent) { + if (event.eventState == EventState.PRE) { + if (event.stepHeight > 0.6F && !canStep) return + if (event.stepHeight <= 0.6F) return + } else { + val rstepHeight = mc.thePlayer.entityBoundingBox.minY - stepY + fakeJump() + when { + rstepHeight > 2.019 -> { + val stpPacket = arrayOf(0.425, 0.821, 0.699, 0.599, 1.022, 1.372, 1.652, 1.869, 2.019, 1.919) + stpPacket.forEach { + mc.thePlayer.sendQueue.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + it, stepZ, false)) + } + mc.thePlayer.motionX = 0.0 + mc.thePlayer.motionZ = 0.0 + } + + rstepHeight <= 2.019 && rstepHeight > 1.869 -> { + val stpPacket = arrayOf(0.425, 0.821, 0.699, 0.599, 1.022, 1.372, 1.652, 1.869) + stpPacket.forEach { + mc.thePlayer.sendQueue.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + it, stepZ, false)) + } + mc.thePlayer.motionX = 0.0 + mc.thePlayer.motionZ = 0.0 + } + + rstepHeight <= 1.869 && rstepHeight > 1.5 -> { + val stpPacket = arrayOf(0.425, 0.821, 0.699, 0.599, 1.022, 1.372, 1.652) + stpPacket.forEach { + mc.thePlayer.sendQueue.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + it, stepZ, false)) + } + mc.thePlayer.motionX = 0.0 + mc.thePlayer.motionZ = 0.0 + } + + rstepHeight <= 1.5 && rstepHeight > 1.015 -> { + val stpPacket = arrayOf(0.42, 0.7532, 1.01, 1.093, 1.015) + stpPacket.forEach { + mc.thePlayer.sendQueue.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + it, stepZ, false)) + } + } + + rstepHeight <= 1.015 && rstepHeight > 0.875 -> { + val stpPacket = arrayOf(0.41999998688698, 0.7531999805212) + stpPacket.forEach { + mc.thePlayer.sendQueue.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + it, stepZ, false)) + } + } + + rstepHeight <= 0.875 && rstepHeight > 0.6 -> { + val stpPacket = arrayOf(0.39, 0.6938) + stpPacket.forEach { + mc.thePlayer.sendQueue.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + it, stepZ, false)) + } + } + } + timer.reset() + } + } +} \ No newline at end of file diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/OldNCP.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/OldNCP.kt new file mode 100644 index 0000000..8c05762 --- /dev/null +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/OldNCP.kt @@ -0,0 +1,20 @@ +package net.ccbluex.liquidbounce.features.module.modules.movement.steps.anticheat + +import net.ccbluex.liquidbounce.event.PacketEvent +import net.ccbluex.liquidbounce.features.module.modules.movement.Step +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.isStep +import net.ccbluex.liquidbounce.features.module.modules.movement.steps.StepMode +import net.minecraft.network.play.client.C03PacketPlayer + +class OldNCP : StepMode("OldNPC") { + override fun onPacket(event: PacketEvent) { + Step.off = true + Step.doncheck = true + val packet = event.packet + + if (packet is C03PacketPlayer && isStep) { + packet.y += 0.07 + isStep = false + } + } +} \ No newline at end of file diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/Spartan.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/Spartan.kt new file mode 100644 index 0000000..9ab2664 --- /dev/null +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/Spartan.kt @@ -0,0 +1,50 @@ +package net.ccbluex.liquidbounce.features.module.modules.movement.steps.anticheat + +import net.ccbluex.liquidbounce.event.EventState +import net.ccbluex.liquidbounce.event.StepEvent +import net.ccbluex.liquidbounce.features.module.modules.movement.Step +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.fakeJump +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.spartanSwitch +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepX +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepY +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepZ +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.timer +import net.ccbluex.liquidbounce.features.module.modules.movement.steps.StepMode +import net.minecraft.network.play.client.C03PacketPlayer + +class Spartan : StepMode("Spartan") { + override fun onStep(event: StepEvent) { + Step.off = false + Step.doncheck = false + if (event.eventState == EventState.PRE) {} else { + fakeJump() + + if (spartanSwitch) { + // Vanilla step (3 packets) [COULD TRIGGER TOO MANY PACKETS] + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 0.41999998688698, stepZ, false)) + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 0.7531999805212, stepZ, false)) + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 1.001335979112147, stepZ, false)) + } else { // Force step + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 0.6, stepZ, false)) + } + + // Spartan allows one unlegit step so just swap between legit and unlegit + spartanSwitch = !spartanSwitch + + // Reset timer + timer.reset() + } + } +} \ No newline at end of file diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/Verus.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/Verus.kt new file mode 100644 index 0000000..c621dc1 --- /dev/null +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/Verus.kt @@ -0,0 +1,31 @@ +package net.ccbluex.liquidbounce.features.module.modules.movement.steps.anticheat + +import net.ccbluex.liquidbounce.event.EventState +import net.ccbluex.liquidbounce.event.StepEvent +import net.ccbluex.liquidbounce.features.module.modules.movement.Step +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.fakeJump +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepX +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepY +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepZ +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.wasTimer +import net.ccbluex.liquidbounce.features.module.modules.movement.steps.StepMode +import net.minecraft.network.play.client.C03PacketPlayer +import kotlin.math.ceil + +class Verus : StepMode("Verus") { + override fun onStep(event: StepEvent) { + Step.doncheck = false + Step.off = false + if (event.eventState == EventState.PRE) else { + val rstepHeight = mc.thePlayer.entityBoundingBox.minY - stepY + mc.timer.timerSpeed = 1f / ceil(rstepHeight * 2.0).toFloat() + var stpHight = 0.0 + fakeJump() + repeat ((ceil(rstepHeight * 2.0) - 1.0).toInt()) { + stpHight += 0.5 + mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(stepX, stepY + stpHight, stepZ, true)) + } + wasTimer = true + } + } +} \ No newline at end of file diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/Vulcan.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/Vulcan.kt new file mode 100644 index 0000000..ba5a8bc --- /dev/null +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/anticheat/Vulcan.kt @@ -0,0 +1,65 @@ +package net.ccbluex.liquidbounce.features.module.modules.movement.steps.anticheat + +import net.ccbluex.liquidbounce.event.EventState +import net.ccbluex.liquidbounce.event.StepEvent +import net.ccbluex.liquidbounce.features.module.modules.movement.Step +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.fakeJump +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepX +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepY +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepZ +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.timer +import net.ccbluex.liquidbounce.features.module.modules.movement.steps.StepMode +import net.minecraft.network.play.client.C03PacketPlayer + +class Vulcan : StepMode("Vulcan") { + override fun onStep(event: StepEvent) { + Step.doncheck = false + Step.off = false + if (event.eventState == EventState.PRE) {} else { + val rstepHeight = mc.thePlayer.entityBoundingBox.minY - stepY + fakeJump() + when { + rstepHeight > 2.0 -> { + val stpPacket = arrayOf(0.5, 1.0, 1.5, 2.0) + stpPacket.forEach { + mc.thePlayer.sendQueue.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + it, stepZ, true)) + } + } + + rstepHeight <= 2.0 && rstepHeight > 1.5 -> { + val stpPacket = arrayOf(0.5, 1.0, 1.5) + stpPacket.forEach { + mc.thePlayer.sendQueue.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + it, stepZ, true)) + } + } + + rstepHeight <= 1.5 && rstepHeight > 1.0 -> { + val stpPacket = arrayOf(0.5, 1.0) + stpPacket.forEach { + mc.thePlayer.sendQueue.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + it, stepZ, true)) + } + } + + rstepHeight <= 1.0 && rstepHeight > 0.6 -> { + val stpPacket = arrayOf(0.5) + stpPacket.forEach { + mc.thePlayer.sendQueue.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + it, stepZ, true)) + } + } + } + timer.reset() + } + } +} \ No newline at end of file diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/server/BlocksMC.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/server/BlocksMC.kt new file mode 100644 index 0000000..915d7a7 --- /dev/null +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/server/BlocksMC.kt @@ -0,0 +1,48 @@ +package net.ccbluex.liquidbounce.features.module.modules.movement.steps.server + +import net.ccbluex.liquidbounce.event.EventState +import net.ccbluex.liquidbounce.event.StepEvent +import net.ccbluex.liquidbounce.features.module.modules.movement.Step +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.fakeJump +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepX +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepY +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepZ +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.timer +import net.ccbluex.liquidbounce.features.module.modules.movement.steps.StepMode +import net.minecraft.init.Blocks +import net.minecraft.item.ItemStack +import net.minecraft.network.play.client.C03PacketPlayer +import net.minecraft.network.play.client.C08PacketPlayerBlockPlacement + +class BlocksMC : StepMode("BlocksMC") { + override fun onStep(event: StepEvent) { + Step.off = false + Step.doncheck = false + if (event.eventState == EventState.PRE) else { + fakeJump() + + val pos = mc.thePlayer.position.add(0.0, -1.5, 0.0) + + mc.netHandler.addToSendQueue( + C08PacketPlayerBlockPlacement(pos, 1, + ItemStack(Blocks.stone.getItem(mc.theWorld, pos)), 0.0F, 0.5F + Math.random().toFloat() * 0.44.toFloat(), 0.0F) + ) + + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 0.41999998688698, stepZ, false)) + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 0.7531999805212, stepZ, false)) + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 1, stepZ, true)) + + // Reset timer + timer.reset() + } + } +} \ No newline at end of file diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/server/Hypixel.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/server/Hypixel.kt new file mode 100644 index 0000000..349d545 --- /dev/null +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/server/Hypixel.kt @@ -0,0 +1,74 @@ +package net.ccbluex.liquidbounce.features.module.modules.movement.steps.server + +import net.ccbluex.liquidbounce.event.EventState +import net.ccbluex.liquidbounce.event.EventTarget +import net.ccbluex.liquidbounce.event.MotionEvent +import net.ccbluex.liquidbounce.event.UpdateEvent +import net.ccbluex.liquidbounce.features.module.modules.movement.Step +import net.ccbluex.liquidbounce.features.module.modules.movement.steps.StepMode +import net.ccbluex.liquidbounce.features.value.BoolValue +import net.ccbluex.liquidbounce.utils.MovementUtils + +class Hypixel : StepMode("Hypixel") { + private val test = BoolValue("Test",false) + private var offGroundTicks = -1 + private var stepping = false + private var lastStep: Long = -1 + override fun onDisable() { + offGroundTicks = -1 + stepping = false + } + + @EventTarget + override fun onMotion(event: MotionEvent) { + Step.off = true + Step.doncheck = true + if (event.eventState == EventState.PRE) { + val time = System.currentTimeMillis() + if (mc.thePlayer.onGround && mc.thePlayer.isCollidedHorizontally && MovementUtils.isMoving() && time - lastStep >= Step.delayValue.get()) { + stepping = true + lastStep = time + } + } + } + + @EventTarget + override fun onUpdate(event: UpdateEvent) { + if (mc.thePlayer.onGround) { + offGroundTicks = 0 + } else if (offGroundTicks != -1) { + offGroundTicks++ + } + + if (stepping) { + if (!MovementUtils.isMoving() || !mc.thePlayer.isCollidedHorizontally) { + stepping = false + return + } + + when (if (test.get()) offGroundTicks % 16 else offGroundTicks) { + 0 -> { + mc.thePlayer.motionZ = 0.0 + mc.thePlayer.motionX = 0.0 + MovementUtils.strafe() + mc.thePlayer.jump() + } + + 1, 2, 3, 4, 5, 6, 7, 8, 9 -> { + mc.thePlayer.motionZ = 0.0 + mc.thePlayer.motionX = 0.0 + } + 10, 11, 13, 14, 15 -> { + mc.thePlayer.motionY = 0.0 + mc.thePlayer.motionZ = 0.0 + mc.thePlayer.motionX = 0.0 + } + + 16 -> { + mc.thePlayer.jump() + stepping = false + } + } + } + } +} \ No newline at end of file diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/server/Rewinside.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/server/Rewinside.kt new file mode 100644 index 0000000..2ade72d --- /dev/null +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/server/Rewinside.kt @@ -0,0 +1,39 @@ +package net.ccbluex.liquidbounce.features.module.modules.movement.steps.server + +import net.ccbluex.liquidbounce.event.EventState +import net.ccbluex.liquidbounce.event.StepEvent +import net.ccbluex.liquidbounce.features.module.modules.movement.Step +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.fakeJump +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepX +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepY +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.stepZ +import net.ccbluex.liquidbounce.features.module.modules.movement.Step.timer +import net.ccbluex.liquidbounce.features.module.modules.movement.steps.StepMode +import net.minecraft.network.play.client.C03PacketPlayer + +class Rewinside : StepMode("Rewinside") { + override fun onStep(event: StepEvent) { + Step.off = false + Step.doncheck = false + if (event.eventState == EventState.PRE) {} else { + fakeJump() + + // Vanilla step (3 packets) [COULD TRIGGER TOO MANY PACKETS] + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 0.41999998688698, stepZ, false)) + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 0.7531999805212, stepZ, false)) + mc.netHandler.addToSendQueue( + C03PacketPlayer.C04PacketPlayerPosition( + stepX, + stepY + 1.001335979112147, stepZ, false)) + + // Reset timer + timer.reset() + } + } +} \ No newline at end of file diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/vanilla/JumpStep.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/vanilla/JumpStep.kt index c294641..1e15c2f 100644 --- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/vanilla/JumpStep.kt +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/vanilla/JumpStep.kt @@ -1,18 +1,18 @@ package net.ccbluex.liquidbounce.features.module.modules.movement.steps.vanilla -import net.ccbluex.liquidbounce.event.StepEvent import net.ccbluex.liquidbounce.event.UpdateEvent -import net.ccbluex.liquidbounce.features.module.modules.movement.StepTest +import net.ccbluex.liquidbounce.features.module.modules.movement.Step import net.ccbluex.liquidbounce.features.module.modules.movement.steps.StepMode import net.ccbluex.liquidbounce.features.value.FloatValue class JumpStep : StepMode("Jump") { private val jumpHeightValue = FloatValue("JumpMotion", 0.42F, 0.37F, 0.42F) override fun onUpdate(event: UpdateEvent) { - StepTest.off = true + Step.off = true + Step.doncheck = true if (mc.thePlayer.isCollidedHorizontally && mc.thePlayer.onGround && !mc.gameSettings.keyBindJump.isKeyDown) { - StepTest.fakeJump() + Step.fakeJump() mc.thePlayer.motionY = jumpHeightValue.get().toDouble() } } diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/vanilla/VanillaStep.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/vanilla/VanillaStep.kt index aa777a9..00367f8 100644 --- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/vanilla/VanillaStep.kt +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/steps/vanilla/VanillaStep.kt @@ -1,11 +1,12 @@ package net.ccbluex.liquidbounce.features.module.modules.movement.steps.vanilla import net.ccbluex.liquidbounce.event.UpdateEvent -import net.ccbluex.liquidbounce.features.module.modules.movement.StepTest +import net.ccbluex.liquidbounce.features.module.modules.movement.Step import net.ccbluex.liquidbounce.features.module.modules.movement.steps.StepMode class VanillaStep : StepMode("Vanilla") { override fun onUpdate(event: UpdateEvent) { - StepTest.off = false + Step.off = false + Step.doncheck = false } } \ No newline at end of file diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/other/AntiExploit.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/other/AntiExploit.kt index 3b5a473..8a327bf 100644 --- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/other/AntiExploit.kt +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/other/AntiExploit.kt @@ -14,6 +14,7 @@ import net.ccbluex.liquidbounce.features.module.ModuleInfo import net.ccbluex.liquidbounce.features.value.BoolValue import net.ccbluex.liquidbounce.features.value.IntegerValue import net.minecraft.network.play.server.* +import kotlin.math.abs @ModuleInfo(name = "AntiExploit", category = ModuleCategory.OTHER, array = false) object AntiExploit : Module() { @@ -37,7 +38,7 @@ object AntiExploit : Module() { } if (packet is S08PacketPlayerPosLook) { - if (Math.abs(packet.x) > 3.0E7 || Math.abs(packet.y) > 3.0E7 || Math.abs(packet.z) > 3.0E7) { + if (abs(packet.x) > 3.0E7 || abs(packet.y) > 3.0E7 || abs(packet.z) > 3.0E7) { event.cancelEvent() } } @@ -49,7 +50,7 @@ object AntiExploit : Module() { } if (packet is S27PacketExplosion) { - if (Math.abs(packet.func_149149_c()) > 100.0 || Math.abs(packet.func_149144_d()) > 100.0 || Math.abs(packet.func_149147_e()) > 100.0) { + if (abs(packet.func_149149_c()) > 100.0 || abs(packet.func_149144_d()) > 100.0 || abs(packet.func_149147_e()) > 100.0) { event.cancelEvent() } } diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/other/AntiStaff.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/other/AntiStaff.kt index 1fb436a..acea38d 100644 --- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/other/AntiStaff.kt +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/other/AntiStaff.kt @@ -17,6 +17,7 @@ import net.ccbluex.liquidbounce.ui.client.hud.element.elements.NotifyType import net.ccbluex.liquidbounce.utils.ClientUtils import net.ccbluex.liquidbounce.utils.misc.HttpUtils import net.ccbluex.liquidbounce.features.value.BoolValue +import net.ccbluex.liquidbounce.features.value.ListValue import net.ccbluex.liquidbounce.features.value.TextValue import net.minecraft.network.play.server.S14PacketEntity import net.minecraft.network.play.server.S1DPacketEntityEffect @@ -26,27 +27,241 @@ object AntiStaff : Module() { private val serversText = TextValue("Servers", "") - private val kkcraftValue = BoolValue("KKCraft",true) - private val blocksMCValue = BoolValue("BlocksMC", true) - private val jartexValue = BoolValue("Jartex", false) - private val pikaValue = BoolValue("Pika", true) - private val mineboxValue = BoolValue("Minebox", false) - private val hycraftValue = BoolValue("Hycraft", true) - private val librecraftValue = BoolValue("Librecraft", false) - private val universocraftValue = BoolValue("Universocraft", true) - private val customValue = BoolValue("Custom", false) + private val mode = ListValue("Mode", arrayOf("Hypixel","KKCraft","BlocksMC","Jartex","Pika","MineBox","HyCraft","LibreCraft","UniverseCraft","Custom"),"Hypixel") private val notifyValue = BoolValue("Notification",true) private val chatValue = BoolValue("SendChatMessage",false) private val messageValue = TextValue("Message", "%staff% was detected as a staff member!").displayable { chatValue.get() } - private val customURLValue = TextValue("CustomURL", "https://raw.githubusercontent.com/fdpweb/fdpweb.github.io/main/test").displayable { customValue.get() } + private val customURLValue = TextValue("CustomURL", "https://raw.githubusercontent.com/fdpweb/fdpweb.github.io/main/test").displayable { mode.equals("Custom") } private val leaveValue = BoolValue("Leave",true) private val leaveMessageValue = TextValue("LeaveCommand","/hub").displayable { leaveValue.get() } - private var kkStaff : String = "Creeper_Hello Kun_God hanhan_api" - private var bmcStaff : String = " iDhoom Jinaaan Eissaa Ev2n 1Mhmmd mohmad_q8 1Daykel Aliiyah 1Brhom xImTaiG_ comsterr 8layh M7mmd 1LaB xIBerryPlayz iiRaivy Refolt 1Sweet Aba5z3l EyesO_Diamond bestleso Firas reallyisntfair e9_ MK_F16 unrelievable Ixfaris_0 LuvDark 420kinaka _NonameIsHere_ iS3od_ 3Mmr Wesccar 1MeKo losingtears KaaReeeM loovq rarticalss 1RealFadi JustDrink_ AFG_progamer92 Jxicide D7oMz 1AhMqD Omaaaaaaaaaar Classic190 Only7oDa sylx69 1_3bdalH frank124 dfdox 1Mohq 1Sweleh_ Om2r epicmines33 1Devesty_ BagmaTwT Azyyq A2boD Ba1z 100k__ Watchdog nv0ola KinderBueno__ Invxe_ GreatMjd zixgamer Salvctore 420Lalilala vIon3 wstre AstroSaif plaintiveness ImS3G 1Flick EstieMeow ItsNqf MVP11 Daddy_Naif shichirouu Lordui 1Reyleigh BIocksMc 1Retired O_lp L6mh 63myh 1Mawja_ Tqfi 3iDO 1M7mmd__ lqmr yzed GsOMAR nshme Fcris RamboKinq qDry1 1Rana 1flyn Harbi deficency 0Aix 0Da3s 0DrRep 0hPqnos 0h_Roby 1A7mad1 1Ahmvd 1Derex 1DeVilz 1F5aMH___3oo 1HeyImHasson_ 1KhaleeD 1Kweng 1L7NN 1Levaai 1Loga_ 1LoST_ 1M0ha 1M7mdz 1M7mmD 1Mshari 1Narwhql 1Omxr 1Pepe_ 1RE3 1Sinqx 1Tz3bo 1_aq 1_ST 3rodi 7MZH 7re2a_YT 8mhh 90fa 91l7 9we A5oShnBaT abd0_369 Aboal3z14 Aboz3bl AbuA7md506 AfootDiamond117 AhmedPROGG Alaam_FG arbawii AsgardOfEddard AwKTaM Aymann_ baderr Banderr BaSiL_123 Bastic beyondviolets BinDontCare BlackOurs Blood_Artz Bo3aShor Bo6lalll bota_69 Boviix c22l Creegam Cryslinq CutieRana cuz_himo cW6n d5qq DaBabyFan DangPavel DarkA5_ deathally Dedz1k DeeRx DestroyerOnyc_ DestroyerTrUnKs Dizibre Dqrkfall Draggn_ Driction Du7ym ebararh EVanDoskI F2rris FaRidok FexoraNEP Flineer Fta7 Futurezii G3rryx GoldenGapples H2ris Haifa_magic HM___ iA11 iAhmedGG IDoubIe IF3MH iiEsaTKing_ iikimo iLuvSG_ ilybb0 iMehdi_ ImXann INFAMOUSEEE InjjectoR inVertice IR3DX iRxv iSolom Its_HighNoon Ittekimasu itzZa1D ixBander IxDjole IxKimo i_Ym5 Jarxay Jrx7 Just7MO KingHOYT KoFTH kostasidk Kuhimitsu lacvna lareey leeleeeleeeleee Lemfs lt1x Lunching Luvaa lwra M1M_ M4rwaan Maarcii manuelmaster Mark_Gamer_YT_ MaybeHeDoes Mhmovd MightyM7MD Millsap MindOfNasser Mjdra_call_ME mokgii Mondoros Mythiques mzh Neeres NotMoHqMeD__ obaida123445 ogm OldAlone Oxenaa phxnomenal PT7 qB6o6 qlxc qMabel qPito Raceth RADVN RealWayne real__happy redcriper Requieem ritclaw rixw1 rqnkk s2lm S3rvox saad6 Saajed Sadlly SalemBayern_ SamoXS sh5boo6 Sp0tzy_ SpecialAdam_ SpecialAdel_ STEEEEEVEEEE Tabby_Bhau Tetdeus TheDaddyJames TheDrag_Xx Thenvra TheOnlyM7MAD Tibbz_BGamer Tibbz_BGamer_ ToFy_ Tostiebramkaas ttkshr_ tverdy uh8e vBursT_ vdhvm vinnythebot vM6r vxom w7r wishingdeath wl3d wzii xanaxjuice xDiaa_levo xDmg xDupzHell xiDayzer xImMuntadher_ xIMonster_Rj xL2d xLePerfect xMz7 Y2men Yaazzeed yff3 yosife_7Y yQuack Y_04 zAhmd ZANAD zayedk zCroDanger Zqvies _0bX _b_i _iSkyla _N3 _Ottawa _R3 _SpecialSA_ _Vxpe _xayu_ _z2_ " - private var jartexStaff : String = "voodootje0 Max Rodagave Wrath JustThiemo Andeh Nirahz stupxd Botervrij Viclyn_ DrogonMC ovq Flexier NotLoLo1818 SabitTSDM07 ItzCqldFxld Laux bene_e iFlyYT HeadsBreker AX79 Technostein Djim Serpentsalamce Almostlikeaboss JustAtaman ZoneRGH naranbaatr louiekeys Difficulted FuzniX xHasey sammyxt CR7811149 Xerrainrin toastt_x UpperGround Swervinng SquareWings928 Yanique1 pakitonia Stxrs".toString() + private var hypStaffttxt : String = + "Gerbor12 " + + "JordWG " + + "LeBrillant " + + "Pensul " + + "LadyBleu " + + "Citria " + + "DeluxeRose " + + "TheBirmanator " + + "TorWolf " + + "Minikloon " + + "Rhune " + + "Greeenn " + + "Fr0z3n " + + "SnowyPai " + + "Rozsa " + + "Quack " + + "ZeaBot " + + "Cheesey " + + "MCVisuals " + + "carstairs95 " + + "DistrictGecko " + + "inventivetalent " + + "JacobRuby " + + "Jayavarmen " + + "Judg3 " + + "LandonHP " + + "Liffeh " + + "xHascox " + + "DEADORKAI " + + "Brandonjja " + + "skyerzz " + + "Dctr " + + "AdamWho " + + "aPunch " + + "jamzs " + + "Phaige " + + "Likaos " + + "hypixel " + + "Plummel " + + "Bloozing " + + "BlocksKey " + + "MistressEldrid " + + "Nausicaah " + + "ChiLynn " + + "TheMGRF " + + "Revengeee " + + "_PolynaLove_ " + + "Sylent_ " + + "Teddy " + + "Relenter " + + "_fudgiethewhale " + + "sfarnham " + + "NoxyD " + + "WilliamTiger " + + "vinny8ball666 " + + "Nitroholic_ " + + "Donpireso " + + "Plancke " + + "ConnorLinfoot " + + "RapidTheNerd " + + "Rezzus " + + "eeyitscoco " + + "Cecer " + + "Externalizable " + + "Bembo " + + "Taytale " + + "JamieTheGeek " + + "williamgburns " + + "BOGA32 " + + "boomerzap " + + "MFN " + + "Gainful " + + "Octaverei " + + "TacNayn " + + "TimeDeo " + + "Minikloon " + + "idhoom " + + "7so " + + "1sweet " + + "jinaaan " + + "ev2n " + + "eissaa " + + "mohmad_q8 " + + "1daykel " + + "ximtaig_ " + + "nshme " + + "comsterr " + + "e9_ " + + "1meko " + + "1lab " + + "mk_f16 " + + "loovq " + + "_sadeq " + + "nv0ola " + + "1f5amh___3oo " + + "frecss217 " + + "xmz7 " + + "a2bod " + + "eyeso_diamond " + + "bunkrat " + + "1rana " + + "1ahmd " + + "1heyimhasson_ " + + "casteret " + + "1elyy " + + "1zeyad " + + "lt1x " + + "firas " + + "postme " + + "3mmr " + + "xl2d " + + "yzed " + + "y2men " + + "iv2a " + + "_nonameishere_ " + + "0hfault " + + "deficency " + + "anauri " + + "xluffy1 " + + "kinderbueno__ " + + "_revoox_ " + + "xidayzer " + + "i7ilin " + + "1adam__ " + + "27bk " + + "ventz_ " + + "awfultimes " + + "ahm2d " + + "gsomar " + + "mvp11 " + + "xxkhaledxxcraft " + + "aymann_ " + + "1iraqi " + + "rambokinq " + + "undertest " + + "zswift " + + "strongest0ne " + + "neverletyouknow " + + "zixgamer " + + "sanfoor_j " + + "ixghoul_ " + + "imbexsl_ " + + "glowdown_ " + + "hunter47 " + + "fexoranep " + + "1reyleigh " + + "420waffle " + + "ywgiz " + + "sweetyalice " + + "xfahadq " + + "mr3nb_ " + + "akash1004 " + + "zaytonaaa " + + "rma7o " + + "mr_1990 " + + "iali_305 " + + "wacros " + + "lwwh " + + "pynifical " + + "rivsci " + + "itsjuan_ " + + "meedo_qb " + + "_r3 " + + "1speedo_ " + + "_justidk " + + "505t " + + "xzvv " + + "mauveracer " + + "_1hypersx_ " + + "rayqquaza " + + "swivee " + + "absqtulate " + + "opgaming2009 " + + "vhagardracarys " + + "luffy404 " + + "faisaal420 " + + "hdzt " + + "sunsnipebeastwtf " + + "_odex " + + "1ashu " + + "n13m_ " + + "callinu " + + "sh59 " + + "drnyx " + + "iisrab5bgii " + + "haoeris " + + "lxrayanxl " + + "toxiclayer " + + "greatm7md " + + "brksfrb2 " + + "madix707 " + + "hnxrr " + + "1sweetty " + + "ohhhhqls " + + "solidfying " + + "_i_b " + + "escoco " + + "dreadpirater0b " + + "aboshxm " + + "0ryze " + + "spuvr " + + "va_1 " + + "kingpvp90 " + + "rieus " + + "prebowed " + + "mitsichu " + + "gogglas " + + "battlebay " + + "32lbo " + + "7far_8bor " + + "evenfai " + + "hlazny " + + "valrm" + private var kkStaff : String = "Creeper_Hello" + + "Kun_God" + + "hanhan_api" + private var bmcStaff : String = " iDhoom " + + "Jinaaan " + + "Eissaa " + + "Ev2n " + + "1Mhmmd " + + "mohmad_q8 " + + "1Daykel Aliiyah 1Brhom xImTaiG_ comsterr 8layh M7mmd 1LaB xIBerryPlayz iiRaivy Refolt 1Sweet Aba5z3l EyesO_Diamond bestleso Firas reallyisntfair e9_ MK_F16 unrelievable Ixfaris_0 LuvDark 420kinaka _NonameIsHere_ iS3od_ 3Mmr Wesccar 1MeKo losingtears KaaReeeM loovq rarticalss 1RealFadi JustDrink_ AFG_progamer92 Jxicide D7oMz 1AhMqD Omaaaaaaaaaar Classic190 Only7oDa sylx69 1_3bdalH frank124 dfdox 1Mohq 1Sweleh_ Om2r epicmines33 1Devesty_ BagmaTwT Azyyq A2boD Ba1z 100k__ Watchdog nv0ola KinderBueno__ Invxe_ GreatMjd zixgamer Salvctore 420Lalilala vIon3 wstre AstroSaif plaintiveness ImS3G 1Flick EstieMeow ItsNqf MVP11 Daddy_Naif shichirouu Lordui 1Reyleigh BIocksMc 1Retired O_lp L6mh 63myh 1Mawja_ Tqfi 3iDO 1M7mmd__ lqmr yzed GsOMAR nshme Fcris RamboKinq qDry1 1Rana 1flyn Harbi deficency 0Aix 0Da3s 0DrRep 0hPqnos 0h_Roby 1A7mad1 1Ahmvd 1Derex 1DeVilz 1F5aMH___3oo 1HeyImHasson_ 1KhaleeD 1Kweng 1L7NN 1Levaai 1Loga_ 1LoST_ 1M0ha 1M7mdz 1M7mmD 1Mshari 1Narwhql 1Omxr 1Pepe_ 1RE3 1Sinqx 1Tz3bo 1_aq 1_ST 3rodi 7MZH 7re2a_YT 8mhh 90fa 91l7 9we A5oShnBaT abd0_369 Aboal3z14 Aboz3bl AbuA7md506 AfootDiamond117 AhmedPROGG Alaam_FG arbawii AsgardOfEddard AwKTaM Aymann_ baderr Banderr BaSiL_123 Bastic beyondviolets BinDontCare BlackOurs Blood_Artz Bo3aShor Bo6lalll bota_69 Boviix c22l Creegam Cryslinq CutieRana cuz_himo cW6n d5qq DaBabyFan DangPavel DarkA5_ deathally Dedz1k DeeRx DestroyerOnyc_ DestroyerTrUnKs Dizibre Dqrkfall Draggn_ Driction Du7ym ebararh EVanDoskI F2rris FaRidok FexoraNEP Flineer Fta7 Futurezii G3rryx GoldenGapples H2ris Haifa_magic HM___ iA11 iAhmedGG IDoubIe IF3MH iiEsaTKing_ iikimo iLuvSG_ ilybb0 iMehdi_ ImXann INFAMOUSEEE InjjectoR inVertice IR3DX iRxv iSolom Its_HighNoon Ittekimasu itzZa1D ixBander IxDjole IxKimo i_Ym5 Jarxay Jrx7 Just7MO KingHOYT KoFTH kostasidk Kuhimitsu lacvna lareey leeleeeleeeleee Lemfs lt1x Lunching Luvaa lwra M1M_ M4rwaan Maarcii manuelmaster Mark_Gamer_YT_ MaybeHeDoes Mhmovd MightyM7MD Millsap MindOfNasser Mjdra_call_ME mokgii Mondoros Mythiques mzh Neeres NotMoHqMeD__ obaida123445 ogm OldAlone Oxenaa phxnomenal PT7 qB6o6 qlxc qMabel qPito Raceth RADVN RealWayne real__happy redcriper Requieem ritclaw rixw1 rqnkk s2lm S3rvox saad6 Saajed Sadlly SalemBayern_ SamoXS sh5boo6 Sp0tzy_ SpecialAdam_ SpecialAdel_ STEEEEEVEEEE Tabby_Bhau Tetdeus TheDaddyJames TheDrag_Xx Thenvra TheOnlyM7MAD Tibbz_BGamer Tibbz_BGamer_ ToFy_ Tostiebramkaas ttkshr_ tverdy uh8e vBursT_ vdhvm vinnythebot vM6r vxom w7r wishingdeath wl3d wzii xanaxjuice xDiaa_levo xDmg xDupzHell xiDayzer xImMuntadher_ xIMonster_Rj xL2d xLePerfect xMz7 Y2men Yaazzeed yff3 yosife_7Y yQuack Y_04 zAhmd ZANAD zayedk zCroDanger Zqvies _0bX _b_i _iSkyla _N3 _Ottawa _R3 _SpecialSA_ _Vxpe _xayu_ _z2_ " + private var jartexStaff : String = "voodootje0 Max Rodagave Wrath JustThiemo Andeh Nirahz stupxd Botervrij Viclyn_ DrogonMC ovq Flexier NotLoLo1818 SabitTSDM07 ItzCqldFxld Laux bene_e iFlyYT HeadsBreker AX79 Technostein Djim Serpentsalamce Almostlikeaboss JustAtaman ZoneRGH naranbaatr louiekeys Difficulted FuzniX xHasey sammyxt CR7811149 Xerrainrin toastt_x UpperGround Swervinng SquareWings928 Yanique1 pakitonia Stxrs" private var pikaStaff : String = "Max voodootje0 MrFrenco JustThiemo Wrath Andeh Nirahz stupxd Botervrij Subvalent Apo2xd Arrly Minecraft_leg CaptainGeoGR Thijme01 ChickenDinnr Crni_ MrGownz Outscale MrEpiko Crveni_Marlboro zMqrcc _Stella_xD Stormidity TryToHitMe Alparo_ CandyOP Astrospeh TinCanL TheTrueNova FIKOZ DarkVenom7 caila5 Lpkfvip i9BAR " private var mineboxStaff : String = "xSp3ctro_ SaF3rC Sagui TheSuperXD_YT xAnibal xTheKillex25x HankWalter JavierFenix inothayami ChaosSoleil ElChamo300 Robert TO1010 itachi_uchiha_s roku__ rynne_ sushi dashi Vicky_21" private var zonecraftStaff : String = "002Aren asiessoydecono donerreMC elMagnificPvP ErCris fernxndx gourd Gudaa ImAle ImMarvolo ismq nicoxrm pacorro rapheos MrBara MrMonkey57 uploadedhh trifeyy 002Aren Agu5 augusmaster BetTD d411 dunshbey85 ElMaGnific Pv ErCris Eugene FelmaxMC Gudaa ¡Enux ImMarvolo sleepless ismq ItzOmar16 joescam LuisPoMC Nicoxrm pacorro " @@ -61,24 +276,41 @@ object AntiStaff : Module() { @EventTarget fun onWorld(event: WorldEvent) { - staffs = "" - if (kkcraftValue.get()) staffs = "$staffs $kkStaff" - if (blocksMCValue.get()) staffs = "$staffs $bmcStaff" - if (jartexValue.get()) staffs = "$staffs $jartexStaff" - if (pikaValue.get()) staffs = "$staffs $pikaStaff" - if (mineboxValue.get()) staffs = "$staffs $mineboxStaff" - if (hycraftValue.get()) staffs = "$staffs $hycraftStaff" - if (librecraftValue.get()) staffs = "$staffs $librecraftStaff" - if (universocraftValue.get()) staffs = "$staffs $universocraftStaff" - if (customValue.get()) { - - try { - staffs = staffs + " " + HttpUtils.get(customURLValue.get()) + staffs = when (mode.get().lowercase()) { + "hypixel" -> "$staffs $hypStaffttxt" + "kkcraft" -> "$staffs $kkStaff" + "blocksmc" -> "$staffs $bmcStaff" + "jartex" -> "$staffs $jartexStaff" + "pika" -> "$staffs $pikaStaff" + "minebox" -> "$staffs $mineboxStaff" + "hycraft" -> "$staffs $hycraftStaff" + "librecraft" -> "$staffs $librecraftStaff" + "universecraft" -> "$staffs $universocraftStaff" + "custom" -> { + try { + staffs + " " + HttpUtils.get(customURLValue.get()) + FDPClient.hud.addNotification( + Notification( + "AntiStaff", + "SuccessFully Loaded URL", + NotifyType.SUCCESS, + 1000 + ) + ) + } catch (err: Throwable) { + FDPClient.hud.addNotification( + Notification( + "AntiStaff", + "Error when loading URL", + NotifyType.ERROR, + 1000 + ) + ) + }.toString() + } - FDPClient.hud.addNotification(Notification("AntiStaff", "SuccessFully Loaded URL", NotifyType.SUCCESS, 1000)) - } catch (err: Throwable) { - FDPClient.hud.addNotification(Notification("AntiStaff", "Error when loading URL", NotifyType.ERROR, 1000)) - println(err) + else -> { + "" } } diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/other/PacketDebugger.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/other/PacketDebugger.kt index 62f0627..4d92ebe 100644 --- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/other/PacketDebugger.kt +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/other/PacketDebugger.kt @@ -31,23 +31,21 @@ object PacketDebugger : Module() { private val settings = arrayListOf>(printFieldsValue,printTimeValue,mcpFieldValue) private val fieldMap = hashMapOf("field_148940_a" to "x","field_148938_b" to "y","field_148939_c" to "z","field_148936_d" to "yaw","field_148937_e" to "pitch","field_179835_f" to "field_179835_f","field_149018_a" to "entityId","field_149016_b" to "x","field_149017_c" to "y","field_149014_d" to "z","field_149015_e" to "speedX","field_149012_f" to "speedY","field_149013_g" to "speedZ","field_149021_h" to "pitch","field_149022_i" to "yaw","field_149019_j" to "type","field_149020_k" to "field_149020_k","field_148992_a" to "entityID","field_148990_b" to "posX","field_148991_c" to "posY","field_148988_d" to "posZ","field_148989_e" to "xpValue","field_149059_a" to "entityId","field_149057_b" to "x","field_149058_c" to "y","field_149055_d" to "z","field_149056_e" to "type","field_149042_a" to "entityId","field_149040_b" to "type","field_149041_c" to "x","field_149038_d" to "y","field_149039_e" to "z","field_149036_f" to "velocityX","field_149037_g" to "velocityY","field_149047_h" to "velocityZ","field_149048_i" to "yaw","field_149045_j" to "pitch","field_149046_k" to "headPitch","field_149043_l" to "field_149043_l","field_149044_m" to "watcher","field_148973_a" to "entityID","field_179838_b" to "position","field_179839_c" to "facing","field_148968_f" to "title","field_148957_a" to "entityId","field_179820_b" to "playerId","field_148956_c" to "x","field_148953_d" to "y","field_148954_e" to "z","field_148951_f" to "yaw","field_148952_g" to "pitch","field_148959_h" to "currentItem","field_148960_i" to "watcher","field_148958_j" to "field_148958_j","field_148981_a" to "entityId","field_148980_b" to "type","field_148976_a" to "field_148976_a","field_148852_a" to "breakerId","field_179822_b" to "position","field_148849_e" to "progress","field_179824_a" to "blockPos","field_148859_d" to "metadata","field_148860_e" to "nbt","field_179826_a" to "blockPosition","field_148872_d" to "instrument","field_148873_e" to "pitch","field_148871_f" to "block","field_179828_a" to "blockPosition","field_148883_d" to "blockState","field_179833_a" to "difficulty","field_179832_b" to "difficultyLocked","field_149632_a" to "matches","field_148919_a" to "chatComponent","field_179842_b" to "type","field_148925_b" to "chunkPosCoord","field_179845_b" to "changedBlocks","field_148894_a" to "windowId","field_148892_b" to "actionNumber","field_148893_c" to "field_148893_c","field_148896_a" to "windowId","field_148909_a" to "windowId","field_148907_b" to "inventoryType","field_148908_c" to "windowTitle","field_148905_d" to "slotCount","field_148904_f" to "entityId","field_148914_a" to "windowId","field_148913_b" to "itemStacks","field_149186_a" to "windowId","field_149184_b" to "varIndex","field_149185_c" to "varValue","field_149179_a" to "windowId","field_149177_b" to "slot","field_149178_c" to "item","field_149172_a" to "channel","field_149171_b" to "data","field_149167_a" to "reason","field_149164_a" to "entityId","field_149163_b" to "logicOpcode","field_179766_a" to "entityId","field_179765_b" to "tagCompound","field_149158_a" to "posX","field_149156_b" to "posY","field_149157_c" to "posZ","field_149154_d" to "strength","field_149155_e" to "affectedBlockPositions","field_149152_f" to "field_149152_f","field_149153_g" to "field_149153_g","field_149159_h" to "field_149159_h","field_179761_a" to "threshold","field_149142_a" to "MESSAGE_NAMES","field_149140_b" to "state","field_149141_c" to "field_149141_c","field_149136_a" to "id","field_149284_a" to "chunkX","field_149282_b" to "chunkZ","field_179758_c" to "extractedData","field_149279_g" to "field_149279_g","field_149266_a" to "xPositions","field_149264_b" to "zPositions","field_179755_c" to "chunksData","field_149267_h" to "isOverworld","field_149251_a" to "soundType","field_179747_b" to "soundPos","field_149249_b" to "soundData","field_149246_f" to "serverWide","field_179751_a" to "particleType","field_149234_b" to "xCoord","field_149235_c" to "yCoord","field_149232_d" to "zCoord","field_149233_e" to "xOffset","field_149230_f" to "yOffset","field_149231_g" to "zOffset","field_149237_h" to "particleSpeed","field_149238_i" to "particleCount","field_179752_j" to "longDistance","field_179753_k" to "particleArguments","field_149219_a" to "soundName","field_149217_b" to "posX","field_149218_c" to "posY","field_149215_d" to "posZ","field_149216_e" to "soundVolume","field_149214_f" to "soundPitch","field_149206_a" to "entityId","field_149204_b" to "hardcoreMode","field_149205_c" to "gameType","field_149202_d" to "dimension","field_149203_e" to "difficulty","field_149200_f" to "maxPlayers","field_149201_g" to "worldType","field_179745_h" to "reducedDebugInfo","field_149191_a" to "mapId","field_179739_b" to "mapScale","field_179740_c" to "mapVisiblePlayersVec4b","field_179737_d" to "mapMinX","field_179738_e" to "mapMinY","field_179735_f" to "mapMaxX","field_179736_g" to "mapMaxY","field_179741_h" to "mapDataBytes","field_149074_a" to "entityId","field_149072_b" to "posX","field_149073_c" to "posY","field_149070_d" to "posZ","field_149071_e" to "yaw","field_149068_f" to "pitch","field_179743_g" to "onGround","field_149069_g" to "field_149069_g","field_179778_a" to "signPosition","field_149119_a" to "invulnerable","field_149117_b" to "flying","field_149118_c" to "allowFlying","field_149115_d" to "creativeMode","field_149116_e" to "flySpeed","field_149114_f" to "walkSpeed","field_179776_a" to "eventType","field_179774_b" to "field_179774_b","field_179775_c" to "field_179775_c","field_179772_d" to "field_179772_d","field_179773_e" to "deathMessage","field_179770_a" to "action","field_179769_b" to "players","field_149097_a" to "playerID","field_179799_b" to "bedPos","field_149100_a" to "entityIDs","field_149079_a" to "entityId","field_149078_b" to "effectId","field_179786_a" to "url","field_179785_b" to "hash","field_149088_a" to "dimensionID","field_149086_b" to "difficulty","field_149087_c" to "gameType","field_149085_d" to "worldType","field_149384_a" to "entityId","field_149383_b" to "yaw","field_179795_a" to "action","field_179793_b" to "size","field_179794_c" to "centerX","field_179791_d" to "centerZ","field_179792_e" to "targetSize","field_179789_f" to "diameter","field_179790_g" to "timeUntilTarget","field_179796_h" to "warningTime","field_179797_i" to "warningDistance","field_179781_a" to "entityId","field_149387_a" to "heldItemHotbarIndex","field_149374_a" to "position","field_149373_b" to "scoreName","field_149379_a" to "entityId","field_149378_b" to "field_149378_b","field_149408_a" to "leash","field_149406_b" to "entityId","field_149407_c" to "vehicleEntityId","field_149417_a" to "entityID","field_149415_b" to "motionX","field_149416_c" to "motionY","field_149414_d" to "motionZ","field_149394_a" to "entityID","field_149392_b" to "equipmentSlot","field_149393_c" to "itemStack","field_149401_a" to "field_149401_a","field_149399_b" to "totalExperience","field_149400_c" to "level","field_149336_a" to "health","field_149334_b" to "foodLevel","field_149335_c" to "saturationLevel","field_149343_a" to "objectiveName","field_149341_b" to "objectiveValue","field_179818_c" to "type","field_149342_c" to "field_149342_c","field_149320_a" to "name","field_149318_b" to "displayName","field_149319_c" to "prefix","field_149316_d" to "suffix","field_179816_e" to "nameTagVisibility","field_179815_f" to "color","field_149317_e" to "players","field_149314_f" to "action","field_149315_g" to "friendlyFlags","field_149329_a" to "name","field_149327_b" to "objective","field_149328_c" to "value","field_149326_d" to "action","field_179801_a" to "spawnBlockPos","field_149369_a" to "totalWorldTime","field_149368_b" to "worldTime","field_179812_a" to "type","field_179810_b" to "message","field_179811_c" to "fadeInTime","field_179808_d" to "displayTime","field_179809_e" to "fadeOutTime","field_179706_a" to "world","field_179705_b" to "blockPos","field_149349_d" to "lines","field_179703_a" to "header","field_179702_b" to "footer","field_149357_a" to "collectedItemEntityId","field_149356_b" to "entityId","field_149458_a" to "entityId","field_149456_b" to "posX","field_149457_c" to "posY","field_149454_d" to "posZ","field_149455_e" to "yaw","field_149453_f" to "pitch","field_179698_g" to "onGround","field_149445_a" to "entityId","field_149444_b" to "field_149444_b","field_149434_a" to "entityId","field_149432_b" to "effectId","field_149433_c" to "amplifier","field_149431_d" to "duration","field_179708_e" to "hideParticles","field_149420_a" to "message","field_179710_b" to "targetBlock","field_149440_a" to "message","field_149437_a" to "status","field_149530_a" to "lang","field_149528_b" to "view","field_149529_c" to "chatVisibility","field_149526_d" to "enableColors","field_179711_e" to "modelPartFlags","field_149536_a" to "windowId","field_149534_b" to "uid","field_149535_c" to "accepted","field_149541_a" to "windowId","field_149540_b" to "button","field_149554_a" to "windowId","field_149552_b" to "slotId","field_149553_c" to "usedButton","field_149550_d" to "actionNumber","field_149551_e" to "clickedItem","field_149549_f" to "mode","field_149556_a" to "windowId","field_149562_a" to "channel","field_149561_c" to "data","field_149567_a" to "entityId","field_149566_b" to "action","field_179713_c" to "hitVec","field_149461_a" to "key","field_149479_a" to "x","field_149477_b" to "y","field_149478_c" to "z","field_149476_e" to "yaw","field_149473_f" to "pitch","field_149474_g" to "onGround","field_149480_h" to "moving","field_149481_i" to "rotating","field_149500_a" to "invulnerable","field_149498_b" to "flying","field_149499_c" to "allowFlying","field_149496_d" to "creativeMode","field_149497_e" to "flySpeed","field_149495_f" to "walkSpeed","field_179717_a" to "position","field_179716_b" to "facing","field_149508_e" to "status","field_149517_a" to "entityID","field_149515_b" to "action","field_149516_c" to "auxData","field_149624_a" to "strafeSpeed","field_149622_b" to "forwardSpeed","field_149623_c" to "jumping","field_149621_d" to "sneaking","field_179720_a" to "hash","field_179719_b" to "status","field_149615_a" to "slotId","field_149629_a" to "slotId","field_149628_b" to "stack","field_179723_a" to "pos","field_149590_d" to "lines","field_179729_a" to "id","field_179726_a" to "field_179726_a","field_179725_b" to "position","field_149579_d" to "placedBlockDirection","field_149580_e" to "stack","field_149577_f" to "facingX","field_149578_g" to "facingY","field_149584_h" to "facingZ","field_149602_a" to "profile","field_149612_a" to "hashedServerId","field_149610_b" to "publicKey","field_149611_c" to "verifyToken","field_179733_a" to "compressionTreshold","field_149605_a" to "reason","field_149305_a" to "profile","field_149302_a" to "secretKeyEncrypted","field_149301_b" to "verifyTokenEncrypted","field_149293_a" to "clientTime","field_149297_a" to "GSON","field_149296_b" to "response","field_149290_a" to "clientTime") - private val packetClasses = arrayOf(C00PacketLoginStart::class.java, C01PacketEncryptionResponse::class.java, C00PacketServerQuery::class.java, C01PacketPing::class.java, C00PacketKeepAlive::class.java, C01PacketChatMessage::class.java, C02PacketUseEntity::class.java, C03PacketPlayer::class.java, C03PacketPlayer.C04PacketPlayerPosition::class.java, C03PacketPlayer.C05PacketPlayerLook::class.java, C03PacketPlayer.C06PacketPlayerPosLook::class.java, C07PacketPlayerDigging::class.java, C08PacketPlayerBlockPlacement::class.java, C09PacketHeldItemChange::class.java, C0APacketAnimation::class.java, C0BPacketEntityAction::class.java, C0CPacketInput::class.java, C0DPacketCloseWindow::class.java, C0EPacketClickWindow::class.java, C0FPacketConfirmTransaction::class.java, C10PacketCreativeInventoryAction::class.java, C11PacketEnchantItem::class.java, C12PacketUpdateSign::class.java, C13PacketPlayerAbilities::class.java, C14PacketTabComplete::class.java, C15PacketClientSettings::class.java, C16PacketClientStatus::class.java, C17PacketCustomPayload::class.java, C18PacketSpectate::class.java, C19PacketResourcePackStatus::class.java, C00Handshake::class.java, S00PacketDisconnect::class.java, S01PacketEncryptionRequest::class.java, S02PacketLoginSuccess::class.java, S03PacketEnableCompression::class.java, S00PacketServerInfo::class.java, S01PacketPong::class.java, S00PacketKeepAlive::class.java, S01PacketJoinGame::class.java, S02PacketChat::class.java, S03PacketTimeUpdate::class.java, S04PacketEntityEquipment::class.java, S05PacketSpawnPosition::class.java, S06PacketUpdateHealth::class.java, S07PacketRespawn::class.java, S08PacketPlayerPosLook::class.java, S09PacketHeldItemChange::class.java, S0APacketUseBed::class.java, S0BPacketAnimation::class.java, S0CPacketSpawnPlayer::class.java, S0DPacketCollectItem::class.java, S0EPacketSpawnObject::class.java, S0FPacketSpawnMob::class.java, S10PacketSpawnPainting::class.java, S11PacketSpawnExperienceOrb::class.java, S12PacketEntityVelocity::class.java, S13PacketDestroyEntities::class.java, S14PacketEntity::class.java, S14PacketEntity.S15PacketEntityRelMove::class.java, S14PacketEntity.S16PacketEntityLook::class.java, S14PacketEntity.S17PacketEntityLookMove::class.java, S18PacketEntityTeleport::class.java, S19PacketEntityHeadLook::class.java, S19PacketEntityStatus::class.java, S1BPacketEntityAttach::class.java, S1CPacketEntityMetadata::class.java, S1DPacketEntityEffect::class.java, S1EPacketRemoveEntityEffect::class.java, S1FPacketSetExperience::class.java, S20PacketEntityProperties::class.java, S21PacketChunkData::class.java, S22PacketMultiBlockChange::class.java, S23PacketBlockChange::class.java, S24PacketBlockAction::class.java, S25PacketBlockBreakAnim::class.java, S26PacketMapChunkBulk::class.java, S27PacketExplosion::class.java, S28PacketEffect::class.java, S29PacketSoundEffect::class.java, S2APacketParticles::class.java, S2BPacketChangeGameState::class.java, S2CPacketSpawnGlobalEntity::class.java, S2DPacketOpenWindow::class.java, S2EPacketCloseWindow::class.java, S2FPacketSetSlot::class.java, S30PacketWindowItems::class.java, S31PacketWindowProperty::class.java, S32PacketConfirmTransaction::class.java, S33PacketUpdateSign::class.java, S34PacketMaps::class.java, S35PacketUpdateTileEntity::class.java, S36PacketSignEditorOpen::class.java, S37PacketStatistics::class.java, S38PacketPlayerListItem::class.java, S39PacketPlayerAbilities::class.java, S3APacketTabComplete::class.java, S3BPacketScoreboardObjective::class.java, S3CPacketUpdateScore::class.java, S3DPacketDisplayScoreboard::class.java, S3EPacketTeams::class.java, S3FPacketCustomPayload::class.java, S40PacketDisconnect::class.java, S41PacketServerDifficulty::class.java, S42PacketCombatEvent::class.java, S43PacketCamera::class.java, S44PacketWorldBorder::class.java, S45PacketTitle::class.java, S46PacketSetCompressionLevel::class.java, S47PacketPlayerListHeaderFooter::class.java, S48PacketResourcePackSend::class.java, S49PacketUpdateEntityNBT::class.java).apply { - forEach { - settings.add( - object : BoolValue(it.simpleName, false) { - val clazz = it + private val packetClasses = arrayOf(C00PacketLoginStart::class.java, C01PacketEncryptionResponse::class.java, C00PacketServerQuery::class.java, C01PacketPing::class.java, C00PacketKeepAlive::class.java, C01PacketChatMessage::class.java, C02PacketUseEntity::class.java, C03PacketPlayer::class.java, C03PacketPlayer.C04PacketPlayerPosition::class.java, C03PacketPlayer.C05PacketPlayerLook::class.java, C03PacketPlayer.C06PacketPlayerPosLook::class.java, C07PacketPlayerDigging::class.java, C08PacketPlayerBlockPlacement::class.java, C09PacketHeldItemChange::class.java, C0APacketAnimation::class.java, C0BPacketEntityAction::class.java, C0CPacketInput::class.java, C0DPacketCloseWindow::class.java, C0EPacketClickWindow::class.java, C0FPacketConfirmTransaction::class.java, C10PacketCreativeInventoryAction::class.java, C11PacketEnchantItem::class.java, C12PacketUpdateSign::class.java, C13PacketPlayerAbilities::class.java, C14PacketTabComplete::class.java, C15PacketClientSettings::class.java, C16PacketClientStatus::class.java, C17PacketCustomPayload::class.java, C18PacketSpectate::class.java, C19PacketResourcePackStatus::class.java, C00Handshake::class.java, S00PacketDisconnect::class.java, S01PacketEncryptionRequest::class.java, S02PacketLoginSuccess::class.java, S03PacketEnableCompression::class.java, S00PacketServerInfo::class.java, S01PacketPong::class.java, S00PacketKeepAlive::class.java, S01PacketJoinGame::class.java, S02PacketChat::class.java, S03PacketTimeUpdate::class.java, S04PacketEntityEquipment::class.java, S05PacketSpawnPosition::class.java, S06PacketUpdateHealth::class.java, S07PacketRespawn::class.java, S08PacketPlayerPosLook::class.java, S09PacketHeldItemChange::class.java, S0APacketUseBed::class.java, S0BPacketAnimation::class.java, S0CPacketSpawnPlayer::class.java, S0DPacketCollectItem::class.java, S0EPacketSpawnObject::class.java, S0FPacketSpawnMob::class.java, S10PacketSpawnPainting::class.java, S11PacketSpawnExperienceOrb::class.java, S12PacketEntityVelocity::class.java, S13PacketDestroyEntities::class.java, S14PacketEntity::class.java, S14PacketEntity.S15PacketEntityRelMove::class.java, S14PacketEntity.S16PacketEntityLook::class.java, S14PacketEntity.S17PacketEntityLookMove::class.java, S18PacketEntityTeleport::class.java, S19PacketEntityHeadLook::class.java, S19PacketEntityStatus::class.java, S1BPacketEntityAttach::class.java, S1CPacketEntityMetadata::class.java, S1DPacketEntityEffect::class.java, S1EPacketRemoveEntityEffect::class.java, S1FPacketSetExperience::class.java, S20PacketEntityProperties::class.java, S21PacketChunkData::class.java, S22PacketMultiBlockChange::class.java, S23PacketBlockChange::class.java, S24PacketBlockAction::class.java, S25PacketBlockBreakAnim::class.java, S26PacketMapChunkBulk::class.java, S27PacketExplosion::class.java, S28PacketEffect::class.java, S29PacketSoundEffect::class.java, S2APacketParticles::class.java, S2BPacketChangeGameState::class.java, S2CPacketSpawnGlobalEntity::class.java, S2DPacketOpenWindow::class.java, S2EPacketCloseWindow::class.java, S2FPacketSetSlot::class.java, S30PacketWindowItems::class.java, S31PacketWindowProperty::class.java, S32PacketConfirmTransaction::class.java, S33PacketUpdateSign::class.java, S34PacketMaps::class.java, S35PacketUpdateTileEntity::class.java, S36PacketSignEditorOpen::class.java, S37PacketStatistics::class.java, S38PacketPlayerListItem::class.java, S39PacketPlayerAbilities::class.java, S3APacketTabComplete::class.java, S3BPacketScoreboardObjective::class.java, S3CPacketUpdateScore::class.java, S3DPacketDisplayScoreboard::class.java, S3EPacketTeams::class.java, S3FPacketCustomPayload::class.java, S40PacketDisconnect::class.java, S41PacketServerDifficulty::class.java, S42PacketCombatEvent::class.java, S43PacketCamera::class.java, S44PacketWorldBorder::class.java, S45PacketTitle::class.java, S46PacketSetCompressionLevel::class.java, S47PacketPlayerListHeaderFooter::class.java, S48PacketResourcePackSend::class.java, S49PacketUpdateEntityNBT::class.java).onEach { + settings.add( + object : BoolValue(it.simpleName, false) { + val clazz = it - override fun onChange(oldValue: Boolean, newValue: Boolean) { - packetDebugStates[clazz.name] = newValue - } + override fun onChange(oldValue: Boolean, newValue: Boolean) { + packetDebugStates[clazz.name] = newValue + } - override fun fromJson(element: JsonElement) { - super.fromJson(element) - onChange(value, value) - } + override fun fromJson(element: JsonElement) { + super.fromJson(element) + onChange(value, value) } - ) - } + } + ) } @EventTarget diff --git a/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/client/MixinMinecraft.java b/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/client/MixinMinecraft.java index 2ecc95f..74c1efc 100644 --- a/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/client/MixinMinecraft.java +++ b/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/client/MixinMinecraft.java @@ -47,6 +47,7 @@ import java.awt.image.BufferedImage; import java.io.File; import java.nio.ByteBuffer; +import java.util.Objects; @Mixin(Minecraft.class) public abstract class MixinMinecraft { @@ -96,7 +97,8 @@ public abstract class MixinMinecraft { @Unique public boolean fDP1$sendClickBlockToController; - private float prevYaw = 0.0f; + @Unique + private final float fDPClient$prevYaw = 0.0f; @Inject(method = "", at = @At("RETURN")) public void injectConstructor(GameConfiguration p_i45547_1_, CallbackInfo ci) { @@ -137,13 +139,14 @@ private void displayGuiScreen(CallbackInfo callbackInfo) { FDPClient.eventManager.callEvent(new ScreenEvent(currentScreen)); } - private long lastFrame = getTime(); + @Unique + private long fDPClient$lastFrame = fDPClient$getTime(); @Inject(method = "runGameLoop", at = @At("HEAD")) private void runGameLoop(final CallbackInfo callbackInfo) { - final long currentTime = getTime(); - final int deltaTime = (int) (currentTime - lastFrame); - lastFrame = currentTime; + final long currentTime = fDPClient$getTime(); + final int deltaTime = (int) (currentTime - fDPClient$lastFrame); + fDPClient$lastFrame = currentTime; RenderUtils.deltaTime = deltaTime; } @@ -153,15 +156,16 @@ private void runTick(final CallbackInfo callbackInfo) { StaticStorage.scaledResolution = new ScaledResolution((Minecraft) (Object) this); } - public long getTime() { - return (Sys.getTime() * 1000) / Sys.getTimerResolution(); - } - @Inject(method = "runTick", at = @At("HEAD")) private void injectGameRuntimeTicks(CallbackInfo ci) { ClientUtils.INSTANCE.setRunTimeTicks(ClientUtils.INSTANCE.getRunTimeTicks() + 1); } + @Unique + public long fDPClient$getTime() { + return (Sys.getTime() * 1000) / Sys.getTimerResolution(); + } + @Inject(method = "runTick", at = @At(value = "FIELD", target = "Lnet/minecraft/client/Minecraft;joinPlayerCounter:I", shift = At.Shift.BEFORE, ordinal = 0)) private void onTick(final CallbackInfo callbackInfo) { FDPClient.eventManager.callEvent(new TickEvent()); @@ -192,7 +196,7 @@ private void shutdown(CallbackInfo callbackInfo) { @Inject(method = "clickMouse", at = @At("HEAD")) private void clickMouse(CallbackInfo callbackInfo) { CPSCounter.registerClick(CPSCounter.MouseButton.LEFT); - if (FDPClient.moduleManager.getModule(AutoClicker.class).getState()) + if (Objects.requireNonNull(FDPClient.moduleManager.getModule(AutoClicker.class)).getState()) leftClickCounter = 0; } @@ -228,14 +232,14 @@ private void clearRenderCache(CallbackInfo ci) { /** * @author CCBlueX - * @reason + * @reason Update */ @Overwrite private void sendClickBlockToController(boolean leftClick) { if (!leftClick) this.leftClickCounter = 0; - if (this.leftClickCounter <= 0 && (!this.thePlayer.isUsingItem() || FDPClient.moduleManager.getModule(MultiActions.class).getState())) { + if (this.leftClickCounter <= 0 && (!this.thePlayer.isUsingItem() || Objects.requireNonNull(FDPClient.moduleManager.getModule(MultiActions.class)).getState())) { if (leftClick && this.objectMouseOver != null && this.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { BlockPos blockPos = this.objectMouseOver.getBlockPos(); @@ -258,7 +262,7 @@ private void sendClickBlockToController(boolean leftClick) { private void setWindowIcon(CallbackInfo callbackInfo) { try { if (Util.getOSType() != Util.EnumOS.OSX) { - BufferedImage image = ImageIO.read(this.getClass().getResourceAsStream("/assets/minecraft/fdpclient/misc/icon.png")); + BufferedImage image = ImageIO.read(Objects.requireNonNull(this.getClass().getResourceAsStream("/assets/minecraft/fdpclient/misc/icon.png"))); ByteBuffer bytebuffer = ImageUtils.readImageToBuffer(ImageUtils.resizeImage(image, 16, 16)); if (bytebuffer == null) { throw new Exception("Error when loading image."); diff --git a/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/entity/MixinEntityPlayerSP.java b/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/entity/MixinEntityPlayerSP.java index fd1e395..87d9732 100644 --- a/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/entity/MixinEntityPlayerSP.java +++ b/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/entity/MixinEntityPlayerSP.java @@ -431,11 +431,13 @@ public void onLivingUpdate() { if (killAura.getSprintmode().equals("Ground")) { this.setSprinting(mc.thePlayer.onGround); } - if (killAura.getSprintmode().equals("StopSprint")) { + if (Objects.equals(killAura.getSprintmode().get(), "StopSprint")) { this.setSprinting(false); } } - + if (Objects.requireNonNull(killAura).getState() && mc.thePlayer.isSprinting() && MovementUtils.INSTANCE.isMoving()) { + this.setSprinting(!killAura.getAttack()); + } //aac may check it :( if (this.capabilities.allowFlying) { diff --git a/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/network/MixinC17PacketCustomPayload.java b/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/network/MixinC17PacketCustomPayload.java index ea8d327..e309c3b 100644 --- a/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/network/MixinC17PacketCustomPayload.java +++ b/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/network/MixinC17PacketCustomPayload.java @@ -12,7 +12,7 @@ @Mixin(C17PacketCustomPayload.class) public class MixinC17PacketCustomPayload { @Shadow - private PacketBuffer data; + public PacketBuffer data; @Inject(method = "processPacket(Lnet/minecraft/network/play/INetHandlerPlayServer;)V", at = @At("TAIL")) private void releaseData(INetHandlerPlayServer handler, CallbackInfo ci) { diff --git a/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/network/MixinNetworkManager.java b/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/network/MixinNetworkManager.java index f6479af..293f803 100644 --- a/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/network/MixinNetworkManager.java +++ b/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/network/MixinNetworkManager.java @@ -117,6 +117,7 @@ protected void initChannel(Channel channel) { /** * show player head in tab bar * @author Liulihaocai, FDPClient + * @reason idk */ @Inject(method = "getIsencrypted", at = @At("HEAD"), cancellable = true) private void injectEncryption(CallbackInfoReturnable cir) { diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/Element.kt b/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/Element.kt index b2552e7..c214a96 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/Element.kt +++ b/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/Element.kt @@ -183,7 +183,7 @@ class Side(var horizontal: Horizontal, var vertical: Vertical) { RIGHT("Right"); companion object { - fun getByName(name: String) = values().find { it.sideName == name } + fun getByName(name: String) = entries.find { it.sideName == name } } } @@ -197,7 +197,7 @@ class Side(var horizontal: Horizontal, var vertical: Vertical) { DOWN("Down"); companion object { - fun getByName(name: String) = values().find { it.sideName == name } + fun getByName(name: String) = entries.find { it.sideName == name } } } } diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/Arraylist.kt b/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/Arraylist.kt index 3fef71b..87bdc4a 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/Arraylist.kt +++ b/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/Arraylist.kt @@ -5,10 +5,10 @@ */ package net.ccbluex.liquidbounce.ui.client.hud.element.elements -import codes.som.anthony.koffee.modifiers.private import net.ccbluex.liquidbounce.FDPClient import net.ccbluex.liquidbounce.features.module.Module import net.ccbluex.liquidbounce.features.module.ModuleCategory +import net.ccbluex.liquidbounce.features.value.* import net.ccbluex.liquidbounce.ui.client.hud.designer.GuiHudDesigner import net.ccbluex.liquidbounce.ui.client.hud.element.Border import net.ccbluex.liquidbounce.ui.client.hud.element.Element @@ -18,14 +18,14 @@ import net.ccbluex.liquidbounce.ui.client.hud.element.Side.Horizontal import net.ccbluex.liquidbounce.ui.client.hud.element.Side.Vertical import net.ccbluex.liquidbounce.ui.font.Fonts import net.ccbluex.liquidbounce.ui.i18n.LanguageManager -import net.ccbluex.liquidbounce.features.value.* -import net.ccbluex.liquidbounce.utils.render.* -import net.ccbluex.liquidbounce.utils.render.RenderUtils.createFrameBuffer +import net.ccbluex.liquidbounce.utils.render.Animation +import net.ccbluex.liquidbounce.utils.render.ColorUtils +import net.ccbluex.liquidbounce.utils.render.RenderUtils +import net.ccbluex.liquidbounce.utils.render.ShadowUtils import net.minecraft.client.renderer.GlStateManager import net.minecraft.client.shader.Framebuffer -import java.awt.Color - import org.lwjgl.opengl.GL11 +import java.awt.Color /** * CustomHUD Arraylist element diff --git a/src/main/java/net/ccbluex/liquidbounce/utils/RawMouseHelper.kt b/src/main/java/net/ccbluex/liquidbounce/utils/RawMouseHelper.kt new file mode 100644 index 0000000..d76748d --- /dev/null +++ b/src/main/java/net/ccbluex/liquidbounce/utils/RawMouseHelper.kt @@ -0,0 +1,13 @@ +package net.ccbluex.liquidbounce.utils + +import net.ccbluex.liquidbounce.features.module.modules.client.RawInput +import net.minecraft.util.MouseHelper + +class RawMouseHelper : MouseHelper() { + override fun mouseXYChange() { + this.deltaX = RawInput.dx + RawInput.dx = 0 + this.deltaY = -RawInput.dy + RawInput.dy = 0 + } +}