From ea512487ac9ce1a12b7cdb18c7b97f37c1352c41 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Wed, 8 Mar 2023 14:26:10 -0600 Subject: [PATCH] Reformat --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/gradle.yml | 44 +++++++++--------- proxy/src/main/java/dev/plex/Plex.java | 3 +- .../java/dev/plex/command/PlexCommand.java | 3 +- .../annotation/CommandPermissions.java | 1 + .../main/java/dev/plex/config/TomlConfig.java | 5 +- .../dev/plex/handlers/ListenerHandler.java | 1 + .../plex/listener/impl/ServerListener.java | 5 +- .../dev/plex/settings/ServerSettings.java | 3 +- .../java/dev/plex/toml/ArrayValueWriter.java | 1 + .../java/dev/plex/toml/ObjectValueWriter.java | 8 +--- .../src/main/java/dev/plex/toml/Results.java | 7 +-- .../dev/plex/toml/TableArrayValueWriter.java | 1 + proxy/src/main/java/dev/plex/toml/Toml.java | 19 ++------ .../main/java/dev/plex/toml/TomlWriter.java | 12 ++--- .../main/java/dev/plex/toml/ValueReaders.java | 1 + .../main/java/dev/plex/util/RandomUtil.java | 3 +- .../java/dev/plex/util/ReflectionsUtil.java | 1 + proxy/src/main/resources/config.toml | 36 +++++++-------- .../src/main/java/dev/plex/admin/Admin.java | 3 +- .../main/java/dev/plex/admin/AdminList.java | 1 + .../main/java/dev/plex/cache/DataUtils.java | 1 + .../main/java/dev/plex/cache/PlayerCache.java | 1 + .../java/dev/plex/command/PlexCommand.java | 23 ++++------ .../annotation/CommandPermissions.java | 1 + .../plex/command/blocking/BlockedCommand.java | 3 +- .../java/dev/plex/command/impl/AdminCMD.java | 5 +- .../dev/plex/command/impl/AdminChatCMD.java | 6 ++- .../dev/plex/command/impl/AdventureCMD.java | 3 +- .../java/dev/plex/command/impl/BanCMD.java | 15 +++--- .../dev/plex/command/impl/CreativeCMD.java | 3 +- .../java/dev/plex/command/impl/DebugCMD.java | 7 +-- .../java/dev/plex/command/impl/DeopCMD.java | 3 +- .../dev/plex/command/impl/EntityWipeCMD.java | 7 +-- .../java/dev/plex/command/impl/FreezeCMD.java | 7 +-- .../dev/plex/command/impl/GamemodeCMD.java | 7 +-- .../java/dev/plex/command/impl/KickCMD.java | 7 +-- .../java/dev/plex/command/impl/LockupCMD.java | 3 +- .../dev/plex/command/impl/MobPurgeCMD.java | 3 +- .../java/dev/plex/command/impl/MuteCMD.java | 7 +-- .../dev/plex/command/impl/NameHistoryCMD.java | 11 ++--- .../java/dev/plex/command/impl/NotesCMD.java | 13 +++--- .../java/dev/plex/command/impl/OpCMD.java | 3 +- .../java/dev/plex/command/impl/PlexCMD.java | 9 ++-- .../dev/plex/command/impl/PunishmentsCMD.java | 3 +- .../java/dev/plex/command/impl/RankCMD.java | 5 +- .../java/dev/plex/command/impl/SmiteCMD.java | 9 ++-- .../dev/plex/command/impl/SpectatorCMD.java | 3 +- .../dev/plex/command/impl/SurvivalCMD.java | 3 +- .../java/dev/plex/command/impl/TFMCMD.java | 5 +- .../dev/plex/command/impl/TempbanCMD.java | 5 +- .../java/dev/plex/command/impl/ToggleCMD.java | 3 +- .../java/dev/plex/command/impl/UnbanCMD.java | 5 +- .../dev/plex/command/impl/UnfreezeCMD.java | 3 +- .../java/dev/plex/command/impl/UnmuteCMD.java | 3 +- .../java/dev/plex/command/impl/WorldCMD.java | 5 +- .../src/main/java/dev/plex/config/Config.java | 3 +- .../java/dev/plex/config/ModuleConfig.java | 5 +- .../dev/plex/handlers/CommandHandler.java | 1 + .../dev/plex/handlers/ListenerHandler.java | 1 + .../dev/plex/listener/impl/AdminListener.java | 1 + .../plex/listener/impl/AntiNukerListener.java | 3 +- .../plex/listener/impl/AntiSpamListener.java | 3 +- .../dev/plex/listener/impl/BlockListener.java | 9 ++-- .../dev/plex/listener/impl/BookListener.java | 7 +-- .../plex/listener/impl/CommandListener.java | 12 +++-- .../dev/plex/listener/impl/MobListener.java | 9 ++-- .../dev/plex/listener/impl/MuteListener.java | 3 +- .../plex/listener/impl/PlayerListener.java | 4 +- .../plex/listener/impl/ServerListener.java | 6 +-- .../dev/plex/listener/impl/WorldListener.java | 11 +++-- .../dev/plex/menu/PunishedPlayerMenu.java | 13 +++--- .../java/dev/plex/menu/PunishmentMenu.java | 13 +++--- .../main/java/dev/plex/menu/ToggleMenu.java | 3 +- .../java/dev/plex/module/ModuleManager.java | 11 +++-- .../main/java/dev/plex/module/PlexModule.java | 15 +++--- .../java/dev/plex/module/PlexModuleFile.java | 3 +- .../dev/plex/module/loader/LibraryLoader.java | 31 +++++++------ .../java/dev/plex/permission/Permission.java | 3 +- .../main/java/dev/plex/player/PlexPlayer.java | 10 ++-- .../java/dev/plex/punishment/Punishment.java | 5 +- .../plex/punishment/PunishmentManager.java | 11 +++-- .../java/dev/plex/punishment/extra/Note.java | 3 +- .../main/java/dev/plex/rank/RankManager.java | 1 - .../dev/plex/services/ServiceManager.java | 10 ++-- .../plex/services/impl/AutoWipeService.java | 3 +- .../dev/plex/services/impl/BanService.java | 5 +- .../services/impl/CommandBlockerService.java | 5 +- .../plex/services/impl/GameRuleService.java | 3 +- .../dev/plex/services/impl/TimingService.java | 5 +- .../dev/plex/storage/RedisConnection.java | 3 +- .../java/dev/plex/storage/SQLConnection.java | 11 +++-- .../storage/codec/ZonedDateTimeCodec.java | 8 ++-- .../storage/permission/SQLPermissions.java | 1 + .../plex/storage/player/MongoPlayerData.java | 1 + .../plex/storage/player/SQLPlayerData.java | 1 + .../dev/plex/storage/punishment/SQLNotes.java | 1 + .../storage/punishment/SQLPunishment.java | 1 + .../main/java/dev/plex/util/AshconInfo.java | 3 +- .../main/java/dev/plex/util/BuildInfo.java | 3 +- .../main/java/dev/plex/util/GameRuleUtil.java | 7 +-- .../main/java/dev/plex/util/MojangUtils.java | 15 +++--- .../main/java/dev/plex/util/PlexUtils.java | 21 +++++---- .../main/java/dev/plex/util/RandomUtil.java | 3 +- .../java/dev/plex/util/ReflectionsUtil.java | 3 +- .../main/java/dev/plex/util/TimeUtils.java | 3 +- .../java/dev/plex/util/UpdateChecker.java | 23 +++++----- .../src/main/java/dev/plex/util/WebUtils.java | 13 +++--- .../util/adapter/ZonedDateTimeAdapter.java | 9 +--- .../java/dev/plex/util/item/ItemBuilder.java | 3 +- .../util/minimessage/SafeMiniMessage.java | 3 +- .../java/dev/plex/util/redis/MessageUtil.java | 46 +++++++++++++------ .../plex/world/BlockMapChunkGenerator.java | 5 +- .../world/ConfigurationChunkGenerator.java | 3 +- .../dev/plex/world/CustomChunkGenerator.java | 5 +- .../main/java/dev/plex/world/CustomWorld.java | 5 +- .../dev/plex/world/FlatChunkGenerator.java | 3 +- .../dev/plex/world/NoiseChunkGenerator.java | 5 +- .../dev/plex/world/OctaveChunkGenerator.java | 5 +- 119 files changed, 440 insertions(+), 364 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 2a2057b..d1db5c1 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -22,7 +22,7 @@ jobs: fail-fast: false matrix: language: [ 'java' ] - java: [17] + java: [ 17 ] steps: - name: Checkout repository diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 4a807b0..47fb35d 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -1,26 +1,26 @@ # Adapted from Paper's build script name: Build -on: [push, pull_request] +on: [ push, pull_request ] jobs: - build: - # Only run on PRs if the source branch is on someone else's repo - if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }} - runs-on: ubuntu-latest - strategy: - matrix: - java: [17] - fail-fast: true - steps: - - uses: actions/checkout@v3 - - name: JDK ${{ matrix.java }} - uses: actions/setup-java@v3 - with: - java-version: ${{ matrix.java }} - cache: 'gradle' - distribution: 'temurin' - - name: Build - run: | - git config --global user.email "no-reply@github.com" - git config --global user.name "Github Actions" - ./gradlew build --stacktrace + build: + # Only run on PRs if the source branch is on someone else's repo + if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }} + runs-on: ubuntu-latest + strategy: + matrix: + java: [ 17 ] + fail-fast: true + steps: + - uses: actions/checkout@v3 + - name: JDK ${{ matrix.java }} + uses: actions/setup-java@v3 + with: + java-version: ${{ matrix.java }} + cache: 'gradle' + distribution: 'temurin' + - name: Build + run: | + git config --global user.email "no-reply@github.com" + git config --global user.name "Github Actions" + ./gradlew build --stacktrace diff --git a/proxy/src/main/java/dev/plex/Plex.java b/proxy/src/main/java/dev/plex/Plex.java index 85d118f..ee3dca9 100644 --- a/proxy/src/main/java/dev/plex/Plex.java +++ b/proxy/src/main/java/dev/plex/Plex.java @@ -10,10 +10,11 @@ import dev.plex.config.TomlConfig; import dev.plex.handlers.ListenerHandler; import dev.plex.settings.ServerSettings; import dev.plex.util.PlexLog; +import lombok.Getter; + import java.io.File; import java.nio.file.Path; import java.util.logging.Logger; -import lombok.Getter; /** * Credits for TOML library go to https://github.com/mwanji/toml4j diff --git a/proxy/src/main/java/dev/plex/command/PlexCommand.java b/proxy/src/main/java/dev/plex/command/PlexCommand.java index b048516..7753aee 100644 --- a/proxy/src/main/java/dev/plex/command/PlexCommand.java +++ b/proxy/src/main/java/dev/plex/command/PlexCommand.java @@ -9,12 +9,13 @@ import dev.plex.Plex; import dev.plex.command.annotation.CommandParameters; import dev.plex.command.annotation.CommandPermissions; import dev.plex.command.source.RequiredCommandSource; -import java.util.Arrays; import net.kyori.adventure.audience.Audience; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.Arrays; + public abstract class PlexCommand implements SimpleCommand { /** diff --git a/proxy/src/main/java/dev/plex/command/annotation/CommandPermissions.java b/proxy/src/main/java/dev/plex/command/annotation/CommandPermissions.java index 0c67abe..1738d6f 100644 --- a/proxy/src/main/java/dev/plex/command/annotation/CommandPermissions.java +++ b/proxy/src/main/java/dev/plex/command/annotation/CommandPermissions.java @@ -1,6 +1,7 @@ package dev.plex.command.annotation; import dev.plex.command.source.RequiredCommandSource; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/proxy/src/main/java/dev/plex/config/TomlConfig.java b/proxy/src/main/java/dev/plex/config/TomlConfig.java index 2c4ce04..a392c89 100644 --- a/proxy/src/main/java/dev/plex/config/TomlConfig.java +++ b/proxy/src/main/java/dev/plex/config/TomlConfig.java @@ -3,12 +3,13 @@ package dev.plex.config; import dev.plex.Plex; import dev.plex.toml.Toml; import dev.plex.toml.TomlWriter; +import lombok.Getter; +import lombok.Setter; + import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.util.function.Consumer; -import lombok.Getter; -import lombok.Setter; @Getter public class TomlConfig diff --git a/proxy/src/main/java/dev/plex/handlers/ListenerHandler.java b/proxy/src/main/java/dev/plex/handlers/ListenerHandler.java index c800324..88f5450 100644 --- a/proxy/src/main/java/dev/plex/handlers/ListenerHandler.java +++ b/proxy/src/main/java/dev/plex/handlers/ListenerHandler.java @@ -4,6 +4,7 @@ import com.google.common.collect.Lists; import dev.plex.listener.PlexListener; import dev.plex.util.PlexLog; import dev.plex.util.ReflectionsUtil; + import java.lang.reflect.InvocationTargetException; import java.util.List; import java.util.Set; diff --git a/proxy/src/main/java/dev/plex/listener/impl/ServerListener.java b/proxy/src/main/java/dev/plex/listener/impl/ServerListener.java index 7e9de8f..e8983c9 100644 --- a/proxy/src/main/java/dev/plex/listener/impl/ServerListener.java +++ b/proxy/src/main/java/dev/plex/listener/impl/ServerListener.java @@ -7,13 +7,14 @@ import com.velocitypowered.api.proxy.server.ServerPing; import dev.plex.listener.PlexListener; import dev.plex.settings.ServerSettings; import dev.plex.util.RandomUtil; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.minimessage.MiniMessage; + import java.util.UUID; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.atomic.AtomicReference; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.minimessage.MiniMessage; public class ServerListener extends PlexListener { diff --git a/proxy/src/main/java/dev/plex/settings/ServerSettings.java b/proxy/src/main/java/dev/plex/settings/ServerSettings.java index 38a245b..2e30f37 100644 --- a/proxy/src/main/java/dev/plex/settings/ServerSettings.java +++ b/proxy/src/main/java/dev/plex/settings/ServerSettings.java @@ -2,10 +2,11 @@ package dev.plex.settings; import com.google.common.collect.Lists; import com.google.gson.annotations.SerializedName; -import java.util.List; import lombok.Data; import lombok.Getter; +import java.util.List; + @Getter public class ServerSettings { diff --git a/proxy/src/main/java/dev/plex/toml/ArrayValueWriter.java b/proxy/src/main/java/dev/plex/toml/ArrayValueWriter.java index a7184e6..8421569 100644 --- a/proxy/src/main/java/dev/plex/toml/ArrayValueWriter.java +++ b/proxy/src/main/java/dev/plex/toml/ArrayValueWriter.java @@ -4,6 +4,7 @@ package dev.plex.toml; import java.lang.reflect.Array; import java.util.ArrayList; import java.util.Collection; + import static dev.plex.toml.ValueWriters.WRITERS; public abstract class ArrayValueWriter implements dev.plex.toml.ValueWriter diff --git a/proxy/src/main/java/dev/plex/toml/ObjectValueWriter.java b/proxy/src/main/java/dev/plex/toml/ObjectValueWriter.java index ec164ac..8f4ab67 100644 --- a/proxy/src/main/java/dev/plex/toml/ObjectValueWriter.java +++ b/proxy/src/main/java/dev/plex/toml/ObjectValueWriter.java @@ -1,14 +1,10 @@ package dev.plex.toml; import com.google.gson.annotations.SerializedName; + import java.lang.reflect.Field; import java.lang.reflect.Modifier; -import java.util.Arrays; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.Map; -import java.util.Set; +import java.util.*; class ObjectValueWriter implements ValueWriter { diff --git a/proxy/src/main/java/dev/plex/toml/Results.java b/proxy/src/main/java/dev/plex/toml/Results.java index 64648ba..7e99f10 100644 --- a/proxy/src/main/java/dev/plex/toml/Results.java +++ b/proxy/src/main/java/dev/plex/toml/Results.java @@ -1,11 +1,6 @@ package dev.plex.toml; -import java.util.ArrayDeque; -import java.util.Deque; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.concurrent.atomic.AtomicInteger; class Results diff --git a/proxy/src/main/java/dev/plex/toml/TableArrayValueWriter.java b/proxy/src/main/java/dev/plex/toml/TableArrayValueWriter.java index 0dce137..844295e 100644 --- a/proxy/src/main/java/dev/plex/toml/TableArrayValueWriter.java +++ b/proxy/src/main/java/dev/plex/toml/TableArrayValueWriter.java @@ -1,6 +1,7 @@ package dev.plex.toml; import java.util.Collection; + import static dev.plex.toml.ValueWriters.WRITERS; class TableArrayValueWriter extends ArrayValueWriter diff --git a/proxy/src/main/java/dev/plex/toml/Toml.java b/proxy/src/main/java/dev/plex/toml/Toml.java index b4e319a..980ad1f 100644 --- a/proxy/src/main/java/dev/plex/toml/Toml.java +++ b/proxy/src/main/java/dev/plex/toml/Toml.java @@ -2,23 +2,12 @@ package dev.plex.toml; import com.google.gson.Gson; import com.google.gson.JsonElement; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import lombok.Getter; +import java.io.*; +import java.nio.charset.StandardCharsets; +import java.util.*; + /** *

