Merge pull request #646 from ArikSquad/feat/inventory-v2

Inventory View System

Author: Swofty-Developments

commons/src/main/java/net/swofty/commons/StringUtility.java

@@ -167,8 +167,10 @@ public static String getAsRomanNumeral(int num) {
 	}
 
 	public static String getTextFromComponent(Component component) {
+		if (component == null)
+			throw new IllegalArgumentException("Component cannot be null");
 		if (!(component instanceof TextComponent))
-			throw new IllegalArgumentException("Component must be a TextComponent");
+			throw new IllegalArgumentException("Component must be a TextComponent, but got: " + component.getClass().getSimpleName());
 		return PlainTextComponentSerializer.plainText().serialize(component);
 	}
 

type.deepcaverns/src/main/java/net/swofty/type/deepcaverns/gui/GUIShopWalter.java

@@ -1,13 +1,13 @@
 package net.swofty.type.deepcaverns.gui;
 
 import net.swofty.commons.skyblock.item.ItemType;
-import net.swofty.type.skyblockgeneric.gui.SkyBlockShopGUI;
+import net.swofty.type.skyblockgeneric.gui.ShopView;
 import net.swofty.type.skyblockgeneric.item.SkyBlockItem;
 import net.swofty.type.skyblockgeneric.shop.type.CoinShopPrice;
 
