Aligned package
All checks were successful
Java CI / Build (push) Successful in 1m30s

This commit is contained in:
Stijn Bannink 2025-04-03 22:31:53 +02:00
parent 57c0ed29b9
commit d8c9c4cc26
Signed by: SBDeveloper
GPG key ID: B730712F2C3A9D7A
26 changed files with 83 additions and 81 deletions

View file

@ -1,13 +1,13 @@
package nl.sbdeveloper.mctpaudio; package tech.sbdevelopment.themeparkaudio;
import co.aikar.commands.PaperCommandManager; import co.aikar.commands.PaperCommandManager;
import lombok.Getter; import lombok.Getter;
import nl.sbdeveloper.mctpaudio.commands.TPAudioCMD; import tech.sbdevelopment.themeparkaudio.commands.TPAudioCMD;
import nl.sbdeveloper.mctpaudio.listener.LogoutListener; import tech.sbdevelopment.themeparkaudio.listener.LogoutListener;
import nl.sbdeveloper.mctpaudio.listener.WGListener; import tech.sbdevelopment.themeparkaudio.listener.WGListener;
import nl.sbdeveloper.mctpaudio.managers.WGManager; import tech.sbdevelopment.themeparkaudio.managers.WGManager;
import nl.sbdeveloper.mctpaudio.radio.Playlist; import tech.sbdevelopment.themeparkaudio.radio.Playlist;
import nl.sbdeveloper.mctpaudio.socket.Client; import tech.sbdevelopment.themeparkaudio.socket.Client;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;

View file

