Item stack size playertryhard

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

@@ -190,23 +190,15 @@ import at.hannibal2.skyhanni.features.inventory.ChestValue
 import at.hannibal2.skyhanni.features.inventory.HarpFeatures
 import at.hannibal2.skyhanni.features.inventory.HideNotClickableItems
 import at.hannibal2.skyhanni.features.inventory.HighlightBonzoMasks
-import at.hannibal2.skyhanni.features.inventory.itemdisplayoverlay.ItemDisplayOverlayFeatures
-import at.hannibal2.skyhanni.features.inventory.itemdisplayoverlay.menu.MenuItemDisplayOverlayAbiphone
-import at.hannibal2.skyhanni.features.inventory.itemdisplayoverlay.menu.MenuItemDisplayOverlayPlayer
-import at.hannibal2.skyhanni.features.inventory.itemdisplayoverlay.menu.MenuItemDisplayOverlayPlayerAdvanced
-import at.hannibal2.skyhanni.features.inventory.itemdisplayoverlay.menu.MenuItemDisplayOverlayPlayerTryhard
-import at.hannibal2.skyhanni.features.inventory.itemdisplayoverlay.menu.MenuItemDisplayOverlayCombat
-import at.hannibal2.skyhanni.features.inventory.itemdisplayoverlay.menu.MenuItemDisplayOverlayFarming
-import at.hannibal2.skyhanni.features.inventory.itemdisplayoverlay.menu.MenuItemDisplayOverlayMining
-import at.hannibal2.skyhanni.features.inventory.itemdisplayoverlay.menu.MenuItemDisplayOverlaySBLeveling
 import at.hannibal2.skyhanni.features.inventory.ItemStars
 import at.hannibal2.skyhanni.features.inventory.QuickCraftFeatures
 import at.hannibal2.skyhanni.features.inventory.RngMeterInventory
 import at.hannibal2.skyhanni.features.inventory.SackDisplay
 import at.hannibal2.skyhanni.features.inventory.ShiftClickEquipment
 import at.hannibal2.skyhanni.features.inventory.SkyBlockLevelGuideHelper
 import at.hannibal2.skyhanni.features.inventory.StatsTuning
-import at.hannibal2.skyhanni.features.inventory.itemdisplayoverlay.menu.MenuItemDisplayOverlayBingo
+import at.hannibal2.skyhanni.features.inventory.itemdisplayoverlay.ItemDisplayOverlayFeatures
+import at.hannibal2.skyhanni.features.inventory.itemdisplayoverlay.menu.MenuItemDisplayOverlayPlayerTryhard
 import at.hannibal2.skyhanni.features.inventory.tiarelay.TiaRelayHelper
 import at.hannibal2.skyhanni.features.inventory.tiarelay.TiaRelayWaypoints
 import at.hannibal2.skyhanni.features.itemabilities.ChickenHeadTimer