-public class GUIShopWalter extends SkyBlockShopGUI {
+public class GUIShopWalter extends ShopView {
 	public GUIShopWalter() {
-		super("Walter", 1, SINGLE_SLOT);
+		super("Walter", SINGLE_SLOT);
 	}
 
 	@Override

type.deepcaverns/src/main/java/net/swofty/type/deepcaverns/npcs/NPCWalter.java

@@ -50,7 +50,7 @@ public void onClick(NPCInteractEvent event) {
 		if (isInDialogue(player)) return;
 
 		setDialogue(player, "none").thenRun(() -> {
-			MathUtility.delay(() -> new GUIShopWalter().open(player), 20);
+			MathUtility.delay(() -> player.openView(new GUIShopWalter()), 20);
 		});
 	}
 

type.dwarvenmines/src/main/java/net/swofty/type/dwarvenmines/commission/CommissionMilestone.java

@@ -2,6 +2,9 @@
 
 import lombok.Getter;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Getter
 public enum CommissionMilestone {
     TIER_1(1, 5, 100_000, 20, true, false, false, false, false, false),
@@ -58,7 +61,7 @@ public static CommissionMilestone getNextMilestone(int totalCompleted) {
     }
 
     public String[] getRewardDescriptions() {
-        java.util.List<String> rewards = new java.util.ArrayList<>();
+        List<String> rewards = new ArrayList<>();
 
         if (unlocksEmissaries) {
             rewards.add("§7- §aEmissaries");

type.dwarvenmines/src/main/java/net/swofty/type/dwarvenmines/gui/GUIShopLumina.java

@@ -1,13 +1,13 @@
 package net.swofty.type.dwarvenmines.gui;
 
 import net.swofty.commons.skyblock.item.ItemType;
-import net.swofty.type.skyblockgeneric.gui.SkyBlockShopGUI;
+import net.swofty.type.skyblockgeneric.gui.ShopView;
 import net.swofty.type.skyblockgeneric.item.SkyBlockItem;
 import net.swofty.type.skyblockgeneric.shop.type.CoinShopPrice;
 
-public class GUIShopLumina extends SkyBlockShopGUI {
+public class GUIShopLumina extends ShopView {
     public GUIShopLumina() {
-        super("Lumina", 1, DEFAULT);
+        super("Lumina", DEFAULT);
     }
 
     @Override

type.dwarvenmines/src/main/java/net/swofty/type/dwarvenmines/npcs/NPCLumina.java

@@ -46,6 +46,6 @@ public boolean looking(HypixelPlayer player) {
     public void onClick(NPCInteractEvent event) {
         SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer();
 
-        new GUIShopLumina().open(player);
+        player.openView(new GUIShopLumina());
     }
 }

type.generic/build.gradle.kts

@@ -35,6 +35,7 @@ dependencies {
     }
     implementation("dev.hollowcube:polar:1.15.0")
     implementation("org.yaml:snakeyaml:2.2")
+    implementation("it.unimi.dsi:fastutil:8.5.18")
 }
 
 tasks.test {

type.generic/src/main/java/net/swofty/type/generic/achievement/PlayerAchievementHandler.java

@@ -157,6 +157,7 @@ private void onAchievementUnlocked(AchievementDefinition def, AchievementData.Ac
             tierText = " " + toRoman(progress.getCurrentTier());
         }
 
+        // TODO: make this actually clickable to open the achievements menu
         Component tierHover = Component.text(def.getName() + tierText, NamedTextColor.GREEN).appendNewline()
                 .append(Component.text(def.getDescription(), NamedTextColor.GRAY))
                 .appendNewline().appendNewline()

type.generic/src/main/java/net/swofty/type/generic/command/commands/DebugViewCommand.java

@@ -0,0 +1,63 @@
+package net.swofty.type.generic.command.commands;
+
+import net.minestom.server.command.builder.arguments.ArgumentLiteral;
+import net.swofty.type.generic.command.CommandParameters;
+import net.swofty.type.generic.command.HypixelCommand;
+import net.swofty.type.generic.gui.v2.test.*;
+import net.swofty.type.generic.user.HypixelPlayer;
+import net.swofty.type.generic.user.categories.Rank;
+
+import java.util.List;
+import java.util.stream.IntStream;
+
+@CommandParameters(aliases = "debugview", usage = "/debugview", description = "opens a debug view", permission = Rank.STAFF, allowsConsole = false)
+public class DebugViewCommand extends HypixelCommand {
+	@Override
+	public void registerUsage(MinestomCommand command) {
+		command.setDefaultExecutor((commandSender, commands) -> {
+			HypixelPlayer player = (HypixelPlayer) commandSender; // safe cast
+			player.openView(new TestStateView());
+		});
+
+		command.addSyntax(((sender, context) -> {
+			HypixelPlayer player = (HypixelPlayer) sender; // safe cast
+			player.openView(new TestContainerView());
+		}), new ArgumentLiteral("container"));
+
+		command.addSyntax(((sender, context) -> {
+			HypixelPlayer player = (HypixelPlayer) sender; // safe cast
+			player.openView(new TestMixedView());
+		}), new ArgumentLiteral("mixedView"));
+
+		// sharedView
+		command.addSyntax(((sender, context) -> {
+			HypixelPlayer player = (HypixelPlayer) sender; // safe cast
+			TestSharedContainerView.open(player, "a", "a");
+		}), new ArgumentLiteral("sharedView"));
+
+		// sharedState
+		command.addSyntax(((sender, context) -> {
+			HypixelPlayer player = (HypixelPlayer) sender; // safe cast
+			TestSharedStateView.openNew(player, "b");
+		}), new ArgumentLiteral("sharedState"));
+
+		// joinSharedState
+		command.addSyntax(((sender, context) -> {
+			HypixelPlayer player = (HypixelPlayer) sender; // safe cast
+			TestSharedStateView.join(player, "b");
+		}), new ArgumentLiteral("joinSharedState"));
+
+		// noState
+		command.addSyntax(((sender, context) -> {
+			HypixelPlayer player = (HypixelPlayer) sender; // safe cast
+			player.openView(new TestNoStateView());
+		}), new ArgumentLiteral("noState"));
+
+		// paginated
+		command.addSyntax(((sender, context) -> {
+			HypixelPlayer player = (HypixelPlayer) sender; // safe cast
+			List<Integer> oneTo100 = IntStream.rangeClosed(1, 100).boxed().toList();
+			player.openView(new TestPaginatedView(), new TestPaginatedView.State(oneTo100, 1, ""));
+		}), new ArgumentLiteral("paginated"));
+	}
+}

type.generic/src/main/java/net/swofty/type/generic/data/datapoints/DatapointToggles.java

@@ -77,7 +77,6 @@ public enum ToggleType {
             HAS_SPOKEN_TO_TIA(false),
             HAS_SPOKEN_TO_LIFT_OPERATOR(false),
             HAS_SPOKEN_TO_LAZY_MINER(false),
-            HAS_SPOKEN_TO_BAKER(false),
             HAS_SPOKEN_TO_RUSTY(false),
             HAS_SPOKEN_TO_RUSTY_ABOUT_PICKAXE(false),
             HAS_SPOKEN_TO_RUSTY_ABOUT_ABIPHONE(false),