Merge pull request #538 from ItzKatze/master

GUIMaterial & little Stats Menus improvements

Author: Swofty-Developments

type.generic/src/main/java/net/swofty/type/generic/gui/inventory/item/GUIMaterial.java

@@ -0,0 +1,18 @@
+package net.swofty.type.generic.gui.inventory.item;
+
+import net.minestom.server.item.Material;
+import org.jetbrains.annotations.Nullable;
+
+public record GUIMaterial(Material material, @Nullable String texture) {
+    public GUIMaterial(Material material) {
+        this(material, null);
+    }
+
+    public GUIMaterial(@Nullable String texture) {
+        this(Material.PLAYER_HEAD, texture);
+    }
+
+    public boolean hasTexture() {
+        return texture != null && !texture.isEmpty();
+    }
+}

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/chest/DoubleChest.java

@@ -6,6 +6,7 @@
 import net.minestom.server.inventory.InventoryType;
 import net.minestom.server.item.ItemStack;
 import net.minestom.server.tag.Tag;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -14,7 +15,7 @@
 
 public class DoubleChest implements Chest {
 
-    private static final Tag<List<ItemStack>> ITEMS_TAG = Tag.ItemStack("configuration/skyblock/items").list();
+    private static final Tag<@NotNull List<ItemStack>> ITEMS_TAG = Tag.ItemStack("configuration/skyblock/items").list();
     private final Instance instance;
     private final Point leftPosition;
     private final Point rightPosition;

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/chest/SingleChest.java

@@ -5,13 +5,14 @@
 import net.minestom.server.inventory.InventoryType;
 import net.minestom.server.item.ItemStack;
 import net.minestom.server.tag.Tag;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Arrays;
 import java.util.List;
 
 public class SingleChest implements Chest {
 
-    private static final Tag<List<ItemStack>> ITEMS_TAG = Tag.ItemStack("configuration/skyblock/items").list();
+    private static final Tag<@NotNull List<ItemStack>> ITEMS_TAG = Tag.ItemStack("configuration/skyblock/items").list();
 
     private final Instance instance;
     private final Point position;

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/entity/mob/BestiaryMob.java

@@ -1,7 +1,7 @@
 package net.swofty.type.skyblockgeneric.entity.mob;
 
 import net.minestom.server.entity.EntityType;
-import net.minestom.server.item.Material;
+import net.swofty.type.generic.gui.inventory.item.GUIMaterial;
 
 public abstract class BestiaryMob extends SkyBlockMob {
     public BestiaryMob(EntityType entityType) {
@@ -11,6 +11,5 @@ public BestiaryMob(EntityType entityType) {
     public abstract int getMaxBestiaryTier();
     public abstract int getBestiaryBracket();
     public abstract String getMobID();
-    public abstract Material getDisplayItem();
-    public abstract String getTexture();
+    public abstract GUIMaterial getGuiMaterial();
 }

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/entity/mob/mobs/hub/MobGraveyardZombie.java

@@ -10,11 +10,13 @@
 import net.swofty.commons.item.ItemType;
 import net.swofty.commons.statistics.ItemStatistic;
 import net.swofty.commons.statistics.ItemStatistics;
+import net.swofty.type.generic.gui.inventory.item.GUIMaterial;
 import net.swofty.type.skyblockgeneric.entity.mob.BestiaryMob;
 import net.swofty.type.skyblockgeneric.entity.mob.ai.ClosestEntityRegionTarget;
 import net.swofty.type.skyblockgeneric.entity.mob.ai.MeleeAttackWithinRegionGoal;
 import net.swofty.type.skyblockgeneric.entity.mob.ai.RandomRegionStrollGoal;
 import net.swofty.type.skyblockgeneric.entity.mob.impl.RegionPopulator;
+import net.swofty.type.skyblockgeneric.gui.inventories.sbmenu.bestiary.GUIBestiaryMob;
 import net.swofty.type.skyblockgeneric.loottable.OtherLoot;
 import net.swofty.type.skyblockgeneric.loottable.SkyBlockLootTable;
 import net.swofty.type.skyblockgeneric.region.RegionType;
@@ -120,13 +122,8 @@ public String getMobID() {
     }
 
     @Override
-    public Material getDisplayItem() {
-        return Material.ZOMBIE_HEAD;
-    }
-
-    @Override
-    public String getTexture() {
-        return "";
+    public GUIMaterial getGuiMaterial() {
+        return new GUIMaterial(Material.ZOMBIE_HEAD);
     }
 
     @Override

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/entity/mob/mobs/hub/MobGraveyardZombieVillager.java

@@ -10,6 +10,7 @@
 import net.swofty.commons.item.ItemType;
 import net.swofty.commons.statistics.ItemStatistic;
 import net.swofty.commons.statistics.ItemStatistics;
+import net.swofty.type.generic.gui.inventory.item.GUIMaterial;
 import net.swofty.type.skyblockgeneric.entity.mob.BestiaryMob;
 import net.swofty.type.skyblockgeneric.entity.mob.ai.ClosestEntityRegionTarget;
 import net.swofty.type.skyblockgeneric.entity.mob.ai.MeleeAttackWithinRegionGoal;
@@ -122,13 +123,8 @@ public String getMobID() {
     }
 
     @Override
-    public Material getDisplayItem() {
-        return Material.PLAYER_HEAD;
-    }
-
-    @Override
-    public String getTexture() {
-        return "69198f410a10f99314aa0fbe9a3db10697bbc1c011f019507d96673c64217f5a";
+    public GUIMaterial getGuiMaterial() {
+        return new GUIMaterial("69198f410a10f99314aa0fbe9a3db10697bbc1c011f019507d96673c64217f5a");
     }
 
     @Override

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/entity/mob/mobs/hub/MobRuinsOldWolf.java

@@ -10,6 +10,7 @@
 import net.swofty.commons.item.ItemType;
 import net.swofty.commons.statistics.ItemStatistic;
 import net.swofty.commons.statistics.ItemStatistics;
+import net.swofty.type.generic.gui.inventory.item.GUIMaterial;
 import net.swofty.type.skyblockgeneric.entity.mob.BestiaryMob;
 import net.swofty.type.skyblockgeneric.entity.mob.ai.ClosestEntityRegionTarget;
 import net.swofty.type.skyblockgeneric.entity.mob.ai.MeleeAttackWithinRegionGoal;
@@ -128,12 +129,7 @@ public String getMobID() {
     }
 
     @Override
-    public Material getDisplayItem() {
-        return Material.PLAYER_HEAD;
-    }
-
-    @Override
-    public String getTexture() {
-        return "d359537c15534f61c1cd886bc118774ed22280e7cdab6613870160aad4ca39";
+    public GUIMaterial getGuiMaterial() {
+        return new GUIMaterial("d359537c15534f61c1cd886bc118774ed22280e7cdab6613870160aad4ca39");
     }
 }

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/entity/mob/mobs/hub/MobRuinsWolf.java

@@ -10,6 +10,7 @@
 import net.swofty.commons.item.ItemType;
 import net.swofty.commons.statistics.ItemStatistic;
 import net.swofty.commons.statistics.ItemStatistics;
+import net.swofty.type.generic.gui.inventory.item.GUIMaterial;
 import net.swofty.type.skyblockgeneric.entity.mob.BestiaryMob;
 import net.swofty.type.skyblockgeneric.entity.mob.ai.ClosestEntityRegionTarget;
 import net.swofty.type.skyblockgeneric.entity.mob.ai.MeleeAttackWithinRegionGoal;
@@ -129,12 +130,7 @@ public String getMobID() {
     }
 
     @Override
-    public Material getDisplayItem() {
-        return Material.PLAYER_HEAD;
-    }
-
-    @Override
-    public String getTexture() {
-        return "f4cb7a6bf6c32c49f2589147e6f0f888e9e35875dd1ea2a8af379ca710589e6b";
+    public GUIMaterial getGuiMaterial() {
+        return new GUIMaterial("f4cb7a6bf6c32c49f2589147e6f0f888e9e35875dd1ea2a8af379ca710589e6b");
     }
 }

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/entity/mob/mobs/island/MobZombie_1.java

@@ -10,6 +10,7 @@
 import net.swofty.commons.item.ItemType;
 import net.swofty.commons.statistics.ItemStatistic;
 import net.swofty.commons.statistics.ItemStatistics;
+import net.swofty.type.generic.gui.inventory.item.GUIMaterial;
 import net.swofty.type.skyblockgeneric.entity.mob.BestiaryMob;
 import net.swofty.type.skyblockgeneric.entity.mob.ai.MeleeAttackWithinRegionGoal;
 import net.swofty.type.skyblockgeneric.entity.mob.ai.RandomRegionStrollGoal;
@@ -114,13 +115,8 @@ public String getMobID() {
     }
 
     @Override
-    public Material getDisplayItem() {
-        return Material.ZOMBIE_HEAD;
-    }
-
-    @Override
-    public String getTexture() {
-        return "";
+    public GUIMaterial getGuiMaterial() {
+        return new GUIMaterial(Material.ZOMBIE_HEAD);
     }
 
     @Override

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/levels/ActionChangeHypixelXP.java

@@ -14,7 +14,6 @@
 
 public class ActionChangeHypixelXP implements HypixelEventClass {
 
-
     @HypixelEvent(node = EventNodes.CUSTOM, requireDataLoaded = true)
     public void run(SkyBlockXPModificationEvent event) {
         if (event.getNewXP() <= event.getOldXP()) return;