diff --git a/src/main/java/fr/alexdoru/mwe/asm/hooks/mc/gui/GuiPlayerTabOverlayHook_PlayerCount.java b/src/main/java/fr/alexdoru/mwe/asm/hooks/mc/gui/GuiPlayerTabOverlayHook_PlayerCount.java index 5bace046..dfbf68e8 100644 --- a/src/main/java/fr/alexdoru/mwe/asm/hooks/mc/gui/GuiPlayerTabOverlayHook_PlayerCount.java +++ b/src/main/java/fr/alexdoru/mwe/asm/hooks/mc/gui/GuiPlayerTabOverlayHook_PlayerCount.java @@ -32,7 +32,7 @@ public static List addPlayerCountInHeader(@NotNull List listIn) nicks++; } } - list.add(GREEN + "Players: " + GOLD + i + (nicks == 0 ? "" : WHITE + " (" + GOLD + nicks + WHITE + ")")); + list.add(GREEN + "Players: " + GOLD + i + (nicks == 0 ? "" : WHITE + " (" + DARK_RED + nicks + WHITE + ")")); } else { list.add(GREEN + "Players: " + GOLD + i); } diff --git a/src/main/java/fr/alexdoru/mwe/config/MWEConfig.java b/src/main/java/fr/alexdoru/mwe/config/MWEConfig.java index b827cd95..75debc72 100644 --- a/src/main/java/fr/alexdoru/mwe/config/MWEConfig.java +++ b/src/main/java/fr/alexdoru/mwe/config/MWEConfig.java @@ -434,6 +434,13 @@ private static void onChatHeadsSetting() { + " §dregeneration§7, §8resistance§7, §bspeed§7, §cstrength§7, §finvisibility§7, §ajump boost§7, §eabsorption§7") public static final RendererPosition miniPotionHUDPosition = new RendererPosition(false, 0.5d, 7.5d / 20d); + @ConfigProperty( + category = PVP_STUFF, subCategory = "Potion HUD", + name = "Vertical Mini Potion HUD", + dependsOn = "Mini Potion HUD", + comment = "Displays the Mini Potion HUD vertically") + public static boolean verticalMiniPotionHUD; + @ConfigProperty( category = PVP_STUFF, subCategory = "Potion HUD", name = "Mini Potion HUD only in MW", diff --git a/src/main/java/fr/alexdoru/mwe/gui/huds/MiniPotionHUD.java b/src/main/java/fr/alexdoru/mwe/gui/huds/MiniPotionHUD.java index 2ef31d5d..e754e283 100644 --- a/src/main/java/fr/alexdoru/mwe/gui/huds/MiniPotionHUD.java +++ b/src/main/java/fr/alexdoru/mwe/gui/huds/MiniPotionHUD.java @@ -61,11 +61,26 @@ public void render(ScaledResolution resolution) { len += mc.fontRendererObj.getStringWidth(strings[count]) + 2; count++; } + if (count == 0) return; len -= 2; - int x = this.rendererPosition.getAbsoluteRenderX() - len / 2; - for (int i = 0; i < count; i++) { - mc.fontRendererObj.drawStringWithShadow(strings[i], x, this.rendererPosition.getAbsoluteRenderY(), colors[i]); - x += mc.fontRendererObj.getStringWidth(strings[i]) + 2; + if (MWEConfig.verticalMiniPotionHUD) { + final int x = this.rendererPosition.getAbsoluteRenderX(); + int y = this.rendererPosition.getAbsoluteRenderY(); + final int maxY = resolution.getScaledHeight() - count * (mc.fontRendererObj.FONT_HEIGHT + 2); + if (y > maxY) { + y = maxY; + } + for (int i = 0; i < count; i++) { + mc.fontRendererObj.drawStringWithShadow(strings[i], x - mc.fontRendererObj.getStringWidth(strings[i]) / 2F, y, colors[i]); + y += mc.fontRendererObj.FONT_HEIGHT + 2; + } + } else { + int x = this.rendererPosition.getAbsoluteRenderX() - len / 2; + final int y = this.rendererPosition.getAbsoluteRenderY(); + for (int i = 0; i < count; i++) { + mc.fontRendererObj.drawStringWithShadow(strings[i], x, y, colors[i]); + x += mc.fontRendererObj.getStringWidth(strings[i]) + 2; + } } }