From b5b9a0dd737a39b4ca68a7f17040d37b5e170224 Mon Sep 17 00:00:00 2001 From: Vankka Date: Tue, 19 Dec 2023 00:37:53 +0200 Subject: [PATCH] Move Permission out of util --- .../common/command/combined/commands/DebugCommand.java | 2 +- .../common/command/combined/commands/LinkInitCommand.java | 2 +- .../common/command/combined/commands/LinkedCommand.java | 2 +- .../common/command/combined/commands/ResyncCommand.java | 2 +- .../common/command/combined/commands/VersionCommand.java | 2 +- .../discordsrv/common/command/game/abstraction/GameCommand.java | 2 +- .../common/command/game/commands/DiscordSRVGameCommand.java | 2 +- .../command/game/commands/subcommand/BroadcastCommand.java | 2 +- .../command/game/commands/subcommand/reload/ReloadCommand.java | 2 +- .../discordsrv/common/command/game/sender/ICommandSender.java | 2 +- .../java/com/discordsrv/common/command/util/CommandUtil.java | 2 +- .../game/minecrafttodiscord/MinecraftToDiscordChatModule.java | 2 +- .../com/discordsrv/common/permission/{util => }/Permission.java | 2 +- .../main/java/com/discordsrv/common/update/UpdateChecker.java | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) rename common/src/main/java/com/discordsrv/common/permission/{util => }/Permission.java (95%) diff --git a/common/src/main/java/com/discordsrv/common/command/combined/commands/DebugCommand.java b/common/src/main/java/com/discordsrv/common/command/combined/commands/DebugCommand.java index d70a93e7..6965584e 100644 --- a/common/src/main/java/com/discordsrv/common/command/combined/commands/DebugCommand.java +++ b/common/src/main/java/com/discordsrv/common/command/combined/commands/DebugCommand.java @@ -31,7 +31,7 @@ import com.discordsrv.common.paste.Paste; import com.discordsrv.common.paste.PasteService; import com.discordsrv.common.paste.service.AESEncryptedPasteService; import com.discordsrv.common.paste.service.BytebinPasteService; -import com.discordsrv.common.permission.util.Permission; +import com.discordsrv.common.permission.Permission; import net.kyori.adventure.text.format.NamedTextColor; import java.nio.charset.StandardCharsets; diff --git a/common/src/main/java/com/discordsrv/common/command/combined/commands/LinkInitCommand.java b/common/src/main/java/com/discordsrv/common/command/combined/commands/LinkInitCommand.java index 653555e0..7e4d5423 100644 --- a/common/src/main/java/com/discordsrv/common/command/combined/commands/LinkInitCommand.java +++ b/common/src/main/java/com/discordsrv/common/command/combined/commands/LinkInitCommand.java @@ -14,7 +14,7 @@ import com.discordsrv.common.command.util.CommandUtil; import com.discordsrv.common.component.util.ComponentUtil; import com.discordsrv.common.linking.LinkProvider; import com.discordsrv.common.linking.LinkStore; -import com.discordsrv.common.permission.util.Permission; +import com.discordsrv.common.permission.Permission; import com.discordsrv.common.player.IPlayer; import com.github.benmanes.caffeine.cache.Cache; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/common/src/main/java/com/discordsrv/common/command/combined/commands/LinkedCommand.java b/common/src/main/java/com/discordsrv/common/command/combined/commands/LinkedCommand.java index 323ba200..21992c74 100644 --- a/common/src/main/java/com/discordsrv/common/command/combined/commands/LinkedCommand.java +++ b/common/src/main/java/com/discordsrv/common/command/combined/commands/LinkedCommand.java @@ -9,7 +9,7 @@ import com.discordsrv.common.command.combined.abstraction.CommandExecution; import com.discordsrv.common.command.combined.abstraction.Text; import com.discordsrv.common.command.game.abstraction.GameCommand; import com.discordsrv.common.command.util.CommandUtil; -import com.discordsrv.common.permission.util.Permission; +import com.discordsrv.common.permission.Permission; import java.util.UUID; diff --git a/common/src/main/java/com/discordsrv/common/command/combined/commands/ResyncCommand.java b/common/src/main/java/com/discordsrv/common/command/combined/commands/ResyncCommand.java index cb0cb368..f14bc89b 100644 --- a/common/src/main/java/com/discordsrv/common/command/combined/commands/ResyncCommand.java +++ b/common/src/main/java/com/discordsrv/common/command/combined/commands/ResyncCommand.java @@ -12,7 +12,7 @@ import com.discordsrv.common.future.util.CompletableFutureUtil; import com.discordsrv.common.groupsync.GroupSyncModule; import com.discordsrv.common.groupsync.enums.GroupSyncCause; import com.discordsrv.common.groupsync.enums.GroupSyncResult; -import com.discordsrv.common.permission.util.Permission; +import com.discordsrv.common.permission.Permission; import com.discordsrv.common.player.IPlayer; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/common/src/main/java/com/discordsrv/common/command/combined/commands/VersionCommand.java b/common/src/main/java/com/discordsrv/common/command/combined/commands/VersionCommand.java index 2ed6ba0b..cdbc9e3c 100644 --- a/common/src/main/java/com/discordsrv/common/command/combined/commands/VersionCommand.java +++ b/common/src/main/java/com/discordsrv/common/command/combined/commands/VersionCommand.java @@ -27,7 +27,7 @@ import com.discordsrv.common.command.combined.abstraction.CommandExecution; import com.discordsrv.common.command.combined.abstraction.Text; import com.discordsrv.common.command.game.abstraction.GameCommand; import com.discordsrv.common.debug.data.VersionInfo; -import com.discordsrv.common.permission.util.Permission; +import com.discordsrv.common.permission.Permission; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.TextColor; import org.apache.commons.lang3.StringUtils; diff --git a/common/src/main/java/com/discordsrv/common/command/game/abstraction/GameCommand.java b/common/src/main/java/com/discordsrv/common/command/game/abstraction/GameCommand.java index 154d095a..cbabe8e0 100644 --- a/common/src/main/java/com/discordsrv/common/command/game/abstraction/GameCommand.java +++ b/common/src/main/java/com/discordsrv/common/command/game/abstraction/GameCommand.java @@ -20,7 +20,7 @@ package com.discordsrv.common.command.game.abstraction; import com.discordsrv.common.command.game.sender.ICommandSender; import com.discordsrv.common.function.CheckedFunction; -import com.discordsrv.common.permission.util.Permission; +import com.discordsrv.common.permission.Permission; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/common/src/main/java/com/discordsrv/common/command/game/commands/DiscordSRVGameCommand.java b/common/src/main/java/com/discordsrv/common/command/game/commands/DiscordSRVGameCommand.java index a4ed019a..13788303 100644 --- a/common/src/main/java/com/discordsrv/common/command/game/commands/DiscordSRVGameCommand.java +++ b/common/src/main/java/com/discordsrv/common/command/game/commands/DiscordSRVGameCommand.java @@ -28,7 +28,7 @@ import com.discordsrv.common.command.game.commands.subcommand.BroadcastCommand; import com.discordsrv.common.command.game.commands.subcommand.reload.ReloadCommand; import com.discordsrv.common.command.game.sender.ICommandSender; import com.discordsrv.common.component.util.ComponentUtil; -import com.discordsrv.common.permission.util.Permission; +import com.discordsrv.common.permission.Permission; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/common/src/main/java/com/discordsrv/common/command/game/commands/subcommand/BroadcastCommand.java b/common/src/main/java/com/discordsrv/common/command/game/commands/subcommand/BroadcastCommand.java index 99d93367..05e3a877 100644 --- a/common/src/main/java/com/discordsrv/common/command/game/commands/subcommand/BroadcastCommand.java +++ b/common/src/main/java/com/discordsrv/common/command/game/commands/subcommand/BroadcastCommand.java @@ -31,7 +31,7 @@ import com.discordsrv.common.command.game.sender.ICommandSender; import com.discordsrv.common.component.util.ComponentUtil; import com.discordsrv.common.config.main.channels.base.BaseChannelConfig; import com.discordsrv.common.config.main.channels.base.IChannelConfig; -import com.discordsrv.common.permission.util.Permission; +import com.discordsrv.common.permission.Permission; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; diff --git a/common/src/main/java/com/discordsrv/common/command/game/commands/subcommand/reload/ReloadCommand.java b/common/src/main/java/com/discordsrv/common/command/game/commands/subcommand/reload/ReloadCommand.java index 59d20bd2..ca8f54ae 100644 --- a/common/src/main/java/com/discordsrv/common/command/game/commands/subcommand/reload/ReloadCommand.java +++ b/common/src/main/java/com/discordsrv/common/command/game/commands/subcommand/reload/ReloadCommand.java @@ -25,7 +25,7 @@ import com.discordsrv.common.command.game.abstraction.GameCommandArguments; import com.discordsrv.common.command.game.abstraction.GameCommandExecutor; import com.discordsrv.common.command.game.abstraction.GameCommandSuggester; import com.discordsrv.common.command.game.sender.ICommandSender; -import com.discordsrv.common.permission.util.Permission; +import com.discordsrv.common.permission.Permission; import com.discordsrv.common.player.IPlayer; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.event.ClickEvent; diff --git a/common/src/main/java/com/discordsrv/common/command/game/sender/ICommandSender.java b/common/src/main/java/com/discordsrv/common/command/game/sender/ICommandSender.java index 81334711..08c958ef 100644 --- a/common/src/main/java/com/discordsrv/common/command/game/sender/ICommandSender.java +++ b/common/src/main/java/com/discordsrv/common/command/game/sender/ICommandSender.java @@ -19,7 +19,7 @@ package com.discordsrv.common.command.game.sender; import com.discordsrv.common.command.game.executor.CommandExecutor; -import com.discordsrv.common.permission.util.Permission; +import com.discordsrv.common.permission.Permission; import net.kyori.adventure.audience.ForwardingAudience; public interface ICommandSender extends ForwardingAudience.Single, CommandExecutor { diff --git a/common/src/main/java/com/discordsrv/common/command/util/CommandUtil.java b/common/src/main/java/com/discordsrv/common/command/util/CommandUtil.java index 12a303b9..35fc81c7 100644 --- a/common/src/main/java/com/discordsrv/common/command/util/CommandUtil.java +++ b/common/src/main/java/com/discordsrv/common/command/util/CommandUtil.java @@ -6,7 +6,7 @@ import com.discordsrv.common.command.combined.abstraction.DiscordCommandExecutio import com.discordsrv.common.command.combined.abstraction.GameCommandExecution; import com.discordsrv.common.command.game.sender.ICommandSender; import com.discordsrv.common.config.messages.MessagesConfig; -import com.discordsrv.common.permission.util.Permission; +import com.discordsrv.common.permission.Permission; import com.discordsrv.common.player.IPlayer; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.entities.User; diff --git a/common/src/main/java/com/discordsrv/common/messageforwarding/game/minecrafttodiscord/MinecraftToDiscordChatModule.java b/common/src/main/java/com/discordsrv/common/messageforwarding/game/minecrafttodiscord/MinecraftToDiscordChatModule.java index 69f02af9..0007d3db 100644 --- a/common/src/main/java/com/discordsrv/common/messageforwarding/game/minecrafttodiscord/MinecraftToDiscordChatModule.java +++ b/common/src/main/java/com/discordsrv/common/messageforwarding/game/minecrafttodiscord/MinecraftToDiscordChatModule.java @@ -38,7 +38,7 @@ import com.discordsrv.common.config.main.channels.MinecraftToDiscordChatConfig; import com.discordsrv.common.config.main.channels.base.BaseChannelConfig; import com.discordsrv.common.future.util.CompletableFutureUtil; import com.discordsrv.common.messageforwarding.game.AbstractGameMessageModule; -import com.discordsrv.common.permission.util.Permission; +import com.discordsrv.common.permission.Permission; import com.discordsrv.common.player.IPlayer; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Role; diff --git a/common/src/main/java/com/discordsrv/common/permission/util/Permission.java b/common/src/main/java/com/discordsrv/common/permission/Permission.java similarity index 95% rename from common/src/main/java/com/discordsrv/common/permission/util/Permission.java rename to common/src/main/java/com/discordsrv/common/permission/Permission.java index b1b31cfb..6c4724d1 100644 --- a/common/src/main/java/com/discordsrv/common/permission/util/Permission.java +++ b/common/src/main/java/com/discordsrv/common/permission/Permission.java @@ -1,4 +1,4 @@ -package com.discordsrv.common.permission.util; +package com.discordsrv.common.permission; public enum Permission { diff --git a/common/src/main/java/com/discordsrv/common/update/UpdateChecker.java b/common/src/main/java/com/discordsrv/common/update/UpdateChecker.java index 408e6de0..f69ab2d6 100644 --- a/common/src/main/java/com/discordsrv/common/update/UpdateChecker.java +++ b/common/src/main/java/com/discordsrv/common/update/UpdateChecker.java @@ -25,7 +25,7 @@ import com.discordsrv.common.config.connection.UpdateConfig; import com.discordsrv.common.debug.data.VersionInfo; import com.discordsrv.common.exception.MessageException; import com.discordsrv.common.logging.NamedLogger; -import com.discordsrv.common.permission.util.Permission; +import com.discordsrv.common.permission.Permission; import com.discordsrv.common.player.IPlayer; import com.discordsrv.common.player.event.PlayerConnectedEvent; import com.discordsrv.common.update.github.GitHubCompareResponse;