Merge pull request #537 from LongPPPP/master

Makes four Stats Menu clickable

Author: Swofty-Developments

commons/src/main/java/net/swofty/commons/statistics/ItemStatistic.java

@@ -35,6 +35,10 @@ public enum ItemStatistic {
     FORAGING_FORTUNE("Foraging Fortune", "§a", "§6", false, "☘"),
     BREAKING_POWER("Breaking Power", "§a", "§2", false, "Ⓟ"),
     PRISTINE("Pristine", "§a", "§5", false, "✧"),
+    MINING_SPREAD("Mining Spread", "§a", "§e", false, "▚"),
+    GEMSTONE_SPREAD("Gemstone Spread", "§a", "§e", false, "▚"),
+    HUNTER_FORTUNE("Hunter Fortune", "§a", "§d", false, "☘"),
+    SWEEP("Sweep", "§a", "§2", false, "∮"),
 
     // Sub-Gathering Stats
     ORE_FORTUNE("Ore Fortune", "§a", "§6", false, "☘"),
@@ -53,14 +57,36 @@ public enum ItemStatistic {
     MUSHROOM_FORTUNE("Mushroom Fortune", "§a", "§6", false, "☘"),
     SUGAR_CANE_FORTUNE("Sugar Cane Fortune", "§a", "§6", false, "☘"),
 
+    FIG_FORTUNE("Fig Fortune", "§a", "§6", false, "☘"),
+    MANGROVE_FORTUNE("Mangrove Fortune", "§a", "§6", false, "☘"),
+
+    // Wisdom Stats
+    ALCHEMY_WISDOM("Alchemy Wisdom", "§a", "§3", false, "☯"),
+    CARPENTRY_WISDOM("Carpentry Wisdom", "§a", "§3", false, "☯"),
+    COMBAT_WISDOM("Combat Wisdom", "§a", "§3", false, "☯"),
+    ENCHANTING_WISDOM("Enchanting Wisdom", "§a", "§3", false, "☯"),
+    FARMING_WISDOM("Farming Wisdom", "§a", "§3", false, "☯"),
+    FISHING_WISDOM("Fishing Wisdom", "§a", "§3", false, "☯"),
+    FORAGING_WISDOM("Foraging Wisdom", "§a", "§3", false, "☯"),
+    MINING_WISDOM("Mining Wisdom", "§a", "§3", false, "☯"),
+    RUNE_CRAFTING_WISDOM("Runecrafting Wisdom", "§a", "§3", false, "☯"),
+    SOCIAL_WISDOM("Social Wisdom", "§a", "§3", false, "☯"),
+    TAMING_WISDOM("Taming Wisdom", "§a", "§3", false, "☯"),
+    HUNTING_WISDOM("Hunting Wisdom", "§a", "§3", false, "☯"),
+
     // Misc Stats
     SPEED("Speed", "§a", "§f", false, "✦", 100D, 1D),
     MAGIC_FIND("Magic Find", "§a", "§b", false, "✯"),
     PET_LUCK("Pet Luck", "§a", "§d", false, "♣"),
     SEA_CREATURE_CHANCE("Sea Creature Chance", "§c", "§9", true, "α", 2D, 1D),
     FISHING_SPEED("Fishing Speed", "§a", "§b", false, "☂"),
-    COLD_RESISTANCE("Cold Resistance", "§a", "§b", false, "❄"),
     BONUS_PEST_CHANCE("Bonus Pest Chance", "§a", "§2", true, "ൠ"),
+    HEAT_RESISTANCE("Heat Resistance","§a","§c",false,"♨"),
+    COLD_RESISTANCE("Cold Resistance", "§a", "§b", false, "❄"),
+    FEAR("Fear","§a","§5",false,"☠"),
+    PULL("Pull","§a","§b",false,"ᛷ"),
+    RESPIRATION("Respiration","§a","§3",false,"⚶"),
+    PRESSURE_RESISTANCE("Pressure Resistance","§a","§9",false,"❍"),
 
     // Other Stats
     DAMAGE("Damage", "§c", "§c", false, "❁",

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/GUISkyBlockProfile.java

@@ -13,6 +13,10 @@
 import net.swofty.type.generic.gui.inventory.item.GUIClickableItem;
 import net.swofty.type.generic.gui.inventory.item.GUIItem;
 import net.swofty.type.generic.user.HypixelPlayer;
+import net.swofty.type.skyblockgeneric.gui.inventories.sbmenu.stats.GUICombatStats;
+import net.swofty.type.skyblockgeneric.gui.inventories.sbmenu.stats.GUIGatheringStats;
+import net.swofty.type.skyblockgeneric.gui.inventories.sbmenu.stats.GUIMiscStats;
+import net.swofty.type.skyblockgeneric.gui.inventories.sbmenu.stats.GUIWisdomStats;
 import net.swofty.type.skyblockgeneric.item.SkyBlockItem;
 import net.swofty.type.skyblockgeneric.item.components.StandardItemComponent;
 import net.swofty.type.skyblockgeneric.item.updater.NonPlayerItemUpdater;
@@ -192,23 +196,24 @@ public ItemStack.Builder getItem(HypixelPlayer p) {
             }
         });
 
-        set(new GUIClickableItem(15) {
+        set(new GUIClickableItem(15) { //Combat Stats
             @Override
             public void run(InventoryPreClickEvent e, HypixelPlayer p) {
                 SkyBlockPlayer player = (SkyBlockPlayer) p;
+                new GUICombatStats().open(player);
             }
 
             @Override
             public ItemStack.Builder getItem(HypixelPlayer p) {
                 SkyBlockPlayer player = (SkyBlockPlayer) p;
                 PlayerStatistics statistics = player.getStatistics();
-                List<String> lore = new ArrayList<>(List.of("§7Gives you a better chance at", "§7fighting strong monsters. "));
+                List<String> lore = new ArrayList<>(List.of("§7Gives you a better chance at", "§7fighting strong monsters. ", " "));
                 List<ItemStatistic> stats = new ArrayList<>(List.of(ItemStatistic.HEALTH, ItemStatistic.DEFENSE, ItemStatistic.STRENGTH, ItemStatistic.INTELLIGENCE,
                         ItemStatistic.CRIT_CHANCE, ItemStatistic.CRIT_DAMAGE, ItemStatistic.BONUS_ATTACK_SPEED, ItemStatistic.ABILITY_DAMAGE, ItemStatistic.TRUE_DEFENSE,
                         ItemStatistic.FEROCITY, ItemStatistic.HEALTH_REGEN, ItemStatistic.VITALITY, ItemStatistic.MENDING, ItemStatistic.SWING_RANGE));
 
                 statistics.allStatistics().getOverall().forEach((statistic, value) -> {
-                    if (!value.equals(statistic.getBaseAdditiveValue()) && stats.contains(statistic)) {
+                    if (stats.contains(statistic)) {
                         lore.add(" " + statistic.getDisplayColor() + statistic.getSymbol() + " " +
                                 StringUtility.toNormalCase(statistic.name()) + " §f" +
                                 StringUtility.decimalify(value, 2) + statistic.getSuffix());
@@ -223,22 +228,28 @@ public ItemStack.Builder getItem(HypixelPlayer p) {
             }
         });
 
-        set(new GUIClickableItem(16) {
+        set(new GUIClickableItem(16) {  //Gathering Stats
             @Override
             public void run(InventoryPreClickEvent e, HypixelPlayer p) {
                 SkyBlockPlayer player = (SkyBlockPlayer) p;
+                new GUIGatheringStats().open(player);
             }
 
             @Override
             public ItemStack.Builder getItem(HypixelPlayer p) {
                 SkyBlockPlayer player = (SkyBlockPlayer) p;
                 PlayerStatistics statistics = player.getStatistics();
-                List<String> lore = new ArrayList<>(List.of("§7Lets you collect and harvest better", "§7items, or more of them. "));
+                List<String> lore = new ArrayList<>(List.of("§7Lets you collect and harvest better", "§7items, or more of them. ", " "));
                 List<ItemStatistic> stats = new ArrayList<>(List.of(ItemStatistic.MINING_SPEED, ItemStatistic.MINING_FORTUNE, ItemStatistic.BREAKING_POWER,
-                        ItemStatistic.PRISTINE, ItemStatistic.FORAGING_FORTUNE, ItemStatistic.FARMING_FORTUNE));
+                        ItemStatistic.PRISTINE, ItemStatistic.FORAGING_FORTUNE, ItemStatistic.FARMING_FORTUNE, ItemStatistic.MINING_SPREAD, ItemStatistic.GEMSTONE_SPREAD,
+                        ItemStatistic.HUNTER_FORTUNE, ItemStatistic.SWEEP, ItemStatistic.ORE_FORTUNE, ItemStatistic.BLOCK_FORTUNE, ItemStatistic.DWARVEN_METAL_FORTUNE,
+                        ItemStatistic.GEMSTONE_FORTUNE, ItemStatistic.WHEAT_FORTUNE, ItemStatistic.POTATO_FORTUNE, ItemStatistic.CARROT_FORTUNE, ItemStatistic.PUMPKIN_FORTUNE,
+                        ItemStatistic.MELON_FORTUNE, ItemStatistic.CACTUS_FORTUNE, ItemStatistic.NETHER_WART_FORTUNE, ItemStatistic.COCOA_BEANS_FORTUNE, ItemStatistic.MUSHROOM_FORTUNE,
+                        ItemStatistic.SUGAR_CANE_FORTUNE, ItemStatistic.FIG_FORTUNE, ItemStatistic.MANGROVE_FORTUNE
+                ));
 
                 statistics.allStatistics().getOverall().forEach((statistic, value) -> {
-                    if (!value.equals(statistic.getBaseAdditiveValue()) && stats.contains(statistic)) {
+                    if (stats.contains(statistic)) {
                         lore.add(" " + statistic.getDisplayColor() + statistic.getSymbol() + " " +
                                 StringUtility.toNormalCase(statistic.name()) + " §f" +
                                 StringUtility.decimalify(value, 2) + statistic.getSuffix());
@@ -252,20 +263,24 @@ public ItemStack.Builder getItem(HypixelPlayer p) {
             }
         });
 
-        set(new GUIClickableItem(24) {
+        set(new GUIClickableItem(24) { //Wisdom Stats
             @Override
             public void run(InventoryPreClickEvent e, HypixelPlayer p) {
                 SkyBlockPlayer player = (SkyBlockPlayer) p;
+                new GUIWisdomStats().open(player);
             }
 
             @Override
             public ItemStack.Builder getItem(HypixelPlayer p) {
                 SkyBlockPlayer player = (SkyBlockPlayer) p;
                 PlayerStatistics statistics = player.getStatistics();
-                List<String> lore = new ArrayList<>(List.of("§7Increases the §3XP §7you gain on your", "§7skills "));
-                List<ItemStatistic> stats = new ArrayList<>(List.of()); // WISDOM STATS
+                List<String> lore = new ArrayList<>(List.of("§7Increases the §3XP §7you gain on your", "§7skills ", " "));
+                List<ItemStatistic> stats = new ArrayList<>(List.of(ItemStatistic.COMBAT_WISDOM, ItemStatistic.MINING_WISDOM, ItemStatistic.FARMING_WISDOM, ItemStatistic.FORAGING_WISDOM,
+                        ItemStatistic.FISHING_WISDOM, ItemStatistic.ENCHANTING_WISDOM, ItemStatistic.ALCHEMY_WISDOM, ItemStatistic.CARPENTRY_WISDOM, ItemStatistic.RUNE_CRAFTING_WISDOM,
+                        ItemStatistic.SOCIAL_WISDOM, ItemStatistic.TAMING_WISDOM, ItemStatistic.HUNTING_WISDOM
+                )); // WISDOM STATS
                 statistics.allStatistics().getOverall().forEach((statistic, value) -> {
-                    if (!value.equals(statistic.getBaseAdditiveValue()) && stats.contains(statistic)) {
+                    if (stats.contains(statistic)) {
                         lore.add(" " + statistic.getDisplayColor() + statistic.getSymbol() + " " +
                                 StringUtility.toNormalCase(statistic.name()) + " §f" +
                                 StringUtility.decimalify(value, 2) + statistic.getSuffix());
@@ -280,22 +295,25 @@ public ItemStack.Builder getItem(HypixelPlayer p) {
             }
         });
 
-        set(new GUIClickableItem(25) {
+        set(new GUIClickableItem(25) { //Misc Stats
             @Override
             public void run(InventoryPreClickEvent e, HypixelPlayer p) {
                 SkyBlockPlayer player = (SkyBlockPlayer) p;
+                new GUIMiscStats().open(player);
             }
 
             @Override
             public ItemStack.Builder getItem(HypixelPlayer p) {
                 SkyBlockPlayer player = (SkyBlockPlayer) p;
                 PlayerStatistics statistics = player.getStatistics();
-                List<String> lore = new ArrayList<>(List.of("§7Augments various aspects of your", "§7gameplay! "));
+                List<String> lore = new ArrayList<>(List.of("§7Augments various aspects of your", "§7gameplay! ", " "));
                 List<ItemStatistic> stats = new ArrayList<>(List.of(ItemStatistic.SPEED, ItemStatistic.MAGIC_FIND, ItemStatistic.PET_LUCK,
-                        ItemStatistic.SEA_CREATURE_CHANCE, ItemStatistic.FISHING_SPEED, ItemStatistic.COLD_RESISTANCE, ItemStatistic.BONUS_PEST_CHANCE));
+                        ItemStatistic.COLD_RESISTANCE, ItemStatistic.BONUS_PEST_CHANCE, ItemStatistic.HEAT_RESISTANCE, ItemStatistic.FEAR,
+                        ItemStatistic.PULL, ItemStatistic.RESPIRATION, ItemStatistic.PRESSURE_RESISTANCE
+                ));
 
                 statistics.allStatistics().getOverall().forEach((statistic, value) -> {
-                    if (!value.equals(statistic.getBaseAdditiveValue()) && stats.contains(statistic)) {
+                    if (stats.contains(statistic)) {
                         lore.add(" " + statistic.getDisplayColor() + statistic.getSymbol() + " " +
                                 StringUtility.toNormalCase(statistic.name()) + " §f" +
                                 StringUtility.decimalify(value, 2) + statistic.getSuffix());