Aligned package

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;

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;

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

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;

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;

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;

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;

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;

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;

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<UUID, String> pins = new WeakHashMap<>();
 

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;

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;
 

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;

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;

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;

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

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;

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;
 

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;
 

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

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) {

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;
 

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;

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;

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.*;

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