Skip to content

Commit 56ac5f3

Browse files
committed
feat: added rounded-rect to blackhotbar
1 parent a22d222 commit 56ac5f3

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/HUDModule.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,20 @@ import net.ccbluex.liquidbounce.ui.client.hud.designer.GuiHudDesigner
1414
import net.ccbluex.liquidbounce.utils.render.ColorUtils
1515
import net.ccbluex.liquidbounce.utils.render.RenderUtils.drawRectWithBorder
1616
import net.ccbluex.liquidbounce.value.BoolValue
17+
import net.ccbluex.liquidbounce.value.FloatValue
1718
import net.ccbluex.liquidbounce.value.IntegerValue
1819
import net.ccbluex.liquidbounce.value.ListValue
1920
import net.minecraft.client.Minecraft
2021
import net.minecraft.client.gui.Gui
2122
import net.minecraft.client.gui.GuiChat
2223
import net.minecraft.client.gui.ScaledResolution
2324
import net.minecraft.util.ResourceLocation
24-
import net.minecraftforge.event.entity.living.LivingEvent
2525
import java.awt.Color
2626

2727
object HUDModule : Module("HUD", Category.CLIENT, defaultInArray = false, gameDetecting = false, hideModule = true) {
2828

2929
val blackHotbar by BoolValue("BlackHotbar", true)
30+
val roundedHotbarRadius by FloatValue("RoundedHotbar-Radius", 0F, 0F..5F) { blackHotbar }
3031

3132
// InventoryPlus
3233
val inventoryOnHotbar = BoolValue("InventoryOnHotbar", false)

src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/gui/MixinGuiInGame.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import net.ccbluex.liquidbounce.ui.font.AWTFontRenderer;
1414
import net.ccbluex.liquidbounce.utils.ClassUtils;
1515
import net.ccbluex.liquidbounce.utils.render.FakeItemRender;
16+
import net.ccbluex.liquidbounce.utils.render.RenderUtils;
1617
import net.minecraft.client.gui.Gui;
1718
import net.minecraft.client.gui.GuiIngame;
1819
import net.minecraft.client.gui.GuiStreamIndicator;
@@ -130,6 +131,7 @@ public void updateTick() {
130131
@Overwrite
131132
protected void renderTooltip(ScaledResolution sr, float partialTicks) {
132133
final HUDModule hud = HUDModule.INSTANCE;
134+
final RenderUtils render = RenderUtils.INSTANCE;
133135

134136
if (hud.getInventoryOnHotbar().get()){
135137
GlStateManager.pushMatrix();
@@ -164,9 +166,9 @@ protected void renderTooltip(ScaledResolution sr, float partialTicks) {
164166
int middleScreen = sr.getScaledWidth() / 2;
165167
int height = sr.getScaledHeight() - 1;
166168

167-
color(1f, 1f, 1f, 1f);
168-
drawRect(middleScreen - 91, height - 22, middleScreen + 91, height, Integer.MIN_VALUE);
169-
drawRect(middleScreen - 91 - 1 + slot * 20 + 1, height - 22, middleScreen - 91 - 1 + slot * 20 + 23, height - 23 - 1 + 24, Integer.MAX_VALUE);
169+
resetColor();
170+
render.drawRoundedRectInt(middleScreen - 91, height - 22, middleScreen + 91, height, Integer.MIN_VALUE, hud.getRoundedHotbarRadius());
171+
render.drawRoundedRectInt(middleScreen - 91 - 1 + slot * 20 + 1, height - 22, middleScreen - 91 - 1 + slot * 20 + 23, height - 23 - 1 + 24, Integer.MAX_VALUE, hud.getRoundedHotbarRadius());
170172

171173
enableRescaleNormal();
172174
glEnable(GL_BLEND);

src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/Arraylist.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class Arraylist(
7474
"Rect-Color",
7575
arrayOf("Custom", "Fade", "Random", "Rainbow", "Gradient", "Theme"),
7676
"Theme"
77-
) { rectMode != "None" }
77+
) { rectMode !in setOf("None", "Outline") }
7878
private val isCustomRectSupported = { rectMode != "None" && rectColorMode in listOf("Custom", "Fade") }
7979
private val rectRed by IntegerValue("Rect-R", 255, 0..255, isSupported = isCustomRectSupported)
8080
private val rectGreen by IntegerValue("Rect-G", 255, 0..255, isSupported = isCustomRectSupported)

0 commit comments

Comments
 (0)