From eb6a2bf305c0e001293067b40de5d8f64c5e4b79 Mon Sep 17 00:00:00 2001 From: MukjepScarlet <93977077+MukjepScarlet@users.noreply.github.com> Date: Thu, 20 Feb 2025 18:50:40 +0800 Subject: [PATCH 1/8] feat(Scaffold/GodBridge): random sneak time (#5664) --- .../scaffold/techniques/ScaffoldGodBridgeTechnique.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/world/scaffold/techniques/ScaffoldGodBridgeTechnique.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/world/scaffold/techniques/ScaffoldGodBridgeTechnique.kt index 16a6c72d68f..424830e57f0 100644 --- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/world/scaffold/techniques/ScaffoldGodBridgeTechnique.kt +++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/world/scaffold/techniques/ScaffoldGodBridgeTechnique.kt @@ -61,7 +61,7 @@ object ScaffoldGodBridgeTechnique : ScaffoldTechnique("GodBridge"), ScaffoldLedg private var mode by enumChoice("Mode", Mode.JUMP) private var forceSneakBelowCount by int("ForceSneakBelowCount", 3, 0..10) - private var sneakTime by int("SneakTime", 1, 1..10) + private val sneakTime by intRange("SneakTime", 1..1, 1..10) override fun ledge( target: BlockPlacementTarget?, @@ -103,16 +103,16 @@ object ScaffoldGodBridgeTechnique : ScaffoldTechnique("GodBridge"), ScaffoldLedg // we need to prevent the player from falling off the ledge e.g by jumping or sneaking. when { ModuleScaffold.blockCount < forceSneakBelowCount -> { - LedgeAction(sneakTime = this@ScaffoldGodBridgeTechnique.sneakTime) + LedgeAction(sneakTime = sneakTime.random()) } mode == Mode.JUMP -> LedgeAction(jump = true) - mode == Mode.SNEAK -> LedgeAction(sneakTime = this@ScaffoldGodBridgeTechnique.sneakTime) + mode == Mode.SNEAK -> LedgeAction(sneakTime = sneakTime.random()) mode == Mode.STOP_INPUT -> LedgeAction(stopInput = true) mode == Mode.BACKWARDS -> LedgeAction(stepBack = true) mode == Mode.RANDOM -> if (Random.nextBoolean()) { LedgeAction(jump = true, sneakTime = 0) } else { - LedgeAction(jump = false, sneakTime = this@ScaffoldGodBridgeTechnique.sneakTime) + LedgeAction(jump = false, sneakTime = sneakTime.random()) } else -> LedgeAction.NO_LEDGE } From 528fd5111a83fd1e574e04ebcda7836b267b715d Mon Sep 17 00:00:00 2001 From: ccetl <109693935+ccetl@users.noreply.github.com> Date: Fri, 21 Feb 2025 05:26:25 +0100 Subject: [PATCH 2/8] fix(LeastDifferencePreference): preferred spot (#5667) --- .../aiming/preference/LeastDifferencePreference.kt | 10 ++++------ .../utils/aiming/preference/RotationPreference.kt | 2 +- .../liquidbounce/utils/aiming/utils/RotationFinding.kt | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/utils/aiming/preference/LeastDifferencePreference.kt b/src/main/kotlin/net/ccbluex/liquidbounce/utils/aiming/preference/LeastDifferencePreference.kt index ab5921948a8..47199659a84 100644 --- a/src/main/kotlin/net/ccbluex/liquidbounce/utils/aiming/preference/LeastDifferencePreference.kt +++ b/src/main/kotlin/net/ccbluex/liquidbounce/utils/aiming/preference/LeastDifferencePreference.kt @@ -43,22 +43,20 @@ class LeastDifferencePreference( return eyesPos + baseRotation.directionVector * range } - override fun getPreferredSpotOnBox(box: Box, eyesPos: Vec3d, range: Double): Vec3d? { + override fun getPreferredSpotOnBox(box: Box, eyesPos: Vec3d, range: Double): Vec3d { if (basePoint != null) { return basePoint } - if (box.contains(eyesPos)) { - return eyesPos - } - val preferredSpot = getPreferredSpot(eyesPos, range) if (box.contains(preferredSpot)) { return preferredSpot } val look = Line(eyesPos, preferredSpot - eyesPos) - return look.getPointOnBoxInDirection(box)?.takeIf { it.squaredDistanceTo(eyesPos) <= range.sq() } + return look.getPointOnBoxInDirection(box) + ?.takeIf { it.squaredDistanceTo(eyesPos) <= range.sq() } + ?: preferredSpot } override fun compare(o1: Rotation, o2: Rotation): Int { diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/utils/aiming/preference/RotationPreference.kt b/src/main/kotlin/net/ccbluex/liquidbounce/utils/aiming/preference/RotationPreference.kt index 144ec162a61..d9ea8835f0c 100644 --- a/src/main/kotlin/net/ccbluex/liquidbounce/utils/aiming/preference/RotationPreference.kt +++ b/src/main/kotlin/net/ccbluex/liquidbounce/utils/aiming/preference/RotationPreference.kt @@ -26,7 +26,7 @@ interface RotationPreference : Comparator { fun getPreferredSpot(eyesPos: Vec3d, range: Double, ): Vec3d - fun getPreferredSpotOnBox(box: Box, eyesPos: Vec3d, range: Double): Vec3d? { + fun getPreferredSpotOnBox(box: Box, eyesPos: Vec3d, range: Double): Vec3d { return getPreferredSpot(eyesPos, range) } diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/utils/aiming/utils/RotationFinding.kt b/src/main/kotlin/net/ccbluex/liquidbounce/utils/aiming/utils/RotationFinding.kt index 3dc2e59503d..a33e5186bd6 100644 --- a/src/main/kotlin/net/ccbluex/liquidbounce/utils/aiming/utils/RotationFinding.kt +++ b/src/main/kotlin/net/ccbluex/liquidbounce/utils/aiming/utils/RotationFinding.kt @@ -307,7 +307,7 @@ fun raytraceBox( val rangeSquared = range * range val wallsRangeSquared = wallsRange * wallsRange - val preferredSpot = rotationPreference.getPreferredSpotOnBox(box, eyes, range) ?: return null + val preferredSpot = rotationPreference.getPreferredSpotOnBox(box, eyes, range) val preferredSpotOnBox = if (box.contains(eyes) && box.contains(preferredSpot)) { preferredSpot } else { From 7f3f08e9ac5535e95b8087b8fa7d97184c9df68d Mon Sep 17 00:00:00 2001 From: Jucku <135509504+Jucku@users.noreply.github.com> Date: Sun, 23 Feb 2025 07:39:35 +0100 Subject: [PATCH 3/8] chore(ViaFabricPlus): bump version (#5681) --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 8551872d784..4160edb56a4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -46,4 +46,4 @@ mc_authlib_version=1.4.1 mod_menu_version=13.0.0-beta.1 sodium_version=mc1.21.4-0.6.6-fabric lithium_version=mc1.21.4-0.14.3-fabric -viafabricplus_version=4.0.1 +viafabricplus_version=4.0.2 From c2984bf703ca40e6834bf4ee3fed41a504ca1c4e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 15:58:54 +0100 Subject: [PATCH 4/8] chore(deps): bump org.junit.jupiter:junit-jupiter from 5.11.3 to 5.12.0 (#5691) Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.11.3 to 5.12.0. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.3...r5.12.0) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 16735ca9132..7b959d07a19 100644 --- a/build.gradle +++ b/build.gradle @@ -180,7 +180,7 @@ dependencies { includeDependency "org.ahocorasick:ahocorasick:0.6.3" // Test libraries - testImplementation "org.junit.jupiter:junit-jupiter:5.11.3" + testImplementation "org.junit.jupiter:junit-jupiter:5.12.0" testRuntimeOnly "org.junit.platform:junit-platform-launcher" // Fix nullable annotations From eaf8a41efdbf921ad470857d98da867ddd2e4cd2 Mon Sep 17 00:00:00 2001 From: Jucku <135509504+Jucku@users.noreply.github.com> Date: Mon, 24 Feb 2025 16:00:15 +0100 Subject: [PATCH 5/8] chore: more module aliases (#5682) --- .../features/module/modules/client/ModuleLiquidChat.kt | 2 +- .../module/modules/combat/velocity/ModuleVelocity.kt | 2 +- .../features/module/modules/exploit/ModuleKick.kt | 1 + .../features/module/modules/misc/ModuleAutoPearl.kt | 2 +- .../modules/movement/terrainspeed/ModuleTerrainSpeed.kt | 2 +- .../features/module/modules/player/ModuleEagle.kt | 4 +++- .../features/module/modules/player/ModuleFastUse.kt | 2 +- .../features/module/modules/player/ModuleReplenish.kt | 2 +- .../module/modules/player/autoqueue/ModuleAutoQueue.kt | 2 +- .../modules/player/invcleaner/ModuleInventoryCleaner.kt | 6 ++++-- .../features/module/modules/render/ModuleAnimations.kt | 3 ++- .../features/module/modules/render/ModuleAntiBlind.kt | 2 +- .../features/module/modules/render/ModuleCustomAmbience.kt | 2 +- 13 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/client/ModuleLiquidChat.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/client/ModuleLiquidChat.kt index 60a18266576..f696a1d2a5b 100644 --- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/client/ModuleLiquidChat.kt +++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/client/ModuleLiquidChat.kt @@ -38,7 +38,7 @@ import net.minecraft.text.Text import net.minecraft.util.Formatting object ModuleLiquidChat : ClientModule("LiquidChat", Category.CLIENT, hide = true, state = true, - aliases = arrayOf("GlobalChat")) { + aliases = arrayOf("GlobalChat", "IRC")) { private var jwtToken by text("JwtToken", "") diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/combat/velocity/ModuleVelocity.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/combat/velocity/ModuleVelocity.kt index 10cbb69de1b..6f6b16f5353 100644 --- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/combat/velocity/ModuleVelocity.kt +++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/combat/velocity/ModuleVelocity.kt @@ -39,7 +39,7 @@ import net.minecraft.network.packet.s2c.play.PlayerPositionLookS2CPacket * Modifies the amount of velocity you take. */ -object ModuleVelocity : ClientModule("Velocity", Category.COMBAT) { +object ModuleVelocity : ClientModule("Velocity", Category.COMBAT, aliases = arrayOf("AntiKnockBack")) { init { enableLock() diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/exploit/ModuleKick.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/exploit/ModuleKick.kt index ec348161f9b..79f0cb7e1da 100644 --- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/exploit/ModuleKick.kt +++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/exploit/ModuleKick.kt @@ -53,6 +53,7 @@ object ModuleKick : ClientModule("Kick", Category.EXPLOIT, disableActivation = t */ fun kick(mode: KickModeEnum) = mode.run() + @Suppress("unused") enum class KickModeEnum(override val choiceName: String, val run: () -> Unit) : NamedChoice { QUIT("Quit", { world.disconnect() diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/misc/ModuleAutoPearl.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/misc/ModuleAutoPearl.kt index f46d94dacd6..51f2929ce58 100644 --- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/misc/ModuleAutoPearl.kt +++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/misc/ModuleAutoPearl.kt @@ -62,7 +62,7 @@ private const val MAX_SIMULATED_TICKS = 240 * * @author sqlerrorthing */ -object ModuleAutoPearl : ClientModule("AutoPearl", Category.MISC, aliases = arrayOf("PearlFollower")) { +object ModuleAutoPearl : ClientModule("AutoPearl", Category.MISC, aliases = arrayOf("PearlFollower", "PearlTarget")) { private val mode by enumChoice("Mode", Modes.TRIGGER) diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/movement/terrainspeed/ModuleTerrainSpeed.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/movement/terrainspeed/ModuleTerrainSpeed.kt index e89c2d77753..5e02984827e 100644 --- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/movement/terrainspeed/ModuleTerrainSpeed.kt +++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/movement/terrainspeed/ModuleTerrainSpeed.kt @@ -30,7 +30,7 @@ import net.ccbluex.liquidbounce.features.module.modules.movement.terrainspeed.ic * * Move faster on specific surfaces. */ -object ModuleTerrainSpeed : ClientModule("TerrainSpeed", Category.MOVEMENT) { +object ModuleTerrainSpeed : ClientModule("TerrainSpeed", Category.MOVEMENT, aliases = arrayOf("FastClimb")) { init { enableLock() diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/player/ModuleEagle.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/player/ModuleEagle.kt index 0f470fc26e3..b0f0368aff3 100644 --- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/player/ModuleEagle.kt +++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/player/ModuleEagle.kt @@ -32,7 +32,9 @@ import net.ccbluex.liquidbounce.utils.kotlin.EventPriorityConvention * * Legit trick to build faster. */ -object ModuleEagle : ClientModule("Eagle", Category.PLAYER, aliases = arrayOf("FastBridge", "BridgeAssistant")) { +object ModuleEagle : ClientModule("Eagle", Category.PLAYER, + aliases = arrayOf("FastBridge", "BridgeAssistant", "LegitScaffold") +) { private val edgeDistance by float("EagleEdgeDistance", 0.4f, 0.01f..1.3f) diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/player/ModuleFastUse.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/player/ModuleFastUse.kt index ab22ae42560..c8f8dc534ac 100644 --- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/player/ModuleFastUse.kt +++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/player/ModuleFastUse.kt @@ -41,7 +41,7 @@ import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket * Allows you to use items faster. */ -object ModuleFastUse : ClientModule("FastUse", Category.PLAYER) { +object ModuleFastUse : ClientModule("FastUse", Category.PLAYER, aliases = arrayOf("FastEat")) { private val modes = choices("Mode", Immediate, arrayOf(Immediate, ItemUseTime)).apply { tagBy(this) } diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/player/ModuleReplenish.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/player/ModuleReplenish.kt index 1f44da20953..0fb81401c0b 100644 --- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/player/ModuleReplenish.kt +++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/player/ModuleReplenish.kt @@ -39,7 +39,7 @@ import net.minecraft.screen.slot.SlotActionType * * @author ccetl */ -object ModuleReplenish : ClientModule("Replenish", Category.PLAYER) { +object ModuleReplenish : ClientModule("Replenish", Category.PLAYER, aliases = arrayOf("Refill")) { private val constraints = tree(PlayerInventoryConstraints()) private val itemThreshold by int("ItemThreshold", 5, 0..63) diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/player/autoqueue/ModuleAutoQueue.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/player/autoqueue/ModuleAutoQueue.kt index a904dc55df8..f294793bab3 100644 --- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/player/autoqueue/ModuleAutoQueue.kt +++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/player/autoqueue/ModuleAutoQueue.kt @@ -24,7 +24,7 @@ import net.ccbluex.liquidbounce.features.module.modules.player.autoqueue.modes.A import net.ccbluex.liquidbounce.features.module.modules.player.autoqueue.modes.AutoQueueHypixelSW import net.ccbluex.liquidbounce.features.module.modules.player.autoqueue.modes.AutoQueuePaper -object ModuleAutoQueue : ClientModule("AutoQueue", Category.PLAYER) { +object ModuleAutoQueue : ClientModule("AutoQueue", Category.PLAYER, aliases = arrayOf("AutoPlay")) { val modes = choices("Mode", AutoQueuePaper, arrayOf( AutoQueuePaper, AutoQueueHypixelSW, diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/player/invcleaner/ModuleInventoryCleaner.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/player/invcleaner/ModuleInventoryCleaner.kt index 0d198981855..c592f3c255f 100644 --- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/player/invcleaner/ModuleInventoryCleaner.kt +++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/player/invcleaner/ModuleInventoryCleaner.kt @@ -33,8 +33,10 @@ import net.minecraft.screen.slot.SlotActionType * * Automatically throws away useless items and sorts them. */ -object ModuleInventoryCleaner : ClientModule("InventoryCleaner", Category.PLAYER) { - +object ModuleInventoryCleaner : ClientModule("InventoryCleaner", Category.PLAYER, + aliases = arrayOf("InventoryManager") +) { + private val inventoryConstraints = tree(PlayerInventoryConstraints()) private val maxBlocks by int("MaximumBlocks", 512, 0..2500) diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/ModuleAnimations.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/ModuleAnimations.kt index a1f85993fc0..fa2c709ddac 100644 --- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/ModuleAnimations.kt +++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/ModuleAnimations.kt @@ -40,7 +40,8 @@ import net.minecraft.util.math.RotationAxis * Please credit from where you got the animation from and make sure they are willing to contribute. * If they are not willing to contribute, please do not add the animation to this module. */ -object ModuleAnimations : ClientModule("Animations", Category.RENDER) { +@Suppress("MagicNumber") +object ModuleAnimations : ClientModule("Animations", Category.RENDER, aliases = arrayOf("ViewModel")) { init { tree(MainHand) diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/ModuleAntiBlind.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/ModuleAntiBlind.kt index acfa15d7b40..88c2029f6fc 100644 --- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/ModuleAntiBlind.kt +++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/ModuleAntiBlind.kt @@ -26,7 +26,7 @@ import net.ccbluex.liquidbounce.features.module.ClientModule * * Protects you from potentially annoying screen effects that block your view. */ -object ModuleAntiBlind : ClientModule("AntiBlind", Category.RENDER) { +object ModuleAntiBlind : ClientModule("AntiBlind", Category.RENDER, aliases = arrayOf("NoRender")) { val antiBlind by boolean("DisableBlindingEffect", true) val antiDarkness by boolean("DisableDarknessEffect", true) val antiNausea by boolean("DisableNauseaEffect", true) diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/ModuleCustomAmbience.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/ModuleCustomAmbience.kt index 5ff59b02fd2..8850a83570e 100644 --- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/ModuleCustomAmbience.kt +++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/ModuleCustomAmbience.kt @@ -41,7 +41,7 @@ import org.lwjgl.opengl.GL13 * * Override the ambience of the game */ -object ModuleCustomAmbience : ClientModule("CustomAmbience", Category.RENDER) { +object ModuleCustomAmbience : ClientModule("CustomAmbience", Category.RENDER, aliases = arrayOf("FogChanger")) { val weather = enumChoice("Weather", WeatherType.SNOWY) private val time = enumChoice("Time", TimeType.NIGHT) From 346d85a86e104f930078f1c6a772ac83a30f609c Mon Sep 17 00:00:00 2001 From: Izuna Date: Mon, 24 Feb 2025 16:23:37 +0100 Subject: [PATCH 6/8] feat(Phase): module description (#5695) fixes https://github.com/CCBlueX/LiquidBounce/issues/5671 --- src/main/resources/resources/liquidbounce/lang/en_us.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/resources/liquidbounce/lang/en_us.json b/src/main/resources/resources/liquidbounce/lang/en_us.json index b433808fd25..5a3e2cc9df2 100644 --- a/src/main/resources/resources/liquidbounce/lang/en_us.json +++ b/src/main/resources/resources/liquidbounce/lang/en_us.json @@ -526,6 +526,7 @@ "liquidbounce.module.nametags.description": "Improves the visibility of player's name tags and show additional information.", "liquidbounce.module.itemTags.description": "Display icons and quantities labels for dropped items.", "liquidbounce.module.noBob.description": "Disables the view bobbing effect.", + "liquidbounce.module.phase.description": "Allows you to phase through blocks by exploiting the anti-cheat.", "liquidbounce.module.noClip.description": "Allows you to move through blocks (let a sand block drop on your head first).", "liquidbounce.module.noClip.messages.setbackDetected": "You have been set back by the server! Make sure you are already standing inside of a block.", "liquidbounce.module.noFOV.description": "Disables FOV from changing during movement", From 1d92ca5b50e34b3006eb4e0c37712a78f538224e Mon Sep 17 00:00:00 2001 From: MukjepScarlet <93977077+MukjepScarlet@users.noreply.github.com> Date: Mon, 24 Feb 2025 23:29:41 +0800 Subject: [PATCH 7/8] refactor(Scaffold): optimize block count calculation (#5678) --- .../module/modules/world/scaffold/ModuleScaffold.kt | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/world/scaffold/ModuleScaffold.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/world/scaffold/ModuleScaffold.kt index e0f8df9e3f1..4cea1aa3b90 100644 --- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/world/scaffold/ModuleScaffold.kt +++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/world/scaffold/ModuleScaffold.kt @@ -222,16 +222,13 @@ object ModuleScaffold : ClientModule("Scaffold", Category.WORLD) { val blockCount: Int get() { - val blockInMainHand = player.inventory.getStack(player.inventory.selectedSlot) - val blockInOffHand = player.offHandStack + fun ItemStack.blockCount() = if (isValidBlock(this)) this.count else 0 - val blocks = hashSetOf(blockInMainHand, blockInOffHand) - - if (ScaffoldAutoBlockFeature.enabled) { - findPlaceableSlots().mapTo(blocks) { it.value() } + return player.offHandStack.blockCount() + if (ScaffoldAutoBlockFeature.enabled) { + findPlaceableSlots().sumOf { it.value().blockCount() } + } else { + player.inventory.getStack(player.inventory.selectedSlot).blockCount() } - - return blocks.sumOf { if (isValidBlock(it)) it.count else 0 } } val isBlockBelow: Boolean From f6919d2e3a545eb6b6c9141a1cf4814f593a7b6e Mon Sep 17 00:00:00 2001 From: heckerpowered <72550834+heckerpowered@users.noreply.github.com> Date: Mon, 24 Feb 2025 23:33:06 +0800 Subject: [PATCH 8/8] fix: macOS blur issue (#5586) Co-authored-by: Izuna --- .../features/module/modules/render/ModuleHud.kt | 6 +----- .../resources/resources/liquidbounce/shaders/sobel.vert | 6 +++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/ModuleHud.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/ModuleHud.kt index f101ccb96d5..21dc3127bf8 100644 --- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/ModuleHud.kt +++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/ModuleHud.kt @@ -39,7 +39,6 @@ import net.ccbluex.liquidbounce.utils.client.chat import net.ccbluex.liquidbounce.utils.client.inGame import net.ccbluex.liquidbounce.utils.client.markAsError import net.ccbluex.liquidbounce.utils.entity.RenderedEntities -import net.minecraft.client.MinecraftClient import net.minecraft.client.gui.screen.DisconnectedScreen /** @@ -67,10 +66,7 @@ object ModuleHud : ClientModule("HUD", Category.RENDER, state = true, hide = tru } val isBlurable - get() = blur && !(mc.options.hudHidden && mc.currentScreen == null) && - // Only blur on Windows and Linux - Mac seems to have issues with it - // TODO: fix blur on macOS - !MinecraftClient.IS_SYSTEM_MAC + get() = blur && !(mc.options.hudHidden && mc.currentScreen == null) init { tree(Configurable("In-built", value = components as MutableList>)) diff --git a/src/main/resources/resources/liquidbounce/shaders/sobel.vert b/src/main/resources/resources/liquidbounce/shaders/sobel.vert index 2e7268e2b33..d1add264fe5 100644 --- a/src/main/resources/resources/liquidbounce/shaders/sobel.vert +++ b/src/main/resources/resources/liquidbounce/shaders/sobel.vert @@ -1,7 +1,7 @@ -#version 150 +#version 410 core -in vec4 Position; -in vec2 UV0; +layout (location = 0) in vec4 Position; +layout (location = 1) in vec2 UV0; out vec2 fragTexCoord;