diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/HotbarSettings.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/HotbarSettings.kt index 4735504a1d..04784b01b7 100644 --- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/HotbarSettings.kt +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/HotbarSettings.kt @@ -35,7 +35,7 @@ import java.awt.Color @ModuleInfo(name = "Hotbar", category = ModuleCategory.CLIENT, array = false, defaultOn = true) object HotbarSettings : Module() { - val hotbarValue = ListValue("HotbarMode", arrayOf("Minecraft", "Rounded", "Full", "LB", "Rise", "Gradient", "Overflow", "Glow", "Glowing", "Dock", "Exhi", "BlueIce", "Bread"), "Minecraft") + val hotbarValue = ListValue("HotbarMode", arrayOf("Minecraft", "Rounded", "Rounded2", "Full", "LB", "Rise", "Gradient", "Overflow", "Glow", "Glowing", "Dock", "Exhi", "BlueIce", "Bread"), "Minecraft") private val hotbarAlphaValue = IntegerValue("HotbarAlpha", 70, 0, 255) private val hotbarEaseValue = BoolValue("HotbarEase", false) private val BlurValue = BoolValue("Blur", false) @@ -136,6 +136,13 @@ object HotbarSettings : Module() { for (j in 0..8) { HotbarItems(j, sr.scaledWidth / 2 - 90 + j * 20 + 2, sr.scaledHeight - 20); HotbarTextOverlay(sr.scaledWidth / 2 - 90 + j * 20 + 2, sr.scaledHeight - 20, null as String?, j) } RenderHelper.disableStandardItemLighting() } + hotbarValue.get() == "Rounded2" -> { + RenderUtils.originalRoundedRect((i - 91).toFloat(), (sr.scaledHeight - 2).toFloat(), (i + 91).toFloat(), (sr.scaledHeight - 22).toFloat(), 3f, Int.MIN_VALUE) + RenderUtils.originalRoundedRect(i - 91 + posInv, (sr.scaledHeight - 2).toFloat(), i - 91 + posInv + 22, (sr.scaledHeight - 22).toFloat(), 3f, Int.MIN_VALUE) + RenderHelper.enableGUIStandardItemLighting() + for (j in 0..8) { HotbarItems(j, sr.scaledWidth / 2 - 90 + j * 20 + 2, sr.scaledHeight - 20); HotbarTextOverlay(sr.scaledWidth / 2 - 90 + j * 20 + 2, sr.scaledHeight - 20, null as String?, j) } + RenderHelper.disableStandardItemLighting() + } hotbarValue.get() == "Dock" -> { RenderUtils.originalRoundedRect((i - 91).toFloat(), (sr.scaledHeight - 1).toFloat(), (i + 91).toFloat(), (sr.scaledHeight - 21).toFloat(), 3f, Int.MIN_VALUE) RenderUtils.drawFilledCircle((itemX + 12).toDouble(), (sr.scaledHeight - 3).toDouble(), 1.4, Color(255, 255, 255).rgb, 255) @@ -295,7 +302,9 @@ object HotbarSettings : Module() { field = value } fun getHotbarEasePos(x: Int): Int { - return if (hotbarEaseValue.get()) easingValue else x + if (!hotbarEaseValue.get()) return x + easingValue = x + return easingValue } @Override diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/Scaffold.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/Scaffold.kt index 2cf9a42210..d27a9a3261 100644 --- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/Scaffold.kt +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/Scaffold.kt @@ -873,12 +873,12 @@ class Scaffold : Module() { if (mc.thePlayer.onGround) { fakeJump() jumpGround = mc.thePlayer.posY - mc.thePlayer.motionY = 0.42 + mc.thePlayer.motionY = 0.41999998688698 } - if (mc.thePlayer.posY > jumpGround + 0.65 && MovementUtils.isMoving()) { + if (mc.thePlayer.posY > jumpGround + 1.04 && MovementUtils.isMoving()) { fakeJump() mc.thePlayer.setPosition(mc.thePlayer.posX, mc.thePlayer.posY, mc.thePlayer.posZ) - mc.thePlayer.motionY = 0.36 + mc.thePlayer.motionY = 0.45 jumpGround = mc.thePlayer.posY } }