From d8c9c4cc26d60e1ccf89cee9ca8ebe3601180220 Mon Sep 17 00:00:00 2001 From: SBDeveloper Date: Thu, 3 Apr 2025 22:31:53 +0200 Subject: [PATCH] Aligned package --- .../themeparkaudio}/ThemeParkAudio.java | 14 +++++++------- .../themeparkaudio}/api/AudioType.java | 4 ++-- .../themeparkaudio}/api/LightRegion.java | 2 +- .../api/events/AudioConnectionUpdateEvent.java | 2 +- .../themeparkaudio}/api/maps/SongList.java | 2 +- .../themeparkaudio}/commands/TPAudioCMD.java | 16 ++++++++-------- .../listener/LogoutListener.java | 4 ++-- .../listener/PlayInRegionHandler.java | 16 ++++++++-------- .../themeparkaudio}/listener/WGListener.java | 16 ++++++++-------- .../themeparkaudio}/managers/PinManager.java | 5 ++++- .../themeparkaudio}/managers/WGManager.java | 2 +- .../themeparkaudio}/radio/Playlist.java | 18 +++++++++--------- .../themeparkaudio}/socket/Client.java | 18 +++++++++--------- .../themeparkaudio}/socket/JSONUtil.java | 2 +- .../socket/messages/AbstractMessage.java | 4 ++-- .../socket/messages/AudioMessage.java | 4 ++-- .../socket/messages/AuthenticationMessage.java | 2 +- .../socket/messages/LightMessage.java | 4 ++-- .../socket/messages/LogoutMessage.java | 2 +- .../socket/messages/MessageTask.java | 2 +- .../socket/messages/StopAudioMessage.java | 4 ++-- .../themeparkaudio}/utils/DiscordUtil.java | 2 +- .../themeparkaudio}/utils/HeadUtil.java | 2 +- .../utils/SpigotPlayerSelector.java | 5 ++--- .../themeparkaudio}/utils/WebhookMessage.java | 2 +- src/main/resources/plugin.yml | 10 +++++----- 26 files changed, 83 insertions(+), 81 deletions(-) rename src/main/java/{nl/sbdeveloper/mctpaudio => tech/sbdevelopment/themeparkaudio}/ThemeParkAudio.java (83%) rename src/main/java/{nl/sbdeveloper/mctpaudio => tech/sbdevelopment/themeparkaudio}/api/AudioType.java (69%) rename src/main/java/{nl/sbdeveloper/mctpaudio => tech/sbdevelopment/themeparkaudio}/api/LightRegion.java (53%) rename src/main/java/{nl/sbdeveloper/mctpaudio => tech/sbdevelopment/themeparkaudio}/api/events/AudioConnectionUpdateEvent.java (95%) rename src/main/java/{nl/sbdeveloper/mctpaudio => tech/sbdevelopment/themeparkaudio}/api/maps/SongList.java (95%) rename src/main/java/{nl/sbdeveloper/mctpaudio => tech/sbdevelopment/themeparkaudio}/commands/TPAudioCMD.java (93%) rename src/main/java/{nl/sbdeveloper/mctpaudio => tech/sbdevelopment/themeparkaudio}/listener/LogoutListener.java (82%) rename src/main/java/{nl/sbdeveloper/mctpaudio => tech/sbdevelopment/themeparkaudio}/listener/PlayInRegionHandler.java (89%) rename src/main/java/{nl/sbdeveloper/mctpaudio => tech/sbdevelopment/themeparkaudio}/listener/WGListener.java (92%) rename src/main/java/{nl/sbdeveloper/mctpaudio => tech/sbdevelopment/themeparkaudio}/managers/PinManager.java (93%) rename src/main/java/{nl/sbdeveloper/mctpaudio => tech/sbdevelopment/themeparkaudio}/managers/WGManager.java (99%) rename src/main/java/{nl/sbdeveloper/mctpaudio => tech/sbdevelopment/themeparkaudio}/radio/Playlist.java (88%) rename src/main/java/{nl/sbdeveloper/mctpaudio => tech/sbdevelopment/themeparkaudio}/socket/Client.java (92%) rename src/main/java/{nl/sbdeveloper/mctpaudio => tech/sbdevelopment/themeparkaudio}/socket/JSONUtil.java (97%) rename src/main/java/{nl/sbdeveloper/mctpaudio => tech/sbdevelopment/themeparkaudio}/socket/messages/AbstractMessage.java (91%) rename src/main/java/{nl/sbdeveloper/mctpaudio => tech/sbdevelopment/themeparkaudio}/socket/messages/AudioMessage.java (90%) rename src/main/java/{nl/sbdeveloper/mctpaudio => tech/sbdevelopment/themeparkaudio}/socket/messages/AuthenticationMessage.java (90%) rename src/main/java/{nl/sbdeveloper/mctpaudio => tech/sbdevelopment/themeparkaudio}/socket/messages/LightMessage.java (93%) rename src/main/java/{nl/sbdeveloper/mctpaudio => tech/sbdevelopment/themeparkaudio}/socket/messages/LogoutMessage.java (80%) rename src/main/java/{nl/sbdeveloper/mctpaudio => tech/sbdevelopment/themeparkaudio}/socket/messages/MessageTask.java (58%) rename src/main/java/{nl/sbdeveloper/mctpaudio => tech/sbdevelopment/themeparkaudio}/socket/messages/StopAudioMessage.java (68%) rename src/main/java/{nl/sbdeveloper/mctpaudio => tech/sbdevelopment/themeparkaudio}/utils/DiscordUtil.java (95%) rename src/main/java/{nl/sbdeveloper/mctpaudio => tech/sbdevelopment/themeparkaudio}/utils/HeadUtil.java (98%) rename src/main/java/{nl/sbdeveloper/mctpaudio => tech/sbdevelopment/themeparkaudio}/utils/SpigotPlayerSelector.java (97%) rename src/main/java/{nl/sbdeveloper/mctpaudio => tech/sbdevelopment/themeparkaudio}/utils/WebhookMessage.java (99%) diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/ThemeParkAudio.java b/src/main/java/tech/sbdevelopment/themeparkaudio/ThemeParkAudio.java similarity index 83% rename from src/main/java/nl/sbdeveloper/mctpaudio/ThemeParkAudio.java rename to src/main/java/tech/sbdevelopment/themeparkaudio/ThemeParkAudio.java index 8a3da09..0d6ef33 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/ThemeParkAudio.java +++ b/src/main/java/tech/sbdevelopment/themeparkaudio/ThemeParkAudio.java @@ -1,13 +1,13 @@ -package nl.sbdeveloper.mctpaudio; +package tech.sbdevelopment.themeparkaudio; import co.aikar.commands.PaperCommandManager; import lombok.Getter; -import nl.sbdeveloper.mctpaudio.commands.TPAudioCMD; -import nl.sbdeveloper.mctpaudio.listener.LogoutListener; -import nl.sbdeveloper.mctpaudio.listener.WGListener; -import nl.sbdeveloper.mctpaudio.managers.WGManager; -import nl.sbdeveloper.mctpaudio.radio.Playlist; -import nl.sbdeveloper.mctpaudio.socket.Client; +import tech.sbdevelopment.themeparkaudio.commands.TPAudioCMD; +import tech.sbdevelopment.themeparkaudio.listener.LogoutListener; +import tech.sbdevelopment.themeparkaudio.listener.WGListener; +import tech.sbdevelopment.themeparkaudio.managers.WGManager; +import tech.sbdevelopment.themeparkaudio.radio.Playlist; +import tech.sbdevelopment.themeparkaudio.socket.Client; import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.java.JavaPlugin; diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/api/AudioType.java b/src/main/java/tech/sbdevelopment/themeparkaudio/api/AudioType.java similarity index 69% rename from src/main/java/nl/sbdeveloper/mctpaudio/api/AudioType.java rename to src/main/java/tech/sbdevelopment/themeparkaudio/api/AudioType.java index c21cb05..a9f82d0 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/api/AudioType.java +++ b/src/main/java/tech/sbdevelopment/themeparkaudio/api/AudioType.java @@ -1,6 +1,6 @@ -package nl.sbdeveloper.mctpaudio.api; +package tech.sbdevelopment.themeparkaudio.api; -import nl.sbdeveloper.mctpaudio.socket.messages.MessageTask; +import tech.sbdevelopment.themeparkaudio.socket.messages.MessageTask; public enum AudioType { MUSIC, SFX, RADIO; diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/api/LightRegion.java b/src/main/java/tech/sbdevelopment/themeparkaudio/api/LightRegion.java similarity index 53% rename from src/main/java/nl/sbdeveloper/mctpaudio/api/LightRegion.java rename to src/main/java/tech/sbdevelopment/themeparkaudio/api/LightRegion.java index 4693215..c261674 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/api/LightRegion.java +++ b/src/main/java/tech/sbdevelopment/themeparkaudio/api/LightRegion.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.mctpaudio.api; +package tech.sbdevelopment.themeparkaudio.api; public enum LightRegion { LEFT, MID, RIGHT, ALL diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/api/events/AudioConnectionUpdateEvent.java b/src/main/java/tech/sbdevelopment/themeparkaudio/api/events/AudioConnectionUpdateEvent.java similarity index 95% rename from src/main/java/nl/sbdeveloper/mctpaudio/api/events/AudioConnectionUpdateEvent.java rename to src/main/java/tech/sbdevelopment/themeparkaudio/api/events/AudioConnectionUpdateEvent.java index 206e41a..a89b2c0 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/api/events/AudioConnectionUpdateEvent.java +++ b/src/main/java/tech/sbdevelopment/themeparkaudio/api/events/AudioConnectionUpdateEvent.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.mctpaudio.api.events; +package tech.sbdevelopment.themeparkaudio.api.events; import lombok.Getter; import org.bukkit.entity.Player; diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/api/maps/SongList.java b/src/main/java/tech/sbdevelopment/themeparkaudio/api/maps/SongList.java similarity index 95% rename from src/main/java/nl/sbdeveloper/mctpaudio/api/maps/SongList.java rename to src/main/java/tech/sbdevelopment/themeparkaudio/api/maps/SongList.java index 04a4bd8..3330c50 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/api/maps/SongList.java +++ b/src/main/java/tech/sbdevelopment/themeparkaudio/api/maps/SongList.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.mctpaudio.api.maps; +package tech.sbdevelopment.themeparkaudio.api.maps; import java.util.ArrayList; import java.util.Random; diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/commands/TPAudioCMD.java b/src/main/java/tech/sbdevelopment/themeparkaudio/commands/TPAudioCMD.java similarity index 93% rename from src/main/java/nl/sbdeveloper/mctpaudio/commands/TPAudioCMD.java rename to src/main/java/tech/sbdevelopment/themeparkaudio/commands/TPAudioCMD.java index 283b396..e6e6c67 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/commands/TPAudioCMD.java +++ b/src/main/java/tech/sbdevelopment/themeparkaudio/commands/TPAudioCMD.java @@ -1,15 +1,15 @@ -package nl.sbdeveloper.mctpaudio.commands; +package tech.sbdevelopment.themeparkaudio.commands; import co.aikar.commands.BaseCommand; import co.aikar.commands.CommandHelp; import co.aikar.commands.annotation.*; -import nl.sbdeveloper.mctpaudio.ThemeParkAudio; -import nl.sbdeveloper.mctpaudio.api.AudioType; -import nl.sbdeveloper.mctpaudio.api.LightRegion; -import nl.sbdeveloper.mctpaudio.listener.PlayInRegionHandler; -import nl.sbdeveloper.mctpaudio.managers.PinManager; -import nl.sbdeveloper.mctpaudio.utils.HeadUtil; -import nl.sbdeveloper.mctpaudio.utils.SpigotPlayerSelector; +import tech.sbdevelopment.themeparkaudio.ThemeParkAudio; +import tech.sbdevelopment.themeparkaudio.api.AudioType; +import tech.sbdevelopment.themeparkaudio.api.LightRegion; +import tech.sbdevelopment.themeparkaudio.listener.PlayInRegionHandler; +import tech.sbdevelopment.themeparkaudio.managers.PinManager; +import tech.sbdevelopment.themeparkaudio.utils.HeadUtil; +import tech.sbdevelopment.themeparkaudio.utils.SpigotPlayerSelector; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/listener/LogoutListener.java b/src/main/java/tech/sbdevelopment/themeparkaudio/listener/LogoutListener.java similarity index 82% rename from src/main/java/nl/sbdeveloper/mctpaudio/listener/LogoutListener.java rename to src/main/java/tech/sbdevelopment/themeparkaudio/listener/LogoutListener.java index db39341..bd14c5f 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/listener/LogoutListener.java +++ b/src/main/java/tech/sbdevelopment/themeparkaudio/listener/LogoutListener.java @@ -1,6 +1,6 @@ -package nl.sbdeveloper.mctpaudio.listener; +package tech.sbdevelopment.themeparkaudio.listener; -import nl.sbdeveloper.mctpaudio.ThemeParkAudio; +import tech.sbdevelopment.themeparkaudio.ThemeParkAudio; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerQuitEvent; diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/listener/PlayInRegionHandler.java b/src/main/java/tech/sbdevelopment/themeparkaudio/listener/PlayInRegionHandler.java similarity index 89% rename from src/main/java/nl/sbdeveloper/mctpaudio/listener/PlayInRegionHandler.java rename to src/main/java/tech/sbdevelopment/themeparkaudio/listener/PlayInRegionHandler.java index 9925343..3d3469c 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/listener/PlayInRegionHandler.java +++ b/src/main/java/tech/sbdevelopment/themeparkaudio/listener/PlayInRegionHandler.java @@ -1,17 +1,17 @@ -package nl.sbdeveloper.mctpaudio.listener; +package tech.sbdevelopment.themeparkaudio.listener; import com.mpatric.mp3agic.InvalidDataException; import com.mpatric.mp3agic.UnsupportedTagException; import com.sk89q.worldguard.protection.regions.ProtectedRegion; import net.raidstone.wgevents.events.RegionEnteredEvent; import net.raidstone.wgevents.events.RegionLeftEvent; -import nl.sbdeveloper.mctpaudio.ThemeParkAudio; -import nl.sbdeveloper.mctpaudio.api.AudioType; -import nl.sbdeveloper.mctpaudio.api.events.AudioConnectionUpdateEvent; -import nl.sbdeveloper.mctpaudio.managers.PinManager; -import nl.sbdeveloper.mctpaudio.managers.WGManager; -import nl.sbdeveloper.mctpaudio.socket.messages.AudioMessage; -import nl.sbdeveloper.mctpaudio.utils.HeadUtil; +import tech.sbdevelopment.themeparkaudio.ThemeParkAudio; +import tech.sbdevelopment.themeparkaudio.api.AudioType; +import tech.sbdevelopment.themeparkaudio.api.events.AudioConnectionUpdateEvent; +import tech.sbdevelopment.themeparkaudio.managers.PinManager; +import tech.sbdevelopment.themeparkaudio.managers.WGManager; +import tech.sbdevelopment.themeparkaudio.socket.messages.AudioMessage; +import tech.sbdevelopment.themeparkaudio.utils.HeadUtil; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/listener/WGListener.java b/src/main/java/tech/sbdevelopment/themeparkaudio/listener/WGListener.java similarity index 92% rename from src/main/java/nl/sbdeveloper/mctpaudio/listener/WGListener.java rename to src/main/java/tech/sbdevelopment/themeparkaudio/listener/WGListener.java index bcc155e..c778a89 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/listener/WGListener.java +++ b/src/main/java/tech/sbdevelopment/themeparkaudio/listener/WGListener.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.mctpaudio.listener; +package tech.sbdevelopment.themeparkaudio.listener; import com.bergerkiller.bukkit.common.entity.CommonEntityController; import com.bergerkiller.bukkit.common.events.EntityMoveEvent; @@ -8,13 +8,13 @@ import com.bergerkiller.bukkit.tc.controller.MinecartMember; import com.bergerkiller.bukkit.tc.controller.MinecartMemberStore; import com.sk89q.worldguard.protection.regions.ProtectedRegion; import net.raidstone.wgevents.events.RegionsEnteredEvent; -import nl.sbdeveloper.mctpaudio.ThemeParkAudio; -import nl.sbdeveloper.mctpaudio.api.AudioType; -import nl.sbdeveloper.mctpaudio.managers.PinManager; -import nl.sbdeveloper.mctpaudio.managers.WGManager; -import nl.sbdeveloper.mctpaudio.socket.messages.AudioMessage; -import nl.sbdeveloper.mctpaudio.socket.messages.LightMessage; -import nl.sbdeveloper.mctpaudio.socket.messages.StopAudioMessage; +import tech.sbdevelopment.themeparkaudio.ThemeParkAudio; +import tech.sbdevelopment.themeparkaudio.api.AudioType; +import tech.sbdevelopment.themeparkaudio.managers.PinManager; +import tech.sbdevelopment.themeparkaudio.managers.WGManager; +import tech.sbdevelopment.themeparkaudio.socket.messages.AudioMessage; +import tech.sbdevelopment.themeparkaudio.socket.messages.LightMessage; +import tech.sbdevelopment.themeparkaudio.socket.messages.StopAudioMessage; import org.bukkit.Location; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/managers/PinManager.java b/src/main/java/tech/sbdevelopment/themeparkaudio/managers/PinManager.java similarity index 93% rename from src/main/java/nl/sbdeveloper/mctpaudio/managers/PinManager.java rename to src/main/java/tech/sbdevelopment/themeparkaudio/managers/PinManager.java index c3b7592..c26f5a6 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/managers/PinManager.java +++ b/src/main/java/tech/sbdevelopment/themeparkaudio/managers/PinManager.java @@ -1,9 +1,12 @@ -package nl.sbdeveloper.mctpaudio.managers; +package tech.sbdevelopment.themeparkaudio.managers; + +import lombok.experimental.UtilityClass; import java.security.SecureRandom; import java.util.UUID; import java.util.WeakHashMap; +@UtilityClass public class PinManager { private static final WeakHashMap pins = new WeakHashMap<>(); diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/managers/WGManager.java b/src/main/java/tech/sbdevelopment/themeparkaudio/managers/WGManager.java similarity index 99% rename from src/main/java/nl/sbdeveloper/mctpaudio/managers/WGManager.java rename to src/main/java/tech/sbdevelopment/themeparkaudio/managers/WGManager.java index 6e0d98c..6a16369 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/managers/WGManager.java +++ b/src/main/java/tech/sbdevelopment/themeparkaudio/managers/WGManager.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.mctpaudio.managers; +package tech.sbdevelopment.themeparkaudio.managers; import com.sk89q.worldedit.IncompleteRegionException; import com.sk89q.worldedit.LocalSession; diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/radio/Playlist.java b/src/main/java/tech/sbdevelopment/themeparkaudio/radio/Playlist.java similarity index 88% rename from src/main/java/nl/sbdeveloper/mctpaudio/radio/Playlist.java rename to src/main/java/tech/sbdevelopment/themeparkaudio/radio/Playlist.java index 3b7a9a5..34b15b1 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/radio/Playlist.java +++ b/src/main/java/tech/sbdevelopment/themeparkaudio/radio/Playlist.java @@ -1,16 +1,16 @@ -package nl.sbdeveloper.mctpaudio.radio; +package tech.sbdevelopment.themeparkaudio.radio; import com.mpatric.mp3agic.InvalidDataException; import com.mpatric.mp3agic.UnsupportedTagException; import lombok.Getter; -import nl.sbdeveloper.mctpaudio.ThemeParkAudio; -import nl.sbdeveloper.mctpaudio.api.AudioType; -import nl.sbdeveloper.mctpaudio.api.maps.SongList; -import nl.sbdeveloper.mctpaudio.managers.PinManager; -import nl.sbdeveloper.mctpaudio.socket.messages.AudioMessage; -import nl.sbdeveloper.mctpaudio.utils.HeadUtil; -import nl.sbdeveloper.mctpaudio.utils.DiscordUtil; -import nl.sbdeveloper.mctpaudio.utils.WebhookMessage; +import tech.sbdevelopment.themeparkaudio.ThemeParkAudio; +import tech.sbdevelopment.themeparkaudio.api.AudioType; +import tech.sbdevelopment.themeparkaudio.api.maps.SongList; +import tech.sbdevelopment.themeparkaudio.managers.PinManager; +import tech.sbdevelopment.themeparkaudio.socket.messages.AudioMessage; +import tech.sbdevelopment.themeparkaudio.utils.HeadUtil; +import tech.sbdevelopment.themeparkaudio.utils.DiscordUtil; +import tech.sbdevelopment.themeparkaudio.utils.WebhookMessage; import org.bukkit.Bukkit; import org.bukkit.scheduler.BukkitTask; diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/socket/Client.java b/src/main/java/tech/sbdevelopment/themeparkaudio/socket/Client.java similarity index 92% rename from src/main/java/nl/sbdeveloper/mctpaudio/socket/Client.java rename to src/main/java/tech/sbdevelopment/themeparkaudio/socket/Client.java index 5b00f90..69aed5e 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/socket/Client.java +++ b/src/main/java/tech/sbdevelopment/themeparkaudio/socket/Client.java @@ -1,14 +1,14 @@ -package nl.sbdeveloper.mctpaudio.socket; +package tech.sbdevelopment.themeparkaudio.socket; import com.sk89q.worldguard.protection.regions.ProtectedRegion; -import nl.sbdeveloper.mctpaudio.ThemeParkAudio; -import nl.sbdeveloper.mctpaudio.api.AudioType; -import nl.sbdeveloper.mctpaudio.api.events.AudioConnectionUpdateEvent; -import nl.sbdeveloper.mctpaudio.managers.PinManager; -import nl.sbdeveloper.mctpaudio.managers.WGManager; -import nl.sbdeveloper.mctpaudio.socket.messages.AudioMessage; -import nl.sbdeveloper.mctpaudio.socket.messages.AuthenticationMessage; -import nl.sbdeveloper.mctpaudio.socket.messages.LightMessage; +import tech.sbdevelopment.themeparkaudio.ThemeParkAudio; +import tech.sbdevelopment.themeparkaudio.api.AudioType; +import tech.sbdevelopment.themeparkaudio.api.events.AudioConnectionUpdateEvent; +import tech.sbdevelopment.themeparkaudio.managers.PinManager; +import tech.sbdevelopment.themeparkaudio.managers.WGManager; +import tech.sbdevelopment.themeparkaudio.socket.messages.AudioMessage; +import tech.sbdevelopment.themeparkaudio.socket.messages.AuthenticationMessage; +import tech.sbdevelopment.themeparkaudio.socket.messages.LightMessage; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.java_websocket.client.WebSocketClient; diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/socket/JSONUtil.java b/src/main/java/tech/sbdevelopment/themeparkaudio/socket/JSONUtil.java similarity index 97% rename from src/main/java/nl/sbdeveloper/mctpaudio/socket/JSONUtil.java rename to src/main/java/tech/sbdevelopment/themeparkaudio/socket/JSONUtil.java index 6aa982c..84714e5 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/socket/JSONUtil.java +++ b/src/main/java/tech/sbdevelopment/themeparkaudio/socket/JSONUtil.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.mctpaudio.socket; +package tech.sbdevelopment.themeparkaudio.socket; import lombok.experimental.UtilityClass; import org.json.simple.JSONObject; diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/socket/messages/AbstractMessage.java b/src/main/java/tech/sbdevelopment/themeparkaudio/socket/messages/AbstractMessage.java similarity index 91% rename from src/main/java/nl/sbdeveloper/mctpaudio/socket/messages/AbstractMessage.java rename to src/main/java/tech/sbdevelopment/themeparkaudio/socket/messages/AbstractMessage.java index 7450c26..a288898 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/socket/messages/AbstractMessage.java +++ b/src/main/java/tech/sbdevelopment/themeparkaudio/socket/messages/AbstractMessage.java @@ -1,7 +1,7 @@ -package nl.sbdeveloper.mctpaudio.socket.messages; +package tech.sbdevelopment.themeparkaudio.socket.messages; import lombok.Getter; -import nl.sbdeveloper.mctpaudio.ThemeParkAudio; +import tech.sbdevelopment.themeparkaudio.ThemeParkAudio; import org.bukkit.Bukkit; import org.bukkit.entity.Entity; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/socket/messages/AudioMessage.java b/src/main/java/tech/sbdevelopment/themeparkaudio/socket/messages/AudioMessage.java similarity index 90% rename from src/main/java/nl/sbdeveloper/mctpaudio/socket/messages/AudioMessage.java rename to src/main/java/tech/sbdevelopment/themeparkaudio/socket/messages/AudioMessage.java index 74ab217..3cc6b3b 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/socket/messages/AudioMessage.java +++ b/src/main/java/tech/sbdevelopment/themeparkaudio/socket/messages/AudioMessage.java @@ -1,7 +1,7 @@ -package nl.sbdeveloper.mctpaudio.socket.messages; +package tech.sbdevelopment.themeparkaudio.socket.messages; import lombok.Getter; -import nl.sbdeveloper.mctpaudio.api.AudioType; +import tech.sbdevelopment.themeparkaudio.api.AudioType; import org.json.simple.JSONObject; @Getter diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/socket/messages/AuthenticationMessage.java b/src/main/java/tech/sbdevelopment/themeparkaudio/socket/messages/AuthenticationMessage.java similarity index 90% rename from src/main/java/nl/sbdeveloper/mctpaudio/socket/messages/AuthenticationMessage.java rename to src/main/java/tech/sbdevelopment/themeparkaudio/socket/messages/AuthenticationMessage.java index 7b36b00..e46a962 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/socket/messages/AuthenticationMessage.java +++ b/src/main/java/tech/sbdevelopment/themeparkaudio/socket/messages/AuthenticationMessage.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.mctpaudio.socket.messages; +package tech.sbdevelopment.themeparkaudio.socket.messages; import lombok.Getter; import org.json.simple.JSONObject; diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/socket/messages/LightMessage.java b/src/main/java/tech/sbdevelopment/themeparkaudio/socket/messages/LightMessage.java similarity index 93% rename from src/main/java/nl/sbdeveloper/mctpaudio/socket/messages/LightMessage.java rename to src/main/java/tech/sbdevelopment/themeparkaudio/socket/messages/LightMessage.java index a48760a..57839b5 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/socket/messages/LightMessage.java +++ b/src/main/java/tech/sbdevelopment/themeparkaudio/socket/messages/LightMessage.java @@ -1,6 +1,6 @@ -package nl.sbdeveloper.mctpaudio.socket.messages; +package tech.sbdevelopment.themeparkaudio.socket.messages; -import nl.sbdeveloper.mctpaudio.api.LightRegion; +import tech.sbdevelopment.themeparkaudio.api.LightRegion; import org.jetbrains.annotations.NotNull; import org.json.simple.JSONObject; diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/socket/messages/LogoutMessage.java b/src/main/java/tech/sbdevelopment/themeparkaudio/socket/messages/LogoutMessage.java similarity index 80% rename from src/main/java/nl/sbdeveloper/mctpaudio/socket/messages/LogoutMessage.java rename to src/main/java/tech/sbdevelopment/themeparkaudio/socket/messages/LogoutMessage.java index c5236ba..d741cb7 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/socket/messages/LogoutMessage.java +++ b/src/main/java/tech/sbdevelopment/themeparkaudio/socket/messages/LogoutMessage.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.mctpaudio.socket.messages; +package tech.sbdevelopment.themeparkaudio.socket.messages; import org.json.simple.JSONObject; diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/socket/messages/MessageTask.java b/src/main/java/tech/sbdevelopment/themeparkaudio/socket/messages/MessageTask.java similarity index 58% rename from src/main/java/nl/sbdeveloper/mctpaudio/socket/messages/MessageTask.java rename to src/main/java/tech/sbdevelopment/themeparkaudio/socket/messages/MessageTask.java index 8ce3487..093cf02 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/socket/messages/MessageTask.java +++ b/src/main/java/tech/sbdevelopment/themeparkaudio/socket/messages/MessageTask.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.mctpaudio.socket.messages; +package tech.sbdevelopment.themeparkaudio.socket.messages; public enum MessageTask { AUTHENTICATION, LOGOUT, LIGHT, MUSIC, SFX, RADIO diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/socket/messages/StopAudioMessage.java b/src/main/java/tech/sbdevelopment/themeparkaudio/socket/messages/StopAudioMessage.java similarity index 68% rename from src/main/java/nl/sbdeveloper/mctpaudio/socket/messages/StopAudioMessage.java rename to src/main/java/tech/sbdevelopment/themeparkaudio/socket/messages/StopAudioMessage.java index e7e1320..3b0eb94 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/socket/messages/StopAudioMessage.java +++ b/src/main/java/tech/sbdevelopment/themeparkaudio/socket/messages/StopAudioMessage.java @@ -1,6 +1,6 @@ -package nl.sbdeveloper.mctpaudio.socket.messages; +package tech.sbdevelopment.themeparkaudio.socket.messages; -import nl.sbdeveloper.mctpaudio.api.AudioType; +import tech.sbdevelopment.themeparkaudio.api.AudioType; public class StopAudioMessage extends AudioMessage { public StopAudioMessage(AudioType type) { diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/utils/DiscordUtil.java b/src/main/java/tech/sbdevelopment/themeparkaudio/utils/DiscordUtil.java similarity index 95% rename from src/main/java/nl/sbdeveloper/mctpaudio/utils/DiscordUtil.java rename to src/main/java/tech/sbdevelopment/themeparkaudio/utils/DiscordUtil.java index 58232fc..5f28d5e 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/utils/DiscordUtil.java +++ b/src/main/java/tech/sbdevelopment/themeparkaudio/utils/DiscordUtil.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.mctpaudio.utils; +package tech.sbdevelopment.themeparkaudio.utils; import lombok.experimental.UtilityClass; diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/utils/HeadUtil.java b/src/main/java/tech/sbdevelopment/themeparkaudio/utils/HeadUtil.java similarity index 98% rename from src/main/java/nl/sbdeveloper/mctpaudio/utils/HeadUtil.java rename to src/main/java/tech/sbdevelopment/themeparkaudio/utils/HeadUtil.java index 5a3f9f8..04c8254 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/utils/HeadUtil.java +++ b/src/main/java/tech/sbdevelopment/themeparkaudio/utils/HeadUtil.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.mctpaudio.utils; +package tech.sbdevelopment.themeparkaudio.utils; import com.mpatric.mp3agic.InvalidDataException; import com.mpatric.mp3agic.Mp3File; diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/utils/SpigotPlayerSelector.java b/src/main/java/tech/sbdevelopment/themeparkaudio/utils/SpigotPlayerSelector.java similarity index 97% rename from src/main/java/nl/sbdeveloper/mctpaudio/utils/SpigotPlayerSelector.java rename to src/main/java/tech/sbdevelopment/themeparkaudio/utils/SpigotPlayerSelector.java index 716c93a..89e22c6 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/utils/SpigotPlayerSelector.java +++ b/src/main/java/tech/sbdevelopment/themeparkaudio/utils/SpigotPlayerSelector.java @@ -1,8 +1,7 @@ -package nl.sbdeveloper.mctpaudio.utils; +package tech.sbdevelopment.themeparkaudio.utils; import com.sk89q.worldguard.protection.regions.ProtectedRegion; -import lombok.experimental.UtilityClass; -import nl.sbdeveloper.mctpaudio.managers.WGManager; +import tech.sbdevelopment.themeparkaudio.managers.WGManager; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.command.BlockCommandSender; diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/utils/WebhookMessage.java b/src/main/java/tech/sbdevelopment/themeparkaudio/utils/WebhookMessage.java similarity index 99% rename from src/main/java/nl/sbdeveloper/mctpaudio/utils/WebhookMessage.java rename to src/main/java/tech/sbdevelopment/themeparkaudio/utils/WebhookMessage.java index 6535c07..78ba3f4 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/utils/WebhookMessage.java +++ b/src/main/java/tech/sbdevelopment/themeparkaudio/utils/WebhookMessage.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.mctpaudio.utils; +package tech.sbdevelopment.themeparkaudio.utils; import javax.net.ssl.HttpsURLConnection; import java.awt.*; diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 92b0730..9bdd76d 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,8 +1,8 @@ -name: MCTPAudio +name: ThemeParkAudio version: ${project.version} -main: nl.sbdeveloper.mctpaudio.ThemeParkAudio -api-version: 1.19 +main: tech.sbdevelopment.themeparkaudio.ThemeParkAudio +api-version: 1.21 depend: [ WorldGuard, Train_Carts ] authors: [ SBDeveloper ] -description: The audio plugin of MCThemeParks! -website: https://mcthemeparks.com +description: Audio and light control from your Minecraft server! +website: https://sbdevelopment.tech