diff --git a/pom.xml b/pom.xml
index 37612b8..a887824 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
jar
- netneutrality.NetNeutrality
+ me.bobert.netneutrality.NetNeutrality
17
UTF-8
17
@@ -20,7 +20,22 @@
+
+
+ src/main/resources
+ true
+
+
+
+
+ org.apache.maven.plugins
+ maven-resources-plugin
+ 3.3.1
+
+ UTF-8
+
+
org.apache.maven.plugins
maven-assembly-plugin
diff --git a/src/main/java/netneutrality/NetNeutrality.java b/src/main/java/me/bobert/netneutrality/NetNeutrality.java
similarity index 80%
rename from src/main/java/netneutrality/NetNeutrality.java
rename to src/main/java/me/bobert/netneutrality/NetNeutrality.java
index 3155d74..ea394f2 100644
--- a/src/main/java/netneutrality/NetNeutrality.java
+++ b/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");
diff --git a/src/main/java/netneutrality/command/AbstractCommand.java b/src/main/java/me/bobert/netneutrality/command/AbstractCommand.java
similarity index 90%
rename from src/main/java/netneutrality/command/AbstractCommand.java
rename to src/main/java/me/bobert/netneutrality/command/AbstractCommand.java
index c098e8d..f02d43b 100644
--- a/src/main/java/netneutrality/command/AbstractCommand.java
+++ b/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 {
diff --git a/src/main/java/netneutrality/command/AbstractMusicCommand.java b/src/main/java/me/bobert/netneutrality/command/AbstractMusicCommand.java
similarity index 90%
rename from src/main/java/netneutrality/command/AbstractMusicCommand.java
rename to src/main/java/me/bobert/netneutrality/command/AbstractMusicCommand.java
index 36d95b1..c59f7a3 100644
--- a/src/main/java/netneutrality/command/AbstractMusicCommand.java
+++ b/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 {
diff --git a/src/main/java/netneutrality/command/CommandExecutionResult.java b/src/main/java/me/bobert/netneutrality/command/CommandExecutionResult.java
similarity index 97%
rename from src/main/java/netneutrality/command/CommandExecutionResult.java
rename to src/main/java/me/bobert/netneutrality/command/CommandExecutionResult.java
index fd51e64..45a2f4a 100644
--- a/src/main/java/netneutrality/command/CommandExecutionResult.java
+++ b/src/main/java/me/bobert/netneutrality/command/CommandExecutionResult.java
@@ -1,4 +1,4 @@
-package netneutrality.command;
+package me.bobert.netneutrality.command;
/*
* Copyright (c) anthorob
*
diff --git a/src/main/java/netneutrality/command/CommandManager.java b/src/main/java/me/bobert/netneutrality/command/CommandManager.java
similarity index 95%
rename from src/main/java/netneutrality/command/CommandManager.java
rename to src/main/java/me/bobert/netneutrality/command/CommandManager.java
index 1f9cd28..540a084 100644
--- a/src/main/java/netneutrality/command/CommandManager.java
+++ b/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;
diff --git a/src/main/java/netneutrality/command/CommandType.java b/src/main/java/me/bobert/netneutrality/command/CommandType.java
similarity index 92%
rename from src/main/java/netneutrality/command/CommandType.java
rename to src/main/java/me/bobert/netneutrality/command/CommandType.java
index 84ecc69..340993e 100644
--- a/src/main/java/netneutrality/command/CommandType.java
+++ b/src/main/java/me/bobert/netneutrality/command/CommandType.java
@@ -1,4 +1,4 @@
-package netneutrality.command;
+package me.bobert.netneutrality.command;
/*
* Copyright (c) anthorob
*
diff --git a/src/main/java/netneutrality/command/ICommand.java b/src/main/java/me/bobert/netneutrality/command/ICommand.java
similarity index 85%
rename from src/main/java/netneutrality/command/ICommand.java
rename to src/main/java/me/bobert/netneutrality/command/ICommand.java
index c7af286..6d290b3 100644
--- a/src/main/java/netneutrality/command/ICommand.java
+++ b/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 {
diff --git a/src/main/java/netneutrality/command/admin/BlacklistCommand.java b/src/main/java/me/bobert/netneutrality/command/admin/BlacklistCommand.java
similarity index 86%
rename from src/main/java/netneutrality/command/admin/BlacklistCommand.java
rename to src/main/java/me/bobert/netneutrality/command/admin/BlacklistCommand.java
index b50f31f..9267025 100644
--- a/src/main/java/netneutrality/command/admin/BlacklistCommand.java
+++ b/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;
diff --git a/src/main/java/netneutrality/command/basic/HelpCommand.java b/src/main/java/me/bobert/netneutrality/command/basic/HelpCommand.java
similarity index 81%
rename from src/main/java/netneutrality/command/basic/HelpCommand.java
rename to src/main/java/me/bobert/netneutrality/command/basic/HelpCommand.java
index 0648a7d..840ab45 100644
--- a/src/main/java/netneutrality/command/basic/HelpCommand.java
+++ b/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;
diff --git a/src/main/java/netneutrality/command/basic/PingCommand.java b/src/main/java/me/bobert/netneutrality/command/basic/PingCommand.java
similarity index 78%
rename from src/main/java/netneutrality/command/basic/PingCommand.java
rename to src/main/java/me/bobert/netneutrality/command/basic/PingCommand.java
index 02c987d..e287444 100644
--- a/src/main/java/netneutrality/command/basic/PingCommand.java
+++ b/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 {
diff --git a/src/main/java/netneutrality/command/bot/ConfigureCommand.java b/src/main/java/me/bobert/netneutrality/command/bot/ConfigureCommand.java
similarity index 96%
rename from src/main/java/netneutrality/command/bot/ConfigureCommand.java
rename to src/main/java/me/bobert/netneutrality/command/bot/ConfigureCommand.java
index 4b33096..a74d50d 100644
--- a/src/main/java/netneutrality/command/bot/ConfigureCommand.java
+++ b/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;
diff --git a/src/main/java/netneutrality/command/crypto/CryptoPriceCommand.java b/src/main/java/me/bobert/netneutrality/command/crypto/CryptoPriceCommand.java
similarity index 92%
rename from src/main/java/netneutrality/command/crypto/CryptoPriceCommand.java
rename to src/main/java/me/bobert/netneutrality/command/crypto/CryptoPriceCommand.java
index 14ec58d..597492c 100644
--- a/src/main/java/netneutrality/command/crypto/CryptoPriceCommand.java
+++ b/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;
diff --git a/src/main/java/netneutrality/command/custom/.gitignore b/src/main/java/me/bobert/netneutrality/command/custom/.gitignore
similarity index 100%
rename from src/main/java/netneutrality/command/custom/.gitignore
rename to src/main/java/me/bobert/netneutrality/command/custom/.gitignore
diff --git a/src/main/java/netneutrality/command/music/BitconnectCommand.java b/src/main/java/me/bobert/netneutrality/command/music/BitconnectCommand.java
similarity index 76%
rename from src/main/java/netneutrality/command/music/BitconnectCommand.java
rename to src/main/java/me/bobert/netneutrality/command/music/BitconnectCommand.java
index e607263..5e5947b 100644
--- a/src/main/java/netneutrality/command/music/BitconnectCommand.java
+++ b/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 {
diff --git a/src/main/java/netneutrality/command/music/ClearQueueCommand.java b/src/main/java/me/bobert/netneutrality/command/music/ClearQueueCommand.java
similarity index 84%
rename from src/main/java/netneutrality/command/music/ClearQueueCommand.java
rename to src/main/java/me/bobert/netneutrality/command/music/ClearQueueCommand.java
index da32cdd..30f06a6 100644
--- a/src/main/java/netneutrality/command/music/ClearQueueCommand.java
+++ b/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 {
diff --git a/src/main/java/netneutrality/command/music/CurrentlyPlayingCommand.java b/src/main/java/me/bobert/netneutrality/command/music/CurrentlyPlayingCommand.java
similarity index 76%
rename from src/main/java/netneutrality/command/music/CurrentlyPlayingCommand.java
rename to src/main/java/me/bobert/netneutrality/command/music/CurrentlyPlayingCommand.java
index 34d24d7..9c432c0 100644
--- a/src/main/java/netneutrality/command/music/CurrentlyPlayingCommand.java
+++ b/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 {
diff --git a/src/main/java/netneutrality/command/music/JoinCommand.java b/src/main/java/me/bobert/netneutrality/command/music/JoinCommand.java
similarity index 85%
rename from src/main/java/netneutrality/command/music/JoinCommand.java
rename to src/main/java/me/bobert/netneutrality/command/music/JoinCommand.java
index c359e0f..85c4d78 100644
--- a/src/main/java/netneutrality/command/music/JoinCommand.java
+++ b/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 {
diff --git a/src/main/java/netneutrality/command/music/LeaveCommand.java b/src/main/java/me/bobert/netneutrality/command/music/LeaveCommand.java
similarity index 77%
rename from src/main/java/netneutrality/command/music/LeaveCommand.java
rename to src/main/java/me/bobert/netneutrality/command/music/LeaveCommand.java
index 6a6a318..806d5a7 100644
--- a/src/main/java/netneutrality/command/music/LeaveCommand.java
+++ b/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 {
diff --git a/src/main/java/netneutrality/command/music/PlayCommand.java b/src/main/java/me/bobert/netneutrality/command/music/PlayCommand.java
similarity index 80%
rename from src/main/java/netneutrality/command/music/PlayCommand.java
rename to src/main/java/me/bobert/netneutrality/command/music/PlayCommand.java
index 39cf5e8..5f3da37 100644
--- a/src/main/java/netneutrality/command/music/PlayCommand.java
+++ b/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 {
diff --git a/src/main/java/netneutrality/command/music/QueueCommand.java b/src/main/java/me/bobert/netneutrality/command/music/QueueCommand.java
similarity index 92%
rename from src/main/java/netneutrality/command/music/QueueCommand.java
rename to src/main/java/me/bobert/netneutrality/command/music/QueueCommand.java
index 32e5153..1d7075f 100644
--- a/src/main/java/netneutrality/command/music/QueueCommand.java
+++ b/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 {
diff --git a/src/main/java/netneutrality/command/music/ShuffleCommand.java b/src/main/java/me/bobert/netneutrality/command/music/ShuffleCommand.java
similarity index 73%
rename from src/main/java/netneutrality/command/music/ShuffleCommand.java
rename to src/main/java/me/bobert/netneutrality/command/music/ShuffleCommand.java
index 22c3623..e4ea2c2 100644
--- a/src/main/java/netneutrality/command/music/ShuffleCommand.java
+++ b/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
diff --git a/src/main/java/netneutrality/command/music/SkipCommand.java b/src/main/java/me/bobert/netneutrality/command/music/SkipCommand.java
similarity index 84%
rename from src/main/java/netneutrality/command/music/SkipCommand.java
rename to src/main/java/me/bobert/netneutrality/command/music/SkipCommand.java
index 6133ae4..7db97f4 100644
--- a/src/main/java/netneutrality/command/music/SkipCommand.java
+++ b/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 {
diff --git a/src/main/java/netneutrality/command/music/StopCommand.java b/src/main/java/me/bobert/netneutrality/command/music/StopCommand.java
similarity index 76%
rename from src/main/java/netneutrality/command/music/StopCommand.java
rename to src/main/java/me/bobert/netneutrality/command/music/StopCommand.java
index 49c5928..48e772d 100644
--- a/src/main/java/netneutrality/command/music/StopCommand.java
+++ b/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 {
diff --git a/src/main/java/netneutrality/command/music/ViewQueueCommand.java b/src/main/java/me/bobert/netneutrality/command/music/ViewQueueCommand.java
similarity index 78%
rename from src/main/java/netneutrality/command/music/ViewQueueCommand.java
rename to src/main/java/me/bobert/netneutrality/command/music/ViewQueueCommand.java
index d2c2ace..84808dc 100644
--- a/src/main/java/netneutrality/command/music/ViewQueueCommand.java
+++ b/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 {
diff --git a/src/main/java/netneutrality/command/music/VolumeCommand.java b/src/main/java/me/bobert/netneutrality/command/music/VolumeCommand.java
similarity index 83%
rename from src/main/java/netneutrality/command/music/VolumeCommand.java
rename to src/main/java/me/bobert/netneutrality/command/music/VolumeCommand.java
index ec69272..1a7178c 100644
--- a/src/main/java/netneutrality/command/music/VolumeCommand.java
+++ b/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 {
diff --git a/src/main/java/netneutrality/command/music/VoteSkipCommand.java b/src/main/java/me/bobert/netneutrality/command/music/VoteSkipCommand.java
similarity index 75%
rename from src/main/java/netneutrality/command/music/VoteSkipCommand.java
rename to src/main/java/me/bobert/netneutrality/command/music/VoteSkipCommand.java
index f07c358..ce84c07 100644
--- a/src/main/java/netneutrality/command/music/VoteSkipCommand.java
+++ b/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 {
diff --git a/src/main/java/netneutrality/core/BotState.java b/src/main/java/me/bobert/netneutrality/core/BotState.java
similarity index 92%
rename from src/main/java/netneutrality/core/BotState.java
rename to src/main/java/me/bobert/netneutrality/core/BotState.java
index f2023c1..db78b80 100644
--- a/src/main/java/netneutrality/core/BotState.java
+++ b/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;
diff --git a/src/main/java/netneutrality/core/CommandProcessor.java b/src/main/java/me/bobert/netneutrality/core/CommandProcessor.java
similarity index 84%
rename from src/main/java/netneutrality/core/CommandProcessor.java
rename to src/main/java/me/bobert/netneutrality/core/CommandProcessor.java
index 0c31320..e76021a 100644
--- a/src/main/java/netneutrality/core/CommandProcessor.java
+++ b/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 {
diff --git a/src/main/java/netneutrality/core/GuildConfigManager.java b/src/main/java/me/bobert/netneutrality/core/GuildConfigManager.java
similarity index 91%
rename from src/main/java/netneutrality/core/GuildConfigManager.java
rename to src/main/java/me/bobert/netneutrality/core/GuildConfigManager.java
index 4d23ff3..d494b32 100644
--- a/src/main/java/netneutrality/core/GuildConfigManager.java
+++ b/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;
diff --git a/src/main/java/netneutrality/core/GuildManager.java b/src/main/java/me/bobert/netneutrality/core/GuildManager.java
similarity index 92%
rename from src/main/java/netneutrality/core/GuildManager.java
rename to src/main/java/me/bobert/netneutrality/core/GuildManager.java
index 22332ab..26aa6bf 100644
--- a/src/main/java/netneutrality/core/GuildManager.java
+++ b/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;
diff --git a/src/main/java/netneutrality/core/LogHandler.java b/src/main/java/me/bobert/netneutrality/core/LogHandler.java
similarity index 89%
rename from src/main/java/netneutrality/core/LogHandler.java
rename to src/main/java/me/bobert/netneutrality/core/LogHandler.java
index e0cdc4b..c8b7fcc 100644
--- a/src/main/java/netneutrality/core/LogHandler.java
+++ b/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;
diff --git a/src/main/java/netneutrality/core/SessionManager.java b/src/main/java/me/bobert/netneutrality/core/SessionManager.java
similarity index 96%
rename from src/main/java/netneutrality/core/SessionManager.java
rename to src/main/java/me/bobert/netneutrality/core/SessionManager.java
index 5d398c8..e79cf8e 100644
--- a/src/main/java/netneutrality/core/SessionManager.java
+++ b/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;
diff --git a/src/main/java/netneutrality/core/context/CommandContext.java b/src/main/java/me/bobert/netneutrality/core/context/CommandContext.java
similarity index 92%
rename from src/main/java/netneutrality/core/context/CommandContext.java
rename to src/main/java/me/bobert/netneutrality/core/context/CommandContext.java
index c812826..74d7abb 100644
--- a/src/main/java/netneutrality/core/context/CommandContext.java
+++ b/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 {
diff --git a/src/main/java/netneutrality/core/context/MessageCommandContext.java b/src/main/java/me/bobert/netneutrality/core/context/MessageCommandContext.java
similarity index 95%
rename from src/main/java/netneutrality/core/context/MessageCommandContext.java
rename to src/main/java/me/bobert/netneutrality/core/context/MessageCommandContext.java
index 52484fe..9ef63af 100644
--- a/src/main/java/netneutrality/core/context/MessageCommandContext.java
+++ b/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;
diff --git a/src/main/java/netneutrality/core/context/SlashCommandContext.java b/src/main/java/me/bobert/netneutrality/core/context/SlashCommandContext.java
similarity index 98%
rename from src/main/java/netneutrality/core/context/SlashCommandContext.java
rename to src/main/java/me/bobert/netneutrality/core/context/SlashCommandContext.java
index e46a880..35064c1 100644
--- a/src/main/java/netneutrality/core/context/SlashCommandContext.java
+++ b/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;
diff --git a/src/main/java/netneutrality/db/AbstractController.java b/src/main/java/me/bobert/netneutrality/db/AbstractController.java
similarity index 80%
rename from src/main/java/netneutrality/db/AbstractController.java
rename to src/main/java/me/bobert/netneutrality/db/AbstractController.java
index 40f68a4..6fad802 100644
--- a/src/main/java/netneutrality/db/AbstractController.java
+++ b/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 {
diff --git a/src/main/java/netneutrality/db/DBController.java b/src/main/java/me/bobert/netneutrality/db/DBController.java
similarity index 90%
rename from src/main/java/netneutrality/db/DBController.java
rename to src/main/java/me/bobert/netneutrality/db/DBController.java
index d6e0ab4..aab0723 100644
--- a/src/main/java/netneutrality/db/DBController.java
+++ b/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;
diff --git a/src/main/java/netneutrality/db/GSettings.java b/src/main/java/me/bobert/netneutrality/db/GSettings.java
similarity index 93%
rename from src/main/java/netneutrality/db/GSettings.java
rename to src/main/java/me/bobert/netneutrality/db/GSettings.java
index 1a7edfe..5945ff5 100644
--- a/src/main/java/netneutrality/db/GSettings.java
+++ b/src/main/java/me/bobert/netneutrality/db/GSettings.java
@@ -1,4 +1,4 @@
-package netneutrality.db;
+package me.bobert.netneutrality.db;
/*
* Copyright (c) anthorob
*
diff --git a/src/main/java/netneutrality/db/controllers/DBBlacklist.java b/src/main/java/me/bobert/netneutrality/db/controllers/DBBlacklist.java
similarity index 92%
rename from src/main/java/netneutrality/db/controllers/DBBlacklist.java
rename to src/main/java/me/bobert/netneutrality/db/controllers/DBBlacklist.java
index de4ba04..8f213fc 100644
--- a/src/main/java/netneutrality/db/controllers/DBBlacklist.java
+++ b/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;
diff --git a/src/main/java/netneutrality/db/controllers/DBMessage.java b/src/main/java/me/bobert/netneutrality/db/controllers/DBMessage.java
similarity index 93%
rename from src/main/java/netneutrality/db/controllers/DBMessage.java
rename to src/main/java/me/bobert/netneutrality/db/controllers/DBMessage.java
index 85e02ea..50d8c21 100644
--- a/src/main/java/netneutrality/db/controllers/DBMessage.java
+++ b/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;
diff --git a/src/main/java/netneutrality/db/entities/OBlacklist.java b/src/main/java/me/bobert/netneutrality/db/entities/OBlacklist.java
similarity index 97%
rename from src/main/java/netneutrality/db/entities/OBlacklist.java
rename to src/main/java/me/bobert/netneutrality/db/entities/OBlacklist.java
index 477f3fa..5db94c6 100644
--- a/src/main/java/netneutrality/db/entities/OBlacklist.java
+++ b/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
diff --git a/src/main/java/netneutrality/db/entities/OGuild.java b/src/main/java/me/bobert/netneutrality/db/entities/OGuild.java
similarity index 98%
rename from src/main/java/netneutrality/db/entities/OGuild.java
rename to src/main/java/me/bobert/netneutrality/db/entities/OGuild.java
index 1ca2f9e..021b560 100644
--- a/src/main/java/netneutrality/db/entities/OGuild.java
+++ b/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
diff --git a/src/main/java/netneutrality/db/entities/OGuildSetting.java b/src/main/java/me/bobert/netneutrality/db/entities/OGuildSetting.java
similarity index 96%
rename from src/main/java/netneutrality/db/entities/OGuildSetting.java
rename to src/main/java/me/bobert/netneutrality/db/entities/OGuildSetting.java
index 00a9d39..a868311 100644
--- a/src/main/java/netneutrality/db/entities/OGuildSetting.java
+++ b/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
diff --git a/src/main/java/netneutrality/db/entities/OLogMessage.java b/src/main/java/me/bobert/netneutrality/db/entities/OLogMessage.java
similarity index 98%
rename from src/main/java/netneutrality/db/entities/OLogMessage.java
rename to src/main/java/me/bobert/netneutrality/db/entities/OLogMessage.java
index 40cb4db..e8b8a82 100644
--- a/src/main/java/netneutrality/db/entities/OLogMessage.java
+++ b/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
diff --git a/src/main/java/netneutrality/db/entities/OLogging.java b/src/main/java/me/bobert/netneutrality/db/entities/OLogging.java
similarity index 95%
rename from src/main/java/netneutrality/db/entities/OLogging.java
rename to src/main/java/me/bobert/netneutrality/db/entities/OLogging.java
index ede819c..7dd2992 100644
--- a/src/main/java/netneutrality/db/entities/OLogging.java
+++ b/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
diff --git a/src/main/java/netneutrality/db/entities/OLoggingId.java b/src/main/java/me/bobert/netneutrality/db/entities/OLoggingId.java
similarity index 96%
rename from src/main/java/netneutrality/db/entities/OLoggingId.java
rename to src/main/java/me/bobert/netneutrality/db/entities/OLoggingId.java
index e551bb5..9cf3671 100644
--- a/src/main/java/netneutrality/db/entities/OLoggingId.java
+++ b/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
diff --git a/src/main/java/netneutrality/exceptions/CommandException.java b/src/main/java/me/bobert/netneutrality/exceptions/CommandException.java
similarity index 84%
rename from src/main/java/netneutrality/exceptions/CommandException.java
rename to src/main/java/me/bobert/netneutrality/exceptions/CommandException.java
index b87eff2..c006425 100644
--- a/src/main/java/netneutrality/exceptions/CommandException.java
+++ b/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 {
diff --git a/src/main/java/netneutrality/exceptions/CommandExecutionException.java b/src/main/java/me/bobert/netneutrality/exceptions/CommandExecutionException.java
similarity index 81%
rename from src/main/java/netneutrality/exceptions/CommandExecutionException.java
rename to src/main/java/me/bobert/netneutrality/exceptions/CommandExecutionException.java
index c04cf31..0639059 100644
--- a/src/main/java/netneutrality/exceptions/CommandExecutionException.java
+++ b/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
diff --git a/src/main/java/netneutrality/exceptions/ExecutorException.java b/src/main/java/me/bobert/netneutrality/exceptions/ExecutorException.java
similarity index 74%
rename from src/main/java/netneutrality/exceptions/ExecutorException.java
rename to src/main/java/me/bobert/netneutrality/exceptions/ExecutorException.java
index 0aa97c5..2704a27 100644
--- a/src/main/java/netneutrality/exceptions/ExecutorException.java
+++ b/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 {
diff --git a/src/main/java/netneutrality/hooks/SlashCommandHooks.java b/src/main/java/me/bobert/netneutrality/hooks/SlashCommandHooks.java
similarity index 80%
rename from src/main/java/netneutrality/hooks/SlashCommandHooks.java
rename to src/main/java/me/bobert/netneutrality/hooks/SlashCommandHooks.java
index 6e5d99b..1cf33e0 100644
--- a/src/main/java/netneutrality/hooks/SlashCommandHooks.java
+++ b/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 {
diff --git a/src/main/java/netneutrality/hooks/guilds/ServerJoinHandler.java b/src/main/java/me/bobert/netneutrality/hooks/guilds/ServerJoinHandler.java
similarity index 86%
rename from src/main/java/netneutrality/hooks/guilds/ServerJoinHandler.java
rename to src/main/java/me/bobert/netneutrality/hooks/guilds/ServerJoinHandler.java
index cb33ea2..ebdb410 100644
--- a/src/main/java/netneutrality/hooks/guilds/ServerJoinHandler.java
+++ b/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 {
diff --git a/src/main/java/netneutrality/hooks/message/EditHandler.java b/src/main/java/me/bobert/netneutrality/hooks/message/EditHandler.java
similarity index 82%
rename from src/main/java/netneutrality/hooks/message/EditHandler.java
rename to src/main/java/me/bobert/netneutrality/hooks/message/EditHandler.java
index cf03953..3fab697 100644
--- a/src/main/java/netneutrality/hooks/message/EditHandler.java
+++ b/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;
diff --git a/src/main/java/netneutrality/hooks/message/MessageReceivedHandler.java b/src/main/java/me/bobert/netneutrality/hooks/message/MessageReceivedHandler.java
similarity index 83%
rename from src/main/java/netneutrality/hooks/message/MessageReceivedHandler.java
rename to src/main/java/me/bobert/netneutrality/hooks/message/MessageReceivedHandler.java
index 6f19d32..c143659 100644
--- a/src/main/java/netneutrality/hooks/message/MessageReceivedHandler.java
+++ b/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 {
diff --git a/src/main/java/netneutrality/hooks/message/ReactionHandler.java b/src/main/java/me/bobert/netneutrality/hooks/message/ReactionHandler.java
similarity index 94%
rename from src/main/java/netneutrality/hooks/message/ReactionHandler.java
rename to src/main/java/me/bobert/netneutrality/hooks/message/ReactionHandler.java
index 994214d..bcbae8c 100644
--- a/src/main/java/netneutrality/hooks/message/ReactionHandler.java
+++ b/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
*
diff --git a/src/main/java/netneutrality/hooks/voice/VoiceEventHandler.java b/src/main/java/me/bobert/netneutrality/hooks/voice/VoiceEventHandler.java
similarity index 90%
rename from src/main/java/netneutrality/hooks/voice/VoiceEventHandler.java
rename to src/main/java/me/bobert/netneutrality/hooks/voice/VoiceEventHandler.java
index 2b983c8..00543ca 100644
--- a/src/main/java/netneutrality/hooks/voice/VoiceEventHandler.java
+++ b/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
*
diff --git a/src/main/java/netneutrality/http/WebModule.java b/src/main/java/me/bobert/netneutrality/http/WebModule.java
similarity index 97%
rename from src/main/java/netneutrality/http/WebModule.java
rename to src/main/java/me/bobert/netneutrality/http/WebModule.java
index ab9d508..2eb19d4 100644
--- a/src/main/java/netneutrality/http/WebModule.java
+++ b/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;
diff --git a/src/main/java/netneutrality/http/server/AbstractHandler.java b/src/main/java/me/bobert/netneutrality/http/server/AbstractHandler.java
similarity index 95%
rename from src/main/java/netneutrality/http/server/AbstractHandler.java
rename to src/main/java/me/bobert/netneutrality/http/server/AbstractHandler.java
index 4b54c69..21f9300 100644
--- a/src/main/java/netneutrality/http/server/AbstractHandler.java
+++ b/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
diff --git a/src/main/java/netneutrality/http/server/ActionHandler.java b/src/main/java/me/bobert/netneutrality/http/server/ActionHandler.java
similarity index 93%
rename from src/main/java/netneutrality/http/server/ActionHandler.java
rename to src/main/java/me/bobert/netneutrality/http/server/ActionHandler.java
index cc8a9af..a2b8f65 100644
--- a/src/main/java/netneutrality/http/server/ActionHandler.java
+++ b/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;
diff --git a/src/main/java/netneutrality/http/server/GuildHandler.java b/src/main/java/me/bobert/netneutrality/http/server/GuildHandler.java
similarity index 96%
rename from src/main/java/netneutrality/http/server/GuildHandler.java
rename to src/main/java/me/bobert/netneutrality/http/server/GuildHandler.java
index 567e41c..26016b8 100644
--- a/src/main/java/netneutrality/http/server/GuildHandler.java
+++ b/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;
diff --git a/src/main/java/netneutrality/http/server/RootHandler.java b/src/main/java/me/bobert/netneutrality/http/server/RootHandler.java
similarity index 90%
rename from src/main/java/netneutrality/http/server/RootHandler.java
rename to src/main/java/me/bobert/netneutrality/http/server/RootHandler.java
index 4a133c1..6d8a8d1 100644
--- a/src/main/java/netneutrality/http/server/RootHandler.java
+++ b/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
diff --git a/src/main/java/netneutrality/http/server/WebApi.java b/src/main/java/me/bobert/netneutrality/http/server/WebApi.java
similarity index 92%
rename from src/main/java/netneutrality/http/server/WebApi.java
rename to src/main/java/me/bobert/netneutrality/http/server/WebApi.java
index e3251f2..7828fce 100644
--- a/src/main/java/netneutrality/http/server/WebApi.java
+++ b/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;
diff --git a/src/main/java/netneutrality/music/AudioPlayerSendHandler.java b/src/main/java/me/bobert/netneutrality/music/AudioPlayerSendHandler.java
similarity index 96%
rename from src/main/java/netneutrality/music/AudioPlayerSendHandler.java
rename to src/main/java/me/bobert/netneutrality/music/AudioPlayerSendHandler.java
index 2b4f108..9307f62 100644
--- a/src/main/java/netneutrality/music/AudioPlayerSendHandler.java
+++ b/src/main/java/me/bobert/netneutrality/music/AudioPlayerSendHandler.java
@@ -1,4 +1,4 @@
-package netneutrality.music;
+package me.bobert.netneutrality.music;
/*
* Copyright (c) anthorob
*
diff --git a/src/main/java/netneutrality/music/MusicManager.java b/src/main/java/me/bobert/netneutrality/music/MusicManager.java
similarity index 93%
rename from src/main/java/netneutrality/music/MusicManager.java
rename to src/main/java/me/bobert/netneutrality/music/MusicManager.java
index d096bc7..f32fd1a 100644
--- a/src/main/java/netneutrality/music/MusicManager.java
+++ b/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;
diff --git a/src/main/java/netneutrality/music/QueueManager.java b/src/main/java/me/bobert/netneutrality/music/QueueManager.java
similarity index 98%
rename from src/main/java/netneutrality/music/QueueManager.java
rename to src/main/java/me/bobert/netneutrality/music/QueueManager.java
index 70c0d1e..1689fed 100644
--- a/src/main/java/netneutrality/music/QueueManager.java
+++ b/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;
diff --git a/src/main/java/netneutrality/music/SourceFinder.java b/src/main/java/me/bobert/netneutrality/music/SourceFinder.java
similarity index 98%
rename from src/main/java/netneutrality/music/SourceFinder.java
rename to src/main/java/me/bobert/netneutrality/music/SourceFinder.java
index 41e1b66..b42bc6f 100644
--- a/src/main/java/netneutrality/music/SourceFinder.java
+++ b/src/main/java/me/bobert/netneutrality/music/SourceFinder.java
@@ -1,4 +1,4 @@
-package netneutrality.music;
+package me.bobert.netneutrality.music;
/*
* Copyright (c) anthorob
diff --git a/src/main/java/netneutrality/music/TrackLoader.java b/src/main/java/me/bobert/netneutrality/music/TrackLoader.java
similarity index 91%
rename from src/main/java/netneutrality/music/TrackLoader.java
rename to src/main/java/me/bobert/netneutrality/music/TrackLoader.java
index 4aea43d..614a8c7 100644
--- a/src/main/java/netneutrality/music/TrackLoader.java
+++ b/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;
diff --git a/src/main/java/netneutrality/music/TrackLoadingHandler.java b/src/main/java/me/bobert/netneutrality/music/TrackLoadingHandler.java
similarity index 95%
rename from src/main/java/netneutrality/music/TrackLoadingHandler.java
rename to src/main/java/me/bobert/netneutrality/music/TrackLoadingHandler.java
index f655008..f4accf2 100644
--- a/src/main/java/netneutrality/music/TrackLoadingHandler.java
+++ b/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;
diff --git a/src/main/java/netneutrality/music/TrackScheduler.java b/src/main/java/me/bobert/netneutrality/music/TrackScheduler.java
similarity index 97%
rename from src/main/java/netneutrality/music/TrackScheduler.java
rename to src/main/java/me/bobert/netneutrality/music/TrackScheduler.java
index 837c522..2860151 100644
--- a/src/main/java/netneutrality/music/TrackScheduler.java
+++ b/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;
diff --git a/src/main/java/netneutrality/music/loadable/AppleMostPlayed.java b/src/main/java/me/bobert/netneutrality/music/loadable/AppleMostPlayed.java
similarity index 95%
rename from src/main/java/netneutrality/music/loadable/AppleMostPlayed.java
rename to src/main/java/me/bobert/netneutrality/music/loadable/AppleMostPlayed.java
index 8f87a11..7d21eef 100644
--- a/src/main/java/netneutrality/music/loadable/AppleMostPlayed.java
+++ b/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
*
diff --git a/src/main/java/netneutrality/music/loadable/CachedSource.java b/src/main/java/me/bobert/netneutrality/music/loadable/CachedSource.java
similarity index 94%
rename from src/main/java/netneutrality/music/loadable/CachedSource.java
rename to src/main/java/me/bobert/netneutrality/music/loadable/CachedSource.java
index 749ffd8..d04b000 100644
--- a/src/main/java/netneutrality/music/loadable/CachedSource.java
+++ b/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
*
diff --git a/src/main/java/netneutrality/music/loadable/LoadableMusicSource.java b/src/main/java/me/bobert/netneutrality/music/loadable/LoadableMusicSource.java
similarity index 84%
rename from src/main/java/netneutrality/music/loadable/LoadableMusicSource.java
rename to src/main/java/me/bobert/netneutrality/music/loadable/LoadableMusicSource.java
index fb2479c..8e08cb6 100644
--- a/src/main/java/netneutrality/music/loadable/LoadableMusicSource.java
+++ b/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
diff --git a/src/main/java/netneutrality/music/loadable/LoadableSong.java b/src/main/java/me/bobert/netneutrality/music/loadable/LoadableSong.java
similarity index 89%
rename from src/main/java/netneutrality/music/loadable/LoadableSong.java
rename to src/main/java/me/bobert/netneutrality/music/loadable/LoadableSong.java
index 6a7c0e2..1d476bc 100644
--- a/src/main/java/netneutrality/music/loadable/LoadableSong.java
+++ b/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
*
diff --git a/src/main/java/netneutrality/music/loadable/LoadableSourceManager.java b/src/main/java/me/bobert/netneutrality/music/loadable/LoadableSourceManager.java
similarity index 94%
rename from src/main/java/netneutrality/music/loadable/LoadableSourceManager.java
rename to src/main/java/me/bobert/netneutrality/music/loadable/LoadableSourceManager.java
index b16957e..a3ed29c 100644
--- a/src/main/java/netneutrality/music/loadable/LoadableSourceManager.java
+++ b/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;
diff --git a/src/main/java/netneutrality/music/source/UdioAudioSourceManager.java b/src/main/java/me/bobert/netneutrality/music/source/UdioAudioSourceManager.java
similarity index 99%
rename from src/main/java/netneutrality/music/source/UdioAudioSourceManager.java
rename to src/main/java/me/bobert/netneutrality/music/source/UdioAudioSourceManager.java
index 54cca31..9bf26e7 100644
--- a/src/main/java/netneutrality/music/source/UdioAudioSourceManager.java
+++ b/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
*
diff --git a/src/main/java/netneutrality/music/source/UdioAudioTrack.java b/src/main/java/me/bobert/netneutrality/music/source/UdioAudioTrack.java
similarity index 98%
rename from src/main/java/netneutrality/music/source/UdioAudioTrack.java
rename to src/main/java/me/bobert/netneutrality/music/source/UdioAudioTrack.java
index 3fd4d31..7b90151 100644
--- a/src/main/java/netneutrality/music/source/UdioAudioTrack.java
+++ b/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
*
diff --git a/src/main/java/netneutrality/thread/BaseThreadFactory.java b/src/main/java/me/bobert/netneutrality/thread/BaseThreadFactory.java
similarity index 87%
rename from src/main/java/netneutrality/thread/BaseThreadFactory.java
rename to src/main/java/me/bobert/netneutrality/thread/BaseThreadFactory.java
index d46a447..1c33201 100644
--- a/src/main/java/netneutrality/thread/BaseThreadFactory.java
+++ b/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;
diff --git a/src/main/java/netneutrality/thread/MusicPlayerAutoDisconnectThread.java b/src/main/java/me/bobert/netneutrality/thread/MusicPlayerAutoDisconnectThread.java
similarity index 92%
rename from src/main/java/netneutrality/thread/MusicPlayerAutoDisconnectThread.java
rename to src/main/java/me/bobert/netneutrality/thread/MusicPlayerAutoDisconnectThread.java
index d367442..e97e091 100644
--- a/src/main/java/netneutrality/thread/MusicPlayerAutoDisconnectThread.java
+++ b/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;
diff --git a/src/main/java/netneutrality/thread/ShutdownThread.java b/src/main/java/me/bobert/netneutrality/thread/ShutdownThread.java
similarity index 87%
rename from src/main/java/netneutrality/thread/ShutdownThread.java
rename to src/main/java/me/bobert/netneutrality/thread/ShutdownThread.java
index 72afaad..c9900e0 100644
--- a/src/main/java/netneutrality/thread/ShutdownThread.java
+++ b/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;
diff --git a/src/main/java/netneutrality/thread/ThreadManager.java b/src/main/java/me/bobert/netneutrality/thread/ThreadManager.java
similarity index 98%
rename from src/main/java/netneutrality/thread/ThreadManager.java
rename to src/main/java/me/bobert/netneutrality/thread/ThreadManager.java
index 7854b0f..f2d88e7 100644
--- a/src/main/java/netneutrality/thread/ThreadManager.java
+++ b/src/main/java/me/bobert/netneutrality/thread/ThreadManager.java
@@ -1,4 +1,4 @@
-package netneutrality.thread;
+package me.bobert.netneutrality.thread;
/*
* Copyright (c) anthorob
*
diff --git a/src/main/java/netneutrality/utils/ChannelMessagePurger.java b/src/main/java/me/bobert/netneutrality/utils/ChannelMessagePurger.java
similarity index 97%
rename from src/main/java/netneutrality/utils/ChannelMessagePurger.java
rename to src/main/java/me/bobert/netneutrality/utils/ChannelMessagePurger.java
index 774831c..95ae067 100644
--- a/src/main/java/netneutrality/utils/ChannelMessagePurger.java
+++ b/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;
diff --git a/src/main/java/netneutrality/utils/JpaUtils.java b/src/main/java/me/bobert/netneutrality/utils/JpaUtils.java
similarity index 93%
rename from src/main/java/netneutrality/utils/JpaUtils.java
rename to src/main/java/me/bobert/netneutrality/utils/JpaUtils.java
index ccca07e..3339ae6 100644
--- a/src/main/java/netneutrality/utils/JpaUtils.java
+++ b/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;
diff --git a/src/main/java/netneutrality/utils/MessageFunction.java b/src/main/java/me/bobert/netneutrality/utils/MessageFunction.java
similarity index 96%
rename from src/main/java/netneutrality/utils/MessageFunction.java
rename to src/main/java/me/bobert/netneutrality/utils/MessageFunction.java
index 35408b1..5b31a74 100644
--- a/src/main/java/netneutrality/utils/MessageFunction.java
+++ b/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;
diff --git a/src/main/java/netneutrality/utils/MiscUtils.java b/src/main/java/me/bobert/netneutrality/utils/MiscUtils.java
similarity index 92%
rename from src/main/java/netneutrality/utils/MiscUtils.java
rename to src/main/java/me/bobert/netneutrality/utils/MiscUtils.java
index 83fd053..c4af9f3 100644
--- a/src/main/java/netneutrality/utils/MiscUtils.java
+++ b/src/main/java/me/bobert/netneutrality/utils/MiscUtils.java
@@ -1,4 +1,4 @@
-package netneutrality.utils;
+package me.bobert.netneutrality.utils;
/*
* Copyright (c) anthorob
*
diff --git a/src/main/java/netneutrality/utils/MusicUtils.java b/src/main/java/me/bobert/netneutrality/utils/MusicUtils.java
similarity index 86%
rename from src/main/java/netneutrality/utils/MusicUtils.java
rename to src/main/java/me/bobert/netneutrality/utils/MusicUtils.java
index 163f8c2..47a36e7 100644
--- a/src/main/java/netneutrality/utils/MusicUtils.java
+++ b/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 {
diff --git a/src/main/java/netneutrality/utils/Settings.java b/src/main/java/me/bobert/netneutrality/utils/Settings.java
similarity index 79%
rename from src/main/java/netneutrality/utils/Settings.java
rename to src/main/java/me/bobert/netneutrality/utils/Settings.java
index 4c73597..e1084da 100644
--- a/src/main/java/netneutrality/utils/Settings.java
+++ b/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";
}
diff --git a/src/main/java/netneutrality/utils/UserFunction.java b/src/main/java/me/bobert/netneutrality/utils/UserFunction.java
similarity index 92%
rename from src/main/java/netneutrality/utils/UserFunction.java
rename to src/main/java/me/bobert/netneutrality/utils/UserFunction.java
index fbbe0f6..f3ef127 100644
--- a/src/main/java/netneutrality/utils/UserFunction.java
+++ b/src/main/java/me/bobert/netneutrality/utils/UserFunction.java
@@ -1,4 +1,4 @@
-package netneutrality.utils;
+package me.bobert.netneutrality.utils;
/*
* Copyright (c) anthorob
diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF
index 2cd435e..9250482 100644
--- a/src/main/resources/META-INF/MANIFEST.MF
+++ b/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
diff --git a/src/main/resources/app.properties b/src/main/resources/app.properties
new file mode 100644
index 0000000..4bc4ae6
--- /dev/null
+++ b/src/main/resources/app.properties
@@ -0,0 +1 @@
+app.version=${project.version}
\ No newline at end of file
diff --git a/src/main/resources/hibernate.cfg.xml b/src/main/resources/hibernate.cfg.xml
index d92de99..817a6be 100644
--- a/src/main/resources/hibernate.cfg.xml
+++ b/src/main/resources/hibernate.cfg.xml
@@ -8,12 +8,12 @@
com.mysql.cj.jdbc.Driver
org.hibernate.hikaricp.internal.HikariCPConnectionProvider
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/log4j2.properties b/src/main/resources/log4j2.properties
index 42be505..836ebf0 100644
--- a/src/main/resources/log4j2.properties
+++ b/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
diff --git a/src/test/java/netneutrality/music/LoadableSourceTest.java b/src/test/java/netneutrality/music/LoadableSourceTest.java
index 9100343..1bf7da9 100644
--- a/src/test/java/netneutrality/music/LoadableSourceTest.java
+++ b/src/test/java/netneutrality/music/LoadableSourceTest.java
@@ -6,9 +6,9 @@ package netneutrality.music;
* https://discord.gg/qUa6zNFZsd
*/
-import netneutrality.music.loadable.AppleMostPlayed;
-import netneutrality.music.loadable.CachedSource;
-import netneutrality.music.loadable.LoadableSourceManager;
+import me.bobert.netneutrality.music.loadable.AppleMostPlayed;
+import me.bobert.netneutrality.music.loadable.CachedSource;
+import me.bobert.netneutrality.music.loadable.LoadableSourceManager;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
diff --git a/src/test/java/netneutrality/music/source/UdioAudioSourceManagerTest.java b/src/test/java/netneutrality/music/source/UdioAudioSourceManagerTest.java
index ad4efde..745e5e2 100644
--- a/src/test/java/netneutrality/music/source/UdioAudioSourceManagerTest.java
+++ b/src/test/java/netneutrality/music/source/UdioAudioSourceManagerTest.java
@@ -8,6 +8,8 @@ package netneutrality.music.source;
import com.sedmelluq.discord.lavaplayer.track.AudioItem;
import com.sedmelluq.discord.lavaplayer.track.AudioReference;
import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
+import me.bobert.netneutrality.music.source.UdioAudioSourceManager;
+import me.bobert.netneutrality.music.source.UdioAudioTrack;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/src/test/java/netneutrality/utils/SettingsTest.java b/src/test/java/netneutrality/utils/SettingsTest.java
index 732b3b7..3e13580 100644
--- a/src/test/java/netneutrality/utils/SettingsTest.java
+++ b/src/test/java/netneutrality/utils/SettingsTest.java
@@ -6,6 +6,7 @@ package netneutrality.utils;
* https://discord.gg/qUa6zNFZsd
*/
+import me.bobert.netneutrality.utils.Settings;
import org.junit.Test;
import static org.junit.Assert.*;
@@ -15,7 +16,6 @@ public class SettingsTest {
@Test
public void getMavenVersion() {
String version = Settings.getInstance().getMavenVersion();
- System.out.println(version);
assertNotNull(version);
}
@@ -23,7 +23,6 @@ public class SettingsTest {
@Test
public void getGitVersion() {
String version = Settings.getInstance().getGitVersion();
- System.out.println(version);
assertNotNull(version);
}