Move Permission out of util

2024-12-31 18:07:56 +01:00 · 2023-12-19 00:37:53 +02:00 · 2023-12-19 00:37:53 +02:00 · b5b9a0dd73
commit b5b9a0dd73
parent e31510ba5c
14 changed files with 14 additions and 14 deletions
--- 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;
--- 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;
--- 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;

--- 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;

--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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 {
--- 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;
--- 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;
--- a/common/src/main/java/com/discordsrv/common/permission/util/Permission.java
+++ b/common/src/main/java/com/discordsrv/common/permission/util/Permission.java
@ -1,4 +1,4 @@
-package com.discordsrv.common.permission.util;
+package com.discordsrv.common.permission;

 public enum Permission {

--- 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;