Feature: Quiver Display

src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt

@@ -229,6 +229,8 @@ import at.hannibal2.skyhanni.features.garden.visitor.VisitorListener
 import at.hannibal2.skyhanni.features.garden.visitor.VisitorRewardWarning
 import at.hannibal2.skyhanni.features.gui.customscoreboard.CustomScoreboard
 import at.hannibal2.skyhanni.features.gui.customscoreboard.ScoreboardPattern
+import at.hannibal2.skyhanni.features.gui.quiver.QuiverDisplay
+import at.hannibal2.skyhanni.features.gui.quiver.QuiverWarning
 import at.hannibal2.skyhanni.features.inventory.AuctionsHighlighter
 import at.hannibal2.skyhanni.features.inventory.ChestValue
 import at.hannibal2.skyhanni.features.inventory.DojoRankDisplay
@@ -240,7 +242,6 @@ import at.hannibal2.skyhanni.features.inventory.ItemStars
 import at.hannibal2.skyhanni.features.inventory.MaxPurseItems
 import at.hannibal2.skyhanni.features.inventory.PowerStoneGuideFeatures
 import at.hannibal2.skyhanni.features.inventory.QuickCraftFeatures
-import at.hannibal2.skyhanni.features.inventory.QuiverNotification
 import at.hannibal2.skyhanni.features.inventory.RngMeterInventory
 import at.hannibal2.skyhanni.features.inventory.SackDisplay
 import at.hannibal2.skyhanni.features.inventory.ShiftClickBrewing
@@ -819,7 +820,6 @@ class SkyHanniMod {
         loadModule(VerminTracker)
         loadModule(SkillProgress)
         loadModule(SkillTooltip())
-        loadModule(QuiverNotification)
         loadModule(MaxPurseItems())
         loadModule(SuperCraftFeatures())
         loadModule(InfernoMinionFeatures())
@@ -829,6 +829,8 @@ class SkyHanniMod {
         loadModule(DungeonShadowAssassinNotification())
         loadModule(PestProfitTracker)
         loadModule(NoBitsWarning())
+        loadModule(QuiverDisplay())
+        loadModule(QuiverWarning())
 
         init()
 

src/main/java/at/hannibal2/skyhanni/config/features/combat/CombatConfig.java

@@ -19,6 +19,11 @@ public class CombatConfig {
     @Category(name = "Ghost Counter", desc = "Ghost counter settings")
     public GhostCounterConfig ghostCounter = new GhostCounterConfig();
 
+    @Expose
+    @ConfigOption(name = "Quiver", desc = "")
+    @Accordion
+    public QuiverConfig quiverConfig = new QuiverConfig();
+
     @Expose
     @ConfigOption(name = "Summonings", desc = "")
     @Accordion

src/main/java/at/hannibal2/skyhanni/config/features/combat/QuiverConfig.java

@@ -0,0 +1,40 @@
+package at.hannibal2.skyhanni.config.features.combat;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.Accordion;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+public class QuiverConfig {
+    @Expose
+    @ConfigOption(name = "Quiver Display", desc = "")
+    @Accordion
+    public QuiverDisplayConfig quiverDisplay = new QuiverDisplayConfig();
+
+    @Expose
+    @ConfigOption(
+        name = "Low Quiver Alert",
+        desc = "Notifies you when your quiver\n" +
+            "reaches an amount of arrows."
+    )
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean lowQuiverNotification = true;
+
+    @Expose
+    @ConfigOption(
+        name = "Reminder After Run",
+        desc = "Reminds you to buy arrows after\n" +
+            "a Dungeons/Kuudra run if you're low."
+    )
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean reminderAfterRun = true;
+
+    @Expose
+    @ConfigOption(name = "Low Quiver Amount", desc = "Amount at which to notify you.")
+    @ConfigEditorSlider(minValue = 50, maxValue = 500, minStep = 50)
+    public int lowQuiverAmount = 100;
+}

src/main/java/at/hannibal2/skyhanni/config/features/combat/QuiverDisplayConfig.java

@@ -0,0 +1,51 @@
+package at.hannibal2.skyhanni.config.features.combat;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import at.hannibal2.skyhanni.config.core.config.Position;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDropdown;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+import io.github.notenoughupdates.moulconfig.observer.Property;
+
+public class QuiverDisplayConfig {
+    @Expose
+    @ConfigOption(name = "Enable", desc = "Show the number of arrows you have.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean enabled = true;
+
+    @Expose
+    public Position quiverDisplayPos = new Position(260, 80);
+
+    @Expose
+    @ConfigOption(name = "Show arrow icon", desc = "Displays an icon next to the Quiver Display.")
+    @ConfigEditorBoolean
+    public Property<Boolean> showIcon = Property.of(true);
+
+    @Expose
+    @ConfigOption(
+        name = "When to show",
+        desc = "Decides in what conditions to show the display."
+    )
+    @ConfigEditorDropdown
+    public Property<ShowWhen> whenToShow = Property.of(ShowWhen.ONLY_BOW_HAND);
+
+    public enum ShowWhen {
+        ALWAYS("Always"),
+        ONLY_BOW_INVENTORY("Bow in inventory"),
+        ONLY_BOW_HAND("Bow in hand"),
+
+        ;
+        private final String str;
+
+        ShowWhen(String str) {
+            this.str = str;
+        }
+
+        @Override
+        public String toString() {
+            return str;
+        }
+    }
+}

src/main/java/at/hannibal2/skyhanni/config/features/dev/DevConfig.java

@@ -44,11 +44,6 @@ public class DevConfig {
     @ConfigEditorBoolean
     public boolean worldEdit = false;
 
-    @Expose
-    @ConfigOption(name = "Bow Sound distance", desc = "The distance in blocks where the sound of shooting a bow will be used for the QuiverAPI.")
-    @ConfigEditorSlider(minValue = 0, maxValue = 50, minStep = 1)
-    public int bowSoundDistance = 5;
-
     @Expose
     @ConfigOption(name = "Unknown Lines warning", desc = "Gives a chat warning when unknown lines are found in the scoreboard." +
         "\nCustom Scoreboard debug option")

src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java

@@ -219,11 +219,4 @@ public String toString() {
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean shiftClickBrewing = false;
-
-    @Expose
-    @ConfigOption(name = "Low Quiver Alert", desc = "Notifies you when your Quiver runs out of arrows.")
-    @ConfigEditorBoolean
-    @FeatureToggle
-    public boolean quiverAlert = false;
-
 }

src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java

@@ -68,7 +68,7 @@ public static class ArrowsStorage {
         public String currentArrow = null;
 
         @Expose
-        public Map<NEUInternalName, Float> arrowAmount = new HashMap<>();
+        public Map<NEUInternalName, Integer> arrowAmount = new HashMap<>();
     }
 
     @Expose

src/main/java/at/hannibal2/skyhanni/data/OwnInventoryData.kt

@@ -48,9 +48,10 @@ class OwnInventoryData {
         if (packet is S2FPacketSetSlot) {
             val windowId = packet.func_149175_c()
             if (windowId == 0) {
+                val slot = packet.func_149173_d()
                 val item = packet.func_149174_e() ?: return
                 DelayedRun.runNextTick {
-                    OwnInventoryItemUpdateEvent(item).postAndCatch()
+                    OwnInventoryItemUpdateEvent(item, slot).postAndCatch()
                 }
             }
         }