feat added GUIBestiaryMob

ItzKatze · ItzKatze · commit dfd5611aa776 · 2025-07-12T14:19:37.000+02:00
diff --git a/type.generic/src/main/java/net/swofty/types/generic/data/DataHandler.java b/type.generic/src/main/java/net/swofty/types/generic/data/DataHandler.java
@@ -303,21 +303,10 @@ public enum Data {
         }, (player, datapoint) -> {
             player.setGameMode((GameMode) datapoint.getValue());
         }, (player) -> new DatapointGamemode("gamemode", player.getGameMode())),
-
-
-
-
         EXPERIENCE("experience", false, false, false, DatapointLong.class, new DatapointLong("experience", 0L), (player, datapoint) -> {
         }, (player, datapoint) -> {
-            //set the exp and levels here (deserializing, onLoad)
             player.setExperience((Long) datapoint.getValue());
-        }, (player) -> {
-            //return a new DatapointLong with the total exp amount (serializing, onQuit)
-            return new DatapointLong("experience", player.getExperience());
-        }),
-
-
-
+        }, (player) -> new DatapointLong("experience", player.getExperience())),
         BAZAAR_ORDERS("bazaar_orders", false, false, false, DatapointStringList.class, new DatapointStringList("bazaar_orders")),
         MISSION_DATA("mission_data", false, false, false, DatapointMissionData.class, new DatapointMissionData("mission_data", new MissionData()), (player, datapoint) -> {
         }, (player, datapoint) -> {
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
@@ -5,14 +5,17 @@
 import lombok.Setter;
 import net.swofty.commons.StringUtility;
 import net.swofty.commons.protocol.Serializer;
+import net.swofty.types.generic.bestiary.BestiaryData;
 import net.swofty.types.generic.data.Datapoint;
 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.BestiaryEntry;
 import net.swofty.types.generic.skill.SkillCategories;
 import net.swofty.types.generic.user.SkyBlockPlayer;
 import org.json.JSONObject;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -99,41 +102,61 @@ public Integer getAmount(List<BestiaryMob> mobs) {
             return kills;
         }
 
-        public List<String> getDisplay(List<String> lore, double currentProgress, double currentRequirement, double totalKills, double totalRequirement, String prefix) {
+        public List<String> getDisplay(List<String> lore, int kills, BestiaryMob mob, BestiaryEntry bestiaryEntry) {
+            BestiaryData bestiaryData = new BestiaryData();
+
+            int bracket = mob.getBestiaryBracket();
+            int tier = bestiaryData.getCurrentBestiaryTier(mob, kills);
+            double currentProgress = bestiaryData.getKillsToNextTier(mob, kills);
+            double currentRequirement = bestiaryData.getTotalKillsForNextTier(bracket, tier + 1);
+            double totalRequirement = bestiaryData.getTotalKillsForMaxTier(mob);
+
+            lore.add("§7" + bestiaryEntry.getDescription());
+            lore.add("");
+            lore.add("§7Kills: §a" + kills);
+            lore.add("§7Deaths: §a TO BE DONE"); //TODO add datapoint for amount of deaths
+            lore.add("");
+
+            if (tier > 0) {
+                bestiaryData.getTotalBonuses(lore, bestiaryEntry.getName(), tier);
+                lore.add("");
+            }
 
             // Current tier progress
             int unlockedPercentage = (int) (currentProgress / currentRequirement * 100);
-            lore.add("§7" + prefix + " §b" + unlockedPercentage + "%");
+            lore.add("§7Progress to Tier " + StringUtility.getAsRomanNumeral(tier + 1) + " §b" + unlockedPercentage + "%");
 
             String baseLoadingBar = "─────────────────";
             int maxBarLength = baseLoadingBar.length();
             int completedLength = (int) Math.round((currentProgress / currentRequirement) * maxBarLength);
 
             String completedLoadingBar = "§3§m" + baseLoadingBar.substring(0, Math.min(completedLength, maxBarLength));
             int formattingCodeLength = 4;
-            String uncompletedLoadingBar = "§f§m" + baseLoadingBar.substring(Math.min(
-                    completedLoadingBar.length() - formattingCodeLength,
-                    maxBarLength
-            ));
+            String uncompletedLoadingBar = "§f§m" + baseLoadingBar.substring(Math.min(completedLoadingBar.length() - formattingCodeLength, maxBarLength));
 
-            lore.add(completedLoadingBar + uncompletedLoadingBar + "§r §b" +
-                    StringUtility.commaify(currentProgress) + "§3/§b" + StringUtility.shortenNumber(currentRequirement));
+            lore.add(completedLoadingBar + uncompletedLoadingBar + "§r §b" + StringUtility.commaify(currentProgress) + "§3/§b" + StringUtility.shortenNumber(currentRequirement));
 
             lore.add("");
 
             // Total kill progress*
-            int totalUnlockedPercentage = (int) (totalKills / totalRequirement * 100);
+            int totalUnlockedPercentage = (int) (kills / totalRequirement * 100);
             lore.add("§7Overall Progress: §b" + totalUnlockedPercentage + "%");
 
-            int totalCompletedLength = (int) Math.round((totalKills / totalRequirement) * maxBarLength);
+            int totalCompletedLength = (int) Math.round((kills / totalRequirement) * maxBarLength);
             String totalCompletedBar = "§3§m" + baseLoadingBar.substring(0, Math.min(totalCompletedLength, maxBarLength));
-            String totalUncompletedBar = "§f§m" + baseLoadingBar.substring(Math.min(
-                    totalCompletedBar.length() - formattingCodeLength,
-                    maxBarLength
-            ));
+            String totalUncompletedBar = "§f§m" + baseLoadingBar.substring(Math.min(totalCompletedBar.length() - formattingCodeLength, maxBarLength));
+
+            lore.add(totalCompletedBar + totalUncompletedBar + "§r §b" + StringUtility.commaify(kills) + "§3/§b" + StringUtility.shortenNumber(totalRequirement));
 
-            lore.add(totalCompletedBar + totalUncompletedBar + "§r §b" +
-                    StringUtility.commaify(totalKills) + "§3/§b" + StringUtility.shortenNumber(totalRequirement));
+            if (mob.getMaxBestiaryTier() > tier) {
+                lore.add("§8Capped at Tier " + StringUtility.getAsRomanNumeral(mob.getMaxBestiaryTier()));
+                lore.add("");
+            }
+
+            if (tier < mob.getMaxBestiaryTier()) {
+                bestiaryData.getNextBonuses(lore, bestiaryEntry.getName(), tier + 1);
+                lore.add("");
+            }
 
             return lore;
         }
diff --git a/type.generic/src/main/java/net/swofty/types/generic/entity/mob/BestiaryMob.java b/type.generic/src/main/java/net/swofty/types/generic/entity/mob/BestiaryMob.java
@@ -1,6 +1,7 @@
 package net.swofty.types.generic.entity.mob;
 
 import net.minestom.server.entity.EntityType;
+import net.minestom.server.item.Material;
 
 public abstract class BestiaryMob extends SkyBlockMob {
     public BestiaryMob(EntityType entityType) {
@@ -10,4 +11,6 @@ public BestiaryMob(EntityType entityType) {
     public abstract int getMaxBestiaryTier();
     public abstract int getBestiaryBracket();
     public abstract String getMobID();
+    public abstract Material getDisplayItem();
+    public abstract String getTexture();
 }
diff --git a/type.generic/src/main/java/net/swofty/types/generic/entity/mob/mobs/hub/MobGraveyardZombie.java b/type.generic/src/main/java/net/swofty/types/generic/entity/mob/mobs/hub/MobGraveyardZombie.java
@@ -5,6 +5,7 @@
 import net.minestom.server.entity.ai.GoalSelector;
 import net.minestom.server.entity.ai.TargetSelector;
 import net.minestom.server.entity.ai.target.LastEntityDamagerTarget;
+import net.minestom.server.item.Material;
 import net.minestom.server.utils.time.TimeUnit;
 import net.swofty.commons.item.ItemType;
 import net.swofty.commons.statistics.ItemStatistic;
@@ -118,6 +119,16 @@ public String getMobID() {
         return "1_graveyard_zombie";
     }
 
+    @Override
+    public Material getDisplayItem() {
+        return Material.ZOMBIE_HEAD;
+    }
+
+    @Override
+    public String getTexture() {
+        return "";
+    }
+
     @Override
     public List<Populator> getPopulators() {
         return Arrays.asList(
diff --git a/type.generic/src/main/java/net/swofty/types/generic/entity/mob/mobs/hub/MobGraveyardZombieVillager.java b/type.generic/src/main/java/net/swofty/types/generic/entity/mob/mobs/hub/MobGraveyardZombieVillager.java
@@ -5,6 +5,7 @@
 import net.minestom.server.entity.ai.GoalSelector;
 import net.minestom.server.entity.ai.TargetSelector;
 import net.minestom.server.entity.ai.target.LastEntityDamagerTarget;
+import net.minestom.server.item.Material;
 import net.minestom.server.utils.time.TimeUnit;
 import net.swofty.commons.item.ItemType;
 import net.swofty.commons.statistics.ItemStatistic;
@@ -120,6 +121,16 @@ public String getMobID() {
         return "1_graveyard_zombie_villager";
     }
 
+    @Override
+    public Material getDisplayItem() {
+        return Material.PLAYER_HEAD;
+    }
+
+    @Override
+    public String getTexture() {
+        return "69198f410a10f99314aa0fbe9a3db10697bbc1c011f019507d96673c64217f5a";
+    }
+
     @Override
     public List<Populator> getPopulators() {
         return Arrays.asList(
diff --git a/type.generic/src/main/java/net/swofty/types/generic/entity/mob/mobs/hub/MobRuinsOldWolf.java b/type.generic/src/main/java/net/swofty/types/generic/entity/mob/mobs/hub/MobRuinsOldWolf.java
@@ -5,6 +5,7 @@
 import net.minestom.server.entity.ai.GoalSelector;
 import net.minestom.server.entity.ai.TargetSelector;
 import net.minestom.server.entity.ai.target.LastEntityDamagerTarget;
+import net.minestom.server.item.Material;
 import net.minestom.server.utils.time.TimeUnit;
 import net.swofty.commons.item.ItemType;
 import net.swofty.commons.statistics.ItemStatistic;
@@ -126,4 +127,14 @@ public int getBestiaryBracket() {
     public String getMobID() {
         return "50_ruins_old_wolf";
     }
+
+    @Override
+    public Material getDisplayItem() {
+        return Material.PLAYER_HEAD;
+    }
+
+    @Override
+    public String getTexture() {
+        return "d359537c15534f61c1cd886bc118774ed22280e7cdab6613870160aad4ca39";
+    }
 }
diff --git a/type.generic/src/main/java/net/swofty/types/generic/entity/mob/mobs/hub/MobRuinsWolf.java b/type.generic/src/main/java/net/swofty/types/generic/entity/mob/mobs/hub/MobRuinsWolf.java
@@ -5,6 +5,7 @@
 import net.minestom.server.entity.ai.GoalSelector;
 import net.minestom.server.entity.ai.TargetSelector;
 import net.minestom.server.entity.ai.target.LastEntityDamagerTarget;
+import net.minestom.server.item.Material;
 import net.minestom.server.utils.time.TimeUnit;
 import net.swofty.commons.item.ItemType;
 import net.swofty.commons.statistics.ItemStatistic;
@@ -126,4 +127,14 @@ public int getBestiaryBracket() {
     public String getMobID() {
         return "15_ruins_wolf";
     }
+
+    @Override
+    public Material getDisplayItem() {
+        return Material.PLAYER_HEAD;
+    }
+
+    @Override
+    public String getTexture() {
+        return "f4cb7a6bf6c32c49f2589147e6f0f888e9e35875dd1ea2a8af379ca710589e6b";
+    }
 }
diff --git a/type.generic/src/main/java/net/swofty/types/generic/entity/mob/mobs/island/MobZombie_1.java b/type.generic/src/main/java/net/swofty/types/generic/entity/mob/mobs/island/MobZombie_1.java
@@ -5,6 +5,7 @@
 import net.minestom.server.entity.ai.GoalSelector;
 import net.minestom.server.entity.ai.TargetSelector;
 import net.minestom.server.entity.ai.target.LastEntityDamagerTarget;
+import net.minestom.server.item.Material;
 import net.minestom.server.utils.time.TimeUnit;
 import net.swofty.commons.item.ItemType;
 import net.swofty.commons.statistics.ItemStatistic;
@@ -114,6 +115,16 @@ public String getMobID() {
         return "1_zombie";
     }
 
+    @Override
+    public Material getDisplayItem() {
+        return Material.ZOMBIE_HEAD;
+    }
+
+    @Override
+    public String getTexture() {
+        return "";
+    }
+
     @Override
     public List<Populator> getPopulators() {
         return Arrays.asList(
diff --git a/type.generic/src/main/java/net/swofty/types/generic/entity/mob/mobs/island/MobZombie_2.java b/type.generic/src/main/java/net/swofty/types/generic/entity/mob/mobs/island/MobZombie_2.java
@@ -0,0 +1,36 @@
+package net.swofty.types.generic.entity.mob.mobs.island;
+
+import lombok.NonNull;
+import net.minestom.server.entity.EntityType;
+import net.minestom.server.entity.ai.GoalSelector;
+import net.minestom.server.entity.ai.TargetSelector;
+import net.minestom.server.entity.ai.target.LastEntityDamagerTarget;
+import net.minestom.server.utils.time.TimeUnit;
+import net.swofty.commons.item.ItemType;
+import net.swofty.commons.statistics.ItemStatistic;
+import net.swofty.commons.statistics.ItemStatistics;
+import net.swofty.types.generic.entity.mob.BestiaryMob;
+import net.swofty.types.generic.entity.mob.ai.MeleeAttackWithinRegionGoal;
+import net.swofty.types.generic.entity.mob.ai.RandomRegionStrollGoal;
+import net.swofty.types.generic.entity.mob.impl.RegionPopulator;
+import net.swofty.types.generic.loottable.OtherLoot;
+import net.swofty.types.generic.loottable.SkyBlockLootTable;
+import net.swofty.types.generic.region.RegionType;
+import net.swofty.types.generic.skill.SkillCategories;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class MobZombie_2 extends MobZombie_1 {
+    @Override
+    public Integer getLevel() {
+        return 2;
+    }
+
+    @Override
+    public String getMobID() {
+        return "2_zombie";
+    }
+}
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
@@ -9,13 +9,14 @@
 import net.swofty.types.generic.entity.mob.mobs.hub.MobRuinsOldWolf;
 import net.swofty.types.generic.entity.mob.mobs.hub.MobRuinsWolf;
 import net.swofty.types.generic.entity.mob.mobs.island.MobZombie_1;
+import net.swofty.types.generic.entity.mob.mobs.island.MobZombie_2;
 
 import java.util.List;
 
 public enum BestiaryCategory {;
     @Getter
     public enum PRIVATE_ISLAND implements BestiaryEntry {
-        ZOMBIE("§aZombie", "Brains.", Material.ZOMBIE_HEAD,"", List.of(new MobZombie_1())),
+        ZOMBIE("§aZombie", "Brains.", Material.ZOMBIE_HEAD,"", List.of(new MobZombie_1(), new MobZombie_2())),
         ;
 
         private final String name, description, texture;
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
@@ -27,8 +27,8 @@ public class GUIBestiary extends SkyBlockInventoryGUI {
 
     @Getter
     private enum BestiaryRegions {
-        YOUR_ISLAND("§aYour Island", Material.PLAYER_HEAD, "c9c8881e42915a9d29bb61a16fb26d059913204d265df5b439b3d792acd56", new GUIBestiaryMob(BestiaryCategories.YOUR_ISLAND),"§7View all of the mobs that you've", "§7found and killed on §aYour Island§7."),
-        HUB("§aHub", Material.PLAYER_HEAD, "d7cc6687423d0570d556ac53e0676cb563bbdd9717cd8269bdebed6f6d4e7bf8", new GUIBestiaryMob(BestiaryCategories.HUB), "§7View all of the mobs that you've", "§7found and killed in the §aHub§7."),
+        YOUR_ISLAND("§aYour Island", Material.PLAYER_HEAD, "c9c8881e42915a9d29bb61a16fb26d059913204d265df5b439b3d792acd56", new GUIBestiaryIsland(BestiaryCategories.YOUR_ISLAND),"§7View all of the mobs that you've", "§7found and killed on §aYour Island§7."),
+        HUB("§aHub", Material.PLAYER_HEAD, "d7cc6687423d0570d556ac53e0676cb563bbdd9717cd8269bdebed6f6d4e7bf8", new GUIBestiaryIsland(BestiaryCategories.HUB), "§7View all of the mobs that you've", "§7found and killed in the §aHub§7."),
         THE_FARMING_ISLANDS("§aThe Farming Islands", Material.PLAYER_HEAD, "4d3a6bd98ac1833c664c4909ff8d2dc62ce887bdcf3cc5b3848651ae5af6b", null, "§7View all of the mobs that you've", "§7found and killed in §aThe Farming", "§aIslands§7."),
         GARDEN("§bGarden", Material.PLAYER_HEAD, "f4880d2c1e7b86e87522e20882656f45bafd42f94932b2c5e0d6ecaa490cb4c", null, "§7View all of the §6Pests §7that you've", "§7killed on the §bGarden§7."),
         SPIDERS_DEN("§cSpider's Den", Material.PLAYER_HEAD, "c754318a3376f470e481dfcd6c83a59aa690ad4b4dd7577fdad1c2ef08d8aee6", null, "§7View all of the mobs that you've", "§7found and killed in the §cSpider's Den§7."),
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
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
