refactor: change package path to reflect group id of pom.xml

BREAKING CHANGE:

src/main/java/me/bobert/netneutrality/NetNeutrality.java

@@ -1,4 +1,4 @@
-package netneutrality;
+package me.bobert.netneutrality;
 
 /*
  * Copyright (c) anthorob
@@ -13,19 +13,19 @@ import net.dv8tion.jda.api.entities.Activity;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.exceptions.InvalidTokenException;
 import net.dv8tion.jda.api.requests.GatewayIntent;
-import netneutrality.command.CommandManager;
-import netneutrality.core.LogHandler;
-import netneutrality.db.DBController;
-import netneutrality.hooks.SlashCommandHooks;
-import netneutrality.hooks.guilds.ServerJoinHandler;
-import netneutrality.hooks.message.EditHandler;
-import netneutrality.hooks.message.MessageReceivedHandler;
-import netneutrality.http.server.WebApi;
-import netneutrality.music.MusicManager;
-import netneutrality.thread.BaseThreadFactory;
-import netneutrality.thread.ShutdownThread;
-import netneutrality.thread.ThreadManager;
-import netneutrality.utils.Settings;
+import me.bobert.netneutrality.command.CommandManager;
+import me.bobert.netneutrality.core.LogHandler;
+import me.bobert.netneutrality.db.DBController;
+import me.bobert.netneutrality.hooks.SlashCommandHooks;
+import me.bobert.netneutrality.hooks.guilds.ServerJoinHandler;
+import me.bobert.netneutrality.hooks.message.EditHandler;
+import me.bobert.netneutrality.hooks.message.MessageReceivedHandler;
+import me.bobert.netneutrality.http.server.WebApi;
+import me.bobert.netneutrality.music.MusicManager;
+import me.bobert.netneutrality.thread.BaseThreadFactory;
+import me.bobert.netneutrality.thread.ShutdownThread;
+import me.bobert.netneutrality.thread.ThreadManager;
+import me.bobert.netneutrality.utils.Settings;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -35,8 +35,7 @@ public class NetNeutrality {
 
     private static JDA jda;
     public final static Logger logger = LogManager.getLogger(NetNeutrality.class);
-
-    public static final String VERSION = "2.0.0";
+    public static final String VERSION = Settings.getInstance().getMavenVersion();
 
     public static void main(String[] args) {
         String env = Settings.getInstance().get("NETNEUTRALITY_BOT_ENV", "dev");

src/main/java/me/bobert/netneutrality/command/AbstractCommand.java

@@ -1,4 +1,4 @@
-package netneutrality.command;
+package me.bobert.netneutrality.command;
 
 /*
  * Copyright (c) anthorob
@@ -6,11 +6,11 @@ package netneutrality.command;
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.core.context.MessageCommandContext;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions;
-import netneutrality.core.context.MessageCommandContext;
 
 public abstract class AbstractCommand implements ICommand {
 

src/main/java/me/bobert/netneutrality/command/AbstractMusicCommand.java

@@ -1,18 +1,18 @@
-package netneutrality.command;
+package me.bobert.netneutrality.command;
 /*
  * Copyright (c) anthorob
  *
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.core.GuildManager;
+import me.bobert.netneutrality.db.GSettings;
+import me.bobert.netneutrality.utils.UserFunction;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Role;
 import net.dv8tion.jda.api.entities.channel.ChannelType;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
-import netneutrality.core.GuildManager;
-import netneutrality.db.GSettings;
-import netneutrality.utils.UserFunction;
 
 public abstract class AbstractMusicCommand extends AbstractCommand {
 

src/main/java/me/bobert/netneutrality/command/CommandExecutionResult.java

@@ -1,4 +1,4 @@
-package netneutrality.command;
+package me.bobert.netneutrality.command;
 /*
  * Copyright (c) anthorob
  *

src/main/java/me/bobert/netneutrality/command/CommandManager.java

@@ -1,16 +1,16 @@
-package netneutrality.command;
+package me.bobert.netneutrality.command;
 /*
  * Copyright (c) anthorob
  *
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.NetNeutrality;
+import me.bobert.netneutrality.core.LogHandler;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
 import net.dv8tion.jda.api.requests.restaction.CommandListUpdateAction;
-import netneutrality.NetNeutrality;
-import netneutrality.core.LogHandler;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.reflections.Reflections;

src/main/java/me/bobert/netneutrality/command/CommandType.java

@@ -1,4 +1,4 @@
-package netneutrality.command;
+package me.bobert.netneutrality.command;
 /*
  * Copyright (c) anthorob
  *

src/main/java/me/bobert/netneutrality/command/ICommand.java

@@ -1,17 +1,17 @@
-package netneutrality.command;
+package me.bobert.netneutrality.command;
 /*
  * Copyright (c) anthorob
  *
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.core.context.MessageCommandContext;
+import me.bobert.netneutrality.core.context.SlashCommandContext;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
-import netneutrality.core.context.MessageCommandContext;
-import netneutrality.core.context.SlashCommandContext;
 
 public interface ICommand {
 

src/main/java/me/bobert/netneutrality/command/admin/BlacklistCommand.java

@@ -1,24 +1,24 @@
-package netneutrality.command.admin;
+package me.bobert.netneutrality.command.admin;
 /*
  * Copyright (c) anthorob
  *
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.command.AbstractCommand;
+import me.bobert.netneutrality.command.CommandExecutionResult;
+import me.bobert.netneutrality.command.CommandType;
+import me.bobert.netneutrality.core.LogHandler;
+import me.bobert.netneutrality.core.context.MessageCommandContext;
+import me.bobert.netneutrality.core.context.SlashCommandContext;
+import me.bobert.netneutrality.db.DBController;
+import me.bobert.netneutrality.db.controllers.DBBlacklist;
+import me.bobert.netneutrality.db.entities.OBlacklist;
 import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
 import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
-import netneutrality.command.AbstractCommand;
-import netneutrality.command.CommandExecutionResult;
-import netneutrality.command.CommandType;
-import netneutrality.core.LogHandler;
-import netneutrality.core.context.MessageCommandContext;
-import netneutrality.core.context.SlashCommandContext;
-import netneutrality.db.DBController;
-import netneutrality.db.controllers.DBBlacklist;
-import netneutrality.db.entities.OBlacklist;
 
 import java.util.ArrayList;
 

src/main/java/me/bobert/netneutrality/command/basic/HelpCommand.java

@@ -1,19 +1,19 @@
-package netneutrality.command.basic;
+package me.bobert.netneutrality.command.basic;
 /*
  * Copyright (c) anthorob
  *
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.command.AbstractCommand;
+import me.bobert.netneutrality.command.CommandExecutionResult;
+import me.bobert.netneutrality.command.CommandType;
+import me.bobert.netneutrality.core.context.MessageCommandContext;
+import me.bobert.netneutrality.core.context.SlashCommandContext;
+import me.bobert.netneutrality.utils.MessageFunction;
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
 import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
-import netneutrality.command.AbstractCommand;
-import netneutrality.command.CommandExecutionResult;
-import netneutrality.command.CommandType;
-import netneutrality.core.context.MessageCommandContext;
-import netneutrality.core.context.SlashCommandContext;
-import netneutrality.utils.MessageFunction;
 
 import java.util.List;
 

src/main/java/me/bobert/netneutrality/command/basic/PingCommand.java

@@ -1,16 +1,16 @@
-package netneutrality.command.basic;
+package me.bobert.netneutrality.command.basic;
 /*
  * Copyright (c) anthorob
  *
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.command.AbstractCommand;
+import me.bobert.netneutrality.command.CommandExecutionResult;
+import me.bobert.netneutrality.command.CommandType;
+import me.bobert.netneutrality.core.context.MessageCommandContext;
+import me.bobert.netneutrality.core.context.SlashCommandContext;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
-import netneutrality.command.AbstractCommand;
-import netneutrality.command.CommandExecutionResult;
-import netneutrality.command.CommandType;
-import netneutrality.core.context.MessageCommandContext;
-import netneutrality.core.context.SlashCommandContext;
 
 public class PingCommand extends AbstractCommand {
 

src/main/java/me/bobert/netneutrality/command/bot/ConfigureCommand.java

@@ -1,10 +1,18 @@
-package netneutrality.command.bot;
+package me.bobert.netneutrality.command.bot;
 /*
  * Copyright (c) anthorob
  *
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.command.AbstractCommand;
+import me.bobert.netneutrality.command.CommandExecutionResult;
+import me.bobert.netneutrality.command.CommandType;
+import me.bobert.netneutrality.core.GuildManager;
+import me.bobert.netneutrality.core.context.MessageCommandContext;
+import me.bobert.netneutrality.core.context.SlashCommandContext;
+import me.bobert.netneutrality.db.GSettings;
+import me.bobert.netneutrality.music.MusicManager;
 import net.dv8tion.jda.api.entities.Role;
 import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.entities.channel.unions.GuildChannelUnion;
@@ -15,14 +23,6 @@ import net.dv8tion.jda.api.interactions.commands.build.OptionData;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
 import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
 import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
-import netneutrality.command.AbstractCommand;
-import netneutrality.command.CommandExecutionResult;
-import netneutrality.command.CommandType;
-import netneutrality.core.GuildManager;
-import netneutrality.core.context.MessageCommandContext;
-import netneutrality.core.context.SlashCommandContext;
-import netneutrality.db.GSettings;
-import netneutrality.music.MusicManager;
 
 import java.util.List;
 import java.util.Map;

src/main/java/me/bobert/netneutrality/command/crypto/CryptoPriceCommand.java

@@ -1,20 +1,20 @@
-package netneutrality.command.crypto;
+package me.bobert.netneutrality.command.crypto;
 /*
  * Copyright (c) anthorob
  *
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.command.AbstractCommand;
+import me.bobert.netneutrality.command.CommandExecutionResult;
+import me.bobert.netneutrality.command.CommandType;
+import me.bobert.netneutrality.core.LogHandler;
+import me.bobert.netneutrality.core.context.MessageCommandContext;
+import me.bobert.netneutrality.core.context.SlashCommandContext;
+import me.bobert.netneutrality.http.WebModule;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
-import netneutrality.command.AbstractCommand;
-import netneutrality.command.CommandExecutionResult;
-import netneutrality.command.CommandType;
-import netneutrality.core.LogHandler;
-import netneutrality.core.context.MessageCommandContext;
-import netneutrality.core.context.SlashCommandContext;
-import netneutrality.http.WebModule;
 import org.json.JSONException;
 import org.json.JSONObject;
 

src/main/java/me/bobert/netneutrality/command/music/BitconnectCommand.java

@@ -1,4 +1,4 @@
-package netneutrality.command.music;
+package me.bobert.netneutrality.command.music;
 
 /*
  * Copyright (c) anthorob
@@ -6,13 +6,13 @@ package netneutrality.command.music;
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.command.AbstractMusicCommand;
+import me.bobert.netneutrality.command.CommandExecutionResult;
+import me.bobert.netneutrality.command.CommandType;
+import me.bobert.netneutrality.core.context.MessageCommandContext;
+import me.bobert.netneutrality.core.context.SlashCommandContext;
+import me.bobert.netneutrality.music.MusicManager;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
-import netneutrality.command.AbstractMusicCommand;
-import netneutrality.command.CommandExecutionResult;
-import netneutrality.command.CommandType;
-import netneutrality.core.context.MessageCommandContext;
-import netneutrality.core.context.SlashCommandContext;
-import netneutrality.music.MusicManager;
 
 public class BitconnectCommand extends AbstractMusicCommand {
 

src/main/java/me/bobert/netneutrality/command/music/ClearQueueCommand.java

@@ -1,4 +1,4 @@
-package netneutrality.command.music;
+package me.bobert.netneutrality.command.music;
 
 /*
  * Copyright (c) anthorob
@@ -6,14 +6,14 @@ package netneutrality.command.music;
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.command.AbstractMusicCommand;
+import me.bobert.netneutrality.command.CommandExecutionResult;
+import me.bobert.netneutrality.core.context.MessageCommandContext;
+import me.bobert.netneutrality.core.context.SlashCommandContext;
+import me.bobert.netneutrality.music.MusicManager;
+import me.bobert.netneutrality.utils.MessageFunction;
+import me.bobert.netneutrality.utils.MusicUtils;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
-import netneutrality.command.AbstractMusicCommand;
-import netneutrality.command.CommandExecutionResult;
-import netneutrality.core.context.MessageCommandContext;
-import netneutrality.core.context.SlashCommandContext;
-import netneutrality.music.MusicManager;
-import netneutrality.utils.MessageFunction;
-import netneutrality.utils.MusicUtils;
 
 public class ClearQueueCommand extends AbstractMusicCommand {
 

src/main/java/me/bobert/netneutrality/command/music/CurrentlyPlayingCommand.java

@@ -1,4 +1,4 @@
-package netneutrality.command.music;
+package me.bobert.netneutrality.command.music;
 
 /*
  * Copyright (c) anthorob
@@ -6,14 +6,14 @@ package netneutrality.command.music;
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.command.AbstractMusicCommand;
+import me.bobert.netneutrality.command.CommandExecutionResult;
+import me.bobert.netneutrality.core.context.MessageCommandContext;
+import me.bobert.netneutrality.core.context.SlashCommandContext;
+import me.bobert.netneutrality.music.MusicManager;
+import me.bobert.netneutrality.utils.MessageFunction;
+import me.bobert.netneutrality.utils.MusicUtils;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
-import netneutrality.command.AbstractMusicCommand;
-import netneutrality.command.CommandExecutionResult;
-import netneutrality.core.context.MessageCommandContext;
-import netneutrality.core.context.SlashCommandContext;
-import netneutrality.music.MusicManager;
-import netneutrality.utils.MessageFunction;
-import netneutrality.utils.MusicUtils;
 
 public class CurrentlyPlayingCommand extends AbstractMusicCommand {
 

src/main/java/me/bobert/netneutrality/command/music/JoinCommand.java

@@ -1,4 +1,4 @@
-package netneutrality.command.music;
+package me.bobert.netneutrality.command.music;
 
 /*
  * Copyright (c) anthorob
@@ -6,14 +6,14 @@ package netneutrality.command.music;
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.command.AbstractMusicCommand;
+import me.bobert.netneutrality.command.CommandExecutionResult;
+import me.bobert.netneutrality.core.context.MessageCommandContext;
+import me.bobert.netneutrality.core.context.SlashCommandContext;
+import me.bobert.netneutrality.exceptions.CommandExecutionException;
+import me.bobert.netneutrality.music.MusicManager;
 import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
-import netneutrality.command.AbstractMusicCommand;
-import netneutrality.command.CommandExecutionResult;
-import netneutrality.core.context.MessageCommandContext;
-import netneutrality.core.context.SlashCommandContext;
-import netneutrality.exceptions.CommandExecutionException;
-import netneutrality.music.MusicManager;
 
 public class JoinCommand extends AbstractMusicCommand {
 

src/main/java/me/bobert/netneutrality/command/music/LeaveCommand.java

@@ -1,4 +1,4 @@
-package netneutrality.command.music;
+package me.bobert.netneutrality.command.music;
 
 /*
  * Copyright (c) anthorob
@@ -6,13 +6,13 @@ package netneutrality.command.music;
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.command.AbstractMusicCommand;
+import me.bobert.netneutrality.command.CommandExecutionResult;
+import me.bobert.netneutrality.core.context.MessageCommandContext;
+import me.bobert.netneutrality.core.context.SlashCommandContext;
+import me.bobert.netneutrality.music.MusicManager;
+import me.bobert.netneutrality.utils.MusicUtils;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
-import netneutrality.command.AbstractMusicCommand;
-import netneutrality.command.CommandExecutionResult;
-import netneutrality.core.context.MessageCommandContext;
-import netneutrality.core.context.SlashCommandContext;
-import netneutrality.music.MusicManager;
-import netneutrality.utils.MusicUtils;
 
 public class LeaveCommand extends AbstractMusicCommand {
 

src/main/java/me/bobert/netneutrality/command/music/PlayCommand.java

@@ -1,4 +1,4 @@
-package netneutrality.command.music;
+package me.bobert.netneutrality.command.music;
 
 /*
  * Copyright (c) anthorob
@@ -6,14 +6,14 @@ package netneutrality.command.music;
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.command.AbstractMusicCommand;
+import me.bobert.netneutrality.command.CommandExecutionResult;
+import me.bobert.netneutrality.core.context.MessageCommandContext;
+import me.bobert.netneutrality.core.context.SlashCommandContext;
+import me.bobert.netneutrality.music.MusicManager;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
-import netneutrality.command.AbstractMusicCommand;
-import netneutrality.command.CommandExecutionResult;
-import netneutrality.core.context.MessageCommandContext;
-import netneutrality.core.context.SlashCommandContext;
-import netneutrality.music.MusicManager;
 
 public class PlayCommand extends AbstractMusicCommand {
 

src/main/java/me/bobert/netneutrality/command/music/QueueCommand.java

@@ -1,10 +1,17 @@
-package netneutrality.command.music;
+package me.bobert.netneutrality.command.music;
 /*
  * Copyright (c) anthorob
  *
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.command.AbstractMusicCommand;
+import me.bobert.netneutrality.command.CommandExecutionResult;
+import me.bobert.netneutrality.core.context.MessageCommandContext;
+import me.bobert.netneutrality.core.context.SlashCommandContext;
+import me.bobert.netneutrality.music.MusicManager;
+import me.bobert.netneutrality.utils.MessageFunction;
+import me.bobert.netneutrality.utils.MusicUtils;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
@@ -12,13 +19,6 @@ import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
 import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
-import netneutrality.command.AbstractMusicCommand;
-import netneutrality.command.CommandExecutionResult;
-import netneutrality.core.context.MessageCommandContext;
-import netneutrality.core.context.SlashCommandContext;
-import netneutrality.music.MusicManager;
-import netneutrality.utils.MessageFunction;
-import netneutrality.utils.MusicUtils;
 
 public class QueueCommand extends AbstractMusicCommand {
 

src/main/java/me/bobert/netneutrality/command/music/ShuffleCommand.java

@@ -1,4 +1,4 @@
-package netneutrality.command.music;
+package me.bobert.netneutrality.command.music;
 
 /*
  * Copyright (c) anthorob
@@ -6,12 +6,12 @@ package netneutrality.command.music;
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.command.AbstractMusicCommand;
+import me.bobert.netneutrality.command.CommandExecutionResult;
+import me.bobert.netneutrality.core.context.SlashCommandContext;
+import me.bobert.netneutrality.music.MusicManager;
+import me.bobert.netneutrality.utils.MusicUtils;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
-import netneutrality.command.AbstractMusicCommand;
-import netneutrality.command.CommandExecutionResult;
-import netneutrality.core.context.SlashCommandContext;
-import netneutrality.music.MusicManager;
-import netneutrality.utils.MusicUtils;
 
 public class ShuffleCommand extends AbstractMusicCommand {
     @Override

src/main/java/me/bobert/netneutrality/command/music/SkipCommand.java

@@ -1,4 +1,4 @@
-package netneutrality.command.music;
+package me.bobert.netneutrality.command.music;
 
 /*
  * Copyright (c) anthorob
@@ -6,17 +6,17 @@ package netneutrality.command.music;
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.command.AbstractMusicCommand;
+import me.bobert.netneutrality.command.CommandExecutionResult;
+import me.bobert.netneutrality.core.context.MessageCommandContext;
+import me.bobert.netneutrality.core.context.SlashCommandContext;
+import me.bobert.netneutrality.music.MusicManager;
+import me.bobert.netneutrality.utils.MusicUtils;
+import me.bobert.netneutrality.utils.UserFunction;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
-import netneutrality.command.AbstractMusicCommand;
-import netneutrality.command.CommandExecutionResult;
-import netneutrality.core.context.MessageCommandContext;
-import netneutrality.core.context.SlashCommandContext;
-import netneutrality.music.MusicManager;
-import netneutrality.utils.MusicUtils;
-import netneutrality.utils.UserFunction;
 
 public class SkipCommand extends AbstractMusicCommand {
 

src/main/java/me/bobert/netneutrality/command/music/StopCommand.java

@@ -1,4 +1,4 @@
-package netneutrality.command.music;
+package me.bobert.netneutrality.command.music;
 
 /*
  * Copyright (c) anthorob
@@ -6,14 +6,14 @@ package netneutrality.command.music;
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.command.AbstractMusicCommand;
+import me.bobert.netneutrality.command.CommandExecutionResult;
+import me.bobert.netneutrality.core.context.MessageCommandContext;
+import me.bobert.netneutrality.core.context.SlashCommandContext;
+import me.bobert.netneutrality.music.MusicManager;
+import me.bobert.netneutrality.utils.MusicUtils;
+import me.bobert.netneutrality.utils.UserFunction;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
-import netneutrality.command.AbstractMusicCommand;
-import netneutrality.command.CommandExecutionResult;
-import netneutrality.core.context.MessageCommandContext;
-import netneutrality.core.context.SlashCommandContext;
-import netneutrality.music.MusicManager;
-import netneutrality.utils.MusicUtils;
-import netneutrality.utils.UserFunction;
 
 public class StopCommand extends AbstractMusicCommand {
 

src/main/java/me/bobert/netneutrality/command/music/ViewQueueCommand.java

@@ -1,18 +1,18 @@
-package netneutrality.command.music;
+package me.bobert.netneutrality.command.music;
 /*
  * Copyright (c) anthorob
  *
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.command.AbstractMusicCommand;
+import me.bobert.netneutrality.command.CommandExecutionResult;
+import me.bobert.netneutrality.core.context.MessageCommandContext;
+import me.bobert.netneutrality.core.context.SlashCommandContext;
+import me.bobert.netneutrality.music.MusicManager;
+import me.bobert.netneutrality.utils.MessageFunction;
+import me.bobert.netneutrality.utils.MusicUtils;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
-import netneutrality.command.AbstractMusicCommand;
-import netneutrality.command.CommandExecutionResult;
-import netneutrality.core.context.MessageCommandContext;
-import netneutrality.core.context.SlashCommandContext;
-import netneutrality.music.MusicManager;
-import netneutrality.utils.MessageFunction;
-import netneutrality.utils.MusicUtils;
 
 public class ViewQueueCommand extends AbstractMusicCommand {
 

src/main/java/me/bobert/netneutrality/command/music/VolumeCommand.java

@@ -1,4 +1,4 @@
-package netneutrality.command.music;
+package me.bobert.netneutrality.command.music;
 
 /*
  * Copyright (c) anthorob
@@ -6,17 +6,17 @@ package netneutrality.command.music;
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.command.AbstractMusicCommand;
+import me.bobert.netneutrality.command.CommandExecutionResult;
+import me.bobert.netneutrality.core.context.MessageCommandContext;
+import me.bobert.netneutrality.core.context.SlashCommandContext;
+import me.bobert.netneutrality.music.MusicManager;
+import me.bobert.netneutrality.utils.MusicUtils;
+import me.bobert.netneutrality.utils.UserFunction;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
-import netneutrality.command.AbstractMusicCommand;
-import netneutrality.command.CommandExecutionResult;
-import netneutrality.core.context.MessageCommandContext;
-import netneutrality.core.context.SlashCommandContext;
-import netneutrality.music.MusicManager;
-import netneutrality.utils.MusicUtils;
-import netneutrality.utils.UserFunction;
 
 public class VolumeCommand extends AbstractMusicCommand {
 

src/main/java/me/bobert/netneutrality/command/music/VoteSkipCommand.java

@@ -1,17 +1,17 @@
-package netneutrality.command.music;
+package me.bobert.netneutrality.command.music;
 /*
  * Copyright (c) anthorob
  *
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.command.AbstractMusicCommand;
+import me.bobert.netneutrality.command.CommandExecutionResult;
+import me.bobert.netneutrality.core.context.MessageCommandContext;
+import me.bobert.netneutrality.core.context.SlashCommandContext;
+import me.bobert.netneutrality.music.MusicManager;
+import me.bobert.netneutrality.utils.MusicUtils;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
-import netneutrality.command.AbstractMusicCommand;
-import netneutrality.command.CommandExecutionResult;
-import netneutrality.core.context.MessageCommandContext;
-import netneutrality.core.context.SlashCommandContext;
-import netneutrality.music.MusicManager;
-import netneutrality.utils.MusicUtils;
 
 public class VoteSkipCommand extends AbstractMusicCommand {
 

src/main/java/me/bobert/netneutrality/core/BotState.java

@@ -1,13 +1,13 @@
-package netneutrality.core;
+package me.bobert.netneutrality.core;
 /*
  * Copyright (c) anthorob
  *
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.music.MusicManager;
+import me.bobert.netneutrality.music.TrackScheduler;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
-import netneutrality.music.MusicManager;
-import netneutrality.music.TrackScheduler;
 import org.json.JSONArray;
 import org.json.JSONObject;
 

src/main/java/me/bobert/netneutrality/core/CommandProcessor.java

@@ -1,4 +1,4 @@
-package netneutrality.core;
+package me.bobert.netneutrality.core;
 /*
  * Copyright (c) anthorob
  *
@@ -6,18 +6,19 @@ package netneutrality.core;
  */
 
 import io.sentry.Sentry;
