From 7049afabe59c533c795fbce9d8675585fe156fd4 Mon Sep 17 00:00:00 2001 From: ADON15c Date: Fri, 27 May 2022 17:34:03 -0600 Subject: Added option for hiding bars --- src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 5 ++++- src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index e3b4339a..c6c6979d 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -79,13 +79,15 @@ public class SkyblockerConfig implements ConfigData { public enum BarPosition { LAYER1, LAYER2, - RIGHT; + RIGHT, + NONE; public String toString() { return switch (this) { case LAYER1 -> "Layer 1"; case LAYER2 -> "Layer 2"; case RIGHT -> "Right"; + case NONE -> "Disabled"; }; } @@ -94,6 +96,7 @@ public class SkyblockerConfig implements ConfigData { case LAYER1 -> 0; case LAYER2 -> 1; case RIGHT -> 2; + case NONE -> -1; }; } } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java index e2a9a684..2b96da12 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java @@ -24,6 +24,7 @@ public class FancyStatusBars extends DrawableHelper { // Positions to show the bars // 0: Hotbar Layer 1, 1: Hotbar Layer 2, 2: Right of hotbar + // Anything outside the set values hides the bar private final int[] anchorsX = new int[3]; private final int[] anchorsY = new int[3]; @@ -149,6 +150,9 @@ public class FancyStatusBars extends DrawableHelper { } public void draw(MatrixStack matrices) { + // Dont draw if anchorNum is outside of range + if (anchorNum < 0 || anchorNum > 2) return; + // Draw the icon for the bar drawTexture(matrices, anchorsX[anchorNum] + offsetX, anchorsY[anchorNum], 0, v, 9, 9); @@ -168,6 +172,9 @@ public class FancyStatusBars extends DrawableHelper { } public void drawText(MatrixStack matrices) { + // Dont draw if anchorNum is outside of range + if (anchorNum < 0 || anchorNum > 2) return; + TextRenderer textRenderer = client.textRenderer; String text = this.text.toString(); int x = anchorsX[anchorNum] + this.offsetX + 11 + (bar_width - textRenderer.getWidth(text)) / 2; -- cgit