diff --git a/commons/src/main/java/net/swofty/commons/skyblock/item/ItemType.java b/commons/src/main/java/net/swofty/commons/skyblock/item/ItemType.java index 7d830e07c..5738ed490 100644 --- a/commons/src/main/java/net/swofty/commons/skyblock/item/ItemType.java +++ b/commons/src/main/java/net/swofty/commons/skyblock/item/ItemType.java @@ -626,6 +626,7 @@ public enum ItemType { GOLDEN_SHOVEL(Material.GOLDEN_SHOVEL, Rarity.COMMON), IRON_SHOVEL(Material.IRON_SHOVEL, Rarity.COMMON), DIAMOND_SHOVEL(Material.DIAMOND_SHOVEL, Rarity.UNCOMMON), + PROMISING_SHOVEL(Material.IRON_SHOVEL, Rarity.UNCOMMON), /** * Bows diff --git a/type.generic/src/main/java/net/swofty/type/generic/data/datapoints/DatapointToggles.java b/type.generic/src/main/java/net/swofty/type/generic/data/datapoints/DatapointToggles.java index 53d1a7801..a9b31da18 100644 --- a/type.generic/src/main/java/net/swofty/type/generic/data/datapoints/DatapointToggles.java +++ b/type.generic/src/main/java/net/swofty/type/generic/data/datapoints/DatapointToggles.java @@ -103,6 +103,10 @@ public enum ToggleType { HAS_SPOKEN_TO_JAX(false), HAS_REALLY_SPOKEN_TO_JAX(false), HAS_SPOKEN_TO_ALCHEMIST(false), + HAS_SPOKEN_TO_BRAMASS_BEASTSLAYER(false), + HAS_SPOKEN_TO_RICK(false), + HAS_SPOKEN_TO_MICHAEL(false), + HAS_SPOKEN_TO_IKE(false), PAPER_ICONS(false), LOBBY_SHOW_PLAYERS(true), AUTO_ACCEPT_QUESTS(false), diff --git a/type.generic/src/main/java/net/swofty/type/generic/entity/npc/NPCOption.java b/type.generic/src/main/java/net/swofty/type/generic/entity/npc/NPCOption.java index b6525654f..4f94b6ec9 100644 --- a/type.generic/src/main/java/net/swofty/type/generic/entity/npc/NPCOption.java +++ b/type.generic/src/main/java/net/swofty/type/generic/entity/npc/NPCOption.java @@ -16,18 +16,39 @@ public class NPCOption { public static final Map options = new HashMap<>(); + private static final Component selectAnOption = Component.text("Select an option:").color(NamedTextColor.YELLOW); - public static void sendOption(HypixelPlayer player, String id, List