Quiver HUD

MisterCheezeCake · Nov 9, 2024 · 24704c8 · 24704c8
1 parent e324106
commit 24704c8
Show file tree

Hide file tree

Showing 17 changed files with 252 additions and 9 deletions.
diff --git a/src/main/java/wtf/cheeze/sbt/SkyblockTweaks.java b/src/main/java/wtf/cheeze/sbt/SkyblockTweaks.java
@@ -90,6 +90,7 @@ public void onInitialize() {
 		HUDS.add(new FpsHUD());
 
 		HUDS.add(new TickerHUD());
+		HUDS.add(new QuiverHUD());
 
 		HudRenderCallback.EVENT.register((context, tickCounter) -> {
 			HUDS.forEach(hud -> hud.render(context, false));

diff --git a/src/main/java/wtf/cheeze/sbt/command/SBTCommand.java b/src/main/java/wtf/cheeze/sbt/command/SBTCommand.java
@@ -333,6 +333,7 @@ public static void registerEvents() {
                                     return 1;
                                 }))
 
+
                                 .then(literal("dumpComponents")
                                         .then(literal("hand")
                                         .executes(context -> {
@@ -342,7 +343,18 @@ public static void registerEvents() {
                                             });
                                             return 1;
                                         }))
-                                        .then(literal("slot")
+                                        .then(literal("inventory")
+                                                .then(argument("number" , IntegerArgumentType.integer())
+                                                        .executes(context -> {
+                                                            var components = SkyblockTweaks.mc.player.getInventory().getStack(IntegerArgumentType.getInteger(context, "number")).getComponents();
+                                                            components.forEach((component) -> {
+                                                                context.getSource().sendFeedback(Text.of(PREFIX + " §3" + component.toString()));
+                                                            });
+                                                            return 1;
+                                                        })
+
+                                        ))
+                                        .then(literal("container")
                                                 .then(argument("number" , IntegerArgumentType.integer())
                                                         .executes(context -> {
                                                             new Thread(() -> {

diff --git a/src/main/java/wtf/cheeze/sbt/config/categories/GlobalSearchCategory.java b/src/main/java/wtf/cheeze/sbt/config/categories/GlobalSearchCategory.java
@@ -66,6 +66,7 @@ public static ConfigCategory getCategory(ConfigImpl defaults, ConfigImpl config)
                 .group(RealTimeHUD.Config.getGroup(defaults, config))
                 .group(FpsHUD.Config.getGroup(defaults, config))
                 .group(TickerHUD.Config.getGroup(defaults, config))
+                .group(QuiverHUD.Config.getGroup(defaults, config))
                 .build();
     }
 

diff --git a/src/main/java/wtf/cheeze/sbt/config/categories/Huds.java b/src/main/java/wtf/cheeze/sbt/config/categories/Huds.java
@@ -78,6 +78,9 @@ public class Huds {
     @SerialEntry
     public TickerHUD.Config ticker = new TickerHUD.Config();
 
+    @SerialEntry
+    public QuiverHUD.Config quiver = new QuiverHUD.Config();
+
     public static ConfigCategory getCategory(ConfigImpl defaults, ConfigImpl config) {
         return ConfigCategory.createBuilder()
                 .name(Text.translatable("sbt.config.huds"))
@@ -99,6 +102,7 @@ public static ConfigCategory getCategory(ConfigImpl defaults, ConfigImpl config)
                 .group(RealTimeHUD.Config.getGroup(defaults, config))
                 .group(FpsHUD.Config.getGroup(defaults, config))
                 .group(TickerHUD.Config.getGroup(defaults, config))
+                .group(QuiverHUD.Config.getGroup(defaults, config))
                 .build();
     }
 }
diff --git a/src/main/java/wtf/cheeze/sbt/features/huds/DrillFuelBar.java b/src/main/java/wtf/cheeze/sbt/features/huds/DrillFuelBar.java
@@ -30,6 +30,7 @@
 import wtf.cheeze.sbt.hud.bases.BarHUD;
 import wtf.cheeze.sbt.hud.utils.HudInformation;
 import wtf.cheeze.sbt.utils.render.Colors;
+import wtf.cheeze.sbt.utils.skyblock.SkyblockUtils;
 
 import java.awt.Color;
 
@@ -59,7 +60,7 @@ public String getName() {
     @Override
     public boolean shouldRender(boolean fromHudScreen) {
         if (!super.shouldRender(fromHudScreen)) return false;
-        if ((SkyblockTweaks.DATA.inSB && SBTConfig.huds().drillFuelBar.enabled) && SkyblockTweaks.DATA.isThePlayerHoldingADrill() || fromHudScreen) return true;
+        if ((SkyblockTweaks.DATA.inSB && SBTConfig.huds().drillFuelBar.enabled) && SkyblockUtils.isThePlayerHoldingADrill() || fromHudScreen) return true;
         return false;
     }
 

diff --git a/src/main/java/wtf/cheeze/sbt/features/huds/DrillFuelHUD.java b/src/main/java/wtf/cheeze/sbt/features/huds/DrillFuelHUD.java
@@ -35,6 +35,7 @@
 import wtf.cheeze.sbt.hud.bases.TextHUD;
 import wtf.cheeze.sbt.hud.components.SingleHudLine;
 import wtf.cheeze.sbt.utils.render.Colors;
+import wtf.cheeze.sbt.utils.skyblock.SkyblockUtils;
 
 import java.awt.Color;
 
@@ -64,7 +65,7 @@ public DrillFuelHUD() {
     @Override
     public boolean shouldRender(boolean fromHudScreen) {
         if (!super.shouldRender(fromHudScreen)) return false;
-        if ((SkyblockTweaks.DATA.inSB && SBTConfig.huds().drillFuel.enabled) && SkyblockTweaks.DATA.isThePlayerHoldingADrill() || fromHudScreen) return true;
+        if ((SkyblockTweaks.DATA.inSB && SBTConfig.huds().drillFuel.enabled) && SkyblockUtils.isThePlayerHoldingADrill() || fromHudScreen) return true;
         return false;
     }
 

diff --git a/src/main/java/wtf/cheeze/sbt/features/huds/QuiverHUD.java b/src/main/java/wtf/cheeze/sbt/features/huds/QuiverHUD.java
@@ -0,0 +1,155 @@
+package wtf.cheeze.sbt.features.huds;
+
+import dev.isxander.yacl3.api.Option;
+import dev.isxander.yacl3.api.OptionGroup;
+import dev.isxander.yacl3.api.controller.ColorControllerBuilder;
+import dev.isxander.yacl3.config.v2.api.SerialEntry;
+import wtf.cheeze.sbt.SkyblockTweaks;
+import wtf.cheeze.sbt.config.ConfigImpl;
+import wtf.cheeze.sbt.config.SBTConfig;
+import wtf.cheeze.sbt.hud.bases.TextHUD;
+import wtf.cheeze.sbt.hud.components.SingleHudLine;
+import wtf.cheeze.sbt.hud.utils.AnchorPoint;
+import wtf.cheeze.sbt.hud.utils.DrawMode;
+import wtf.cheeze.sbt.hud.utils.HudInformation;
+import wtf.cheeze.sbt.utils.TextUtils;
+import wtf.cheeze.sbt.utils.render.Colors;
+import wtf.cheeze.sbt.utils.skyblock.IconDict;
+import wtf.cheeze.sbt.utils.skyblock.SkyblockUtils;
+
+import java.awt.*;
+
+public class QuiverHUD extends TextHUD {
+    @Override
+    public String getName() {
+        return "Quiver HUD";
+    }
+
+
+    public QuiverHUD() {
+        INFO = new HudInformation(
+                () -> SBTConfig.huds().quiver.x,
+                () -> SBTConfig.huds().quiver.y,
+                () -> SBTConfig.huds().quiver.scale,
+                () -> SBTConfig.huds().quiver.anchor,
+                x -> SBTConfig.huds().quiver.x = (float) x,
+                y -> SBTConfig.huds().quiver.y = (float) y,
+                scale -> SBTConfig.huds().quiver.scale = (float) scale,
+                anchor -> SBTConfig.huds().quiver.anchor = anchor
+        );
+        line = new SingleHudLine(
+                () -> Colors.WHITE,
+                () -> SBTConfig.huds().quiver.outlineColor,
+                () -> SBTConfig.huds().quiver.mode,
+                () -> {
+                    var quiver = SkyblockUtils.getQuiverData();
+                    return TextUtils.join(
+                            quiver.arrowName,
+                            TextUtils.SPACE,
+                            TextUtils.withColor("x" + quiver.arrowCount, Colors.GRAY)
+                    );
+                },
+                () -> IconDict.ARROW,
+                () -> SBTConfig.huds().quiver.icon
+        );
+
+    }
+
+    @Override
+    public boolean shouldRender(boolean fromHudScreen) {
+        if (!super.shouldRender(fromHudScreen)) return false;
+        if ((SkyblockTweaks.DATA.inSB && SBTConfig.huds().quiver.enabled && SkyblockUtils.quiverActive()) || fromHudScreen) return true;
+        return false;
+    }
+
+
+    public static class Config {
+        @SerialEntry
+        public boolean enabled = false;
+
+        @SerialEntry
+        public DrawMode mode = DrawMode.SHADOW;
+
+        @SerialEntry // Not handled by YACL Gui
+        public float x = 0;
+
+        @SerialEntry // Not handled by YACL Gui
+        public float y = 0.9f;
+
+        @SerialEntry
+        public float scale = 1.0f;
+
+        @SerialEntry
+        public int outlineColor = Colors.BLACK;
+
+        @SerialEntry
+        public AnchorPoint anchor = AnchorPoint.LEFT;
+
+        @SerialEntry
+        public boolean icon = true;
+
+        public static OptionGroup getGroup(ConfigImpl defaults, ConfigImpl config) {
+            var enabled = Option.<Boolean>createBuilder()
+                    .name(key("quiver.enabled"))
+                    .description(keyD("quiver.enabled"))
+                    .controller(SBTConfig::generateBooleanController)
+                    .binding(
+                            defaults.huds.quiver.enabled,
+                            () -> config.huds.quiver.enabled,
+                            value -> config.huds.quiver.enabled = (Boolean) value
+                    )
+                    .build();
+            var icon = Option.<Boolean>createBuilder()
+                    .name(key("quiver.icon"))
+                    .description(keyD("quiver.icon"))
+                    .controller(SBTConfig::generateBooleanController)
+                    .binding(
+                            defaults.huds.quiver.icon,
+                            () -> config.huds.quiver.icon,
+                            value -> config.huds.quiver.icon = (Boolean) value
+                    )
+                    .build();
+
+
+
+            var outline = Option.<Color>createBuilder()
+                    .name(key("quiver.outlineColor"))
+                    .description(keyD("quiver.outlineColor"))
+                    .controller(ColorControllerBuilder::create)
+                    .available(config.huds.quiver.mode == DrawMode.OUTLINE)
+                    .binding(
+                            new Color(defaults.huds.quiver.outlineColor),
+                            () ->  new Color(config.huds.quiver.outlineColor),
+                            value -> config.huds.quiver.outlineColor = value.getRGB()
+
+                    )
+                    .build();
+
+            var mode = Option.<DrawMode>createBuilder()
+                    .name(key("quiver.mode"))
+                    .description(keyD("quiver.mode"))
+                    .controller(SBTConfig::generateDrawModeController)
+                    .binding(
+                            defaults.huds.quiver.mode,
+                            () -> config.huds.quiver.mode,
+                            value -> {
+                                config.huds.quiver.mode = value;
+                                if (value == DrawMode.OUTLINE) outline.setAvailable(true);
+                                else outline.setAvailable(false);
+                            }
+                    )
+                    .build();
+
+            return OptionGroup.createBuilder()
+                    .name(key("quiver"))
+                    .description(keyD("quiver"))
+                    .option(enabled)
+                    .option(icon)
+                    .option(outline)
+                    .option(mode)
+                    .collapsed(true)
+                    .build();
+        }
+    }
+
+}
diff --git a/src/main/java/wtf/cheeze/sbt/hud/HudIcon.java b/src/main/java/wtf/cheeze/sbt/hud/HudIcon.java
@@ -9,7 +9,7 @@
 public class HudIcon {
     @Nullable private Identifier iconTexture;
     @Nullable private ItemStack iconStack;
-    private Mode mode;
+    private final Mode mode;
 
     public HudIcon(Identifier iconTexture) {
         this.iconTexture = iconTexture;

diff --git a/src/main/java/wtf/cheeze/sbt/utils/NotificationHandler.java b/src/main/java/wtf/cheeze/sbt/utils/NotificationHandler.java
@@ -29,7 +29,7 @@ public class NotificationHandler {
 
     public static void registerEvents() {
         ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> {
-            if (NOTIFICATION_QUEUE.size() == 0) return;
+            if (NOTIFICATION_QUEUE.isEmpty()) return;
             new Thread(() -> {
                 try {
                     Thread.sleep(2500);

diff --git a/src/main/java/wtf/cheeze/sbt/utils/TextUtils.java b/src/main/java/wtf/cheeze/sbt/utils/TextUtils.java
@@ -25,6 +25,7 @@ public class TextUtils {
     public static String removeColorCodes(String text) {
         return text.replaceAll("§[a-f0-9k-o]", "");
     }
+    public static final Text SPACE = Text.literal(" ");
 
     public static Text getTextThatLinksToURL(String text, String hovered, String url) {
         return Text.literal(text).styled(style -> {

diff --git a/src/main/java/wtf/cheeze/sbt/utils/UpdateChecker.java b/src/main/java/wtf/cheeze/sbt/utils/UpdateChecker.java
@@ -40,6 +40,7 @@ public static void checkForUpdates() {
                                 if (remote.latestAlpha == null) {
                                     break;
                                 }
+
                                 internalRun(remote.latestAlpha.get(SkyblockTweaks.mc.getGameVersion()));
                             }
                             case NotificationStream.BETA -> {
@@ -64,6 +65,7 @@ public static void checkForUpdates() {
     }
 
     private static void internalRun(Version.RemoteVersion remoteVersion) {
+        if (remoteVersion == null) return;
         var version = new Version(remoteVersion.versionString);
         var comparison = Version.compareVersions(version, SkyblockTweaks.VERSION);
         if (comparison == Version.VersionComparison.GREATER) {

diff --git a/src/main/java/wtf/cheeze/sbt/utils/render/Colors.java b/src/main/java/wtf/cheeze/sbt/utils/render/Colors.java
@@ -5,6 +5,8 @@ public class Colors {
 
     public static final int WHITE = 0xFFFFFFFF;
     public static final int BLACK = 0xFF000000;
+    public static final int GRAY = 0xFFAAAAAA;
+    public static final int DARK_GRAY = 0xFF555555;
 
     public static final int BLUE = 0xFF5555FF;
     public static final int RED = 0xFFFF5555;
@@ -18,4 +20,6 @@ public class Colors {
 
 
 
+
+
 }
diff --git a/src/main/java/wtf/cheeze/sbt/utils/skyblock/IconDict.java b/src/main/java/wtf/cheeze/sbt/utils/skyblock/IconDict.java
@@ -41,6 +41,8 @@ public class IconDict {
             Map.entry(Skills.SOCIAL, new HudIcon(ofItem("emerald"))
             ));
 
+    public static final HudIcon ARROW = new HudIcon(ofItem("arrow"));
+
     private static Identifier ofItem(String name) {
         return Identifier.ofVanilla("textures/item/" + name + ".png");
     }

diff --git a/src/main/java/wtf/cheeze/sbt/utils/skyblock/QuiverData.java b/src/main/java/wtf/cheeze/sbt/utils/skyblock/QuiverData.java
@@ -0,0 +1,31 @@
+package wtf.cheeze.sbt.utils.skyblock;
+
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.LoreComponent;
+import net.minecraft.item.ItemStack;
+import net.minecraft.text.Text;
+import wtf.cheeze.sbt.SkyblockTweaks;
+import wtf.cheeze.sbt.features.huds.QuiverHUD;
+
+import java.util.regex.Pattern;
+
+public class QuiverData {
+    private static final Pattern QUIVER_PATTERN = Pattern.compile("Active Arrow: (.+) \\((\\d+)\\)");
+
+    public final Text arrowName;
+    public final int arrowCount;
+
+   QuiverData (ItemStack stack) {
+        var lines = stack.getOrDefault(DataComponentTypes.LORE, LoreComponent.DEFAULT).lines();
+        var line = lines.get(4);
+        var matcher = QUIVER_PATTERN.matcher(line.getString());
+        if (matcher.matches()) {
+            arrowCount = Integer.parseInt(matcher.group(2));
+            var type = line.getSiblings().get(1);
+            arrowName = Text.literal(type.getString().trim()).setStyle(type.getStyle());
+        } else {
+            arrowCount = 0;
+            arrowName = Text.of("Placeholder Arrow");
+        }
+    }
+}
diff --git a/src/main/java/wtf/cheeze/sbt/utils/skyblock/SkyblockData.java b/src/main/java/wtf/cheeze/sbt/utils/skyblock/SkyblockData.java
@@ -70,10 +70,6 @@ public float damageReduction() {
         return (defense / (defense + 100f)) * 100;
     }
 
-    public boolean isThePlayerHoldingADrill() {
-        return MinecraftClient.getInstance().player.getMainHandStack().getName().getString().contains("Drill");
-    }
-
     /**
      * Provides the profile ID with an appended "_ALPHA" if the player is in the alpha network
      * We do this so that what players do on the Alpha network does not affect persistent data for their main profile

diff --git a/src/main/java/wtf/cheeze/sbt/utils/skyblock/SkyblockUtils.java b/src/main/java/wtf/cheeze/sbt/utils/skyblock/SkyblockUtils.java
@@ -18,6 +18,9 @@
  */
 package wtf.cheeze.sbt.utils.skyblock;
 
+import net.minecraft.client.MinecraftClient;
+import wtf.cheeze.sbt.SkyblockTweaks;
+
 public class SkyblockUtils {
 
     public static SkyblockConstants.Rarity castStringToRarity(String input) {
@@ -80,4 +83,21 @@ public static SkyblockConstants.Skills strictCastStringToSkill(String skill) {
             default -> SkyblockConstants.Skills.UNKNOWN;
         };
     }
+
+    public static boolean isThePlayerHoldingADrill() {
+        return MinecraftClient.getInstance().player.getMainHandStack().getName().getString().contains("Drill");
+    }
+
+    public static boolean quiverActive() {
+        return SkyblockTweaks.mc.player.getInventory().getStack(8).getName().getString().startsWith("Quiver");
+    }
+
+    /**
+     * Please qualify calls to this with a call to quiverActive
+     */
+    public static QuiverData getQuiverData() {
+        return new QuiverData(SkyblockTweaks.mc.player.getInventory().getStack(8));
+    }
+
+
 }