Skip to content

Commit 164943c

Browse files
ItzKatzeItzKatze
authored
Merge pull request #744 from ArikSquad/feat/songs
Galatea NPCs and song improvements
2 parents a4f1cb4 + b7943ba commit 164943c

95 files changed

Lines changed: 1441 additions & 416 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// AUTO-GENERATED FILE. DO NOT EDIT.
22
package net.swofty.commons.skyblock.item;
33

4-
import java.lang.Exception;
5-
import java.lang.String;
64
import net.minestom.server.item.Material;
75
import net.swofty.commons.StringUtility;
86
import org.jetbrains.annotations.Nullable;
@@ -876,15 +874,15 @@ public enum ItemType {
876874

877875
DIAMOND_BLOCK(Material.DIAMOND_BLOCK, Rarity.COMMON),
878876

879-
DIAMOND_BOOTS(Material.DIAMOND_BOOTS, Rarity.RARE),
877+
DIAMOND_BOOTS(Material.DIAMOND_BOOTS, Rarity.COMMON),
880878

881-
DIAMOND_CHESTPLATE(Material.DIAMOND_CHESTPLATE, Rarity.RARE),
879+
DIAMOND_CHESTPLATE(Material.DIAMOND_CHESTPLATE, Rarity.COMMON),
882880

883-
DIAMOND_HELMET(Material.DIAMOND_HELMET, Rarity.RARE),
881+
DIAMOND_HELMET(Material.DIAMOND_HELMET, Rarity.COMMON),
884882

885883
DIAMOND_HOE(Material.DIAMOND_HOE, Rarity.COMMON),
886884

887-
DIAMOND_LEGGINGS(Material.DIAMOND_LEGGINGS, Rarity.RARE),
885+
DIAMOND_LEGGINGS(Material.DIAMOND_LEGGINGS, Rarity.COMMON),
888886

889887
DIAMOND_MAGMAFISH(Material.PLAYER_HEAD, Rarity.COMMON),
890888

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
@Getter
88
public enum Songs {
99
WILDERNESS(Path.of("./configuration/skyblock/songs/wilderness.nbs")),
10+
A_SILENT_MEMOIR(Path.of("./configuration/skyblock/songs/a_silent_memoir.nbs"))
1011
;
1112

1213
private final Path path;

‎configuration/skyblock/Minestom.regions.csv‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,4 @@ fishing_outpost,FISHING_OUTPOST,92,69,-21,166,95,-79,SKYBLOCK_HUB
8383
museum_1,PLAYER_MUSEUM,25,78,-3,42,71,5,SKYBLOCK_HUB
8484
museum_2,PLAYER_MUSEUM,21,80,4,38,70,19,SKYBLOCK_HUB
8585
museum_3,PLAYER_MUSEUM,45,84,24,13,65,53,SKYBLOCK_HUB
86+
tangleburgs_path,TANGLEBURGS_PATH,-533,107,-32,-560,122,20,SKYBLOCK_GALATEA

‎configuration/skyblock/songs/SONGS.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# A Silent Memoir
2+
3+
"[skyblock] A Silent Memoir (Galatea)" by Huangwakawaii is licensed under CC BY-SA 4.0
4+
(https://creativecommons.org/licenses/by-sa/4.0)
5+
https://noteblock.world/song/L0PqKZeKpk
6+
7+
Originally composed by ShinkoNet for the Hypixel Network

‎configuration/skyblock/songs/a_silent_memoir.nbs‎

100 KB
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public ItemStack.Builder getItem(HypixelPlayer player) {
167167

168168
@Override
169169
public void run(InventoryPreClickEvent e, HypixelPlayer player) {
170-
player.sendMessage("§cThis feature is coming soon!");
170+
player.notImplemented();
171171
}
172172
});
173173

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package net.swofty.type.bedwarslobby.item.impl;
22

3-
import net.kyori.adventure.text.Component;
4-
import net.kyori.adventure.text.event.ClickEvent;
53
import net.minestom.server.event.item.ItemDropEvent;
64
import net.minestom.server.event.trait.CancellableEvent;
75
import net.minestom.server.event.trait.PlayerInstanceEvent;
86
import net.minestom.server.item.ItemStack;
97
import net.minestom.server.item.Material;
108
import net.swofty.type.generic.gui.inventory.ItemStackCreator;
9+
import net.swofty.type.generic.user.HypixelPlayer;
1110
import net.swofty.type.lobby.item.LobbyItem;
1211

1312
public class BedWarsMenu extends LobbyItem {
@@ -29,8 +28,7 @@ public void onItemDrop(ItemDropEvent event) {
2928
@Override
3029
public void onItemInteract(PlayerInstanceEvent event) {
3130
((CancellableEvent) event).setCancelled(true);
32-
event.getPlayer().sendMessage(Component.text("§cThis Feature is not there yet. §aOpen a Pull request HERE to get it added quickly!")
33-
.clickEvent(ClickEvent.openUrl("https://github.com/Swofty-Developments/HypixelSkyBlock")));
31+
((HypixelPlayer) event.getPlayer()).notImplemented();
3432
}
3533

3634
}

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package net.swofty.type.bedwarslobby.item.impl;
22

3-
import net.kyori.adventure.text.Component;
4-
import net.kyori.adventure.text.event.ClickEvent;
53
import net.minestom.server.event.item.ItemDropEvent;
64
import net.minestom.server.event.trait.CancellableEvent;
75
import net.minestom.server.event.trait.PlayerInstanceEvent;
86
import net.minestom.server.item.ItemStack;
97
import net.minestom.server.item.Material;
108
import net.swofty.type.generic.gui.inventory.ItemStackCreator;
9+
import net.swofty.type.generic.user.HypixelPlayer;
1110
import net.swofty.type.lobby.item.LobbyItem;
1211

1312
public class Collectibles extends LobbyItem {
@@ -29,8 +28,7 @@ public void onItemDrop(ItemDropEvent event) {
2928
@Override
3029
public void onItemInteract(PlayerInstanceEvent event) {
3130
((CancellableEvent) event).setCancelled(true);
32-
event.getPlayer().sendMessage(Component.text("§cThis Feature is not there yet. §aOpen a Pull request HERE to get it added quickly!")
33-
.clickEvent(ClickEvent.openUrl("https://github.com/Swofty-Developments/HypixelSkyBlock")));
31+
((HypixelPlayer) event.getPlayer()).notImplemented();
3432
}
3533

3634
}

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package net.swofty.type.bedwarslobby.npcs;
22

3-
import net.kyori.adventure.text.Component;
4-
import net.kyori.adventure.text.event.ClickEvent;
53
import net.minestom.server.coordinate.Pos;
64
import net.swofty.type.generic.entity.npc.HypixelNPC;
75
import net.swofty.type.generic.entity.npc.configuration.HumanConfiguration;
@@ -44,7 +42,6 @@ public boolean looking(HypixelPlayer player) {
4442

4543
@Override
4644
public void onClick(NPCInteractEvent event) {
47-
event.player().sendMessage(Component.text("§cThis Feature is not there yet. §aOpen a Pull request HERE to get it added quickly!")
48-
.clickEvent(ClickEvent.openUrl("https://github.com/Swofty-Developments/HypixelSkyBlock")));
45+
event.player().notImplemented();
4946
}
5047
}

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
package net.swofty.type.bedwarslobby.npcs;
22

3-
import net.kyori.adventure.text.Component;
4-
import net.kyori.adventure.text.event.ClickEvent;
53
import net.minestom.server.coordinate.Pos;
64
import net.swofty.commons.ServerType;
75
import net.swofty.commons.StringUtility;
86
import net.swofty.commons.UnderstandableProxyServer;
97
import net.swofty.proxyapi.ProxyInformation;
108
import net.swofty.type.generic.entity.npc.HypixelNPC;
119
import net.swofty.type.generic.entity.npc.configuration.HumanConfiguration;
10+
import net.swofty.type.generic.event.custom.NPCInteractEvent;
1211
import net.swofty.type.generic.user.HypixelPlayer;
1312

1413
import java.util.ArrayList;
1514
import java.util.List;
1615

17-
import net.swofty.type.generic.event.custom.NPCInteractEvent;
18-
1916
public class NPCDream extends HypixelNPC {
2017
private static List<UnderstandableProxyServer> cacheServers = new ArrayList<>();
2118
private static long lastCacheTime = 0;
@@ -71,7 +68,6 @@ public boolean looking(HypixelPlayer player) {
7168
@Override
7269
public void onClick(NPCInteractEvent event) {
7370
event.player().sendMessage("§7You can dream about this :)");
74-
event.player().sendMessage(Component.text("§cThis Feature is not there yet. §aOpen a Pull request HERE to get it added quickly!")
75-
.clickEvent(ClickEvent.openUrl("https://github.com/Swofty-Developments/HypixelSkyBlock")));
71+
event.player().notImplemented();
7672
}
7773
}

0 commit comments

Comments
 (0)