Provides access to the keys and tables in a TOML data source.

* diff --git a/proxy/src/main/java/dev/plex/toml/TomlWriter.java b/proxy/src/main/java/dev/plex/toml/TomlWriter.java index d2e653e..284ec23 100644 --- a/proxy/src/main/java/dev/plex/toml/TomlWriter.java +++ b/proxy/src/main/java/dev/plex/toml/TomlWriter.java @@ -1,17 +1,13 @@ package dev.plex.toml; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.io.StringWriter; -import java.io.Writer; +import org.jetbrains.annotations.Nullable; + +import java.io.*; import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Map; import java.util.TimeZone; -import org.jetbrains.annotations.Nullable; + import static dev.plex.toml.ValueWriters.WRITERS; /** diff --git a/proxy/src/main/java/dev/plex/toml/ValueReaders.java b/proxy/src/main/java/dev/plex/toml/ValueReaders.java index 4c894d0..114ae7c 100644 --- a/proxy/src/main/java/dev/plex/toml/ValueReaders.java +++ b/proxy/src/main/java/dev/plex/toml/ValueReaders.java @@ -1,6 +1,7 @@ package dev.plex.toml; import java.util.concurrent.atomic.AtomicInteger; + import static dev.plex.toml.ArrayValueReader.ARRAY_VALUE_READER; import static dev.plex.toml.BooleanValueReaderWriter.BOOLEAN_VALUE_READER_WRITER; import static dev.plex.toml.DateValueReaderWriter.DATE_VALUE_READER_WRITER; diff --git a/proxy/src/main/java/dev/plex/util/RandomUtil.java b/proxy/src/main/java/dev/plex/util/RandomUtil.java index 0e639b6..6770bf1 100644 --- a/proxy/src/main/java/dev/plex/util/RandomUtil.java +++ b/proxy/src/main/java/dev/plex/util/RandomUtil.java @@ -1,8 +1,9 @@ package dev.plex.util; -import java.util.concurrent.ThreadLocalRandom; import net.kyori.adventure.text.format.NamedTextColor; +import java.util.concurrent.ThreadLocalRandom; + public class RandomUtil { public static NamedTextColor getRandomColor() diff --git a/proxy/src/main/java/dev/plex/util/ReflectionsUtil.java b/proxy/src/main/java/dev/plex/util/ReflectionsUtil.java index 2e6c948..eaae5bb 100644 --- a/proxy/src/main/java/dev/plex/util/ReflectionsUtil.java +++ b/proxy/src/main/java/dev/plex/util/ReflectionsUtil.java @@ -3,6 +3,7 @@ package dev.plex.util; import com.google.common.collect.ImmutableSet; import com.google.common.reflect.ClassPath; import dev.plex.Plex; + import java.io.IOException; import java.util.Arrays; import java.util.Collections; diff --git a/proxy/src/main/resources/config.toml b/proxy/src/main/resources/config.toml index 3521839..3587d14 100644 --- a/proxy/src/main/resources/config.toml +++ b/proxy/src/main/resources/config.toml @@ -6,26 +6,26 @@ ############################# [server] - name = "Plexus" +name = "Plexus" - # Placeholders - # %mcversion% - The Velocity Version (i.e. 3.1.2-SNAPSHOT) - # %servername% - The name provided above - # %randomgradient% - Creates a random gradient every ping of two random colors for the whole string - # Supports MiniMessage strings, no legacy & and § - motd = ["%randomgradient%%servername% - %mcversion%", "Another motd"] - colorizeMotd = false +# Placeholders +# %mcversion% - The Velocity Version (i.e. 3.1.2-SNAPSHOT) +# %servername% - The name provided above +# %randomgradient% - Creates a random gradient every ping of two random colors for the whole string +# Supports MiniMessage strings, no legacy & and § +motd = ["%randomgradient%%servername% - %mcversion%", "Another motd"] +colorizeMotd = false - # Enables debug messages - debug = false +# Enables debug messages +debug = false - # Due to game code only supporting legacy color codes for - # player samples and not components, you may only use § or & here - # for colors. - sample = ["example", "example"] +# Due to game code only supporting legacy color codes for +# player samples and not components, you may only use § or & here +# for colors. +sample = ["example", "example"] - # Adds this amount to the current player count - add-player-count = 0 +# Adds this amount to the current player count +add-player-count = 0 - # The max player count will always display as +1 more than the player count - plus-one-max-count = true \ No newline at end of file +# The max player count will always display as +1 more than the player count +plus-one-max-count = true \ No newline at end of file diff --git a/server/src/main/java/dev/plex/admin/Admin.java b/server/src/main/java/dev/plex/admin/Admin.java index e67b21e..6370a0b 100644 --- a/server/src/main/java/dev/plex/admin/Admin.java +++ b/server/src/main/java/dev/plex/admin/Admin.java @@ -1,11 +1,12 @@ package dev.plex.admin; import dev.plex.rank.enums.Rank; -import java.util.UUID; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; +import java.util.UUID; + /** * Admin object to handle cached admins */ diff --git a/server/src/main/java/dev/plex/admin/AdminList.java b/server/src/main/java/dev/plex/admin/AdminList.java index 473c5fa..916cf60 100644 --- a/server/src/main/java/dev/plex/admin/AdminList.java +++ b/server/src/main/java/dev/plex/admin/AdminList.java @@ -10,6 +10,7 @@ import dev.plex.PlexBase; import dev.plex.player.PlexPlayer; import dev.plex.rank.enums.Rank; import dev.plex.storage.StorageType; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/server/src/main/java/dev/plex/cache/DataUtils.java b/server/src/main/java/dev/plex/cache/DataUtils.java index 4d0fb63..8b33bad 100644 --- a/server/src/main/java/dev/plex/cache/DataUtils.java +++ b/server/src/main/java/dev/plex/cache/DataUtils.java @@ -3,6 +3,7 @@ package dev.plex.cache; import dev.plex.Plex; import dev.plex.player.PlexPlayer; import dev.plex.storage.StorageType; + import java.util.Optional; import java.util.UUID; diff --git a/server/src/main/java/dev/plex/cache/PlayerCache.java b/server/src/main/java/dev/plex/cache/PlayerCache.java index a6b91c6..a70734f 100644 --- a/server/src/main/java/dev/plex/cache/PlayerCache.java +++ b/server/src/main/java/dev/plex/cache/PlayerCache.java @@ -2,6 +2,7 @@ package dev.plex.cache; import com.google.common.collect.Maps; import dev.plex.player.PlexPlayer; + import java.util.Map; import java.util.UUID; diff --git a/server/src/main/java/dev/plex/command/PlexCommand.java b/server/src/main/java/dev/plex/command/PlexCommand.java index 39532eb..efafce8 100644 --- a/server/src/main/java/dev/plex/command/PlexCommand.java +++ b/server/src/main/java/dev/plex/command/PlexCommand.java @@ -4,18 +4,12 @@ import dev.plex.Plex; import dev.plex.cache.DataUtils; import dev.plex.command.annotation.CommandParameters; import dev.plex.command.annotation.CommandPermissions; -import dev.plex.command.exception.CommandFailException; -import dev.plex.command.exception.ConsoleMustDefinePlayerException; -import dev.plex.command.exception.ConsoleOnlyException; -import dev.plex.command.exception.PlayerNotBannedException; -import dev.plex.command.exception.PlayerNotFoundException; +import dev.plex.command.exception.*; import dev.plex.command.source.RequiredCommandSource; import dev.plex.player.PlexPlayer; import dev.plex.rank.enums.Rank; import dev.plex.util.PlexLog; import dev.plex.util.PlexUtils; -import java.util.Arrays; -import java.util.UUID; import net.kyori.adventure.audience.Audience; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; @@ -23,15 +17,14 @@ import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.World; -import org.bukkit.command.Command; -import org.bukkit.command.CommandMap; -import org.bukkit.command.CommandSender; -import org.bukkit.command.ConsoleCommandSender; -import org.bukkit.command.PluginIdentifiableCommand; +import org.bukkit.command.*; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.Arrays; +import java.util.UUID; + /** * Superclass for all commands */ @@ -206,7 +199,7 @@ public abstract class PlexCommand extends Command implements PluginIdentifiableC } try { - Component component = this.execute(sender, isConsole(sender) ? null : (Player)sender, args); + Component component = this.execute(sender, isConsole(sender) ? null : (Player) sender, args); if (component != null) { send(sender, component); @@ -292,7 +285,7 @@ public abstract class PlexCommand extends Command implements PluginIdentifiableC { if (!isConsole(sender)) { - return checkRank((Player)sender, rank, permission); + return checkRank((Player) sender, rank, permission); } if (!sender.getName().equalsIgnoreCase("console")) { @@ -387,7 +380,7 @@ public abstract class PlexCommand extends Command implements PluginIdentifiableC { if (!isConsole(sender)) { - return checkTab((Player)sender, rank, permission); + return checkTab((Player) sender, rank, permission); } return true; } diff --git a/server/src/main/java/dev/plex/command/annotation/CommandPermissions.java b/server/src/main/java/dev/plex/command/annotation/CommandPermissions.java index 2b25c5c..8dc171f 100644 --- a/server/src/main/java/dev/plex/command/annotation/CommandPermissions.java +++ b/server/src/main/java/dev/plex/command/annotation/CommandPermissions.java @@ -2,6 +2,7 @@ package dev.plex.command.annotation; import dev.plex.command.source.RequiredCommandSource; import dev.plex.rank.enums.Rank; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/server/src/main/java/dev/plex/command/blocking/BlockedCommand.java b/server/src/main/java/dev/plex/command/blocking/BlockedCommand.java index 667afa4..dda3f2f 100644 --- a/server/src/main/java/dev/plex/command/blocking/BlockedCommand.java +++ b/server/src/main/java/dev/plex/command/blocking/BlockedCommand.java @@ -1,10 +1,11 @@ package dev.plex.command.blocking; import com.google.common.collect.Lists; -import java.util.List; import lombok.Data; import net.kyori.adventure.text.Component; +import java.util.List; + @Data public class BlockedCommand { diff --git a/server/src/main/java/dev/plex/command/impl/AdminCMD.java b/server/src/main/java/dev/plex/command/impl/AdminCMD.java index 24cd18a..66b6c93 100644 --- a/server/src/main/java/dev/plex/command/impl/AdminCMD.java +++ b/server/src/main/java/dev/plex/command/impl/AdminCMD.java @@ -15,8 +15,6 @@ import dev.plex.event.AdminSetRankEvent; import dev.plex.player.PlexPlayer; import dev.plex.rank.enums.Rank; import dev.plex.util.PlexUtils; -import java.util.Arrays; -import java.util.List; import net.kyori.adventure.text.Component; import org.apache.commons.lang3.StringUtils; import org.bukkit.Bukkit; @@ -25,6 +23,9 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.Arrays; +import java.util.List; + @CommandPermissions(level = Rank.OP, source = RequiredCommandSource.ANY) @CommandParameters(name = "admin", usage = "/ | remove | setrank | list>", aliases = "saconfig,slconfig,adminconfig,adminmanage", description = "Manage all admins") @System(value = "ranks") diff --git a/server/src/main/java/dev/plex/command/impl/AdminChatCMD.java b/server/src/main/java/dev/plex/command/impl/AdminChatCMD.java index 2e510d3..d069313 100644 --- a/server/src/main/java/dev/plex/command/impl/AdminChatCMD.java +++ b/server/src/main/java/dev/plex/command/impl/AdminChatCMD.java @@ -10,7 +10,6 @@ import dev.plex.rank.enums.Rank; import dev.plex.util.PlexUtils; import dev.plex.util.minimessage.SafeMiniMessage; import dev.plex.util.redis.MessageUtil; -import java.util.UUID; import net.kyori.adventure.text.Component; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; @@ -19,6 +18,8 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.UUID; + @CommandPermissions(level = Rank.ADMIN, permission = "plex.adminchat", source = RequiredCommandSource.ANY) @CommandParameters(name = "adminchat", description = "Talk privately with other admins", usage = "/ ", aliases = "o,ac,sc,staffchat") public class AdminChatCMD extends PlexCommand @@ -28,7 +29,8 @@ public class AdminChatCMD extends PlexCommand { if (args.length == 0) { - if (playerSender != null) { + if (playerSender != null) + { PlexPlayer player = DataUtils.getPlayer(playerSender.getUniqueId()); player.setStaffChat(!player.isStaffChat()); return messageComponent("adminChatToggled", BooleanUtils.toStringOnOff(player.isStaffChat())); diff --git a/server/src/main/java/dev/plex/command/impl/AdventureCMD.java b/server/src/main/java/dev/plex/command/impl/AdventureCMD.java index 080bd2b..a5b5ed3 100644 --- a/server/src/main/java/dev/plex/command/impl/AdventureCMD.java +++ b/server/src/main/java/dev/plex/command/impl/AdventureCMD.java @@ -9,7 +9,6 @@ import dev.plex.command.source.RequiredCommandSource; import dev.plex.event.GameModeUpdateEvent; import dev.plex.rank.enums.Rank; import dev.plex.util.PlexUtils; -import java.util.List; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.GameMode; @@ -18,6 +17,8 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.List; + @CommandPermissions(level = Rank.OP, permission = "plex.gamemode.adventure", source = RequiredCommandSource.ANY) @CommandParameters(name = "adventure", aliases = "gma,egma,eadventure,adventuremode,eadventuremode", description = "Set your own or another player's gamemode to adventure mode") public class AdventureCMD extends PlexCommand diff --git a/server/src/main/java/dev/plex/command/impl/BanCMD.java b/server/src/main/java/dev/plex/command/impl/BanCMD.java index 04f0c3f..2c45247 100644 --- a/server/src/main/java/dev/plex/command/impl/BanCMD.java +++ b/server/src/main/java/dev/plex/command/impl/BanCMD.java @@ -12,15 +12,7 @@ import dev.plex.player.PlexPlayer; import dev.plex.punishment.Punishment; import dev.plex.punishment.PunishmentType; import dev.plex.rank.enums.Rank; -import dev.plex.util.BungeeUtil; -import dev.plex.util.PlexLog; -import dev.plex.util.PlexUtils; -import dev.plex.util.TimeUtils; -import dev.plex.util.WebUtils; -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.util.List; -import java.util.UUID; +import dev.plex.util.*; import net.kyori.adventure.text.Component; import org.apache.commons.lang3.StringUtils; import org.bukkit.Bukkit; @@ -29,6 +21,11 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.util.List; +import java.util.UUID; + @CommandParameters(name = "ban", usage = "/ [reason]", aliases = "offlineban,gtfo", description = "Bans a player, offline or online") @CommandPermissions(level = Rank.ADMIN, permission = "plex.ban", source = RequiredCommandSource.ANY) diff --git a/server/src/main/java/dev/plex/command/impl/CreativeCMD.java b/server/src/main/java/dev/plex/command/impl/CreativeCMD.java index dde92bf..65e30c1 100644 --- a/server/src/main/java/dev/plex/command/impl/CreativeCMD.java +++ b/server/src/main/java/dev/plex/command/impl/CreativeCMD.java @@ -9,7 +9,6 @@ import dev.plex.command.source.RequiredCommandSource; import dev.plex.event.GameModeUpdateEvent; import dev.plex.rank.enums.Rank; import dev.plex.util.PlexUtils; -import java.util.List; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.GameMode; @@ -18,6 +17,8 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.List; + @CommandPermissions(level = Rank.OP, permission = "plex.gamemode.creative", source = RequiredCommandSource.ANY) @CommandParameters(name = "creative", aliases = "gmc,egmc,ecreative,eecreative,creativemode,ecreativemode", description = "Set your own or another player's gamemode to creative mode") public class CreativeCMD extends PlexCommand diff --git a/server/src/main/java/dev/plex/command/impl/DebugCMD.java b/server/src/main/java/dev/plex/command/impl/DebugCMD.java index fbdbc72..62931e3 100644 --- a/server/src/main/java/dev/plex/command/impl/DebugCMD.java +++ b/server/src/main/java/dev/plex/command/impl/DebugCMD.java @@ -9,9 +9,6 @@ import dev.plex.rank.enums.Rank; import dev.plex.util.GameRuleUtil; import dev.plex.util.PlexLog; import dev.plex.util.PlexUtils; -import java.util.Arrays; -import java.util.List; -import java.util.Locale; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.Bukkit; @@ -22,6 +19,10 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.Arrays; +import java.util.List; +import java.util.Locale; + @CommandParameters(name = "pdebug", description = "Plex's debug command", usage = "/ | redis-reset | gamerules>") @CommandPermissions(level = Rank.EXECUTIVE, permission = "plex.debug") @System(debug = true) diff --git a/server/src/main/java/dev/plex/command/impl/DeopCMD.java b/server/src/main/java/dev/plex/command/impl/DeopCMD.java index 17eeb60..5e8a86f 100644 --- a/server/src/main/java/dev/plex/command/impl/DeopCMD.java +++ b/server/src/main/java/dev/plex/command/impl/DeopCMD.java @@ -7,13 +7,14 @@ import dev.plex.command.annotation.CommandPermissions; import dev.plex.command.annotation.System; import dev.plex.rank.enums.Rank; import dev.plex.util.PlexUtils; -import java.util.List; import net.kyori.adventure.text.Component; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.List; + @CommandParameters(name = "deop", description = "Deop a player on the server", usage = "/ ") @CommandPermissions(level = Rank.ADMIN, permission = "plex.deop") @System(value = "ranks") diff --git a/server/src/main/java/dev/plex/command/impl/EntityWipeCMD.java b/server/src/main/java/dev/plex/command/impl/EntityWipeCMD.java index 2255e32..b277709 100644 --- a/server/src/main/java/dev/plex/command/impl/EntityWipeCMD.java +++ b/server/src/main/java/dev/plex/command/impl/EntityWipeCMD.java @@ -6,11 +6,6 @@ import dev.plex.command.annotation.CommandPermissions; import dev.plex.command.source.RequiredCommandSource; import dev.plex.rank.enums.Rank; import dev.plex.util.PlexUtils; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.World; @@ -21,6 +16,8 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.*; + @CommandPermissions(level = Rank.ADMIN, permission = "plex.entitywipe", source = RequiredCommandSource.ANY) @CommandParameters(name = "entitywipe", description = "Remove various server entities that may cause lag, such as dropped items, minecarts, and boats.", usage = "/ [name]", aliases = "ew,rd") public class EntityWipeCMD extends PlexCommand diff --git a/server/src/main/java/dev/plex/command/impl/FreezeCMD.java b/server/src/main/java/dev/plex/command/impl/FreezeCMD.java index 339a62a..592eb66 100644 --- a/server/src/main/java/dev/plex/command/impl/FreezeCMD.java +++ b/server/src/main/java/dev/plex/command/impl/FreezeCMD.java @@ -10,15 +10,16 @@ import dev.plex.punishment.PunishmentType; import dev.plex.rank.enums.Rank; import dev.plex.util.PlexUtils; import dev.plex.util.TimeUtils; -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.util.List; import net.kyori.adventure.text.Component; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.util.List; + @CommandParameters(name = "freeze", description = "Freeze a player on the server", usage = "/ ", aliases = "fr") @CommandPermissions(level = Rank.ADMIN, permission = "plex.freeze") public class FreezeCMD extends PlexCommand diff --git a/server/src/main/java/dev/plex/command/impl/GamemodeCMD.java b/server/src/main/java/dev/plex/command/impl/GamemodeCMD.java index c035a42..d23cde1 100644 --- a/server/src/main/java/dev/plex/command/impl/GamemodeCMD.java +++ b/server/src/main/java/dev/plex/command/impl/GamemodeCMD.java @@ -8,9 +8,6 @@ import dev.plex.command.source.RequiredCommandSource; import dev.plex.event.GameModeUpdateEvent; import dev.plex.rank.enums.Rank; import dev.plex.util.PlexUtils; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.GameMode; @@ -19,6 +16,10 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + @CommandParameters(name = "gamemode", usage = "/ [player]", description = "Change your gamemode", aliases = "gm,egamemode,gmt,egmt") @CommandPermissions(level = Rank.OP, permission = "plex.gamemode", source = RequiredCommandSource.ANY) public class GamemodeCMD extends PlexCommand diff --git a/server/src/main/java/dev/plex/command/impl/KickCMD.java b/server/src/main/java/dev/plex/command/impl/KickCMD.java index 1412b9b..ef6218d 100644 --- a/server/src/main/java/dev/plex/command/impl/KickCMD.java +++ b/server/src/main/java/dev/plex/command/impl/KickCMD.java @@ -14,9 +14,6 @@ import dev.plex.util.BungeeUtil; import dev.plex.util.PlexUtils; import dev.plex.util.TimeUtils; import dev.plex.util.WebUtils; -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.util.UUID; import net.kyori.adventure.text.Component; import org.apache.commons.lang3.StringUtils; import org.bukkit.Bukkit; @@ -25,6 +22,10 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.util.UUID; + @CommandParameters(name = "kick", description = "Kicks a player", usage = "/ ") @CommandPermissions(level = Rank.ADMIN, permission = "plex.kick", source = RequiredCommandSource.ANY) public class KickCMD extends PlexCommand diff --git a/server/src/main/java/dev/plex/command/impl/LockupCMD.java b/server/src/main/java/dev/plex/command/impl/LockupCMD.java index 65ef907..042d6ef 100644 --- a/server/src/main/java/dev/plex/command/impl/LockupCMD.java +++ b/server/src/main/java/dev/plex/command/impl/LockupCMD.java @@ -7,13 +7,14 @@ import dev.plex.command.annotation.CommandPermissions; import dev.plex.player.PlexPlayer; import dev.plex.rank.enums.Rank; import dev.plex.util.PlexUtils; -import java.util.List; import net.kyori.adventure.text.Component; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.List; + @CommandParameters(name = "lockup", description = "Lockup a player on the server", usage = "/ ") @CommandPermissions(level = Rank.ADMIN, permission = "plex.lockup") public class LockupCMD extends PlexCommand diff --git a/server/src/main/java/dev/plex/command/impl/MobPurgeCMD.java b/server/src/main/java/dev/plex/command/impl/MobPurgeCMD.java index a967afe..cfd300d 100644 --- a/server/src/main/java/dev/plex/command/impl/MobPurgeCMD.java +++ b/server/src/main/java/dev/plex/command/impl/MobPurgeCMD.java @@ -6,7 +6,6 @@ import dev.plex.command.annotation.CommandPermissions; import dev.plex.command.source.RequiredCommandSource; import dev.plex.rank.enums.Rank; import dev.plex.util.PlexUtils; -import java.util.HashMap; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.World; @@ -17,6 +16,8 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.HashMap; + @CommandPermissions(level = Rank.ADMIN, permission = "plex.mobpurge", source = RequiredCommandSource.ANY) @CommandParameters(name = "mobpurge", description = "Purge all mobs.", usage = "/", aliases = "mp") public class MobPurgeCMD extends PlexCommand diff --git a/server/src/main/java/dev/plex/command/impl/MuteCMD.java b/server/src/main/java/dev/plex/command/impl/MuteCMD.java index ca4747d..9eb3687 100644 --- a/server/src/main/java/dev/plex/command/impl/MuteCMD.java +++ b/server/src/main/java/dev/plex/command/impl/MuteCMD.java @@ -10,15 +10,16 @@ import dev.plex.punishment.PunishmentType; import dev.plex.rank.enums.Rank; import dev.plex.util.PlexUtils; import dev.plex.util.TimeUtils; -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.util.List; import net.kyori.adventure.text.Component; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.util.List; + @CommandParameters(name = "mute", description = "Mute a player on the server", usage = "/ ", aliases = "stfu") @CommandPermissions(level = Rank.ADMIN, permission = "plex.mute") public class MuteCMD extends PlexCommand diff --git a/server/src/main/java/dev/plex/command/impl/NameHistoryCMD.java b/server/src/main/java/dev/plex/command/impl/NameHistoryCMD.java index d2006f9..3a9b2a8 100644 --- a/server/src/main/java/dev/plex/command/impl/NameHistoryCMD.java +++ b/server/src/main/java/dev/plex/command/impl/NameHistoryCMD.java @@ -6,13 +6,7 @@ import dev.plex.command.PlexCommand; import dev.plex.command.annotation.CommandParameters; import dev.plex.command.annotation.CommandPermissions; import dev.plex.rank.enums.Rank; -import dev.plex.util.AshconInfo; -import dev.plex.util.MojangUtils; -import dev.plex.util.PlexLog; -import dev.plex.util.PlexUtils; -import dev.plex.util.TimeUtils; -import java.util.Arrays; -import java.util.List; +import dev.plex.util.*; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.command.CommandSender; @@ -20,6 +14,9 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.Arrays; +import java.util.List; + @CommandParameters(name = "namehistory", description = "Get the name history of a player", usage = "/ ", aliases = "nh") @CommandPermissions(level = Rank.OP, permission = "plex.namehistory") public class NameHistoryCMD extends PlexCommand diff --git a/server/src/main/java/dev/plex/command/impl/NotesCMD.java b/server/src/main/java/dev/plex/command/impl/NotesCMD.java index 04f8a99..562bdcd 100644 --- a/server/src/main/java/dev/plex/command/impl/NotesCMD.java +++ b/server/src/main/java/dev/plex/command/impl/NotesCMD.java @@ -10,12 +10,6 @@ import dev.plex.rank.enums.Rank; import dev.plex.storage.StorageType; import dev.plex.util.PlexUtils; import dev.plex.util.TimeUtils; -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.atomic.AtomicReference; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.apache.commons.lang3.ArrayUtils; @@ -25,6 +19,13 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.atomic.AtomicReference; + @CommandParameters(name = "notes", description = "Manage notes for a player", usage = "/ | remove | clear>") @CommandPermissions(level = Rank.ADMIN, permission = "plex.notes") public class NotesCMD extends PlexCommand diff --git a/server/src/main/java/dev/plex/command/impl/OpCMD.java b/server/src/main/java/dev/plex/command/impl/OpCMD.java index 631c204..bf3625c 100644 --- a/server/src/main/java/dev/plex/command/impl/OpCMD.java +++ b/server/src/main/java/dev/plex/command/impl/OpCMD.java @@ -7,13 +7,14 @@ import dev.plex.command.annotation.CommandPermissions; import dev.plex.command.annotation.System; import dev.plex.rank.enums.Rank; import dev.plex.util.PlexUtils; -import java.util.List; import net.kyori.adventure.text.Component; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.List; + @CommandParameters(name = "op", description = "Op a player on the server", usage = "/ ") @CommandPermissions(level = Rank.OP) @System(value = "ranks") diff --git a/server/src/main/java/dev/plex/command/impl/PlexCMD.java b/server/src/main/java/dev/plex/command/impl/PlexCMD.java index c0aea76..4fb46a5 100644 --- a/server/src/main/java/dev/plex/command/impl/PlexCMD.java +++ b/server/src/main/java/dev/plex/command/impl/PlexCMD.java @@ -11,10 +11,6 @@ import dev.plex.rank.enums.Rank; import dev.plex.util.BuildInfo; import dev.plex.util.PlexUtils; import dev.plex.util.TimeUtils; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; import net.kyori.adventure.text.Component; import org.apache.commons.lang3.StringUtils; import org.bukkit.Bukkit; @@ -24,6 +20,11 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + @CommandPermissions(level = Rank.IMPOSTOR, source = RequiredCommandSource.ANY) @CommandParameters(name = "plex", usage = "/ [reload | redis | modules [reload]]", description = "Show information about Plex or reload it") public class PlexCMD extends PlexCommand diff --git a/server/src/main/java/dev/plex/command/impl/PunishmentsCMD.java b/server/src/main/java/dev/plex/command/impl/PunishmentsCMD.java index 7942e07..43fb5e9 100644 --- a/server/src/main/java/dev/plex/command/impl/PunishmentsCMD.java +++ b/server/src/main/java/dev/plex/command/impl/PunishmentsCMD.java @@ -8,13 +8,14 @@ import dev.plex.command.source.RequiredCommandSource; import dev.plex.menu.PunishmentMenu; import dev.plex.rank.enums.Rank; import dev.plex.util.PlexUtils; -import java.util.List; import net.kyori.adventure.text.Component; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.List; + @CommandParameters(name = "punishments", usage = "/ [player]", description = "Opens the Punishments GUI", aliases = "punishlist,punishes") @CommandPermissions(level = Rank.ADMIN, permission = "plex.punishments", source = RequiredCommandSource.IN_GAME) public class PunishmentsCMD extends PlexCommand diff --git a/server/src/main/java/dev/plex/command/impl/RankCMD.java b/server/src/main/java/dev/plex/command/impl/RankCMD.java index 949e4eb..e41bad1 100644 --- a/server/src/main/java/dev/plex/command/impl/RankCMD.java +++ b/server/src/main/java/dev/plex/command/impl/RankCMD.java @@ -8,14 +8,15 @@ import dev.plex.command.exception.CommandFailException; import dev.plex.command.source.RequiredCommandSource; import dev.plex.rank.enums.Rank; import dev.plex.util.PlexUtils; -import java.util.Collections; -import java.util.List; import net.kyori.adventure.text.Component; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.Collections; +import java.util.List; + @CommandPermissions(level = Rank.OP, permission = "plex.rank", source = RequiredCommandSource.ANY) @CommandParameters(name = "rank", description = "Displays your rank") @System(value = "ranks") diff --git a/server/src/main/java/dev/plex/command/impl/SmiteCMD.java b/server/src/main/java/dev/plex/command/impl/SmiteCMD.java index 9aa6349..5538473 100644 --- a/server/src/main/java/dev/plex/command/impl/SmiteCMD.java +++ b/server/src/main/java/dev/plex/command/impl/SmiteCMD.java @@ -10,10 +10,6 @@ import dev.plex.punishment.PunishmentType; import dev.plex.rank.enums.Rank; import dev.plex.util.PlexUtils; import dev.plex.util.TimeUtils; -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.util.Collections; -import java.util.List; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.title.Title; @@ -27,6 +23,11 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.util.Collections; +import java.util.List; + @CommandPermissions(level = Rank.ADMIN, permission = "plex.smite", source = RequiredCommandSource.ANY) @CommandParameters(name = "smite", usage = "/ [reason] [-ci | -q]", description = "Someone being a little bitch? Smite them down...") public class SmiteCMD extends PlexCommand diff --git a/server/src/main/java/dev/plex/command/impl/SpectatorCMD.java b/server/src/main/java/dev/plex/command/impl/SpectatorCMD.java index 162d864..276aee8 100644 --- a/server/src/main/java/dev/plex/command/impl/SpectatorCMD.java +++ b/server/src/main/java/dev/plex/command/impl/SpectatorCMD.java @@ -9,7 +9,6 @@ import dev.plex.command.source.RequiredCommandSource; import dev.plex.event.GameModeUpdateEvent; import dev.plex.rank.enums.Rank; import dev.plex.util.PlexUtils; -import java.util.List; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.GameMode; @@ -18,6 +17,8 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.List; + @CommandPermissions(level = Rank.ADMIN, permission = "plex.gamemode.spectator", source = RequiredCommandSource.ANY) @CommandParameters(name = "spectator", aliases = "gmsp,egmsp,spec", description = "Set your own or another player's gamemode to spectator mode") public class SpectatorCMD extends PlexCommand diff --git a/server/src/main/java/dev/plex/command/impl/SurvivalCMD.java b/server/src/main/java/dev/plex/command/impl/SurvivalCMD.java index 632a4ae..49ede47 100644 --- a/server/src/main/java/dev/plex/command/impl/SurvivalCMD.java +++ b/server/src/main/java/dev/plex/command/impl/SurvivalCMD.java @@ -9,7 +9,6 @@ import dev.plex.command.source.RequiredCommandSource; import dev.plex.event.GameModeUpdateEvent; import dev.plex.rank.enums.Rank; import dev.plex.util.PlexUtils; -import java.util.List; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.GameMode; @@ -18,6 +17,8 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.List; + @CommandPermissions(level = Rank.OP, permission = "plex.gamemode.survival", source = RequiredCommandSource.ANY) @CommandParameters(name = "survival", aliases = "gms,egms,esurvival,survivalmode,esurvivalmode", description = "Set your own or another player's gamemode to survival mode") public class SurvivalCMD extends PlexCommand diff --git a/server/src/main/java/dev/plex/command/impl/TFMCMD.java b/server/src/main/java/dev/plex/command/impl/TFMCMD.java index b477e69..298d1fc 100644 --- a/server/src/main/java/dev/plex/command/impl/TFMCMD.java +++ b/server/src/main/java/dev/plex/command/impl/TFMCMD.java @@ -7,8 +7,6 @@ import dev.plex.command.annotation.CommandPermissions; import dev.plex.command.source.RequiredCommandSource; import dev.plex.rank.enums.Rank; import dev.plex.util.PlexUtils; -import java.util.ArrayList; -import java.util.List; import net.kyori.adventure.inventory.Book; import net.kyori.adventure.text.Component; import org.bukkit.command.CommandSender; @@ -16,6 +14,9 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.ArrayList; +import java.util.List; + @CommandParameters(name = "totalfreedommod", description = "You can't simpy do that.", aliases = "tfm") @CommandPermissions(level = Rank.OP, source = RequiredCommandSource.ANY) diff --git a/server/src/main/java/dev/plex/command/impl/TempbanCMD.java b/server/src/main/java/dev/plex/command/impl/TempbanCMD.java index bf099db..8161669 100644 --- a/server/src/main/java/dev/plex/command/impl/TempbanCMD.java +++ b/server/src/main/java/dev/plex/command/impl/TempbanCMD.java @@ -15,8 +15,6 @@ import dev.plex.util.BungeeUtil; import dev.plex.util.PlexUtils; import dev.plex.util.TimeUtils; import dev.plex.util.WebUtils; -import java.util.List; -import java.util.UUID; import net.kyori.adventure.text.Component; import org.apache.commons.lang3.StringUtils; import org.bukkit.Bukkit; @@ -25,6 +23,9 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.List; +import java.util.UUID; + @CommandParameters(name = "tempban", usage = "/