Galatea NPCs and song improvements

commons/src/generated/java/net/swofty/commons/skyblock/item/ItemType.java

@@ -1,8 +1,6 @@
 // AUTO-GENERATED FILE. DO NOT EDIT.
 package net.swofty.commons.skyblock.item;
 
-import java.lang.Exception;
-import java.lang.String;
 import net.minestom.server.item.Material;
 import net.swofty.commons.StringUtility;
 import org.jetbrains.annotations.Nullable;
@@ -876,15 +874,15 @@ public enum ItemType {
 
   DIAMOND_BLOCK(Material.DIAMOND_BLOCK, Rarity.COMMON),
 
-  DIAMOND_BOOTS(Material.DIAMOND_BOOTS, Rarity.RARE),
+  DIAMOND_BOOTS(Material.DIAMOND_BOOTS, Rarity.COMMON),
 
-  DIAMOND_CHESTPLATE(Material.DIAMOND_CHESTPLATE, Rarity.RARE),
+  DIAMOND_CHESTPLATE(Material.DIAMOND_CHESTPLATE, Rarity.COMMON),
 
-  DIAMOND_HELMET(Material.DIAMOND_HELMET, Rarity.RARE),
+  DIAMOND_HELMET(Material.DIAMOND_HELMET, Rarity.COMMON),
 
   DIAMOND_HOE(Material.DIAMOND_HOE, Rarity.COMMON),
 
-  DIAMOND_LEGGINGS(Material.DIAMOND_LEGGINGS, Rarity.RARE),
+  DIAMOND_LEGGINGS(Material.DIAMOND_LEGGINGS, Rarity.COMMON),
 
   DIAMOND_MAGMAFISH(Material.PLAYER_HEAD, Rarity.COMMON),
 

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

@@ -7,6 +7,7 @@
 @Getter
 public enum Songs {
     WILDERNESS(Path.of("./configuration/skyblock/songs/wilderness.nbs")),
+    A_SILENT_MEMOIR(Path.of("./configuration/skyblock/songs/a_silent_memoir.nbs"))
     ;
 
     private final Path path;

configuration/skyblock/Minestom.regions.csv

@@ -83,3 +83,4 @@ fishing_outpost,FISHING_OUTPOST,92,69,-21,166,95,-79,SKYBLOCK_HUB
 museum_1,PLAYER_MUSEUM,25,78,-3,42,71,5,SKYBLOCK_HUB
 museum_2,PLAYER_MUSEUM,21,80,4,38,70,19,SKYBLOCK_HUB
 museum_3,PLAYER_MUSEUM,45,84,24,13,65,53,SKYBLOCK_HUB
+tangleburgs_path,TANGLEBURGS_PATH,-533,107,-32,-560,122,20,SKYBLOCK_GALATEA

configuration/skyblock/songs/SONGS.md

@@ -0,0 +1,7 @@
+# A Silent Memoir
+
+"[skyblock] A Silent Memoir (Galatea)" by Huangwakawaii is licensed under CC BY-SA 4.0
+(https://creativecommons.org/licenses/by-sa/4.0)
+https://noteblock.world/song/L0PqKZeKpk
+
+Originally composed by ShinkoNet for the Hypixel Network

type.bedwarslobby/src/main/java/net/swofty/type/bedwarslobby/gui/GUILeaderboardSettings.java

@@ -167,7 +167,7 @@ public ItemStack.Builder getItem(HypixelPlayer player) {
 
 			@Override
 			public void run(InventoryPreClickEvent e, HypixelPlayer player) {
-				player.sendMessage("§cThis feature is coming soon!");
+				player.notImplemented();
 			}
 		});
 

type.bedwarslobby/src/main/java/net/swofty/type/bedwarslobby/item/impl/BedWarsMenu.java

@@ -1,13 +1,12 @@
 package net.swofty.type.bedwarslobby.item.impl;
 
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.event.ClickEvent;
 import net.minestom.server.event.item.ItemDropEvent;
 import net.minestom.server.event.trait.CancellableEvent;
 import net.minestom.server.event.trait.PlayerInstanceEvent;
 import net.minestom.server.item.ItemStack;
 import net.minestom.server.item.Material;
 import net.swofty.type.generic.gui.inventory.ItemStackCreator;
+import net.swofty.type.generic.user.HypixelPlayer;
 import net.swofty.type.lobby.item.LobbyItem;
 
 public class BedWarsMenu extends LobbyItem {
@@ -29,8 +28,7 @@ public void onItemDrop(ItemDropEvent event) {
 	@Override
 	public void onItemInteract(PlayerInstanceEvent event) {
 		((CancellableEvent) event).setCancelled(true);
-		event.getPlayer().sendMessage(Component.text("§cThis Feature is not there yet. §aOpen a Pull request HERE to get it added quickly!")
-				.clickEvent(ClickEvent.openUrl("https://github.com/Swofty-Developments/HypixelSkyBlock")));
+		((HypixelPlayer) event.getPlayer()).notImplemented();
 	}
 
 }

type.bedwarslobby/src/main/java/net/swofty/type/bedwarslobby/item/impl/Collectibles.java

@@ -1,13 +1,12 @@
 package net.swofty.type.bedwarslobby.item.impl;
 
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.event.ClickEvent;
 import net.minestom.server.event.item.ItemDropEvent;
 import net.minestom.server.event.trait.CancellableEvent;
 import net.minestom.server.event.trait.PlayerInstanceEvent;
 import net.minestom.server.item.ItemStack;
 import net.minestom.server.item.Material;
 import net.swofty.type.generic.gui.inventory.ItemStackCreator;
+import net.swofty.type.generic.user.HypixelPlayer;
 import net.swofty.type.lobby.item.LobbyItem;
 
 public class Collectibles extends LobbyItem {
@@ -29,8 +28,7 @@ public void onItemDrop(ItemDropEvent event) {
 	@Override
 	public void onItemInteract(PlayerInstanceEvent event) {
 		((CancellableEvent) event).setCancelled(true);
-		event.getPlayer().sendMessage(Component.text("§cThis Feature is not there yet. §aOpen a Pull request HERE to get it added quickly!")
-				.clickEvent(ClickEvent.openUrl("https://github.com/Swofty-Developments/HypixelSkyBlock")));
+		((HypixelPlayer) event.getPlayer()).notImplemented();
 	}
 
 }

type.bedwarslobby/src/main/java/net/swofty/type/bedwarslobby/npcs/NPCDoormanDave.java

@@ -1,7 +1,5 @@
 package net.swofty.type.bedwarslobby.npcs;
 
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.event.ClickEvent;
 import net.minestom.server.coordinate.Pos;
 import net.swofty.type.generic.entity.npc.HypixelNPC;
 import net.swofty.type.generic.entity.npc.configuration.HumanConfiguration;
@@ -44,7 +42,6 @@ public boolean looking(HypixelPlayer player) {
 
 	@Override
 	public void onClick(NPCInteractEvent event) {
-		event.player().sendMessage(Component.text("§cThis Feature is not there yet. §aOpen a Pull request HERE to get it added quickly!")
-				.clickEvent(ClickEvent.openUrl("https://github.com/Swofty-Developments/HypixelSkyBlock")));
+		event.player().notImplemented();
 	}
 }

type.bedwarslobby/src/main/java/net/swofty/type/bedwarslobby/npcs/NPCDream.java

@@ -1,21 +1,18 @@
 package net.swofty.type.bedwarslobby.npcs;
 
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.event.ClickEvent;
 import net.minestom.server.coordinate.Pos;
 import net.swofty.commons.ServerType;
 import net.swofty.commons.StringUtility;
 import net.swofty.commons.UnderstandableProxyServer;
 import net.swofty.proxyapi.ProxyInformation;
 import net.swofty.type.generic.entity.npc.HypixelNPC;
 import net.swofty.type.generic.entity.npc.configuration.HumanConfiguration;
+import net.swofty.type.generic.event.custom.NPCInteractEvent;
 import net.swofty.type.generic.user.HypixelPlayer;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import net.swofty.type.generic.event.custom.NPCInteractEvent;
-
 public class NPCDream extends HypixelNPC {
 	private static List<UnderstandableProxyServer> cacheServers = new ArrayList<>();
 	private static long lastCacheTime = 0;
@@ -71,7 +68,6 @@ public boolean looking(HypixelPlayer player) {
 	@Override
 	public void onClick(NPCInteractEvent event) {
 		event.player().sendMessage("§7You can dream about this :)");
-		event.player().sendMessage(Component.text("§cThis Feature is not there yet. §aOpen a Pull request HERE to get it added quickly!")
-				.clickEvent(ClickEvent.openUrl("https://github.com/Swofty-Developments/HypixelSkyBlock")));
+		event.player().notImplemented();
 	}
 }

type.bedwarslobby/src/main/java/net/swofty/type/bedwarslobby/npcs/NPCHolidayMan.java

@@ -1,13 +1,10 @@
 package net.swofty.type.bedwarslobby.npcs;
 
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.event.ClickEvent;
 import net.minestom.server.coordinate.Pos;
 import net.swofty.type.generic.entity.npc.HypixelNPC;
 import net.swofty.type.generic.entity.npc.configuration.HumanConfiguration;
-import net.swofty.type.generic.user.HypixelPlayer;
-
 import net.swofty.type.generic.event.custom.NPCInteractEvent;
+import net.swofty.type.generic.user.HypixelPlayer;
 
 public class NPCHolidayMan extends HypixelNPC {
 
@@ -46,7 +43,6 @@ public boolean looking(HypixelPlayer player) {
 
 	@Override
 	public void onClick(NPCInteractEvent event) {
-		event.player().sendMessage(Component.text("§cThis Feature is not there yet. §aOpen a Pull request HERE to get it added quickly!")
-				.clickEvent(ClickEvent.openUrl("https://github.com/Swofty-Developments/HypixelSkyBlock")));
+        event.player().notImplemented();
 	}
 }

type.bedwarslobby/src/main/java/net/swofty/type/bedwarslobby/npcs/NPCHypixelStore.java

@@ -1,13 +1,10 @@
 package net.swofty.type.bedwarslobby.npcs;
 
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.event.ClickEvent;
 import net.minestom.server.coordinate.Pos;
 import net.swofty.type.generic.entity.npc.HypixelNPC;
 import net.swofty.type.generic.entity.npc.configuration.HumanConfiguration;
-import net.swofty.type.generic.user.HypixelPlayer;
-
 import net.swofty.type.generic.event.custom.NPCInteractEvent;
+import net.swofty.type.generic.user.HypixelPlayer;
 
 public class NPCHypixelStore extends HypixelNPC {
 
@@ -42,7 +39,6 @@ public boolean looking(HypixelPlayer player) {
 
 	@Override
 	public void onClick(NPCInteractEvent event) {
-		event.player().sendMessage(Component.text("§cThis Feature is not there yet. §aOpen a Pull request HERE to get it added quickly!")
-				.clickEvent(ClickEvent.openUrl("https://github.com/Swofty-Developments/HypixelSkyBlock")));
+        event.player().notImplemented();
 	}
 }

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

@@ -1,14 +1,11 @@
 package net.swofty.type.deepcaverns.npcs;
 
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.event.ClickEvent;
 import net.minestom.server.coordinate.Pos;
-import net.swofty.type.generic.user.HypixelPlayer;
 import net.swofty.type.generic.entity.npc.HypixelNPC;
 import net.swofty.type.generic.entity.npc.configuration.HumanConfiguration;
-import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
-
 import net.swofty.type.generic.event.custom.NPCInteractEvent;
+import net.swofty.type.generic.user.HypixelPlayer;
+import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
 
 public class NPCLapisMiner extends HypixelNPC {
 
@@ -44,7 +41,6 @@ public boolean looking(HypixelPlayer player) {
 	@Override
 	public void onClick(NPCInteractEvent event) {
 		SkyBlockPlayer player = (SkyBlockPlayer) event.player();
-		player.sendMessage(Component.text("§cThis Feature is not there yet. §aOpen a Pull request HERE to get it added quickly!")
-				.clickEvent(ClickEvent.openUrl("https://github.com/Swofty-Developments/HypixelSkyBlock")));
+		player.notImplemented();
 	}
 }

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

@@ -1,14 +1,11 @@
 package net.swofty.type.deepcaverns.npcs;
 
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.event.ClickEvent;
 import net.minestom.server.coordinate.Pos;
-import net.swofty.type.generic.user.HypixelPlayer;
 import net.swofty.type.generic.entity.npc.HypixelNPC;
 import net.swofty.type.generic.entity.npc.configuration.HumanConfiguration;
-import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
-
 import net.swofty.type.generic.event.custom.NPCInteractEvent;
+import net.swofty.type.generic.user.HypixelPlayer;
+import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
 
 public class NPCRedstoneMiner extends HypixelNPC {
 
@@ -44,7 +41,6 @@ public boolean looking(HypixelPlayer player) {
 	@Override
 	public void onClick(NPCInteractEvent event) {
 		SkyBlockPlayer player = (SkyBlockPlayer) event.player();
-		player.sendMessage(Component.text("§cThis Feature is not there yet. §aOpen a Pull request HERE to get it added quickly!")
-				.clickEvent(ClickEvent.openUrl("https://github.com/Swofty-Developments/HypixelSkyBlock")));
+        player.notImplemented();
 	}
 }

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

@@ -1,14 +1,11 @@
 package net.swofty.type.deepcaverns.npcs;
 
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.event.ClickEvent;
 import net.minestom.server.coordinate.Pos;
-import net.swofty.type.generic.user.HypixelPlayer;
 import net.swofty.type.generic.entity.npc.HypixelNPC;
 import net.swofty.type.generic.entity.npc.configuration.HumanConfiguration;
-import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
-
 import net.swofty.type.generic.event.custom.NPCInteractEvent;
+import net.swofty.type.generic.user.HypixelPlayer;
+import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
 
 public class NPCRhys extends HypixelNPC {
 
@@ -44,7 +41,6 @@ public boolean looking(HypixelPlayer player) {
 	@Override
 	public void onClick(NPCInteractEvent event) {
 		SkyBlockPlayer player = (SkyBlockPlayer) event.player();
-		player.sendMessage(Component.text("§cThis Feature is not there yet. §aOpen a Pull request HERE to get it added quickly!")
-				.clickEvent(ClickEvent.openUrl("https://github.com/Swofty-Developments/HypixelSkyBlock")));
+		player.notImplemented();
 	}
 }

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

@@ -1,14 +1,11 @@
 package net.swofty.type.dwarvenmines.npcs;
 
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.event.ClickEvent;
 import net.minestom.server.coordinate.Pos;
-import net.swofty.type.generic.user.HypixelPlayer;
 import net.swofty.type.generic.entity.npc.HypixelNPC;
 import net.swofty.type.generic.entity.npc.configuration.HumanConfiguration;
-import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
-
 import net.swofty.type.generic.event.custom.NPCInteractEvent;
+import net.swofty.type.generic.user.HypixelPlayer;
+import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
 
 public class NPCBubu extends HypixelNPC {
 
@@ -44,7 +41,6 @@ public boolean looking(HypixelPlayer player) {
 	@Override
 	public void onClick(NPCInteractEvent event) {
 		SkyBlockPlayer player = (SkyBlockPlayer) event.player();
-		player.sendMessage(Component.text("§cThis Feature is not there yet. §aOpen a Pull request HERE to get it added quickly!")
-				.clickEvent(ClickEvent.openUrl("https://github.com/Swofty-Developments/HypixelSkyBlock")));
+		player.notImplemented();
 	}
 }

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

@@ -1,14 +1,11 @@
 package net.swofty.type.dwarvenmines.npcs;
 
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.event.ClickEvent;
 import net.minestom.server.coordinate.Pos;
-import net.swofty.type.generic.user.HypixelPlayer;
 import net.swofty.type.generic.entity.npc.HypixelNPC;
 import net.swofty.type.generic.entity.npc.configuration.HumanConfiguration;
-import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
-
 import net.swofty.type.generic.event.custom.NPCInteractEvent;
+import net.swofty.type.generic.user.HypixelPlayer;
+import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
 
 public class NPCBulvar extends HypixelNPC {
 
@@ -44,7 +41,6 @@ public boolean looking(HypixelPlayer player) {
 	@Override
 	public void onClick(NPCInteractEvent event) {
 		SkyBlockPlayer player = (SkyBlockPlayer) event.player();
-		player.sendMessage(Component.text("§cThis Feature is not there yet. §aOpen a Pull request HERE to get it added quickly!")
-				.clickEvent(ClickEvent.openUrl("https://github.com/Swofty-Developments/HypixelSkyBlock")));
+		player.notImplemented();
 	}
 }

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

@@ -1,15 +1,12 @@
 package net.swofty.type.dwarvenmines.npcs;
 
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.event.ClickEvent;
 import net.minestom.server.coordinate.Pos;
 import net.swofty.type.generic.entity.npc.HypixelNPC;
 import net.swofty.type.generic.entity.npc.configuration.HumanConfiguration;
+import net.swofty.type.generic.event.custom.NPCInteractEvent;
 import net.swofty.type.generic.user.HypixelPlayer;
 import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
 
-import net.swofty.type.generic.event.custom.NPCInteractEvent;
-
 public class NPCLiftOperator extends HypixelNPC {
 
 	public NPCLiftOperator() {
@@ -44,7 +41,6 @@ public boolean looking(HypixelPlayer player) {
 	@Override
 	public void onClick(NPCInteractEvent event) {
 		SkyBlockPlayer player = (SkyBlockPlayer) event.player();
-		player.sendMessage(Component.text("§cThis Feature is not there yet. §aOpen a Pull request HERE to get it added quickly!")
-				.clickEvent(ClickEvent.openUrl("https://github.com/Swofty-Developments/HypixelSkyBlock")));
+        player.notImplemented();
 	}
 }

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

@@ -1,15 +1,12 @@
 package net.swofty.type.dwarvenmines.npcs;
 
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.event.ClickEvent;
 import net.minestom.server.coordinate.Pos;
 import net.swofty.type.generic.entity.npc.HypixelNPC;
 import net.swofty.type.generic.entity.npc.configuration.HumanConfiguration;
+import net.swofty.type.generic.event.custom.NPCInteractEvent;
 import net.swofty.type.generic.user.HypixelPlayer;
 import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
 
-import net.swofty.type.generic.event.custom.NPCInteractEvent;
-
 public class NPCPuzzler extends HypixelNPC {
 
 	public NPCPuzzler() {
@@ -44,8 +41,7 @@ public boolean looking(HypixelPlayer player) {
 	@Override
 	public void onClick(NPCInteractEvent event) {
 		SkyBlockPlayer player = (SkyBlockPlayer) event.player();
-		player.sendMessage(Component.text("§cThis Feature is not there yet. §aOpen a Pull request HERE to get it added quickly!")
-				.clickEvent(ClickEvent.openUrl("https://github.com/Swofty-Developments/HypixelSkyBlock")));
+		player.notImplemented();
 	}
 
 }