SBDevelopment/ThemeParkAudio
3
0
Fork 0
Code Issues Pull requests Activity Actions

Fixed compile issue
Some checks failed
Java CI / Build (push) Failing after 1m27s
Details

Browse source
This commit is contained in:
Stijn Bannink 2025-04-03 22:21:58 +02:00
parent 2deeee7971
commit 6196b0bfa1
Signed by: SBDeveloper
GPG key ID: B730712F2C3A9D7A
5 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/nl/sbdeveloper/mctpaudio/commands/TPAudioCMD.java
View file

@ -45,10 +45,10 @@ public class TPAudioCMD extends BaseCommand {
@Subcommand("addsong") @Subcommand("addsong")
@Description("") @Description("")
public void onAddSong(CommandSender sender, String url) { public void onAddSong(CommandSender sender, String url) {
List<String> urls = ThemeParkAudio.getPlugin().getConfig().getStringList("radioSongs"); List<String> urls = ThemeParkAudio.getInstance().getConfig().getStringList("radioSongs");
urls.add(url); urls.add(url);
ThemeParkAudio.getPlugin().getConfig().set("radioSongs", urls); ThemeParkAudio.getInstance().getConfig().set("radioSongs", urls);
ThemeParkAudio.getPlugin().saveConfig(); ThemeParkAudio.getInstance().saveConfig();
ThemeParkAudio.getPlaylist().addSong(url); ThemeParkAudio.getPlaylist().addSong(url);
sender.sendMessage(ChatColor.GRAY + "Nummer toegevoegd aan de automatische radio."); sender.sendMessage(ChatColor.GRAY + "Nummer toegevoegd aan de automatische radio.");
} }
@ -121,8 +121,8 @@ public class TPAudioCMD extends BaseCommand {
String regionID = HeadUtil.getArgument(selector, "region"); String regionID = HeadUtil.getArgument(selector, "region");
String data = brightness + "_" + r + "_" + g + "_" + b + "_" + w + "_" + region.name(); String data = brightness + "_" + r + "_" + g + "_" + b + "_" + w + "_" + region.name();
ThemeParkAudio.getPlugin().getConfig().set("regions.light." + regionID, data); ThemeParkAudio.getInstance().getConfig().set("regions.light." + regionID, data);
ThemeParkAudio.getPlugin().saveConfig(); ThemeParkAudio.getInstance().saveConfig();
} }
JSONObject data; JSONObject data;
@ -145,8 +145,8 @@ public class TPAudioCMD extends BaseCommand {
@Subcommand("setregion") @Subcommand("setregion")
@Description("") @Description("")
public void onSetRegion(CommandSender sender, String regionName, String url) { public void onSetRegion(CommandSender sender, String regionName, String url) {
ThemeParkAudio.getPlugin().getConfig().set("regions.audio." + regionName, url); ThemeParkAudio.getInstance().getConfig().set("regions.audio." + regionName, url);
ThemeParkAudio.getPlugin().saveConfig(); ThemeParkAudio.getInstance().saveConfig();
sender.sendMessage(ChatColor.GRAY + "De region zal vanaf nu muziek afspelen."); sender.sendMessage(ChatColor.GRAY + "De region zal vanaf nu muziek afspelen.");
} }
@ -154,8 +154,8 @@ public class TPAudioCMD extends BaseCommand {
@Subcommand("sethueregion") @Subcommand("sethueregion")
@Description("") @Description("")
public void onSetHueRegion(CommandSender sender, String regionName, String url) { public void onSetHueRegion(CommandSender sender, String regionName, String url) {
ThemeParkAudio.getPlugin().getConfig().set("regions.light." + regionName, url); ThemeParkAudio.getInstance().getConfig().set("regions.light." + regionName, url);
ThemeParkAudio.getPlugin().saveConfig(); ThemeParkAudio.getInstance().saveConfig();
sender.sendMessage(ChatColor.GRAY + "De region zal vanaf nu licht aanpassen."); sender.sendMessage(ChatColor.GRAY + "De region zal vanaf nu licht aanpassen.");
} }

4
src/main/java/nl/sbdeveloper/mctpaudio/listener/PlayInRegionHandler.java
View file

@ -40,7 +40,7 @@ public class PlayInRegionHandler implements Listener {
this.players = players; this.players = players;
load(); load();
Bukkit.getPluginManager().registerEvents(this, ThemeParkAudio.getPlugin()); Bukkit.getPluginManager().registerEvents(this, ThemeParkAudio.getInstance());
} }
/** /**
@ -64,7 +64,7 @@ public class PlayInRegionHandler implements Listener {
cancel(); cancel();
} }
} }
}.runTaskTimer(ThemeParkAudio.getPlugin(), 0L, 1L); }.runTaskTimer(ThemeParkAudio.getInstance(), 0L, 1L);
AudioMessage.of(AudioType.SFX, url, true).send(players, PinManager::hasPin); AudioMessage.of(AudioType.SFX, url, true).send(players, PinManager::hasPin);
} }

12
src/main/java/nl/sbdeveloper/mctpaudio/listener/WGListener.java
View file

@ -59,7 +59,7 @@ public class WGListener implements Listener {
if (from.getBlockX() != to.getBlockX() || from.getBlockY() != to.getBlockY() || from.getBlockZ() != to.getBlockZ()) { if (from.getBlockX() != to.getBlockX() || from.getBlockY() != to.getBlockY() || from.getBlockZ() != to.getBlockZ()) {
if (!PinManager.hasPin(player.getUniqueId())) return; if (!PinManager.hasPin(player.getUniqueId())) return;
Set<String> list = ThemeParkAudio.getPlugin().getConfig().getConfigurationSection("regions.audio").getKeys(false); Set<String> list = ThemeParkAudio.getInstance().getConfig().getConfigurationSection("regions.audio").getKeys(false);
List<String> fromRegions = WGManager.getRegionsIn(from).stream().map(ProtectedRegion::getId).toList(); List<String> fromRegions = WGManager.getRegionsIn(from).stream().map(ProtectedRegion::getId).toList();
List<String> toRegions = WGManager.getRegionsIn(to).stream().map(ProtectedRegion::getId).toList(); List<String> toRegions = WGManager.getRegionsIn(to).stream().map(ProtectedRegion::getId).toList();
@ -86,8 +86,8 @@ public class WGListener implements Listener {
return; //Beide heeft een region, en dat is dezelfde. return; //Beide heeft een region, en dat is dezelfde.
if (name.isPresent() && name2.isPresent()) { if (name.isPresent() && name2.isPresent()) {
String regionURL = ThemeParkAudio.getPlugin().getConfig().getString("regions.audio." + name.get()); String regionURL = ThemeParkAudio.getInstance().getConfig().getString("regions.audio." + name.get());
String regionURL2 = ThemeParkAudio.getPlugin().getConfig().getString("regions.audio." + name2.get()); String regionURL2 = ThemeParkAudio.getInstance().getConfig().getString("regions.audio." + name2.get());
if (regionURL.equals(regionURL2)) if (regionURL.equals(regionURL2))
return; //Beide heeft een region, niet dezelfde, maar wel met dezelfde muziek. return; //Beide heeft een region, niet dezelfde, maar wel met dezelfde muziek.
@ -96,7 +96,7 @@ public class WGListener implements Listener {
Optional<String> name = toRegions.stream().filter(list::contains).findFirst(); Optional<String> name = toRegions.stream().filter(list::contains).findFirst();
if (name.isEmpty()) return; if (name.isEmpty()) return;
String regionURL = ThemeParkAudio.getPlugin().getConfig().getString("regions.audio." + name.get()); String regionURL = ThemeParkAudio.getInstance().getConfig().getString("regions.audio." + name.get());
AudioMessage.of(AudioType.MUSIC, regionURL).send(player.getUniqueId()); AudioMessage.of(AudioType.MUSIC, regionURL).send(player.getUniqueId());
} else if (!Collections.disjoint(list, fromRegions) && Collections.disjoint(list, toRegions)) { } else if (!Collections.disjoint(list, fromRegions) && Collections.disjoint(list, toRegions)) {
@ -113,14 +113,14 @@ public class WGListener implements Listener {
public void onRegionEnter(RegionsEnteredEvent e) { public void onRegionEnter(RegionsEnteredEvent e) {
if (e.getPlayer() == null) return; if (e.getPlayer() == null) return;
Set<String> list2 = ThemeParkAudio.getPlugin().getConfig().getConfigurationSection("regions.light").getKeys(false); Set<String> list2 = ThemeParkAudio.getInstance().getConfig().getConfigurationSection("regions.light").getKeys(false);
if (!Collections.disjoint(list2, e.getRegionsNames())) { if (!Collections.disjoint(list2, e.getRegionsNames())) {
//One element is the same -> In a region //One element is the same -> In a region
Optional<String> name = e.getRegionsNames().stream().filter(list2::contains).findFirst(); Optional<String> name = e.getRegionsNames().stream().filter(list2::contains).findFirst();
if (name.isEmpty()) return; if (name.isEmpty()) return;
String configData = ThemeParkAudio.getPlugin().getConfig().getString("regions.light." + name.get()); String configData = ThemeParkAudio.getInstance().getConfig().getString("regions.light." + name.get());
if (configData != null) { if (configData != null) {
LightMessage.of(configData).send(e.getPlayer().getUniqueId()); LightMessage.of(configData).send(e.getPlayer().getUniqueId());

6
src/main/java/nl/sbdeveloper/mctpaudio/radio/Playlist.java
View file

@ -37,11 +37,11 @@ public class Playlist {
* Start this playlist * Start this playlist
*/ */
public void start() { public void start() {
for (String URL : ThemeParkAudio.getPlugin().getConfig().getStringList("RadioSongs")) { for (String URL : ThemeParkAudio.getInstance().getConfig().getStringList("RadioSongs")) {
addSong(URL); addSong(URL);
} }
Bukkit.getScheduler().runTaskAsynchronously(ThemeParkAudio.getPlugin(), this::nextSong); Bukkit.getScheduler().runTaskAsynchronously(ThemeParkAudio.getInstance(), this::nextSong);
running = true; running = true;
} }
@ -141,7 +141,7 @@ public class Playlist {
faultCounter = 0; faultCounter = 0;
//And started timer, so that it starts a new song if the old one is done //And started timer, so that it starts a new song if the old one is done
currentTimer = Bukkit.getScheduler().runTaskLaterAsynchronously(ThemeParkAudio.getPlugin(), () -> { currentTimer = Bukkit.getScheduler().runTaskLaterAsynchronously(ThemeParkAudio.getInstance(), () -> {
currentTimer = null; currentTimer = null;
nextSong(); nextSong();
}, ticks); }, ticks);

12
src/main/java/nl/sbdeveloper/mctpaudio/socket/Client.java
View file

@ -48,7 +48,7 @@ public class Client {
public void connect() { public void connect() {
if (!this.connected) { if (!this.connected) {
this.connected = true; this.connected = true;
this.controlID = Bukkit.getScheduler().runTaskTimer(ThemeParkAudio.getPlugin(), () -> { this.controlID = Bukkit.getScheduler().runTaskTimer(ThemeParkAudio.getInstance(), () -> {
if (!this.connected) { if (!this.connected) {
Bukkit.getScheduler().cancelTask(this.controlID); Bukkit.getScheduler().cancelTask(this.controlID);
this.controlID = 0; this.controlID = 0;
@ -99,17 +99,17 @@ public class Client {
Bukkit.getPluginManager().callEvent(event); Bukkit.getPluginManager().callEvent(event);
List<String> regions = WGManager.getRegionsIn(p.getLocation()).stream().map(ProtectedRegion::getId).toList(); List<String> regions = WGManager.getRegionsIn(p.getLocation()).stream().map(ProtectedRegion::getId).toList();
Set<String> list = ThemeParkAudio.getPlugin().getConfig().getConfigurationSection("regions.audio").getKeys(false); Set<String> list = ThemeParkAudio.getInstance().getConfig().getConfigurationSection("regions.audio").getKeys(false);
Optional<String> regionName = regions.stream().filter(list::contains).findFirst(); Optional<String> regionName = regions.stream().filter(list::contains).findFirst();
regionName.ifPresent(name -> { regionName.ifPresent(name -> {
String regionURL = ThemeParkAudio.getPlugin().getConfig().getString("regions.audio." + name); String regionURL = ThemeParkAudio.getInstance().getConfig().getString("regions.audio." + name);
AudioMessage.of(AudioType.MUSIC, regionURL).send(pUUID); AudioMessage.of(AudioType.MUSIC, regionURL).send(pUUID);
}); });
Set<String> list2 = ThemeParkAudio.getPlugin().getConfig().getConfigurationSection("regions.light").getKeys(false); Set<String> list2 = ThemeParkAudio.getInstance().getConfig().getConfigurationSection("regions.light").getKeys(false);
Optional<String> regionName2 = regions.stream().filter(list2::contains).findFirst(); Optional<String> regionName2 = regions.stream().filter(list2::contains).findFirst();
regionName2.ifPresent(name -> { regionName2.ifPresent(name -> {
String configData = ThemeParkAudio.getPlugin().getConfig().getString("regions.light." + name); String configData = ThemeParkAudio.getInstance().getConfig().getString("regions.light." + name);
if (configData != null) { if (configData != null) {
LightMessage.of(configData).send(pUUID); LightMessage.of(configData).send(pUUID);
} }
@ -146,7 +146,7 @@ public class Client {
this.wsc.connect(); this.wsc.connect();
if (this.taskID == 0) { if (this.taskID == 0) {
this.taskID = Bukkit.getScheduler().runTaskTimerAsynchronously(ThemeParkAudio.getPlugin(), () -> { this.taskID = Bukkit.getScheduler().runTaskTimerAsynchronously(ThemeParkAudio.getInstance(), () -> {
if (Client.this.wsc != null && Client.this.wsc.isOpen()) { if (Client.this.wsc != null && Client.this.wsc.isOpen()) {
Client.this.wsc.send("__PING__"); Client.this.wsc.send("__PING__");
} else { } else {