diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/commands/TPAudioCMD.java b/src/main/java/nl/sbdeveloper/mctpaudio/commands/TPAudioCMD.java index 7586c1a..283b396 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/commands/TPAudioCMD.java +++ b/src/main/java/nl/sbdeveloper/mctpaudio/commands/TPAudioCMD.java @@ -45,10 +45,10 @@ public class TPAudioCMD extends BaseCommand { @Subcommand("addsong") @Description("") public void onAddSong(CommandSender sender, String url) { - List urls = ThemeParkAudio.getPlugin().getConfig().getStringList("radioSongs"); + List urls = ThemeParkAudio.getInstance().getConfig().getStringList("radioSongs"); urls.add(url); - ThemeParkAudio.getPlugin().getConfig().set("radioSongs", urls); - ThemeParkAudio.getPlugin().saveConfig(); + ThemeParkAudio.getInstance().getConfig().set("radioSongs", urls); + ThemeParkAudio.getInstance().saveConfig(); ThemeParkAudio.getPlaylist().addSong(url); 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 data = brightness + "_" + r + "_" + g + "_" + b + "_" + w + "_" + region.name(); - ThemeParkAudio.getPlugin().getConfig().set("regions.light." + regionID, data); - ThemeParkAudio.getPlugin().saveConfig(); + ThemeParkAudio.getInstance().getConfig().set("regions.light." + regionID, data); + ThemeParkAudio.getInstance().saveConfig(); } JSONObject data; @@ -145,8 +145,8 @@ public class TPAudioCMD extends BaseCommand { @Subcommand("setregion") @Description("") public void onSetRegion(CommandSender sender, String regionName, String url) { - ThemeParkAudio.getPlugin().getConfig().set("regions.audio." + regionName, url); - ThemeParkAudio.getPlugin().saveConfig(); + ThemeParkAudio.getInstance().getConfig().set("regions.audio." + regionName, url); + ThemeParkAudio.getInstance().saveConfig(); sender.sendMessage(ChatColor.GRAY + "De region zal vanaf nu muziek afspelen."); } @@ -154,8 +154,8 @@ public class TPAudioCMD extends BaseCommand { @Subcommand("sethueregion") @Description("") public void onSetHueRegion(CommandSender sender, String regionName, String url) { - ThemeParkAudio.getPlugin().getConfig().set("regions.light." + regionName, url); - ThemeParkAudio.getPlugin().saveConfig(); + ThemeParkAudio.getInstance().getConfig().set("regions.light." + regionName, url); + ThemeParkAudio.getInstance().saveConfig(); sender.sendMessage(ChatColor.GRAY + "De region zal vanaf nu licht aanpassen."); } diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/listener/PlayInRegionHandler.java b/src/main/java/nl/sbdeveloper/mctpaudio/listener/PlayInRegionHandler.java index 167e53d..9925343 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/listener/PlayInRegionHandler.java +++ b/src/main/java/nl/sbdeveloper/mctpaudio/listener/PlayInRegionHandler.java @@ -40,7 +40,7 @@ public class PlayInRegionHandler implements Listener { this.players = players; load(); - Bukkit.getPluginManager().registerEvents(this, ThemeParkAudio.getPlugin()); + Bukkit.getPluginManager().registerEvents(this, ThemeParkAudio.getInstance()); } /** @@ -64,7 +64,7 @@ public class PlayInRegionHandler implements Listener { cancel(); } } - }.runTaskTimer(ThemeParkAudio.getPlugin(), 0L, 1L); + }.runTaskTimer(ThemeParkAudio.getInstance(), 0L, 1L); AudioMessage.of(AudioType.SFX, url, true).send(players, PinManager::hasPin); } diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/listener/WGListener.java b/src/main/java/nl/sbdeveloper/mctpaudio/listener/WGListener.java index d26b664..bcc155e 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/listener/WGListener.java +++ b/src/main/java/nl/sbdeveloper/mctpaudio/listener/WGListener.java @@ -59,7 +59,7 @@ public class WGListener implements Listener { if (from.getBlockX() != to.getBlockX() || from.getBlockY() != to.getBlockY() || from.getBlockZ() != to.getBlockZ()) { if (!PinManager.hasPin(player.getUniqueId())) return; - Set list = ThemeParkAudio.getPlugin().getConfig().getConfigurationSection("regions.audio").getKeys(false); + Set list = ThemeParkAudio.getInstance().getConfig().getConfigurationSection("regions.audio").getKeys(false); List fromRegions = WGManager.getRegionsIn(from).stream().map(ProtectedRegion::getId).toList(); List 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. if (name.isPresent() && name2.isPresent()) { - String regionURL = ThemeParkAudio.getPlugin().getConfig().getString("regions.audio." + name.get()); - String regionURL2 = ThemeParkAudio.getPlugin().getConfig().getString("regions.audio." + name2.get()); + String regionURL = ThemeParkAudio.getInstance().getConfig().getString("regions.audio." + name.get()); + String regionURL2 = ThemeParkAudio.getInstance().getConfig().getString("regions.audio." + name2.get()); if (regionURL.equals(regionURL2)) return; //Beide heeft een region, niet dezelfde, maar wel met dezelfde muziek. @@ -96,7 +96,7 @@ public class WGListener implements Listener { Optional name = toRegions.stream().filter(list::contains).findFirst(); 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()); } else if (!Collections.disjoint(list, fromRegions) && Collections.disjoint(list, toRegions)) { @@ -113,14 +113,14 @@ public class WGListener implements Listener { public void onRegionEnter(RegionsEnteredEvent e) { if (e.getPlayer() == null) return; - Set list2 = ThemeParkAudio.getPlugin().getConfig().getConfigurationSection("regions.light").getKeys(false); + Set list2 = ThemeParkAudio.getInstance().getConfig().getConfigurationSection("regions.light").getKeys(false); if (!Collections.disjoint(list2, e.getRegionsNames())) { //One element is the same -> In a region Optional name = e.getRegionsNames().stream().filter(list2::contains).findFirst(); 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) { LightMessage.of(configData).send(e.getPlayer().getUniqueId()); diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/radio/Playlist.java b/src/main/java/nl/sbdeveloper/mctpaudio/radio/Playlist.java index d821ee5..3b7a9a5 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/radio/Playlist.java +++ b/src/main/java/nl/sbdeveloper/mctpaudio/radio/Playlist.java @@ -37,11 +37,11 @@ public class Playlist { * Start this playlist */ public void start() { - for (String URL : ThemeParkAudio.getPlugin().getConfig().getStringList("RadioSongs")) { + for (String URL : ThemeParkAudio.getInstance().getConfig().getStringList("RadioSongs")) { addSong(URL); } - Bukkit.getScheduler().runTaskAsynchronously(ThemeParkAudio.getPlugin(), this::nextSong); + Bukkit.getScheduler().runTaskAsynchronously(ThemeParkAudio.getInstance(), this::nextSong); running = true; } @@ -141,7 +141,7 @@ public class Playlist { faultCounter = 0; //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; nextSong(); }, ticks); diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/socket/Client.java b/src/main/java/nl/sbdeveloper/mctpaudio/socket/Client.java index 7084fe9..b693a21 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/socket/Client.java +++ b/src/main/java/nl/sbdeveloper/mctpaudio/socket/Client.java @@ -48,7 +48,7 @@ public class Client { public void connect() { if (!this.connected) { this.connected = true; - this.controlID = Bukkit.getScheduler().runTaskTimer(ThemeParkAudio.getPlugin(), () -> { + this.controlID = Bukkit.getScheduler().runTaskTimer(ThemeParkAudio.getInstance(), () -> { if (!this.connected) { Bukkit.getScheduler().cancelTask(this.controlID); this.controlID = 0; @@ -99,17 +99,17 @@ public class Client { Bukkit.getPluginManager().callEvent(event); List regions = WGManager.getRegionsIn(p.getLocation()).stream().map(ProtectedRegion::getId).toList(); - Set list = ThemeParkAudio.getPlugin().getConfig().getConfigurationSection("regions.audio").getKeys(false); + Set list = ThemeParkAudio.getInstance().getConfig().getConfigurationSection("regions.audio").getKeys(false); Optional regionName = regions.stream().filter(list::contains).findFirst(); 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); }); - Set list2 = ThemeParkAudio.getPlugin().getConfig().getConfigurationSection("regions.light").getKeys(false); + Set list2 = ThemeParkAudio.getInstance().getConfig().getConfigurationSection("regions.light").getKeys(false); Optional regionName2 = regions.stream().filter(list2::contains).findFirst(); regionName2.ifPresent(name -> { - String configData = ThemeParkAudio.getPlugin().getConfig().getString("regions.light." + name); + String configData = ThemeParkAudio.getInstance().getConfig().getString("regions.light." + name); if (configData != null) { LightMessage.of(configData).send(pUUID); } @@ -146,7 +146,7 @@ public class Client { this.wsc.connect(); 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()) { Client.this.wsc.send("__PING__"); } else {