-import netneutrality.command.AbstractCommand;
-import netneutrality.command.CommandExecutionResult;
-import netneutrality.command.CommandManager;
-import netneutrality.core.context.CommandContext;
-import netneutrality.core.context.MessageCommandContext;
-import netneutrality.core.context.SlashCommandContext;
-import netneutrality.exceptions.CommandExecutionException;
-import netneutrality.utils.UserFunction;
+import me.bobert.netneutrality.command.AbstractCommand;
+import me.bobert.netneutrality.command.CommandExecutionResult;
+import me.bobert.netneutrality.command.CommandManager;
+import me.bobert.netneutrality.core.context.CommandContext;
+import me.bobert.netneutrality.core.context.MessageCommandContext;
+import me.bobert.netneutrality.core.context.SlashCommandContext;
+import me.bobert.netneutrality.exceptions.CommandExecutionException;
+import me.bobert.netneutrality.utils.UserFunction;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import static netneutrality.command.CommandExecutionResult.Result.*;
+import static me.bobert.netneutrality.command.CommandExecutionResult.Result.ERROR;
+import static me.bobert.netneutrality.command.CommandExecutionResult.Result.NOACTION;
 
 public class CommandProcessor {
 

src/main/java/me/bobert/netneutrality/core/GuildConfigManager.java

@@ -1,4 +1,4 @@
-package netneutrality.core;
+package me.bobert.netneutrality.core;
 
 /*
  * Copyright (c) anthorob
@@ -6,11 +6,11 @@ package netneutrality.core;
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.db.GSettings;
+import me.bobert.netneutrality.db.entities.OGuild;
+import me.bobert.netneutrality.db.entities.OGuildSetting;
+import me.bobert.netneutrality.utils.JpaUtils;
 import net.dv8tion.jda.api.entities.Guild;
-import netneutrality.db.GSettings;
-import netneutrality.db.entities.OGuild;
-import netneutrality.db.entities.OGuildSetting;
-import netneutrality.utils.JpaUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.hibernate.Session;

src/main/java/me/bobert/netneutrality/core/GuildManager.java

@@ -1,22 +1,22 @@
-package netneutrality.core;
+package me.bobert.netneutrality.core;
 /*
  * Copyright (c) anthorob
  *
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.NetNeutrality;
+import me.bobert.netneutrality.db.DBController;
+import me.bobert.netneutrality.db.controllers.DBMessage;
+import me.bobert.netneutrality.db.entities.OBlacklist;
+import me.bobert.netneutrality.db.entities.OGuild;
+import me.bobert.netneutrality.thread.ThreadManager;
+import me.bobert.netneutrality.utils.JpaUtils;
+import me.bobert.netneutrality.utils.MessageFunction;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
-import netneutrality.NetNeutrality;
-import netneutrality.db.DBController;
-import netneutrality.db.controllers.DBMessage;
-import netneutrality.db.entities.OBlacklist;
-import netneutrality.db.entities.OGuild;
-import netneutrality.thread.ThreadManager;
-import netneutrality.utils.JpaUtils;
-import netneutrality.utils.MessageFunction;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.hibernate.Session;

src/main/java/me/bobert/netneutrality/core/LogHandler.java

@@ -1,4 +1,4 @@
-package netneutrality.core;
+package me.bobert.netneutrality.core;
 /*
  * Copyright (c) anthorob
  *
@@ -6,13 +6,13 @@ package netneutrality.core;
  */
 
 import io.sentry.Sentry;
+import me.bobert.netneutrality.core.context.CommandContext;
+import me.bobert.netneutrality.core.context.SlashCommandContext;
+import me.bobert.netneutrality.exceptions.CommandException;
+import me.bobert.netneutrality.exceptions.CommandExecutionException;
+import me.bobert.netneutrality.utils.MessageFunction;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
-import netneutrality.core.context.CommandContext;
-import netneutrality.core.context.SlashCommandContext;
-import netneutrality.exceptions.CommandException;
-import netneutrality.exceptions.CommandExecutionException;
-import netneutrality.utils.MessageFunction;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

src/main/java/me/bobert/netneutrality/core/SessionManager.java

@@ -1,4 +1,4 @@
-package netneutrality.core;
+package me.bobert.netneutrality.core;
 /*
  * Copyright (c) anthorob
  *
@@ -6,7 +6,7 @@ package netneutrality.core;
  */
 
 import io.sentry.Sentry;
-import netneutrality.utils.Settings;
+import me.bobert.netneutrality.utils.Settings;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.hibernate.SessionFactory;

src/main/java/me/bobert/netneutrality/core/context/CommandContext.java

@@ -1,4 +1,4 @@
-package netneutrality.core.context;
+package me.bobert.netneutrality.core.context;
 
 /*
  * Copyright (c) anthorob
@@ -6,6 +6,7 @@ package netneutrality.core.context;
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.command.AbstractCommand;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
@@ -14,7 +15,6 @@ import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.events.Event;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
-import netneutrality.command.AbstractCommand;
 
 public interface CommandContext {
 

src/main/java/me/bobert/netneutrality/core/context/MessageCommandContext.java

@@ -1,4 +1,4 @@
-package netneutrality.core.context;
+package me.bobert.netneutrality.core.context;
 /*
  * Copyright (c) anthorob
  *
@@ -7,15 +7,15 @@ package netneutrality.core.context;
 
 import io.sentry.Breadcrumb;
 import io.sentry.Sentry;
+import me.bobert.netneutrality.command.AbstractCommand;
+import me.bobert.netneutrality.core.GuildManager;
+import me.bobert.netneutrality.thread.ThreadManager;
+import me.bobert.netneutrality.utils.Settings;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.*;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
-import netneutrality.command.AbstractCommand;
-import netneutrality.core.GuildManager;
-import netneutrality.thread.ThreadManager;
-import netneutrality.utils.Settings;
 
 import java.util.Collection;
 import java.util.concurrent.ExecutorService;

src/main/java/me/bobert/netneutrality/core/context/SlashCommandContext.java

@@ -1,10 +1,11 @@
-package netneutrality.core.context;
+package me.bobert.netneutrality.core.context;
 /*
  * Copyright (c) anthorob
  *
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.command.AbstractCommand;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
@@ -16,7 +17,6 @@ import net.dv8tion.jda.api.interactions.InteractionHook;
 import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
 import net.dv8tion.jda.api.utils.messages.MessageEditData;
-import netneutrality.command.AbstractCommand;
 
 import java.util.Collection;
 

src/main/java/me/bobert/netneutrality/db/AbstractController.java

@@ -1,4 +1,4 @@
-package netneutrality.db;
+package me.bobert.netneutrality.db;
 
 /*
  * Copyright (c) anthorob
@@ -6,7 +6,7 @@ package netneutrality.db;
  * https://discord.gg/qUa6zNFZsd
  */
 
-import netneutrality.core.SessionManager;
+import me.bobert.netneutrality.core.SessionManager;
 import org.hibernate.SessionFactory;
 
 public abstract class AbstractController {

src/main/java/me/bobert/netneutrality/db/DBController.java

@@ -1,4 +1,4 @@
-package netneutrality.db;
+package me.bobert.netneutrality.db;
 
 /*
  * Copyright (c) anthorob
@@ -6,7 +6,7 @@ package netneutrality.db;
  * https://discord.gg/qUa6zNFZsd
  */
 
-import netneutrality.core.SessionManager;
+import me.bobert.netneutrality.core.SessionManager;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

src/main/java/me/bobert/netneutrality/db/GSettings.java

@@ -1,4 +1,4 @@
-package netneutrality.db;
+package me.bobert.netneutrality.db;
 /*
  * Copyright (c) anthorob
  *

src/main/java/me/bobert/netneutrality/db/controllers/DBBlacklist.java

@@ -1,17 +1,17 @@
-package netneutrality.db.controllers;
+package me.bobert.netneutrality.db.controllers;
 /*
  * Copyright (c) anthorob
  *
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.core.GuildManager;
+import me.bobert.netneutrality.core.context.CommandContext;
+import me.bobert.netneutrality.db.AbstractController;
+import me.bobert.netneutrality.db.entities.OBlacklist;
+import me.bobert.netneutrality.db.entities.OGuild;
+import me.bobert.netneutrality.utils.JpaUtils;
 import net.dv8tion.jda.api.entities.Guild;
-import netneutrality.core.GuildManager;
-import netneutrality.core.context.CommandContext;
-import netneutrality.db.AbstractController;
-import netneutrality.db.entities.OBlacklist;
-import netneutrality.db.entities.OGuild;
-import netneutrality.utils.JpaUtils;
 import org.hibernate.Session;
 import org.hibernate.query.Query;
 

src/main/java/me/bobert/netneutrality/db/controllers/DBMessage.java

@@ -1,16 +1,16 @@
-package netneutrality.db.controllers;
+package me.bobert.netneutrality.db.controllers;
 /*
  * Copyright (c) anthorob
  *
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.core.GuildManager;
+import me.bobert.netneutrality.db.AbstractController;
+import me.bobert.netneutrality.db.entities.OLogMessage;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
-import netneutrality.core.GuildManager;
-import netneutrality.db.AbstractController;
-import netneutrality.db.entities.OLogMessage;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.hibernate.Session;

src/main/java/me/bobert/netneutrality/db/entities/OBlacklist.java

@@ -1,4 +1,4 @@
-package netneutrality.db.entities;
+package me.bobert.netneutrality.db.entities;
 
 /*
  * Copyright (c) anthorob

src/main/java/me/bobert/netneutrality/db/entities/OGuild.java

@@ -1,4 +1,4 @@
-package netneutrality.db.entities;
+package me.bobert.netneutrality.db.entities;
 
 /*
  * Copyright (c) anthorob

src/main/java/me/bobert/netneutrality/db/entities/OGuildSetting.java

@@ -1,4 +1,4 @@
-package netneutrality.db.entities;
+package me.bobert.netneutrality.db.entities;
 
 /*
  * Copyright (c) anthorob

src/main/java/me/bobert/netneutrality/db/entities/OLogMessage.java

@@ -1,4 +1,4 @@
-package netneutrality.db.entities;
+package me.bobert.netneutrality.db.entities;
 
 /*
  * Copyright (c) anthorob

src/main/java/me/bobert/netneutrality/db/entities/OLogging.java

@@ -1,4 +1,4 @@
-package netneutrality.db.entities;
+package me.bobert.netneutrality.db.entities;
 
 /*
  * Copyright (c) anthorob

src/main/java/me/bobert/netneutrality/db/entities/OLoggingId.java

@@ -1,4 +1,4 @@
-package netneutrality.db.entities;
+package me.bobert.netneutrality.db.entities;
 
 /*
  * Copyright (c) anthorob

src/main/java/me/bobert/netneutrality/exceptions/CommandException.java

@@ -1,4 +1,4 @@
-package netneutrality.exceptions;
+package me.bobert.netneutrality.exceptions;
 
 /*
  * Copyright (c) anthorob
@@ -6,7 +6,7 @@ package netneutrality.exceptions;
  * https://discord.gg/qUa6zNFZsd
  */
 
-import netneutrality.core.context.CommandContext;
+import me.bobert.netneutrality.core.context.CommandContext;
 
 public abstract class CommandException extends RuntimeException {
 

src/main/java/me/bobert/netneutrality/exceptions/CommandExecutionException.java

@@ -1,4 +1,4 @@
-package netneutrality.exceptions;
+package me.bobert.netneutrality.exceptions;
 
 /*
  * Copyright (c) anthorob
@@ -6,7 +6,7 @@ package netneutrality.exceptions;
  * https://discord.gg/qUa6zNFZsd
  */
 
-import netneutrality.core.context.CommandContext;
+import me.bobert.netneutrality.core.context.CommandContext;
 
 /**
  * Logs the error internally, without sending a message

src/main/java/me/bobert/netneutrality/exceptions/ExecutorException.java

@@ -1,4 +1,4 @@
-package netneutrality.exceptions;
+package me.bobert.netneutrality.exceptions;
 
 /*
  * Copyright (c) anthorob
@@ -6,7 +6,7 @@ package netneutrality.exceptions;
  * https://discord.gg/qUa6zNFZsd
  */
 
-import netneutrality.core.LogHandler;
+import me.bobert.netneutrality.core.LogHandler;
 
 public class ExecutorException implements Thread.UncaughtExceptionHandler {
 

src/main/java/me/bobert/netneutrality/hooks/SlashCommandHooks.java

@@ -1,14 +1,14 @@
-package netneutrality.hooks;
+package me.bobert.netneutrality.hooks;
 /*
  * Copyright (c) anthorob
  *
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.core.CommandProcessor;
+import me.bobert.netneutrality.core.context.SlashCommandContext;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
-import netneutrality.core.CommandProcessor;
-import netneutrality.core.context.SlashCommandContext;
 import org.jetbrains.annotations.NotNull;
 
 public class SlashCommandHooks extends ListenerAdapter {

src/main/java/me/bobert/netneutrality/hooks/guilds/ServerJoinHandler.java

@@ -1,4 +1,4 @@
-package netneutrality.hooks.guilds;
+package me.bobert.netneutrality.hooks.guilds;
 
 /*
  * Copyright (c) anthorob
@@ -6,10 +6,10 @@ package netneutrality.hooks.guilds;
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.core.GuildManager;
 import net.dv8tion.jda.api.events.guild.GuildJoinEvent;
 import net.dv8tion.jda.api.events.guild.GuildLeaveEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
-import netneutrality.core.GuildManager;
 import org.jetbrains.annotations.NotNull;
 
 public class ServerJoinHandler extends ListenerAdapter {

src/main/java/me/bobert/netneutrality/hooks/message/EditHandler.java

@@ -1,4 +1,4 @@
-package netneutrality.hooks.message;
+package me.bobert.netneutrality.hooks.message;
 
 /*
  * Copyright (c) anthorob
@@ -6,16 +6,16 @@ package netneutrality.hooks.message;
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.core.GuildManager;
+import me.bobert.netneutrality.core.SessionManager;
+import me.bobert.netneutrality.db.DBController;
+import me.bobert.netneutrality.db.controllers.DBMessage;
+import me.bobert.netneutrality.db.entities.OGuild;
+import me.bobert.netneutrality.utils.JpaUtils;
+import me.bobert.netneutrality.utils.MessageFunction;
 import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.events.message.MessageUpdateEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
-import netneutrality.core.GuildManager;
-import netneutrality.core.SessionManager;
-import netneutrality.db.DBController;
-import netneutrality.db.controllers.DBMessage;
-import netneutrality.db.entities.OGuild;
-import netneutrality.utils.JpaUtils;
-import netneutrality.utils.MessageFunction;
 import org.hibernate.Session;
 
 import java.util.stream.Collectors;

src/main/java/me/bobert/netneutrality/hooks/message/MessageReceivedHandler.java

@@ -1,19 +1,17 @@
-package netneutrality.hooks.message;
+package me.bobert.netneutrality.hooks.message;
 /*
  * Copyright (c) anthorob
  *
  * https://discord.gg/qUa6zNFZsd
  */
 
-import io.sentry.Breadcrumb;
-import io.sentry.Sentry;
+import me.bobert.netneutrality.core.CommandProcessor;
+import me.bobert.netneutrality.core.GuildManager;
+import me.bobert.netneutrality.core.context.MessageCommandContext;
+import me.bobert.netneutrality.utils.Settings;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
-import netneutrality.core.CommandProcessor;
-import netneutrality.core.GuildManager;
-import netneutrality.core.context.MessageCommandContext;
-import netneutrality.utils.Settings;
 import org.jetbrains.annotations.NotNull;
 
 public class MessageReceivedHandler extends ListenerAdapter {

src/main/java/me/bobert/netneutrality/hooks/message/ReactionHandler.java

@@ -1,4 +1,4 @@
-package netneutrality.hooks.message;
+package me.bobert.netneutrality.hooks.message;
 /*
  * Copyright (c) anthorob
  *

src/main/java/me/bobert/netneutrality/hooks/voice/VoiceEventHandler.java

@@ -1,4 +1,4 @@
-package netneutrality.hooks.voice;
+package me.bobert.netneutrality.hooks.voice;
 /*
  * Copyright (c) anthorob
  *

src/main/java/me/bobert/netneutrality/http/WebModule.java

@@ -1,4 +1,4 @@
-package netneutrality.http;
+package me.bobert.netneutrality.http;
 
 /*
  * Copyright (c) anthorob
@@ -8,11 +8,10 @@ package netneutrality.http;
 
 import io.sentry.Breadcrumb;
 import io.sentry.Sentry;
-import netneutrality.NetNeutrality;
-import netneutrality.core.LogHandler;
+import me.bobert.netneutrality.NetNeutrality;
+import me.bobert.netneutrality.core.LogHandler;
 import okhttp3.*;
 import org.json.JSONArray;
-import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.IOException;

src/main/java/me/bobert/netneutrality/http/server/AbstractHandler.java

@@ -1,4 +1,4 @@
-package netneutrality.http.server;
+package me.bobert.netneutrality.http.server;
 
 /*
  * Copyright (c) anthorob

src/main/java/me/bobert/netneutrality/http/server/ActionHandler.java

@@ -1,4 +1,4 @@
-package netneutrality.http.server;
+package me.bobert.netneutrality.http.server;
 
 /*
  * Copyright (c) anthorob
@@ -7,10 +7,10 @@ package netneutrality.http.server;
  */
 
 import com.sun.net.httpserver.HttpExchange;
+import me.bobert.netneutrality.NetNeutrality;
+import me.bobert.netneutrality.core.GuildManager;
+import me.bobert.netneutrality.http.WebModule;
 import net.dv8tion.jda.api.entities.Guild;
-import netneutrality.NetNeutrality;
-import netneutrality.core.GuildManager;
-import netneutrality.http.WebModule;
 import org.apache.logging.log4j.LogManager;
 import org.json.JSONObject;
 

src/main/java/me/bobert/netneutrality/http/server/GuildHandler.java

@@ -1,4 +1,4 @@
-package netneutrality.http.server;
+package me.bobert.netneutrality.http.server;
 
 /*
  * Copyright (c) anthorob
@@ -7,8 +7,8 @@ package netneutrality.http.server;
  */
 
 import com.sun.net.httpserver.HttpExchange;
+import me.bobert.netneutrality.NetNeutrality;
 import net.dv8tion.jda.api.JDA;
-import netneutrality.NetNeutrality;
 import org.json.JSONArray;
 import org.json.JSONObject;
 

src/main/java/me/bobert/netneutrality/http/server/RootHandler.java

@@ -1,4 +1,4 @@
-package netneutrality.http.server;
+package me.bobert.netneutrality.http.server;
 
 /*
  * Copyright (c) anthorob

src/main/java/me/bobert/netneutrality/http/server/WebApi.java

@@ -1,4 +1,4 @@
-package netneutrality.http.server;
+package me.bobert.netneutrality.http.server;
 
 /*
  * Copyright (c) anthorob
@@ -7,7 +7,7 @@ package netneutrality.http.server;
  */
 
 import com.sun.net.httpserver.HttpServer;
-import netneutrality.thread.BaseThreadFactory;
+import me.bobert.netneutrality.thread.BaseThreadFactory;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

src/main/java/me/bobert/netneutrality/music/AudioPlayerSendHandler.java

@@ -1,4 +1,4 @@
-package netneutrality.music;
+package me.bobert.netneutrality.music;
 /*
  * Copyright (c) anthorob
  *

src/main/java/me/bobert/netneutrality/music/MusicManager.java

@@ -1,4 +1,4 @@
-package netneutrality.music;
+package me.bobert.netneutrality.music;
 
 /*
  * Copyright (c) anthorob
@@ -13,20 +13,20 @@ import com.sedmelluq.discord.lavaplayer.source.http.HttpAudioSourceManager;
 import com.sedmelluq.discord.lavaplayer.source.soundcloud.SoundCloudAudioSourceManager;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import dev.lavalink.youtube.YoutubeAudioSourceManager;
+import me.bobert.netneutrality.command.CommandExecutionResult;
+import me.bobert.netneutrality.core.GuildManager;
+import me.bobert.netneutrality.core.LogHandler;
+import me.bobert.netneutrality.core.context.CommandContext;
+import me.bobert.netneutrality.db.GSettings;
+import me.bobert.netneutrality.exceptions.CommandExecutionException;
+import me.bobert.netneutrality.music.loadable.LoadableSong;
+import me.bobert.netneutrality.music.source.UdioAudioSourceManager;
+import me.bobert.netneutrality.thread.MusicPlayerAutoDisconnectThread;
+import me.bobert.netneutrality.thread.ThreadManager;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
-import netneutrality.command.CommandExecutionResult;
-import netneutrality.core.GuildManager;
-import netneutrality.core.LogHandler;
-import netneutrality.core.context.CommandContext;
-import netneutrality.db.GSettings;
-import netneutrality.exceptions.CommandExecutionException;
-import netneutrality.music.loadable.LoadableSong;
-import netneutrality.music.source.UdioAudioSourceManager;
-import netneutrality.thread.MusicPlayerAutoDisconnectThread;
-import netneutrality.thread.ThreadManager;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

src/main/java/me/bobert/netneutrality/music/QueueManager.java

@@ -1,4 +1,4 @@
-package netneutrality.music;
+package me.bobert.netneutrality.music;
 /*
  * Copyright (c) anthorob
  *
@@ -7,9 +7,9 @@ package netneutrality.music;
 
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
+import me.bobert.netneutrality.command.CommandExecutionResult;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
-import netneutrality.command.CommandExecutionResult;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

src/main/java/me/bobert/netneutrality/music/SourceFinder.java

@@ -1,4 +1,4 @@
-package netneutrality.music;
+package me.bobert.netneutrality.music;
 
 /*
  * Copyright (c) anthorob

src/main/java/me/bobert/netneutrality/music/TrackLoader.java

@@ -1,4 +1,4 @@
-package netneutrality.music;
+package me.bobert.netneutrality.music;
 /*
  * Copyright (c) anthorob
  *
@@ -6,12 +6,12 @@ package netneutrality.music;
  */
 
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
-import netneutrality.core.LogHandler;
-import netneutrality.core.context.CommandContext;
-import netneutrality.music.loadable.CachedSource;
-import netneutrality.music.loadable.LoadableMusicSource;
-import netneutrality.music.loadable.LoadableSong;
-import netneutrality.thread.ThreadManager;
+import me.bobert.netneutrality.core.LogHandler;
+import me.bobert.netneutrality.core.context.CommandContext;
+import me.bobert.netneutrality.music.loadable.CachedSource;
+import me.bobert.netneutrality.music.loadable.LoadableMusicSource;
+import me.bobert.netneutrality.music.loadable.LoadableSong;
+import me.bobert.netneutrality.thread.ThreadManager;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

src/main/java/me/bobert/netneutrality/music/TrackLoadingHandler.java

@@ -1,4 +1,4 @@
-package netneutrality.music;
+package me.bobert.netneutrality.music;
 /*
  * Copyright (c) anthorob
  *
@@ -10,10 +10,10 @@ import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
 import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
+import me.bobert.netneutrality.core.LogHandler;
+import me.bobert.netneutrality.core.context.CommandContext;
+import me.bobert.netneutrality.utils.MessageFunction;
 import net.dv8tion.jda.api.entities.Guild;
-import netneutrality.core.LogHandler;
-import netneutrality.core.context.CommandContext;
-import netneutrality.utils.MessageFunction;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

src/main/java/me/bobert/netneutrality/music/TrackScheduler.java

@@ -1,4 +1,4 @@
-package netneutrality.music;
+package me.bobert.netneutrality.music;
 /*
  * Copyright (c) anthorob
  *
@@ -10,11 +10,11 @@ import com.sedmelluq.discord.lavaplayer.player.event.AudioEventAdapter;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackEndReason;
+import me.bobert.netneutrality.core.LogHandler;
+import me.bobert.netneutrality.utils.MessageFunction;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
-import netneutrality.core.LogHandler;
-import netneutrality.utils.MessageFunction;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

src/main/java/me/bobert/netneutrality/music/loadable/AppleMostPlayed.java

@@ -1,4 +1,4 @@
-package netneutrality.music.loadable;
+package me.bobert.netneutrality.music.loadable;
 /*
  * Copyright (c) anthorob
  *

src/main/java/me/bobert/netneutrality/music/loadable/CachedSource.java

@@ -1,4 +1,4 @@
-package netneutrality.music.loadable;
+package me.bobert.netneutrality.music.loadable;
 /*
  * Copyright (c) anthorob
  *

src/main/java/me/bobert/netneutrality/music/loadable/LoadableMusicSource.java

@@ -1,4 +1,4 @@
-package netneutrality.music.loadable;
+package me.bobert.netneutrality.music.loadable;
 
 /*
  * Copyright (c) anthorob

src/main/java/me/bobert/netneutrality/music/loadable/LoadableSong.java

@@ -1,4 +1,4 @@
-package netneutrality.music.loadable;
+package me.bobert.netneutrality.music.loadable;
 /*
  * Copyright (c) anthorob
  *

src/main/java/me/bobert/netneutrality/music/loadable/LoadableSourceManager.java

@@ -1,11 +1,11 @@
-package netneutrality.music.loadable;
+package me.bobert.netneutrality.music.loadable;
 /*
  * Copyright (c) anthorob
  *
  * https://discord.gg/qUa6zNFZsd
  */
 
-import netneutrality.http.WebModule;
+import me.bobert.netneutrality.http.WebModule;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.json.JSONObject;

src/main/java/me/bobert/netneutrality/music/source/UdioAudioSourceManager.java

@@ -1,4 +1,4 @@
-package netneutrality.music.source;
+package me.bobert.netneutrality.music.source;
 /*
  * Copyright (c) anthorob
  *

src/main/java/me/bobert/netneutrality/music/source/UdioAudioTrack.java

@@ -1,4 +1,4 @@
-package netneutrality.music.source;
+package me.bobert.netneutrality.music.source;
 /*
  * Copyright (c) anthorob
  *

src/main/java/me/bobert/netneutrality/thread/BaseThreadFactory.java

@@ -1,4 +1,4 @@
-package netneutrality.thread;
+package me.bobert.netneutrality.thread;
 
 /*
  * Copyright (c) anthorob
@@ -6,7 +6,7 @@ package netneutrality.thread;
  * https://discord.gg/qUa6zNFZsd
  */
 
-import netneutrality.exceptions.ExecutorException;
+import me.bobert.netneutrality.exceptions.ExecutorException;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.concurrent.ThreadFactory;

src/main/java/me/bobert/netneutrality/thread/MusicPlayerAutoDisconnectThread.java

@@ -1,15 +1,15 @@
-package netneutrality.thread;
+package me.bobert.netneutrality.thread;
 /*
  * Copyright (c) anthorob
  *
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.NetNeutrality;
+import me.bobert.netneutrality.music.MusicManager;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
-import netneutrality.NetNeutrality;
-import netneutrality.music.MusicManager;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

src/main/java/me/bobert/netneutrality/thread/ShutdownThread.java

@@ -1,4 +1,4 @@
-package netneutrality.thread;
+package me.bobert.netneutrality.thread;
 
 /*
  * Copyright (c) anthorob
@@ -6,7 +6,7 @@ package netneutrality.thread;
  * https://discord.gg/qUa6zNFZsd
  */
 
-import netneutrality.NetNeutrality;
+import me.bobert.netneutrality.NetNeutrality;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.config.Configurator;

src/main/java/me/bobert/netneutrality/thread/ThreadManager.java

@@ -1,4 +1,4 @@
-package netneutrality.thread;
+package me.bobert.netneutrality.thread;
 /*
  * Copyright (c) anthorob
  *

src/main/java/me/bobert/netneutrality/utils/ChannelMessagePurger.java

@@ -1,4 +1,4 @@
-package netneutrality.utils;
+package me.bobert.netneutrality.utils;
 /*
  * Copyright (c) anthorob
  *
@@ -9,12 +9,12 @@ import io.sentry.ISpan;
 import io.sentry.ITransaction;
 import io.sentry.Sentry;
 import io.sentry.SpanStatus;
+import me.bobert.netneutrality.core.context.CommandContext;
+import me.bobert.netneutrality.thread.ThreadManager;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.MessageHistory;
 import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
 import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
-import netneutrality.core.context.CommandContext;
-import netneutrality.thread.ThreadManager;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

src/main/java/me/bobert/netneutrality/utils/JpaUtils.java

@@ -1,4 +1,4 @@
-package netneutrality.utils;
+package me.bobert.netneutrality.utils;
 
 /*
  * Copyright (c) anthorob
@@ -9,9 +9,9 @@ package netneutrality.utils;
 import io.sentry.Breadcrumb;
 import io.sentry.Sentry;
 import io.sentry.SentryLevel;
-import netneutrality.core.GuildManager;
-import netneutrality.core.SessionManager;
-import netneutrality.db.entities.OGuild;
+import me.bobert.netneutrality.core.GuildManager;
+import me.bobert.netneutrality.core.SessionManager;
+import me.bobert.netneutrality.db.entities.OGuild;
 import org.hibernate.HibernateException;
 import org.hibernate.ObjectNotFoundException;
 import org.hibernate.Session;

src/main/java/me/bobert/netneutrality/utils/MessageFunction.java

@@ -1,4 +1,4 @@
-package netneutrality.utils;
+package me.bobert.netneutrality.utils;
 
 /*
  * Copyright (c) anthorob
@@ -10,19 +10,19 @@ import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
 import io.sentry.Sentry;
+import me.bobert.netneutrality.command.AbstractCommand;
+import me.bobert.netneutrality.command.CommandManager;
+import me.bobert.netneutrality.command.CommandType;
+import me.bobert.netneutrality.core.context.CommandContext;
+import me.bobert.netneutrality.exceptions.CommandException;
+import me.bobert.netneutrality.music.MusicManager;
+import me.bobert.netneutrality.music.QueueManager;
+import me.bobert.netneutrality.music.SourceFinder;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
-import netneutrality.command.AbstractCommand;
-import netneutrality.command.CommandType;
-import netneutrality.command.CommandManager;
-import netneutrality.core.context.CommandContext;
-import netneutrality.exceptions.CommandException;
-import netneutrality.music.MusicManager;
-import netneutrality.music.QueueManager;
-import netneutrality.music.SourceFinder;
 import org.apache.commons.lang3.time.DurationFormatUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

src/main/java/me/bobert/netneutrality/utils/MiscUtils.java

@@ -1,4 +1,4 @@
-package netneutrality.utils;
+package me.bobert.netneutrality.utils;
 /*
  * Copyright (c) anthorob
  *

src/main/java/me/bobert/netneutrality/utils/MusicUtils.java

@@ -1,15 +1,15 @@
-package netneutrality.utils;
+package me.bobert.netneutrality.utils;
 /*
  * Copyright (c) anthorob
  *
  * https://discord.gg/qUa6zNFZsd
  */
 
+import me.bobert.netneutrality.core.context.CommandContext;
+import me.bobert.netneutrality.exceptions.CommandExecutionException;
+import me.bobert.netneutrality.music.MusicManager;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
-import netneutrality.core.context.CommandContext;
-import netneutrality.exceptions.CommandExecutionException;
-import netneutrality.music.MusicManager;
 
 public class MusicUtils {
 

src/main/java/me/bobert/netneutrality/utils/Settings.java

@@ -1,4 +1,4 @@
-package netneutrality.utils;
+package me.bobert.netneutrality.utils;
 
 /*
  * Copyright (c) anthorob
@@ -6,10 +6,9 @@ package netneutrality.utils;
  * https://discord.gg/qUa6zNFZsd
  */
 
-import netneutrality.http.WebModule;
+import me.bobert.netneutrality.http.WebModule;
 import org.apache.logging.log4j.LogManager;
 import org.json.JSONArray;
-import org.json.JSONObject;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -76,27 +75,15 @@ public class Settings {
     public String getMavenVersion() {
         String version = null;
 
-        // try to load from maven properties first
         try {
             Properties p = new Properties();
-            InputStream is = getClass().getResourceAsStream("/META-INF/maven/me.bobert/netneutrality/pom.properties");
+            InputStream is = getClass().getResourceAsStream("/app.properties");
             if (is != null) {
                 p.load(is);
-                version = p.getProperty("version", "");
+                version = p.getProperty("app.version", "");
             }
         } catch (Exception ignored) {}
 
-        // fallback to using Java API
-        if (version == null) {
-            Package aPackage = getClass().getPackage();
-            if (aPackage != null) {
-                version = aPackage.getImplementationVersion();
-                if (version == null) {
-                    version = aPackage.getSpecificationVersion();
-                }
-            }
-        }
-
         if (version == null) {
             version = "0.0.0";
         }

src/main/java/me/bobert/netneutrality/utils/UserFunction.java

@@ -1,4 +1,4 @@
-package netneutrality.utils;
+package me.bobert.netneutrality.utils;
 
 /*
  * Copyright (c) anthorob

src/main/resources/META-INF/MANIFEST.MF

@@ -1,2 +1,2 @@
 Manifest-Version: 1.0
-Main-Class: netneutrality.NetNeutrality
+Main-Class: me.bobert.netneutrality.NetNeutrality

src/main/resources/app.properties

@@ -0,0 +1 @@
+app.version=${project.version}

src/main/resources/hibernate.cfg.xml

@@ -8,12 +8,12 @@
         <property name="hibernate.connection.driver_class">com.mysql.cj.jdbc.Driver</property>
         <property name="hibernate.connection.provider_class">org.hibernate.hikaricp.internal.HikariCPConnectionProvider</property>
 
-        <mapping class="netneutrality.db.entities.OGuild"/>
-        <mapping class="netneutrality.db.entities.OBlacklist"/>
-        <mapping class="netneutrality.db.entities.OGuildSetting"/>
-        <mapping class="netneutrality.db.entities.OLogMessage"/>
-        <mapping class="netneutrality.db.entities.OLogging"/>
-        <mapping class="netneutrality.db.entities.OLoggingId"/>
+        <mapping class="me.bobert.netneutrality.db.entities.OGuild"/>
+        <mapping class="me.bobert.netneutrality.db.entities.OBlacklist"/>
+        <mapping class="me.bobert.netneutrality.db.entities.OGuildSetting"/>
+        <mapping class="me.bobert.netneutrality.db.entities.OLogMessage"/>
+        <mapping class="me.bobert.netneutrality.db.entities.OLogging"/>
+        <mapping class="me.bobert.netneutrality.db.entities.OLoggingId"/>
 
     </session-factory>
 </hibernate-configuration>

src/main/resources/log4j2.properties

@@ -38,7 +38,7 @@ logger.lavaplayer.appenderRef.console.ref = consoleLogger
 
 
 
-logger.app.name = netneutrality
+logger.app.name = me.bobert.netneutrality
 logger.app.level = debug
 logger.app.additivity = false
 logger.app.appenderRef.rolling.ref = LogToRollingFile