Merge pull request #498 from ItzKatze/master

Swofty-Developments · web-flow · commit a26ea8128185 · 2025-07-24T11:18:13.000+10:00
void fix + total bestiary progress display
diff --git a/type.generic/src/main/java/net/swofty/types/generic/data/datapoints/DatapointBestiary.java b/type.generic/src/main/java/net/swofty/types/generic/data/datapoints/DatapointBestiary.java
@@ -10,13 +10,13 @@
 import net.swofty.types.generic.entity.mob.BestiaryMob;
 import net.swofty.types.generic.event.SkyBlockEventHandler;
 import net.swofty.types.generic.event.custom.BestiaryUpdateEvent;
+import net.swofty.types.generic.gui.inventory.inventories.sbmenu.bestiary.BestiaryCategories;
+import net.swofty.types.generic.gui.inventory.inventories.sbmenu.bestiary.BestiaryCategory;
 import net.swofty.types.generic.gui.inventory.inventories.sbmenu.bestiary.BestiaryEntry;
 import net.swofty.types.generic.user.SkyBlockPlayer;
 import org.json.JSONObject;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class DatapointBestiary extends Datapoint<DatapointBestiary.PlayerBestiary> {
 
@@ -58,6 +58,8 @@ public static class PlayerBestiary {
         @Setter
         private SkyBlockPlayer attachedPlayer = null;
 
+        BestiaryData bestiaryData = new BestiaryData();
+
         public PlayerBestiary(Map<String, Integer> mobs) {
             this.mobs = mobs;
         }
@@ -100,8 +102,7 @@ public Integer getAmount(List<BestiaryMob> mobs) {
             return kills;
         }
 
-        public List<String> getDisplay(List<String> lore, int kills, BestiaryMob mob, BestiaryEntry bestiaryEntry) {
-            BestiaryData bestiaryData = new BestiaryData();
+        public List<String> getMobDisplay(List<String> lore, int kills, BestiaryMob mob, BestiaryEntry bestiaryEntry) {
 
             int bracket = mob.getBestiaryBracket();
             int tier = bestiaryData.getCurrentBestiaryTier(mob, kills);
@@ -171,5 +172,72 @@ public List<String> getDisplay(List<String> lore, int kills, BestiaryMob mob, Be
 
             return lore;
         }
+
+        public List<String> getTotalDisplay(List<String> lore) {
+
+            List<BestiaryEntry> allEntries = new ArrayList<>();
+            double totalFamilies = 0;
+            double familiesFound = 0;
+            double familiesCompleted = 0;
+
+            String baseLoadingBar = "─────────────────";
+            int maxBarLength = baseLoadingBar.length();
+            int formattingCodeLength = 4;
+
+            for (BestiaryCategories category : BestiaryCategories.values()) {
+                allEntries.addAll(Arrays.asList(category.getEntries()));
+            }
+
+            totalFamilies = allEntries.size();
+
+            for (BestiaryEntry entry : allEntries) {
+                int kills = getAmount(entry.getMobs());
+                if (kills > 0) familiesFound++;
+                if (kills >= bestiaryData.getTotalKillsForMaxTier(entry.getMobs().getFirst())) familiesCompleted++;
+            }
+
+            lore.add("§7The Bestiary is a compendium of");
+            lore.add("§7mobs in SkyBlock. It contains detailed");
+            lore.add("§7information on loot drops, your mob");
+            lore.add("§7stats, and more!");
+            lore.add("");
+            lore.add("§7Kill mobs within §aFamilies §7to progress");
+            lore.add("§7and earn §arewards§7, including §b✯ Magic");
+            lore.add("§bFind §7bonuses towards mobs in the");
+            lore.add("§7Family.");
+            lore.add("");
+
+            // Families found
+            int unlockedPercentage = (int) (familiesFound / totalFamilies * 100);
+            if (familiesFound != totalFamilies) {
+                lore.add("§7Families Found: §e" + unlockedPercentage + "%");
+            } else {
+                lore.add("§7Families Found: §e" + unlockedPercentage + "% §7(§c§lMAX!§7)");
+            }
+
+            int completedLength = (int) Math.round((familiesFound / totalFamilies) * maxBarLength);
+
+            String completedLoadingBar = "§3§m" + baseLoadingBar.substring(0, Math.min(completedLength, maxBarLength));
+            String uncompletedLoadingBar = "§f§m" + baseLoadingBar.substring(Math.min(completedLoadingBar.length() - formattingCodeLength, maxBarLength));
+
+            lore.add(completedLoadingBar + uncompletedLoadingBar + "§r §b" + StringUtility.commaify(familiesFound) + "§3/§b" + StringUtility.shortenNumber(totalFamilies));
+            lore.add("");
+
+            // Families completed
+            int totalUnlockedPercentage = (int) (familiesCompleted / totalFamilies * 100);
+            if (familiesCompleted != totalFamilies) {
+                lore.add("§7Families Completed: §e" + totalUnlockedPercentage + "%");
+            } else {
+                lore.add("§7Families Completed: §e" + totalUnlockedPercentage + "% §7(§c§lMAX!§7)");
+            }
+
+            int totalCompletedLength = (int) Math.round((familiesCompleted / totalFamilies) * maxBarLength);
+            String totalCompletedBar = "§3§m" + baseLoadingBar.substring(0, Math.min(totalCompletedLength, maxBarLength));
+            String totalUncompletedBar = "§f§m" + baseLoadingBar.substring(Math.min(totalCompletedBar.length() - formattingCodeLength, maxBarLength));
+
+            lore.add(totalCompletedBar + totalUncompletedBar + "§r §b" + StringUtility.commaify(familiesCompleted) + "§3/§b" + StringUtility.shortenNumber(totalFamilies));
+
+            return lore;
+        }
     }
 }
diff --git a/type.generic/src/main/java/net/swofty/types/generic/event/actions/player/fall/ActionPlayerVoid.java b/type.generic/src/main/java/net/swofty/types/generic/event/actions/player/fall/ActionPlayerVoid.java
@@ -15,11 +15,8 @@ public class ActionPlayerVoid implements SkyBlockEventClass {
     public void run(PlayerMoveEvent event) {
         final SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer();
 
-        if (player.getPosition().y() <= -1) {
-            player.damage(DamageType.OUT_OF_WORLD, 1000000000);
-
-            if (player.getGameMode() == GameMode.CREATIVE)
-                player.sendTo(SkyBlockConst.getTypeLoader().getType());
+        if (player.getPosition().y() < 0 && player.getGameMode() != GameMode.CREATIVE && player.getGameMode() != GameMode.SPECTATOR) {
+            player.kill();
         }
     }
 }
diff --git a/type.generic/src/main/java/net/swofty/types/generic/gui/inventory/inventories/sbmenu/bestiary/BestiaryCategory.java b/type.generic/src/main/java/net/swofty/types/generic/gui/inventory/inventories/sbmenu/bestiary/BestiaryCategory.java
@@ -2,7 +2,6 @@
 
 import lombok.Getter;
 import net.minestom.server.item.Material;
-import net.swofty.commons.item.ItemType;
 import net.swofty.types.generic.entity.mob.BestiaryMob;
 import net.swofty.types.generic.entity.mob.mobs.hub.MobGraveyardZombie;
 import net.swofty.types.generic.entity.mob.mobs.hub.MobGraveyardZombieVillager;
diff --git a/type.generic/src/main/java/net/swofty/types/generic/gui/inventory/inventories/sbmenu/bestiary/GUIBestiary.java b/type.generic/src/main/java/net/swofty/types/generic/gui/inventory/inventories/sbmenu/bestiary/GUIBestiary.java
@@ -15,6 +15,9 @@
 import net.swofty.types.generic.skill.SkillCategories;
 import net.swofty.types.generic.user.SkyBlockPlayer;
 
+import java.util.ArrayList;
+import java.util.List;
+
 
 public class GUIBestiary extends SkyBlockInventoryGUI {
 
@@ -73,21 +76,10 @@ public void onOpen(InventoryGUIOpenEvent e) {
         set(new GUIItem(4) {
             @Override
             public ItemStack.Builder getItem(SkyBlockPlayer player) {
-                return ItemStackCreator.getStack("§3Bestiary", Material.WRITTEN_BOOK, 1,
-                        "§7The Bestiary is a compendium of",
-                        "§7mobs in SkyBlock. It contains detailed",
-                        "§7information on loot drops, your mob",
-                        "§7stats, and more!",
-                        " ",
-                        "§7Kill mobs within §aFamilies §7to progress",
-                        "§7and earn §arewards§7, including §b✯ Magic",
-                        "§bFind §7bonuses towards mobs in the",
-                        "§7Family.",
-                        " ",
-                        "§c§lHERE PROGRESS BAR",
-                        " ",
-                        "§eClick to view!"
-                );
+                List<String> lore = new ArrayList<>();
+                player.getBestiaryData().getTotalDisplay(lore);
+
+                return ItemStackCreator.getStack("§3Bestiary", Material.WRITTEN_BOOK, 1, lore);
             }
         });
         BestiaryRegions[] allBestiaryRegions = BestiaryRegions.values();
diff --git a/type.generic/src/main/java/net/swofty/types/generic/gui/inventory/inventories/sbmenu/bestiary/GUIBestiaryIsland.java b/type.generic/src/main/java/net/swofty/types/generic/gui/inventory/inventories/sbmenu/bestiary/GUIBestiaryIsland.java
@@ -121,7 +121,7 @@ public void run(InventoryPreClickEvent e, SkyBlockPlayer player) {
                     public ItemStack.Builder getItem(SkyBlockPlayer player) {
                         ArrayList<String> lore = new ArrayList<>();
 
-                        player.getBestiaryData().getDisplay(lore, kills, mob, bestiaryEntry);
+                        player.getBestiaryData().getMobDisplay(lore, kills, mob, bestiaryEntry);
 
                         lore.add("§eClick to view!");
 
diff --git a/type.generic/src/main/java/net/swofty/types/generic/gui/inventory/inventories/sbmenu/bestiary/GUIBestiaryMob.java b/type.generic/src/main/java/net/swofty/types/generic/gui/inventory/inventories/sbmenu/bestiary/GUIBestiaryMob.java
@@ -67,7 +67,7 @@ public ItemStack.Builder getItem(SkyBlockPlayer player) {
                 int kills = getPlayer().getBestiaryData().getAmount(bestiaryEntry.getMobs());
                 int tier = bestiaryData.getCurrentBestiaryTier(mob, kills);
 
-                player.getBestiaryData().getDisplay(lore, kills, mob, bestiaryEntry);
+                player.getBestiaryData().getMobDisplay(lore, kills, mob, bestiaryEntry);
 
                 if (bestiaryEntry.getMaterial() == Material.PLAYER_HEAD) {
                     return ItemStackCreator.getStackHead("§a" + bestiaryEntry.getName() + " " + StringUtility.getAsRomanNumeral(tier),
diff --git a/type.generic/src/main/java/net/swofty/types/generic/gui/inventory/inventories/sbmenu/skills/GUISkillCategory.java b/type.generic/src/main/java/net/swofty/types/generic/gui/inventory/inventories/sbmenu/skills/GUISkillCategory.java
@@ -53,21 +53,12 @@ public void run(InventoryPreClickEvent e, SkyBlockPlayer player) {
 
                 @Override
                 public ItemStack.Builder getItem(SkyBlockPlayer player) {
-                    return ItemStackCreator.getStack("§3Bestiary", Material.WRITTEN_BOOK, 1,
-                            "§7The Bestiary is a compendium of",
-                            "§7mobs in SkyBlock. It contains detailed",
-                            "§7information on loot drops, your mob",
-                            "§7stats, and more!",
-                            " ",
-                            "§7Kill mobs within §aFamilies §7to progress",
-                            "§7and earn §arewards§7, including §b✯ Magic",
-                            "§bFind §7bonuses towards mobs in the",
-                            "§7Family.",
-                            " ",
-                            "§c§lHERE PROGRESS BAR",
-                            " ",
-                            "§eClick to view!"
-                            );
+                    ArrayList<String> lore = new ArrayList<>();
+                    player.getBestiaryData().getTotalDisplay(lore);
+                    lore.add("");
+                    lore.add("§eClick to view!");
+
+                    return ItemStackCreator.getStack("§3Bestiary", Material.WRITTEN_BOOK, 1, lore);
                 }
             });
         }
diff --git a/type.generic/src/main/java/net/swofty/types/generic/user/SkyBlockPlayer.java b/type.generic/src/main/java/net/swofty/types/generic/user/SkyBlockPlayer.java
@@ -756,16 +756,15 @@ public void kill() {
         setHealth(getMaxHealth());
         sendTo(SkyBlockConst.getTypeLoader().getType());
 
-        if (SkyBlockConst.isIslandServer()) return;
-
         DeathMessageCreator creator = new DeathMessageCreator(this.lastDamage);
-
         sendMessage("§c☠ §7You " + creator.createPersonal());
 
         getDeathData().increase(this.lastDamage, 1);
 
         playSound(Sound.sound(Key.key("block.anvil.fall"), Sound.Source.PLAYER, 1.0f, 2.0f));
 
+        if (SkyBlockConst.isIslandServer()) return;
+
         if (!isBoosterCookieActive()) {
             sendMessage("§cYou died and lost " + StringUtility.decimalify(getCoins() / 2, 1) + " coins!");
             setCoins(getCoins() / 2);

Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,8 @@ public class ActionPlayerVoid implements SkyBlockEventClass {`
`15`	`15`	`public void run(PlayerMoveEvent event) {`
`16`	`16`	`final SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer();`
`17`	`17`
`18`		`- if (player.getPosition().y() <= -1) {`
`19`		`- player.damage(DamageType.OUT_OF_WORLD, 1000000000);`
`20`		`-`
`21`		`- if (player.getGameMode() == GameMode.CREATIVE)`
`22`		`- player.sendTo(SkyBlockConst.getTypeLoader().getType());`
	`18`	`+ if (player.getPosition().y() < 0 && player.getGameMode() != GameMode.CREATIVE && player.getGameMode() != GameMode.SPECTATOR) {`
	`19`	`+ player.kill();`
`23`	`20`	`}`
`24`	`21`	`}`
`25`	`22`	`}`