diff --git a/src/main/java/me/bobert/netneutrality/command/basic/HelpCommand.java b/src/main/java/me/bobert/netneutrality/command/basic/HelpCommand.java index c286403..004f7ab 100644 --- a/src/main/java/me/bobert/netneutrality/command/basic/HelpCommand.java +++ b/src/main/java/me/bobert/netneutrality/command/basic/HelpCommand.java @@ -18,7 +18,7 @@ import me.bobert.netneutrality.core.tasks.TaskManager; import me.bobert.netneutrality.tasks.help.BotInfo; import me.bobert.netneutrality.tasks.help.CommandHelp; import me.bobert.netneutrality.tasks.help.ReportBug; -import me.bobert.netneutrality.shared.util.MessageFunction; +import me.bobert.netneutrality.utils.MessageFunction; import net.dv8tion.jda.api.components.actionrow.ActionRow; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.interactions.commands.OptionType; diff --git a/src/main/java/me/bobert/netneutrality/command/music/CurrentlyPlayingCommand.java b/src/main/java/me/bobert/netneutrality/command/music/CurrentlyPlayingCommand.java index b080f73..8260fb4 100644 --- a/src/main/java/me/bobert/netneutrality/command/music/CurrentlyPlayingCommand.java +++ b/src/main/java/me/bobert/netneutrality/command/music/CurrentlyPlayingCommand.java @@ -13,7 +13,7 @@ import me.bobert.netneutrality.db.service.GuildServiceProvider; import me.bobert.netneutrality.music.MusicService; import me.bobert.netneutrality.core.context.CommandContext; import me.bobert.netneutrality.music.MusicManager; -import me.bobert.netneutrality.shared.util.MessageFunction; +import me.bobert.netneutrality.utils.MessageFunction; import me.bobert.netneutrality.utils.MusicUtils; public class CurrentlyPlayingCommand extends MusicCommand { diff --git a/src/main/java/me/bobert/netneutrality/command/music/QueueCommand.java b/src/main/java/me/bobert/netneutrality/command/music/QueueCommand.java index f291ce5..2d64416 100644 --- a/src/main/java/me/bobert/netneutrality/command/music/QueueCommand.java +++ b/src/main/java/me/bobert/netneutrality/command/music/QueueCommand.java @@ -13,7 +13,7 @@ import me.bobert.netneutrality.music.MusicService; import me.bobert.netneutrality.core.command.options.CommandOption; import me.bobert.netneutrality.core.context.CommandContext; import me.bobert.netneutrality.music.MusicManager; -import me.bobert.netneutrality.shared.util.MessageFunction; +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.OptionType; diff --git a/src/main/java/me/bobert/netneutrality/command/music/SkipCommand.java b/src/main/java/me/bobert/netneutrality/command/music/SkipCommand.java index 369cb18..d075258 100644 --- a/src/main/java/me/bobert/netneutrality/command/music/SkipCommand.java +++ b/src/main/java/me/bobert/netneutrality/command/music/SkipCommand.java @@ -15,7 +15,7 @@ import me.bobert.netneutrality.core.command.options.CommandOption; import me.bobert.netneutrality.core.context.CommandContext; import me.bobert.netneutrality.music.MusicManager; import me.bobert.netneutrality.utils.MusicUtils; -import me.bobert.netneutrality.shared.util.UserFunction; +import me.bobert.netneutrality.utils.UserFunction; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; diff --git a/src/main/java/me/bobert/netneutrality/command/music/StopCommand.java b/src/main/java/me/bobert/netneutrality/command/music/StopCommand.java index d28b1b6..cb81ece 100644 --- a/src/main/java/me/bobert/netneutrality/command/music/StopCommand.java +++ b/src/main/java/me/bobert/netneutrality/command/music/StopCommand.java @@ -14,7 +14,7 @@ import me.bobert.netneutrality.music.MusicService; import me.bobert.netneutrality.core.context.CommandContext; import me.bobert.netneutrality.music.MusicManager; import me.bobert.netneutrality.utils.MusicUtils; -import me.bobert.netneutrality.shared.util.UserFunction; +import me.bobert.netneutrality.utils.UserFunction; public class StopCommand extends MusicCommand { diff --git a/src/main/java/me/bobert/netneutrality/command/music/ViewQueueCommand.java b/src/main/java/me/bobert/netneutrality/command/music/ViewQueueCommand.java index eb70809..7ab27f7 100644 --- a/src/main/java/me/bobert/netneutrality/command/music/ViewQueueCommand.java +++ b/src/main/java/me/bobert/netneutrality/command/music/ViewQueueCommand.java @@ -12,7 +12,7 @@ import me.bobert.netneutrality.db.service.GuildServiceProvider; import me.bobert.netneutrality.music.MusicService; import me.bobert.netneutrality.core.context.CommandContext; import me.bobert.netneutrality.music.MusicManager; -import me.bobert.netneutrality.shared.util.MessageFunction; +import me.bobert.netneutrality.utils.MessageFunction; import me.bobert.netneutrality.utils.MusicUtils; public class ViewQueueCommand extends MusicCommand { diff --git a/src/main/java/me/bobert/netneutrality/command/music/VolumeCommand.java b/src/main/java/me/bobert/netneutrality/command/music/VolumeCommand.java index 378c334..ed460f3 100644 --- a/src/main/java/me/bobert/netneutrality/command/music/VolumeCommand.java +++ b/src/main/java/me/bobert/netneutrality/command/music/VolumeCommand.java @@ -15,7 +15,7 @@ import me.bobert.netneutrality.core.command.options.CommandOption; import me.bobert.netneutrality.core.context.CommandContext; import me.bobert.netneutrality.music.MusicManager; import me.bobert.netneutrality.utils.MusicUtils; -import me.bobert.netneutrality.shared.util.UserFunction; +import me.bobert.netneutrality.utils.UserFunction; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; diff --git a/src/main/java/me/bobert/netneutrality/core/LogHandler.java b/src/main/java/me/bobert/netneutrality/core/LogHandler.java index 4aefae3..12861a3 100644 --- a/src/main/java/me/bobert/netneutrality/core/LogHandler.java +++ b/src/main/java/me/bobert/netneutrality/core/LogHandler.java @@ -11,7 +11,7 @@ import me.bobert.netneutrality.core.context.Context; import me.bobert.netneutrality.core.context.TaskContext; import me.bobert.netneutrality.db.service.GuildServiceProvider; import me.bobert.netneutrality.exceptions.ContextException; -import me.bobert.netneutrality.shared.util.MessageFunction; +import me.bobert.netneutrality.utils.MessageFunction; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/me/bobert/netneutrality/core/command/CommandProcessor.java b/src/main/java/me/bobert/netneutrality/core/command/CommandProcessor.java index 0505ac9..9c95fe1 100644 --- a/src/main/java/me/bobert/netneutrality/core/command/CommandProcessor.java +++ b/src/main/java/me/bobert/netneutrality/core/command/CommandProcessor.java @@ -15,7 +15,7 @@ import me.bobert.netneutrality.core.context.CommandContext; import me.bobert.netneutrality.exceptions.CommandExecutionException; import me.bobert.netneutrality.exceptions.GracefulContextError; import me.bobert.netneutrality.core.tasks.TaskManager; -import me.bobert.netneutrality.shared.util.UserFunction; +import me.bobert.netneutrality.utils.UserFunction; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/me/bobert/netneutrality/core/command/impl/MusicCommand.java b/src/main/java/me/bobert/netneutrality/core/command/impl/MusicCommand.java index 426eb0d..c90ae07 100644 --- a/src/main/java/me/bobert/netneutrality/core/command/impl/MusicCommand.java +++ b/src/main/java/me/bobert/netneutrality/core/command/impl/MusicCommand.java @@ -9,7 +9,7 @@ import me.bobert.netneutrality.core.command.CommandCategory; import me.bobert.netneutrality.db.service.GuildServiceProvider; import me.bobert.netneutrality.db.GSettings; import me.bobert.netneutrality.db.service.GuildService; -import me.bobert.netneutrality.shared.util.UserFunction; +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; diff --git a/src/main/java/me/bobert/netneutrality/core/command/precondition/PermissionPrecondition.java b/src/main/java/me/bobert/netneutrality/core/command/precondition/PermissionPrecondition.java index ffbdde4..232e707 100644 --- a/src/main/java/me/bobert/netneutrality/core/command/precondition/PermissionPrecondition.java +++ b/src/main/java/me/bobert/netneutrality/core/command/precondition/PermissionPrecondition.java @@ -7,7 +7,7 @@ package me.bobert.netneutrality.core.command.precondition; import me.bobert.netneutrality.core.command.Command; import me.bobert.netneutrality.core.context.CommandContext; -import me.bobert.netneutrality.shared.util.UserFunction; +import me.bobert.netneutrality.utils.UserFunction; public class PermissionPrecondition implements CommandPrecondition { diff --git a/src/main/java/me/bobert/netneutrality/core/context/Context.java b/src/main/java/me/bobert/netneutrality/core/context/Context.java index 81af47d..f06356e 100644 --- a/src/main/java/me/bobert/netneutrality/core/context/Context.java +++ b/src/main/java/me/bobert/netneutrality/core/context/Context.java @@ -5,7 +5,7 @@ package me.bobert.netneutrality.core.context; * https://discord.gg/qUa6zNFZsd */ -import me.bobert.netneutrality.shared.util.ContextUtils; +import me.bobert.netneutrality.utils.ContextUtils; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.components.MessageTopLevelComponent; import net.dv8tion.jda.api.entities.Guild; diff --git a/src/main/java/me/bobert/netneutrality/music/TrackLoadingHandler.java b/src/main/java/me/bobert/netneutrality/music/TrackLoadingHandler.java index 5c5abc0..09d6bb8 100644 --- a/src/main/java/me/bobert/netneutrality/music/TrackLoadingHandler.java +++ b/src/main/java/me/bobert/netneutrality/music/TrackLoadingHandler.java @@ -14,7 +14,7 @@ import dev.arbjerg.lavalink.client.player.Track; import dev.arbjerg.lavalink.client.player.TrackLoaded; import me.bobert.netneutrality.core.LogHandler; import me.bobert.netneutrality.core.context.CommandContext; -import me.bobert.netneutrality.shared.util.MessageFunction; +import me.bobert.netneutrality.utils.MessageFunction; import me.bobert.netneutrality.tasks.music.LoadPlaylistTask; import me.bobert.netneutrality.utils.MusicUtils; import net.dv8tion.jda.api.entities.Guild; diff --git a/src/main/java/me/bobert/netneutrality/tasks/help/CommandHelp.java b/src/main/java/me/bobert/netneutrality/tasks/help/CommandHelp.java index da1d18b..88577f7 100644 --- a/src/main/java/me/bobert/netneutrality/tasks/help/CommandHelp.java +++ b/src/main/java/me/bobert/netneutrality/tasks/help/CommandHelp.java @@ -11,7 +11,7 @@ import me.bobert.netneutrality.core.tasks.trait.WithButton; import me.bobert.netneutrality.core.command.CommandRegistry; import me.bobert.netneutrality.core.tasks.TaskManager; import me.bobert.netneutrality.utils.SettingsProvider; -import me.bobert.netneutrality.shared.util.MessageFunction; +import me.bobert.netneutrality.utils.MessageFunction; import net.dv8tion.jda.api.components.buttons.Button; public class CommandHelp extends AbstractBuiltInTask implements WithButton { diff --git a/src/main/java/me/bobert/netneutrality/tasks/music/LoadPlaylistTask.java b/src/main/java/me/bobert/netneutrality/tasks/music/LoadPlaylistTask.java index e09f4cf..ca57f55 100644 --- a/src/main/java/me/bobert/netneutrality/tasks/music/LoadPlaylistTask.java +++ b/src/main/java/me/bobert/netneutrality/tasks/music/LoadPlaylistTask.java @@ -16,7 +16,7 @@ import me.bobert.netneutrality.music.MusicManager; import me.bobert.netneutrality.music.SourceFinder; import me.bobert.netneutrality.core.tasks.generic.AcceptButton; import me.bobert.netneutrality.core.tasks.generic.CancelButton; -import me.bobert.netneutrality.shared.util.MessageFunction; +import me.bobert.netneutrality.utils.MessageFunction; import me.bobert.netneutrality.utils.MusicUtils; import net.dv8tion.jda.api.components.actionrow.ActionRow; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/me/bobert/netneutrality/tasks/music/LoadTrackFromPlaylistTask.java b/src/main/java/me/bobert/netneutrality/tasks/music/LoadTrackFromPlaylistTask.java index b1fce4a..2f3f84b 100644 --- a/src/main/java/me/bobert/netneutrality/tasks/music/LoadTrackFromPlaylistTask.java +++ b/src/main/java/me/bobert/netneutrality/tasks/music/LoadTrackFromPlaylistTask.java @@ -9,7 +9,7 @@ import dev.arbjerg.lavalink.client.player.Track; import me.bobert.netneutrality.music.MusicManager; import me.bobert.netneutrality.music.SourceFinder; import me.bobert.netneutrality.core.tasks.generic.AcceptButton; -import me.bobert.netneutrality.shared.util.MessageFunction; +import me.bobert.netneutrality.utils.MessageFunction; import me.bobert.netneutrality.utils.MusicUtils; import net.dv8tion.jda.api.components.buttons.ButtonStyle; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/me/bobert/netneutrality/tasks/reaction/EmojiReactionRoleTask.java b/src/main/java/me/bobert/netneutrality/tasks/reaction/EmojiReactionRoleTask.java index ee7e950..f7d5ac1 100644 --- a/src/main/java/me/bobert/netneutrality/tasks/reaction/EmojiReactionRoleTask.java +++ b/src/main/java/me/bobert/netneutrality/tasks/reaction/EmojiReactionRoleTask.java @@ -8,7 +8,7 @@ package me.bobert.netneutrality.tasks.reaction; import me.bobert.netneutrality.core.context.TaskContext; import me.bobert.netneutrality.core.tasks.impl.EmojiTask; import me.bobert.netneutrality.core.tasks.TaskManager; -import me.bobert.netneutrality.shared.util.GuildUtils; +import me.bobert.netneutrality.utils.GuildUtils; import net.dv8tion.jda.api.entities.Role; import java.util.Map; diff --git a/src/main/java/me/bobert/netneutrality/shared/util/ContextUtils.java b/src/main/java/me/bobert/netneutrality/utils/ContextUtils.java similarity index 98% rename from src/main/java/me/bobert/netneutrality/shared/util/ContextUtils.java rename to src/main/java/me/bobert/netneutrality/utils/ContextUtils.java index a3ba871..995cc33 100644 --- a/src/main/java/me/bobert/netneutrality/shared/util/ContextUtils.java +++ b/src/main/java/me/bobert/netneutrality/utils/ContextUtils.java @@ -1,4 +1,4 @@ -package me.bobert.netneutrality.shared.util; +package me.bobert.netneutrality.utils; /* * Copyright (c) anthorob * diff --git a/src/main/java/me/bobert/netneutrality/shared/util/GuildUtils.java b/src/main/java/me/bobert/netneutrality/utils/GuildUtils.java similarity index 93% rename from src/main/java/me/bobert/netneutrality/shared/util/GuildUtils.java rename to src/main/java/me/bobert/netneutrality/utils/GuildUtils.java index 850e9c0..66e8fcb 100644 --- a/src/main/java/me/bobert/netneutrality/shared/util/GuildUtils.java +++ b/src/main/java/me/bobert/netneutrality/utils/GuildUtils.java @@ -1,4 +1,4 @@ -package me.bobert.netneutrality.shared.util; +package me.bobert.netneutrality.utils; /* * Copyright (c) anthorob diff --git a/src/main/java/me/bobert/netneutrality/shared/util/MessageFunction.java b/src/main/java/me/bobert/netneutrality/utils/MessageFunction.java similarity index 99% rename from src/main/java/me/bobert/netneutrality/shared/util/MessageFunction.java rename to src/main/java/me/bobert/netneutrality/utils/MessageFunction.java index 9f1c8c7..b4709fc 100644 --- a/src/main/java/me/bobert/netneutrality/shared/util/MessageFunction.java +++ b/src/main/java/me/bobert/netneutrality/utils/MessageFunction.java @@ -1,4 +1,4 @@ -package me.bobert.netneutrality.shared.util; +package me.bobert.netneutrality.utils; /* * Copyright (c) anthorob diff --git a/src/main/java/me/bobert/netneutrality/shared/util/MiscUtils.java b/src/main/java/me/bobert/netneutrality/utils/MiscUtils.java similarity index 91% rename from src/main/java/me/bobert/netneutrality/shared/util/MiscUtils.java rename to src/main/java/me/bobert/netneutrality/utils/MiscUtils.java index 03ffd56..c4af9f3 100644 --- a/src/main/java/me/bobert/netneutrality/shared/util/MiscUtils.java +++ b/src/main/java/me/bobert/netneutrality/utils/MiscUtils.java @@ -1,4 +1,4 @@ -package me.bobert.netneutrality.shared.util; +package me.bobert.netneutrality.utils; /* * Copyright (c) anthorob * diff --git a/src/main/java/me/bobert/netneutrality/shared/util/UserFunction.java b/src/main/java/me/bobert/netneutrality/utils/UserFunction.java similarity index 95% rename from src/main/java/me/bobert/netneutrality/shared/util/UserFunction.java rename to src/main/java/me/bobert/netneutrality/utils/UserFunction.java index e216e30..530112f 100644 --- a/src/main/java/me/bobert/netneutrality/shared/util/UserFunction.java +++ b/src/main/java/me/bobert/netneutrality/utils/UserFunction.java @@ -1,4 +1,4 @@ -package me.bobert.netneutrality.shared.util; +package me.bobert.netneutrality.utils; /* * Copyright (c) anthorob