@@ -436,16 +428,8 @@ class SkyHanniMod {
         loadModule(PlayerChatModifier())
         loadModule(DungeonChatFilter())
         loadModule(HideNotClickableItems())
-        loadModule(ItemDisplayOverlayFeatures())
-        loadModule(MenuItemDisplayOverlayAbiphone())
-        loadModule(MenuItemDisplayOverlayPlayer())
-        loadModule(MenuItemDisplayOverlayPlayerAdvanced())
+        loadModule(ItemDisplayOverlayFeatures)
         loadModule(MenuItemDisplayOverlayPlayerTryhard())
-        loadModule(MenuItemDisplayOverlayFarming())
-        loadModule(MenuItemDisplayOverlayMining())
-        loadModule(MenuItemDisplayOverlayCombat())
-        loadModule(MenuItemDisplayOverlaySBLeveling())
-        loadModule(MenuItemDisplayOverlayBingo())
         loadModule(CurrentPetDisplay())
         loadModule(ExpOrbsOnGroundHider())
         loadModule(FandomWikiFromMenus())

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

@@ -1,24 +1,14 @@
 package at.hannibal2.skyhanni.config.features.inventory;
 
 import at.hannibal2.skyhanni.config.FeatureToggle;
-import at.hannibal2.skyhanni.config.HasLegacyId;
 import at.hannibal2.skyhanni.config.features.inventory.helper.HelperConfig;
+import at.hannibal2.skyhanni.config.features.inventory.stacksize.StackSizeConfig;
 import com.google.gson.annotations.Expose;
 import io.github.moulberry.moulconfig.annotations.Accordion;
 import io.github.moulberry.moulconfig.annotations.Category;
 import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorDraggableList;
 import io.github.moulberry.moulconfig.annotations.ConfigOption;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.LARVA_HOOK;
-import static at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.NEW_YEAR_CAKE;
-import static at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.RANCHERS_BOOTS_SPEED;
-import static at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.VACUUM_GARDEN;
-
 public class InventoryConfig {
 
     @Expose
@@ -57,62 +47,8 @@ public class InventoryConfig {
     public HelperConfig helper = new HelperConfig();
 
     @Expose
-    @ConfigOption(
-        name = "Item Number",
-        desc = "Showing the item number as a stack size for these items."
-    )
-    @ConfigEditorDraggableList()
-    public List<ItemNumberEntry> itemNumberAsStackSize = new ArrayList<>(Arrays.asList(
-        NEW_YEAR_CAKE,
-        RANCHERS_BOOTS_SPEED,
-        LARVA_HOOK,
-        VACUUM_GARDEN
-    ));
-
-    public enum ItemNumberEntry implements HasLegacyId {
-        MASTER_STAR_TIER("§bMaster Star Tier", 0),
-        MASTER_SKULL_TIER("§bMaster Skull Tier", 1),
-        DUNGEON_HEAD_FLOOR_NUMBER("§bDungeon Head Floor Number", 2),
-        NEW_YEAR_CAKE("§bNew Year Cake", 3),
-        PET_LEVEL("§bPet Level", 4),
-        MINION_TIER("§bMinion Tier", 5),
-        CRIMSON_ARMOR("§bCrimson Armor", 6),
-        REMOVED("§7(Removed)", 7),
-        KUUDRA_KEY("§bKuudra Key", 8),
-        SKILL_LEVEL("§bSkill Level", 9),
-        COLLECTION_LEVEL("§bCollection Level", 10),
-        RANCHERS_BOOTS_SPEED("§bRancher's Boots speed", 11),
-        LARVA_HOOK("§bLarva Hook", 12),
-        DUNGEON_POTION_LEVEL("§bDungeon Potion Level", 13),
-        VACUUM_GARDEN("§bVacuum (Garden)", 14),
-        BOTTLE_OF_JYRRE("§bBottle Of Jyrre", 15),
-        EDITION_NUMBER("§bEdition Number", 16),
-        BINGO_GOAL_RANK("§bBingo Goal Rank"),
-        ;
-
-        private final String str;
-        private final int legacyId;
-
-        ItemNumberEntry(String str, int legacyId) {
-            this.str = str;
-            this.legacyId = legacyId;
-        }
-
-        // Constructor if new enum elements are added post-migration
-        ItemNumberEntry(String str) {
-            this(str, -1);
-        }
-
-        @Override
-        public int getLegacyId() {
-            return legacyId;
-        }
-
-        @Override
-        public String toString() {
-            return str;
-        }
-    }
+    @Category(name = "Stack Size", desc = "Stack Sizes in Inventories")
+    public StackSizeConfig stackSize = new StackSizeConfig();
 
     @Expose
     @ConfigOption(name = " Vacuum Bag Cap", desc = "Capping the Garden Vacuum Bag item number display to 40.")

src/main/java/at/hannibal2/skyhanni/config/features/inventory/stacksize/StackSizeConfig.java

@@ -18,51 +18,51 @@ public class StackSizeConfig {
         desc = "Showing the item number as a stack size for these items." // Some values may be truncated percentages or §a✔§r§7s.
     )
     @ConfigEditorDraggableList
-    public List<ItemNumber> itemNumber = new ArrayList<>(Arrays.asList(
-        ItemNumber.MASTER_STAR,
-        ItemNumber.MASTER_SKULL,
-        ItemNumber.SKYBLOCK_YEAR,
-        ItemNumber.CRIMSON_STARS,
-        ItemNumber.LARVA_HOOK,
-        ItemNumber.ARMADILLO,
-        ItemNumber.BEASTMASTER,
-        ItemNumber.CAMPFIRE
+    public List<ItemNumberEntry> itemNumberAsStackSize = new ArrayList<>(Arrays.asList(
+        ItemNumberEntry.MASTER_STAR_TIER,
+        ItemNumberEntry.MASTER_SKULL_TIER,
+        ItemNumberEntry.NEW_YEAR_CAKE,
+        ItemNumberEntry.CRIMSON_ARMOR,
+        ItemNumberEntry.LARVA_HOOK,
+        ItemNumberEntry.ARMADILLO,
+        ItemNumberEntry.BEASTMASTER,
+        ItemNumberEntry.CAMPFIRE
     ));
 
-    public enum ItemNumber implements HasLegacyId {
-        MASTER_STAR("§bMaster Star Tier", 0),
-        MASTER_SKULL("§bMaster Skull Tier", 1),
+    public enum ItemNumberEntry implements HasLegacyId {
+        MASTER_STAR_TIER("§bMaster Star Tier", 0),
+        MASTER_SKULL_TIER("§bMaster Skull Tier", 1),
         DUNGEON_HEAD_FLOOR_NUMBER("§bGolden/Diamond Dungeon Head Floor Number", 2),
-        SKYBLOCK_YEAR("§bNew Year Cake/Spooky Pie SB Year", 3),
-        PET_LVL("§bPet Level", 4),
+        NEW_YEAR_CAKE("§bNew Year Cake/Spooky Pie SB Year", 3),
+        PET_LEVEL("§bPet Level", 4),
         MINION_TIER("§bMinion Tier", 5),
-        CRIMSON_STARS("§bCrimson Armor Crimson Stars", 6),
+        CRIMSON_ARMOR("§bCrimson Armor Crimson Stars", 6),
         CAMPFIRE("§bCampfire Talisman Tier", 7),
-        KUUDRA("§bKuudra Key", 8),
-        SOULFLOW("§bInternalized Soulflow Count\n§b(Abbv, won't show in the Auction House)", 9),
+        KUUDRA_KEY("§bKuudra Key", 8),
+        SOULFLOW("§bInternalized Soulflow Count", 9), //(Abbv, won't show in the Auction House)
         BLOOD_GOD("§bBlood God Crest Strength", 10),
-        RANCHER_SPEED("§bRancher's Boots Speed", 11),
+        RANCHERS_BOOTS_SPEED("§bRancher's Boots Speed", 11),
         LARVA_HOOK("§bLarva Hook", 12),
         DUNGEON_POTION_LEVEL("§bDungeon Potion Level", 13),
-        VACCUM_PESTS("§bPests Stored in Vaccum (Garden)", 14),
-        JYRRE("§bBottle of Jyrre (#, Intelligence Bonus on Legacy Bottles and Time on New Bottles)", 15),
-        EDITION_AUCTION_NUMBER("§bItem Edition/Auction Number (if less than 1000)", 16),
+        VACUUM_GARDEN("§bPests Stored in Vaccum", 14),
+        BOTTLE_OF_JYRRE("§bBottle of Jyrre Intel Bonus", 15),
+        EDITION_NUMBER("§bItem Edition/Auction Number (if less than 1000)", 16),
         ARMADILLO("§bArmadillo Blocks Walked Progress (%)"),
         NECRONS_LADDER("§bNecron's Ladder Progress"),
         FRUIT_BOWL("§bFruit Bowl Progress"),
-        BEASTMASTER("§bBeastmaster Crest Kill Progress (%)"),
+        BEASTMASTER("§bBeastmaster Crest Kills"), // Progress (%)
         YETI_ROD("§bYeti Rod Bonus"),
         SHREDDER("§bShredder Bonus Damage"),
-        STORAGE_TIER("§bMinion Storage Tier (#)"),
-        COMPACTOR_DELETOR("§bCompactor/Deletor Enabled Status (§a✔§b/§c§l✖§b) + Tier (Abbv)"),
+        STORAGE_TIER("§bMinion Storage Tier"), // (#)
+        COMPACTOR_DELETOR("§bCompactor/Deletor Enabled Status + Tier (Abbv)"), // (§a✔§b/§c§l✖§b)
         ABIPHONE("§bAbiphone Tier", 7),
-        STACKING_ENCHANTMENT("§bStacking Enchantment Tier (for items without dungeon stars)"),
+        STACKING_ENCHANTMENT("§bStacking Enchantment Tier"), // (for items without dungeon stars)
         ;
 
         final String str;
         final int legacyId;
-        ItemNumber(String str, int legacyId) { this.str = str; this.legacyId = legacyId; }
-        ItemNumber(String str) { this(str, -1); }
+        ItemNumberEntry(String str, int legacyId) { this.str = str; this.legacyId = legacyId; }
+        ItemNumberEntry(String str) { this(str, -1); }
         @Override public String toString() { return str; }
         @Override public int getLegacyId() { return legacyId; }
     }