From b80b75c2f690df4e75b1324af1b081279a6cfa70 Mon Sep 17 00:00:00 2001 From: ManInMyVan <113963219+ManInMyVan@users.noreply.github.com> Date: Sun, 23 Jun 2024 12:24:26 -0600 Subject: [PATCH] feat: Grim2364 1.8 NoSlow (#3297) --- .../modules/movement/noslow/modes/blocking/NoSlowBlock.kt | 4 ++-- .../module/modules/movement/noslow/modes/bow/NoSlowBow.kt | 4 ++-- .../modules/movement/noslow/modes/consume/NoSlowConsume.kt | 4 ++-- ...SlowSharedGrim2360MC18.kt => NoSlowSharedGrim2364MC18.kt} | 5 +++-- 4 files changed, 9 insertions(+), 8 deletions(-) rename src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/movement/noslow/modes/shared/{NoSlowSharedGrim2360MC18.kt => NoSlowSharedGrim2364MC18.kt} (89%) diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/movement/noslow/modes/blocking/NoSlowBlock.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/movement/noslow/modes/blocking/NoSlowBlock.kt index 9c24cf68dd7..1765b14459a 100644 --- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/movement/noslow/modes/blocking/NoSlowBlock.kt +++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/movement/noslow/modes/blocking/NoSlowBlock.kt @@ -23,7 +23,7 @@ import net.ccbluex.liquidbounce.config.NoneChoice import net.ccbluex.liquidbounce.config.ToggleableConfigurable import net.ccbluex.liquidbounce.features.module.modules.movement.noslow.ModuleNoSlow import net.ccbluex.liquidbounce.features.module.modules.movement.noslow.modes.shared.NoSlowSharedGrim2360 -import net.ccbluex.liquidbounce.features.module.modules.movement.noslow.modes.shared.NoSlowSharedGrim2360MC18 +import net.ccbluex.liquidbounce.features.module.modules.movement.noslow.modes.shared.NoSlowSharedGrim2364MC18 import net.ccbluex.liquidbounce.utils.client.InteractionTracker.isBlocking import net.ccbluex.liquidbounce.utils.client.inGame import net.minecraft.util.UseAction @@ -41,7 +41,7 @@ internal object NoSlowBlock : ToggleableConfigurable(ModuleNoSlow, "Blocking", t NoSlowBlockingSwitch, NoSlowBlockingBlink, NoSlowSharedGrim2360(it), - NoSlowSharedGrim2360MC18(it) + NoSlowSharedGrim2364MC18(it) ) } diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/movement/noslow/modes/bow/NoSlowBow.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/movement/noslow/modes/bow/NoSlowBow.kt index 2eb20b28b34..26ead61ab9f 100644 --- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/movement/noslow/modes/bow/NoSlowBow.kt +++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/movement/noslow/modes/bow/NoSlowBow.kt @@ -24,7 +24,7 @@ import net.ccbluex.liquidbounce.config.ToggleableConfigurable import net.ccbluex.liquidbounce.features.module.modules.movement.noslow.ModuleNoSlow import net.ccbluex.liquidbounce.features.module.modules.movement.noslow.modes.shared.NoSlowNoBlockInteract import net.ccbluex.liquidbounce.features.module.modules.movement.noslow.modes.shared.NoSlowSharedGrim2360 -import net.ccbluex.liquidbounce.features.module.modules.movement.noslow.modes.shared.NoSlowSharedGrim2360MC18 +import net.ccbluex.liquidbounce.features.module.modules.movement.noslow.modes.shared.NoSlowSharedGrim2364MC18 import net.ccbluex.liquidbounce.utils.client.inGame import net.minecraft.util.UseAction @@ -37,7 +37,7 @@ internal object NoSlowBow : ToggleableConfigurable(ModuleNoSlow, "Bow", true) { arrayOf( NoneChoice(it), NoSlowSharedGrim2360(it), - NoSlowSharedGrim2360MC18(it) + NoSlowSharedGrim2364MC18(it) ) } diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/movement/noslow/modes/consume/NoSlowConsume.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/movement/noslow/modes/consume/NoSlowConsume.kt index ff016e1c35d..7ce4d5ae343 100644 --- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/movement/noslow/modes/consume/NoSlowConsume.kt +++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/movement/noslow/modes/consume/NoSlowConsume.kt @@ -24,7 +24,7 @@ import net.ccbluex.liquidbounce.config.ToggleableConfigurable import net.ccbluex.liquidbounce.features.module.modules.movement.noslow.ModuleNoSlow import net.ccbluex.liquidbounce.features.module.modules.movement.noslow.modes.shared.NoSlowNoBlockInteract import net.ccbluex.liquidbounce.features.module.modules.movement.noslow.modes.shared.NoSlowSharedGrim2360 -import net.ccbluex.liquidbounce.features.module.modules.movement.noslow.modes.shared.NoSlowSharedGrim2360MC18 +import net.ccbluex.liquidbounce.features.module.modules.movement.noslow.modes.shared.NoSlowSharedGrim2364MC18 import net.ccbluex.liquidbounce.utils.client.inGame import net.ccbluex.liquidbounce.utils.item.isConsumable import net.minecraft.util.UseAction @@ -41,7 +41,7 @@ object NoSlowConsume : ToggleableConfigurable(ModuleNoSlow, "Consume", true) { @Suppress("unused") private val modes = choices(this, "Mode", { it.choices[0] }) { - arrayOf(NoneChoice(it), NoSlowSharedGrim2360(it), NoSlowSharedGrim2360MC18(it)) + arrayOf(NoneChoice(it), NoSlowSharedGrim2360(it), NoSlowSharedGrim2364MC18(it)) } override fun handleEvents(): Boolean { diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/movement/noslow/modes/shared/NoSlowSharedGrim2360MC18.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/movement/noslow/modes/shared/NoSlowSharedGrim2364MC18.kt similarity index 89% rename from src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/movement/noslow/modes/shared/NoSlowSharedGrim2360MC18.kt rename to src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/movement/noslow/modes/shared/NoSlowSharedGrim2364MC18.kt index 201b8bdf8ba..19da0ea39c8 100644 --- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/movement/noslow/modes/shared/NoSlowSharedGrim2360MC18.kt +++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/movement/noslow/modes/shared/NoSlowSharedGrim2364MC18.kt @@ -28,9 +28,9 @@ import net.minecraft.network.packet.c2s.play.UpdateSelectedSlotC2SPacket /** * @anticheat Grim - * @anticheatVersion 2.3.60 + * @anticheatVersion 2.3.64 */ -internal class NoSlowSharedGrim2360MC18(override val parent: ChoiceConfigurable<*>) : Choice("Grim2360-1.8") { +internal class NoSlowSharedGrim2364MC18(override val parent: ChoiceConfigurable<*>) : Choice("Grim2364-1.8") { @Suppress("unused") private val onNetworkTick = handler { event -> @@ -40,6 +40,7 @@ internal class NoSlowSharedGrim2360MC18(override val parent: ChoiceConfigurable< untracked { val slot = player.inventory.selectedSlot network.sendPacket(UpdateSelectedSlotC2SPacket(slot % 8 + 1)) + network.sendPacket(UpdateSelectedSlotC2SPacket(slot % 7 + 2)) network.sendPacket(UpdateSelectedSlotC2SPacket(slot)) } }