@ -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 { public enum AudioType {
MUSIC, SFX, RADIO; MUSIC, SFX, RADIO;

View file

@ -1,4 +1,4 @@
package nl.sbdeveloper.mctpaudio.api; package tech.sbdevelopment.themeparkaudio.api;
public enum LightRegion { public enum LightRegion {
LEFT, MID, RIGHT, ALL LEFT, MID, RIGHT, ALL

View file

@ -1,4 +1,4 @@
package nl.sbdeveloper.mctpaudio.api.events; package tech.sbdevelopment.themeparkaudio.api.events;
import lombok.Getter; import lombok.Getter;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

View file

@ -1,4 +1,4 @@
package nl.sbdeveloper.mctpaudio.api.maps; package tech.sbdevelopment.themeparkaudio.api.maps;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Random; import java.util.Random;

View file

@ -1,15 +1,15 @@
package nl.sbdeveloper.mctpaudio.commands; package tech.sbdevelopment.themeparkaudio.commands;
import co.aikar.commands.BaseCommand; import co.aikar.commands.BaseCommand;
import co.aikar.commands.CommandHelp; import co.aikar.commands.CommandHelp;
import co.aikar.commands.annotation.*; import co.aikar.commands.annotation.*;
import nl.sbdeveloper.mctpaudio.ThemeParkAudio; import tech.sbdevelopment.themeparkaudio.ThemeParkAudio;
import nl.sbdeveloper.mctpaudio.api.AudioType; import tech.sbdevelopment.themeparkaudio.api.AudioType;
import nl.sbdeveloper.mctpaudio.api.LightRegion; import tech.sbdevelopment.themeparkaudio.api.LightRegion;
import nl.sbdeveloper.mctpaudio.listener.PlayInRegionHandler; import tech.sbdevelopment.themeparkaudio.listener.PlayInRegionHandler;
import nl.sbdeveloper.mctpaudio.managers.PinManager; import tech.sbdevelopment.themeparkaudio.managers.PinManager;
import nl.sbdeveloper.mctpaudio.utils.HeadUtil; import tech.sbdevelopment.themeparkaudio.utils.HeadUtil;
import nl.sbdeveloper.mctpaudio.utils.SpigotPlayerSelector; import tech.sbdevelopment.themeparkaudio.utils.SpigotPlayerSelector;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;

View file

@ -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.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerQuitEvent;

View file

@ -1,17 +1,17 @@
package nl.sbdeveloper.mctpaudio.listener; package tech.sbdevelopment.themeparkaudio.listener;
import com.mpatric.mp3agic.InvalidDataException; import com.mpatric.mp3agic.InvalidDataException;
import com.mpatric.mp3agic.UnsupportedTagException; import com.mpatric.mp3agic.UnsupportedTagException;
import com.sk89q.worldguard.protection.regions.ProtectedRegion; import com.sk89q.worldguard.protection.regions.ProtectedRegion;
import net.raidstone.wgevents.events.RegionEnteredEvent; import net.raidstone.wgevents.events.RegionEnteredEvent;
import net.raidstone.wgevents.events.RegionLeftEvent; import net.raidstone.wgevents.events.RegionLeftEvent;
import nl.sbdeveloper.mctpaudio.ThemeParkAudio; import tech.sbdevelopment.themeparkaudio.ThemeParkAudio;
import nl.sbdeveloper.mctpaudio.api.AudioType; import tech.sbdevelopment.themeparkaudio.api.AudioType;
import nl.sbdeveloper.mctpaudio.api.events.AudioConnectionUpdateEvent; import tech.sbdevelopment.themeparkaudio.api.events.AudioConnectionUpdateEvent;
import nl.sbdeveloper.mctpaudio.managers.PinManager; import tech.sbdevelopment.themeparkaudio.managers.PinManager;
import nl.sbdeveloper.mctpaudio.managers.WGManager; import tech.sbdevelopment.themeparkaudio.managers.WGManager;
import nl.sbdeveloper.mctpaudio.socket.messages.AudioMessage; import tech.sbdevelopment.themeparkaudio.socket.messages.AudioMessage;
import nl.sbdeveloper.mctpaudio.utils.HeadUtil; import tech.sbdevelopment.themeparkaudio.utils.HeadUtil;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;

View file

@ -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.entity.CommonEntityController;
import com.bergerkiller.bukkit.common.events.EntityMoveEvent; 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.bergerkiller.bukkit.tc.controller.MinecartMemberStore;
import com.sk89q.worldguard.protection.regions.ProtectedRegion; import com.sk89q.worldguard.protection.regions.ProtectedRegion;
import net.raidstone.wgevents.events.RegionsEnteredEvent; import net.raidstone.wgevents.events.RegionsEnteredEvent;
import nl.sbdeveloper.mctpaudio.ThemeParkAudio; import tech.sbdevelopment.themeparkaudio.ThemeParkAudio;
import nl.sbdeveloper.mctpaudio.api.AudioType; import tech.sbdevelopment.themeparkaudio.api.AudioType;
import nl.sbdeveloper.mctpaudio.managers.PinManager; import tech.sbdevelopment.themeparkaudio.managers.PinManager;
import nl.sbdeveloper.mctpaudio.managers.WGManager; import tech.sbdevelopment.themeparkaudio.managers.WGManager;
import nl.sbdeveloper.mctpaudio.socket.messages.AudioMessage; import tech.sbdevelopment.themeparkaudio.socket.messages.AudioMessage;
import nl.sbdeveloper.mctpaudio.socket.messages.LightMessage; import tech.sbdevelopment.themeparkaudio.socket.messages.LightMessage;
import nl.sbdeveloper.mctpaudio.socket.messages.StopAudioMessage; import tech.sbdevelopment.themeparkaudio.socket.messages.StopAudioMessage;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

View file

@ -1,9 +1,12 @@
package nl.sbdeveloper.mctpaudio.managers; package tech.sbdevelopment.themeparkaudio.managers;
import lombok.experimental.UtilityClass;
import java.security.SecureRandom; import java.security.SecureRandom;
import java.util.UUID; import java.util.UUID;
import java.util.WeakHashMap; import java.util.WeakHashMap;
@UtilityClass
public class PinManager { public class PinManager {
private static final WeakHashMap<UUID, String> pins = new WeakHashMap<>(); private static final WeakHashMap<UUID, String> pins = new WeakHashMap<>();

View file

@ -1,4 +1,4 @@
package nl.sbdeveloper.mctpaudio.managers; package tech.sbdevelopment.themeparkaudio.managers;
import com.sk89q.worldedit.IncompleteRegionException; import com.sk89q.worldedit.IncompleteRegionException;
import com.sk89q.worldedit.LocalSession; import com.sk89q.worldedit.LocalSession;

View file

@ -1,16 +1,16 @@
package nl.sbdeveloper.mctpaudio.radio; package tech.sbdevelopment.themeparkaudio.radio;
import com.mpatric.mp3agic.InvalidDataException; import com.mpatric.mp3agic.InvalidDataException;
import com.mpatric.mp3agic.UnsupportedTagException; import com.mpatric.mp3agic.UnsupportedTagException;
import lombok.Getter; import lombok.Getter;
import nl.sbdeveloper.mctpaudio.ThemeParkAudio; import tech.sbdevelopment.themeparkaudio.ThemeParkAudio;
import nl.sbdeveloper.mctpaudio.api.AudioType; import tech.sbdevelopment.themeparkaudio.api.AudioType;
import nl.sbdeveloper.mctpaudio.api.maps.SongList; import tech.sbdevelopment.themeparkaudio.api.maps.SongList;
import nl.sbdeveloper.mctpaudio.managers.PinManager; import tech.sbdevelopment.themeparkaudio.managers.PinManager;
import nl.sbdeveloper.mctpaudio.socket.messages.AudioMessage; import tech.sbdevelopment.themeparkaudio.socket.messages.AudioMessage;
import nl.sbdeveloper.mctpaudio.utils.HeadUtil; import tech.sbdevelopment.themeparkaudio.utils.HeadUtil;
import nl.sbdeveloper.mctpaudio.utils.DiscordUtil; import tech.sbdevelopment.themeparkaudio.utils.DiscordUtil;
import nl.sbdeveloper.mctpaudio.utils.WebhookMessage; import tech.sbdevelopment.themeparkaudio.utils.WebhookMessage;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.scheduler.BukkitTask; import org.bukkit.scheduler.BukkitTask;

View file

@ -1,14 +1,14 @@
package nl.sbdeveloper.mctpaudio.socket; package tech.sbdevelopment.themeparkaudio.socket;
import com.sk89q.worldguard.protection.regions.ProtectedRegion; import com.sk89q.worldguard.protection.regions.ProtectedRegion;
import nl.sbdeveloper.mctpaudio.ThemeParkAudio; import tech.sbdevelopment.themeparkaudio.ThemeParkAudio;
import nl.sbdeveloper.mctpaudio.api.AudioType; import tech.sbdevelopment.themeparkaudio.api.AudioType;
import nl.sbdeveloper.mctpaudio.api.events.AudioConnectionUpdateEvent; import tech.sbdevelopment.themeparkaudio.api.events.AudioConnectionUpdateEvent;
import nl.sbdeveloper.mctpaudio.managers.PinManager; import tech.sbdevelopment.themeparkaudio.managers.PinManager;
import nl.sbdeveloper.mctpaudio.managers.WGManager; import tech.sbdevelopment.themeparkaudio.managers.WGManager;
import nl.sbdeveloper.mctpaudio.socket.messages.AudioMessage; import tech.sbdevelopment.themeparkaudio.socket.messages.AudioMessage;
import nl.sbdeveloper.mctpaudio.socket.messages.AuthenticationMessage; import tech.sbdevelopment.themeparkaudio.socket.messages.AuthenticationMessage;
import nl.sbdeveloper.mctpaudio.socket.messages.LightMessage; import tech.sbdevelopment.themeparkaudio.socket.messages.LightMessage;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.java_websocket.client.WebSocketClient; import org.java_websocket.client.WebSocketClient;

View file

@ -1,4 +1,4 @@
package nl.sbdeveloper.mctpaudio.socket; package tech.sbdevelopment.themeparkaudio.socket;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;

View file

@ -1,7 +1,7 @@
package nl.sbdeveloper.mctpaudio.socket.messages; package tech.sbdevelopment.themeparkaudio.socket.messages;
import lombok.Getter; import lombok.Getter;
import nl.sbdeveloper.mctpaudio.ThemeParkAudio; import tech.sbdevelopment.themeparkaudio.ThemeParkAudio;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;

View file

@ -1,7 +1,7 @@
package nl.sbdeveloper.mctpaudio.socket.messages; package tech.sbdevelopment.themeparkaudio.socket.messages;
import lombok.Getter; import lombok.Getter;
import nl.sbdeveloper.mctpaudio.api.AudioType; import tech.sbdevelopment.themeparkaudio.api.AudioType;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
@Getter @Getter

View file

@ -1,4 +1,4 @@
package nl.sbdeveloper.mctpaudio.socket.messages; package tech.sbdevelopment.themeparkaudio.socket.messages;
import lombok.Getter; import lombok.Getter;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;

View file

@ -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.jetbrains.annotations.NotNull;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;

View file

@ -1,4 +1,4 @@
package nl.sbdeveloper.mctpaudio.socket.messages; package tech.sbdevelopment.themeparkaudio.socket.messages;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;

View file

@ -1,4 +1,4 @@
package nl.sbdeveloper.mctpaudio.socket.messages; package tech.sbdevelopment.themeparkaudio.socket.messages;
public enum MessageTask { public enum MessageTask {
AUTHENTICATION, LOGOUT, LIGHT, MUSIC, SFX, RADIO AUTHENTICATION, LOGOUT, LIGHT, MUSIC, SFX, RADIO

View file

@ -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 class StopAudioMessage extends AudioMessage {
public StopAudioMessage(AudioType type) { public StopAudioMessage(AudioType type) {

View file

@ -1,4 +1,4 @@
package nl.sbdeveloper.mctpaudio.utils; package tech.sbdevelopment.themeparkaudio.utils;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;

View file

@ -1,4 +1,4 @@
package nl.sbdeveloper.mctpaudio.utils; package tech.sbdevelopment.themeparkaudio.utils;
import com.mpatric.mp3agic.InvalidDataException; import com.mpatric.mp3agic.InvalidDataException;
import com.mpatric.mp3agic.Mp3File; import com.mpatric.mp3agic.Mp3File;

View file

@ -1,8 +1,7 @@
package nl.sbdeveloper.mctpaudio.utils; package tech.sbdevelopment.themeparkaudio.utils;
import com.sk89q.worldguard.protection.regions.ProtectedRegion; import com.sk89q.worldguard.protection.regions.ProtectedRegion;
import lombok.experimental.UtilityClass; import tech.sbdevelopment.themeparkaudio.managers.WGManager;
import nl.sbdeveloper.mctpaudio.managers.WGManager;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.command.BlockCommandSender; import org.bukkit.command.BlockCommandSender;

View file

@ -1,4 +1,4 @@
package nl.sbdeveloper.mctpaudio.utils; package tech.sbdevelopment.themeparkaudio.utils;
import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.HttpsURLConnection;
import java.awt.*; import java.awt.*;

View file

@ -1,8 +1,8 @@
name: MCTPAudio name: ThemeParkAudio
version: ${project.version} version: ${project.version}
main: nl.sbdeveloper.mctpaudio.ThemeParkAudio main: tech.sbdevelopment.themeparkaudio.ThemeParkAudio
api-version: 1.19 api-version: 1.21
depend: [ WorldGuard, Train_Carts ] depend: [ WorldGuard, Train_Carts ]
authors: [ SBDeveloper ] authors: [ SBDeveloper ]
description: The audio plugin of MCThemeParks! description: Audio and light control from your Minecraft server!
website: https://mcthemeparks.com website: https://sbdevelopment.tech