From 532e2523ba7030537a2c874d98f52f5a9bf3f697 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Sun, 4 Feb 2024 12:51:04 -0500 Subject: Beacon Highlighter performance fix + Fix fire sales widget (#521) * Beacon Highlighter performance improvements * Fix Fire Sales widget (yet again) --- .../hysky/skyblocker/skyblock/end/BeaconHighlighter.java | 14 ++++++-------- .../skyblocker/skyblock/tabhud/widget/FireSaleWidget.java | 5 ++++- 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'src/main/java/de/hysky') diff --git a/src/main/java/de/hysky/skyblocker/skyblock/end/BeaconHighlighter.java b/src/main/java/de/hysky/skyblocker/skyblock/end/BeaconHighlighter.java index d2269482..f69fca6d 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/end/BeaconHighlighter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/end/BeaconHighlighter.java @@ -12,6 +12,7 @@ import java.util.List; public class BeaconHighlighter { public static final List beaconPositions = new ArrayList<>(); + private static final float[] RED_COLOR_COMPONENTS = { 1.0f, 0.0f, 0.0f }; /** * Initializes the beacon highlighting system. @@ -28,13 +29,10 @@ public class BeaconHighlighter { * @param context An instance of WorldRenderContext for the RenderHelper to use */ public static void render(WorldRenderContext context) { - if (Utils.isInTheEnd() && SkyblockerConfigManager.get().slayer.endermanSlayer.highlightBeacons) - beaconPositions.forEach((position) -> RenderHelper.renderFilled( - context, - position, - new float[]{1.0f, 0.0f, 0.0f}, - 0.5f, - false - )); + if (Utils.isInTheEnd() && SkyblockerConfigManager.get().slayer.endermanSlayer.highlightBeacons) { + for (BlockPos pos : beaconPositions) { + RenderHelper.renderFilled(context, pos, RED_COLOR_COMPONENTS, 0.5f, false); + } + } } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/FireSaleWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/FireSaleWidget.java index b77941c2..715a99bd 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/FireSaleWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/FireSaleWidget.java @@ -40,7 +40,10 @@ public class FireSaleWidget extends Widget { return; } - if (event.getString().contains("starting in")) { + String text = event.getString(); + + //We're keeping both cases as it might have something to do with having multiple fire sales at once vs having only one + if (text.contains("starting in") || text.contains("Starts in")) { this.addComponent(new IcoTextComponent(Ico.CLOCK, event)); return; } -- cgit