From 575ec33eae053003886db751648543eb382a0321 Mon Sep 17 00:00:00 2001 From: thetrouper Date: Sat, 22 Mar 2025 01:51:22 -0500 Subject: [PATCH] Optimized Imports --- build/tmp/.cache/expanded/expanded.lock | Bin 17 -> 17 bytes src/main/java/me/trouper/sentinel/Director.java | 4 +++- src/main/java/me/trouper/sentinel/Sentinel.java | 5 ----- src/main/java/me/trouper/sentinel/data/IO.java | 2 +- .../trouper/sentinel/data/config/FPConfig.java | 1 - .../sentinel/data/config/StrictConfig.java | 1 - .../{types => misc}/CommandBlockHolder.java | 3 +-- .../sentinel/data/{types => misc}/Emojis.java | 2 +- .../data/{types => misc}/IPLocation.java | 2 +- .../data/{types => misc}/Selection.java | 2 +- .../data/{types => misc}/SerialLocation.java | 5 +---- .../data/storage/CommandBlockStorage.java | 5 +---- .../sentinel/data/storage/ExtraStorage.java | 6 ++++-- .../sentinel/data/storage/NBTStorage.java | 5 ----- .../me/trouper/sentinel/data/types/Test.java | 12 ------------ .../server/commands/CallbackCommand.java | 1 - .../sentinel/server/commands/ExtraCommand.java | 4 ++-- .../server/commands/MessageCommand.java | 1 - .../sentinel/server/commands/ReplyCommand.java | 1 - .../server/commands/SentinelCommand.java | 11 +++++++---- .../sentinel/server/commands/TrapCommand.java | 1 - .../server/events/admin/WandEvents.java | 11 +++++++---- .../server/events/extras/ShadowRealmEvents.java | 1 - .../blocks/command/CommandBlockBreak.java | 3 +-- .../blocks/command/CommandBlockEdit.java | 7 +------ .../blocks/command/CommandBlockPlace.java | 2 +- .../blocks/command/CommandBlockUse.java | 2 +- .../entities/CommandMinecartBreak.java | 3 +-- .../entities/CommandMinecartEdit.java | 7 +------ .../entities/CommandMinecartPlace.java | 2 +- .../violations/entities/CommandMinecartUse.java | 3 +-- .../violations/players/CreativeHotbar.java | 2 -- .../players/PluginCloakingPacket.java | 6 +++--- .../whitelist/CommandBlockExecute.java | 2 +- .../whitelist/CommandMinecartExecute.java | 2 +- .../chatfilter/profanity/ProfanityFilter.java | 1 - .../chatfilter/profanity/ProfanityResponse.java | 2 +- .../functions/chatfilter/spam/SpamResponse.java | 1 - .../chatfilter/unicode/UnicodeResponse.java | 2 +- .../functions/chatfilter/url/UrlResponse.java | 2 +- .../functions/helpers/ActionConfiguration.java | 4 +--- .../functions/helpers/CBWhitelistManager.java | 6 +++--- .../server/functions/helpers/ReportHandler.java | 2 +- .../functions/hotbar/entities/EntityCheck.java | 2 +- .../hotbar/entities/EquipmentCheck.java | 2 +- .../functions/hotbar/items/ItemCheck.java | 1 - .../sentinel/server/gui/PaginatedGUI.java | 7 +++++-- .../sentinel/server/gui/config/ConfigGUI.java | 4 ++-- .../server/gui/config/chat/ChatGUI.java | 6 ++++-- .../trouper/sentinel/server/gui/nbt/NBTGui.java | 11 +++-------- .../server/gui/whitelist/WhitelistGUI.java | 2 +- .../sentinel/startup/BackdoorDetection.java | 1 - .../me/trouper/sentinel/startup/Telemetry.java | 1 - .../me/trouper/sentinel/startup/drm/Auth.java | 1 - .../me/trouper/sentinel/startup/drm/Loader.java | 16 +++++++++++----- .../me/trouper/sentinel/utils/DisplayUtils.java | 2 +- .../me/trouper/sentinel/utils/FileUtils.java | 1 - .../java/me/trouper/sentinel/utils/IPUtils.java | 2 +- .../me/trouper/sentinel/utils/MathUtils.java | 8 -------- .../me/trouper/sentinel/utils/PlayerUtils.java | 4 ---- .../me/trouper/sentinel/utils/ServerUtils.java | 8 -------- .../sentinel/utils/trees/EmbedFormatter.java | 2 +- 62 files changed, 82 insertions(+), 146 deletions(-) rename src/main/java/me/trouper/sentinel/data/{types => misc}/CommandBlockHolder.java (99%) rename src/main/java/me/trouper/sentinel/data/{types => misc}/Emojis.java (98%) rename src/main/java/me/trouper/sentinel/data/{types => misc}/IPLocation.java (98%) rename src/main/java/me/trouper/sentinel/data/{types => misc}/Selection.java (98%) rename src/main/java/me/trouper/sentinel/data/{types => misc}/SerialLocation.java (94%) delete mode 100644 src/main/java/me/trouper/sentinel/data/types/Test.java diff --git a/build/tmp/.cache/expanded/expanded.lock b/build/tmp/.cache/expanded/expanded.lock index e1cd2a932b0bc74132c83a92b06730c4218adfc7..9d67bf419dc5e6100fe825291e57d3214e35ad95 100644 GIT binary patch literal 17 TcmZSP@eSBD^Y7I=3{U_7HF5;5 literal 17 TcmZSnZuw==9;=P53{U_7KY|4I diff --git a/src/main/java/me/trouper/sentinel/Director.java b/src/main/java/me/trouper/sentinel/Director.java index 85194eb..fc168e9 100644 --- a/src/main/java/me/trouper/sentinel/Director.java +++ b/src/main/java/me/trouper/sentinel/Director.java @@ -4,7 +4,9 @@ import me.trouper.sentinel.data.IO; import me.trouper.sentinel.server.functions.helpers.CBWhitelistManager; import me.trouper.sentinel.server.functions.helpers.MessageHandler; import me.trouper.sentinel.server.functions.helpers.ReportHandler; -import me.trouper.sentinel.startup.*; +import me.trouper.sentinel.startup.BackdoorDetection; +import me.trouper.sentinel.startup.Injection; +import me.trouper.sentinel.startup.Telemetry; import me.trouper.sentinel.startup.drm.Auth; import me.trouper.sentinel.startup.drm.Loader; import me.trouper.sentinel.utils.ServerUtils; diff --git a/src/main/java/me/trouper/sentinel/Sentinel.java b/src/main/java/me/trouper/sentinel/Sentinel.java index 7635d53..d477712 100644 --- a/src/main/java/me/trouper/sentinel/Sentinel.java +++ b/src/main/java/me/trouper/sentinel/Sentinel.java @@ -1,20 +1,15 @@ package me.trouper.sentinel; import com.github.retrooper.packetevents.PacketEvents; -import com.github.retrooper.packetevents.event.PacketListenerPriority; import de.tr7zw.changeme.nbtapi.NBT; import io.github.itzispyder.pdk.PDK; import io.github.retrooper.packetevents.factory.spigot.SpigotPacketEventsBuilder; -import me.trouper.sentinel.server.events.extras.ShadowRealmEvents; -import me.trouper.sentinel.server.events.violations.blocks.command.CommandBlockEdit; -import me.trouper.sentinel.server.events.violations.players.PluginCloakingPacket; import org.bukkit.Bukkit; import org.bukkit.NamespacedKey; import org.bukkit.World; import org.bukkit.entity.Entity; import org.bukkit.plugin.java.JavaPlugin; -import java.io.File; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/me/trouper/sentinel/data/IO.java b/src/main/java/me/trouper/sentinel/data/IO.java index 9fdaee2..7390d3c 100644 --- a/src/main/java/me/trouper/sentinel/data/IO.java +++ b/src/main/java/me/trouper/sentinel/data/IO.java @@ -4,8 +4,8 @@ import io.github.itzispyder.pdk.utils.misc.config.JsonSerializable; import me.trouper.sentinel.Sentinel; import me.trouper.sentinel.data.config.*; import me.trouper.sentinel.data.config.lang.LanguageFile; -import me.trouper.sentinel.data.storage.ExtraStorage; import me.trouper.sentinel.data.storage.CommandBlockStorage; +import me.trouper.sentinel.data.storage.ExtraStorage; import me.trouper.sentinel.data.storage.NBTStorage; import java.io.File; diff --git a/src/main/java/me/trouper/sentinel/data/config/FPConfig.java b/src/main/java/me/trouper/sentinel/data/config/FPConfig.java index e2fd637..cd64e5f 100644 --- a/src/main/java/me/trouper/sentinel/data/config/FPConfig.java +++ b/src/main/java/me/trouper/sentinel/data/config/FPConfig.java @@ -4,7 +4,6 @@ import io.github.itzispyder.pdk.utils.misc.config.JsonSerializable; import me.trouper.sentinel.Sentinel; import java.io.File; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/me/trouper/sentinel/data/config/StrictConfig.java b/src/main/java/me/trouper/sentinel/data/config/StrictConfig.java index 3a1d57e..4d37394 100644 --- a/src/main/java/me/trouper/sentinel/data/config/StrictConfig.java +++ b/src/main/java/me/trouper/sentinel/data/config/StrictConfig.java @@ -4,7 +4,6 @@ import io.github.itzispyder.pdk.utils.misc.config.JsonSerializable; import me.trouper.sentinel.Sentinel; import java.io.File; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/me/trouper/sentinel/data/types/CommandBlockHolder.java b/src/main/java/me/trouper/sentinel/data/misc/CommandBlockHolder.java similarity index 99% rename from src/main/java/me/trouper/sentinel/data/types/CommandBlockHolder.java rename to src/main/java/me/trouper/sentinel/data/misc/CommandBlockHolder.java index 9d83e39..10a5ca6 100644 --- a/src/main/java/me/trouper/sentinel/data/types/CommandBlockHolder.java +++ b/src/main/java/me/trouper/sentinel/data/misc/CommandBlockHolder.java @@ -1,9 +1,8 @@ -package me.trouper.sentinel.data.types; +package me.trouper.sentinel.data.misc; import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientUpdateCommandBlock; import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientUpdateCommandBlockMinecart; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.startup.drm.Auth; import me.trouper.sentinel.utils.DisplayUtils; import me.trouper.sentinel.utils.ServerUtils; import me.trouper.sentinel.utils.Text; diff --git a/src/main/java/me/trouper/sentinel/data/types/Emojis.java b/src/main/java/me/trouper/sentinel/data/misc/Emojis.java similarity index 98% rename from src/main/java/me/trouper/sentinel/data/types/Emojis.java rename to src/main/java/me/trouper/sentinel/data/misc/Emojis.java index bab6afd..17793a1 100644 --- a/src/main/java/me/trouper/sentinel/data/types/Emojis.java +++ b/src/main/java/me/trouper/sentinel/data/misc/Emojis.java @@ -1,4 +1,4 @@ -package me.trouper.sentinel.data.types; +package me.trouper.sentinel.data.misc; public class Emojis { public static String space = "<:space:1210008300515762238>"; diff --git a/src/main/java/me/trouper/sentinel/data/types/IPLocation.java b/src/main/java/me/trouper/sentinel/data/misc/IPLocation.java similarity index 98% rename from src/main/java/me/trouper/sentinel/data/types/IPLocation.java rename to src/main/java/me/trouper/sentinel/data/misc/IPLocation.java index c69f12e..2b8d050 100644 --- a/src/main/java/me/trouper/sentinel/data/types/IPLocation.java +++ b/src/main/java/me/trouper/sentinel/data/misc/IPLocation.java @@ -1,4 +1,4 @@ -package me.trouper.sentinel.data.types; +package me.trouper.sentinel.data.misc; public class IPLocation { private String country; diff --git a/src/main/java/me/trouper/sentinel/data/types/Selection.java b/src/main/java/me/trouper/sentinel/data/misc/Selection.java similarity index 98% rename from src/main/java/me/trouper/sentinel/data/types/Selection.java rename to src/main/java/me/trouper/sentinel/data/misc/Selection.java index 7d2f63c..bd7342f 100644 --- a/src/main/java/me/trouper/sentinel/data/types/Selection.java +++ b/src/main/java/me/trouper/sentinel/data/misc/Selection.java @@ -1,4 +1,4 @@ -package me.trouper.sentinel.data.types; +package me.trouper.sentinel.data.misc; import me.trouper.sentinel.utils.display.BlockDisplayRaytracer; import org.bukkit.Location; diff --git a/src/main/java/me/trouper/sentinel/data/types/SerialLocation.java b/src/main/java/me/trouper/sentinel/data/misc/SerialLocation.java similarity index 94% rename from src/main/java/me/trouper/sentinel/data/types/SerialLocation.java rename to src/main/java/me/trouper/sentinel/data/misc/SerialLocation.java index 5122536..ee506d7 100644 --- a/src/main/java/me/trouper/sentinel/data/types/SerialLocation.java +++ b/src/main/java/me/trouper/sentinel/data/misc/SerialLocation.java @@ -1,13 +1,10 @@ -package me.trouper.sentinel.data.types; +package me.trouper.sentinel.data.misc; import me.trouper.sentinel.utils.MathUtils; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; -import java.math.BigInteger; -import java.nio.ByteBuffer; -import java.util.Arrays; import java.util.UUID; public record SerialLocation(String world, double x, double y, double z) { diff --git a/src/main/java/me/trouper/sentinel/data/storage/CommandBlockStorage.java b/src/main/java/me/trouper/sentinel/data/storage/CommandBlockStorage.java index e9af207..3b407e0 100644 --- a/src/main/java/me/trouper/sentinel/data/storage/CommandBlockStorage.java +++ b/src/main/java/me/trouper/sentinel/data/storage/CommandBlockStorage.java @@ -2,14 +2,11 @@ package me.trouper.sentinel.data.storage; import io.github.itzispyder.pdk.utils.misc.config.JsonSerializable; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.data.types.CommandBlockHolder; -import me.trouper.sentinel.data.types.SerialLocation; +import me.trouper.sentinel.data.misc.CommandBlockHolder; import java.io.File; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; public class CommandBlockStorage implements JsonSerializable { @Override diff --git a/src/main/java/me/trouper/sentinel/data/storage/ExtraStorage.java b/src/main/java/me/trouper/sentinel/data/storage/ExtraStorage.java index c419de4..e5d9b84 100644 --- a/src/main/java/me/trouper/sentinel/data/storage/ExtraStorage.java +++ b/src/main/java/me/trouper/sentinel/data/storage/ExtraStorage.java @@ -2,10 +2,12 @@ package me.trouper.sentinel.data.storage; import io.github.itzispyder.pdk.utils.misc.config.JsonSerializable; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.data.types.SerialLocation; +import me.trouper.sentinel.data.misc.SerialLocation; import java.io.File; -import java.util.*; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; public class ExtraStorage implements JsonSerializable { @Override diff --git a/src/main/java/me/trouper/sentinel/data/storage/NBTStorage.java b/src/main/java/me/trouper/sentinel/data/storage/NBTStorage.java index de7a0cf..a65922b 100644 --- a/src/main/java/me/trouper/sentinel/data/storage/NBTStorage.java +++ b/src/main/java/me/trouper/sentinel/data/storage/NBTStorage.java @@ -1,14 +1,9 @@ package me.trouper.sentinel.data.storage; -import com.github.retrooper.packetevents.protocol.nbt.serializer.NBTSerializer; -import de.tr7zw.changeme.nbtapi.NBTContainer; -import de.tr7zw.changeme.nbtapi.NBTItem; import io.github.itzispyder.pdk.plugin.builders.ItemBuilder; import io.github.itzispyder.pdk.utils.misc.config.JsonSerializable; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.utils.ServerUtils; import me.trouper.sentinel.utils.Text; -import net.md_5.bungee.api.chat.hover.content.ItemSerializer; import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/src/main/java/me/trouper/sentinel/data/types/Test.java b/src/main/java/me/trouper/sentinel/data/types/Test.java deleted file mode 100644 index f2e95f3..0000000 --- a/src/main/java/me/trouper/sentinel/data/types/Test.java +++ /dev/null @@ -1,12 +0,0 @@ -package me.trouper.sentinel.data.types; - -import java.math.BigInteger; -import java.nio.ByteBuffer; -import java.util.Arrays; -import java.util.UUID; - -public class Test { - - - -} diff --git a/src/main/java/me/trouper/sentinel/server/commands/CallbackCommand.java b/src/main/java/me/trouper/sentinel/server/commands/CallbackCommand.java index 4d707e0..a1a5112 100644 --- a/src/main/java/me/trouper/sentinel/server/commands/CallbackCommand.java +++ b/src/main/java/me/trouper/sentinel/server/commands/CallbackCommand.java @@ -7,7 +7,6 @@ import io.github.itzispyder.pdk.commands.Permission; import io.github.itzispyder.pdk.commands.completions.CompletionBuilder; import io.github.itzispyder.pdk.utils.misc.Cooldown; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.server.functions.helpers.ReportHandler; import me.trouper.sentinel.server.functions.helpers.Report; import me.trouper.sentinel.utils.PlayerUtils; import me.trouper.sentinel.utils.Text; diff --git a/src/main/java/me/trouper/sentinel/server/commands/ExtraCommand.java b/src/main/java/me/trouper/sentinel/server/commands/ExtraCommand.java index 5f36c52..de5ae2c 100644 --- a/src/main/java/me/trouper/sentinel/server/commands/ExtraCommand.java +++ b/src/main/java/me/trouper/sentinel/server/commands/ExtraCommand.java @@ -10,8 +10,8 @@ import io.github.itzispyder.pdk.commands.CustomCommand; import io.github.itzispyder.pdk.commands.Permission; import io.github.itzispyder.pdk.commands.completions.CompletionBuilder; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.data.types.IPLocation; -import me.trouper.sentinel.data.types.SerialLocation; +import me.trouper.sentinel.data.misc.IPLocation; +import me.trouper.sentinel.data.misc.SerialLocation; import me.trouper.sentinel.server.events.extras.ShadowRealmEvents; import me.trouper.sentinel.utils.*; import net.kyori.adventure.text.Component; diff --git a/src/main/java/me/trouper/sentinel/server/commands/MessageCommand.java b/src/main/java/me/trouper/sentinel/server/commands/MessageCommand.java index 51bdb46..9b381f0 100644 --- a/src/main/java/me/trouper/sentinel/server/commands/MessageCommand.java +++ b/src/main/java/me/trouper/sentinel/server/commands/MessageCommand.java @@ -6,7 +6,6 @@ import io.github.itzispyder.pdk.commands.CustomCommand; import io.github.itzispyder.pdk.commands.Permission; import io.github.itzispyder.pdk.commands.completions.CompletionBuilder; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.server.functions.helpers.MessageHandler; import me.trouper.sentinel.utils.PlayerUtils; import me.trouper.sentinel.utils.Text; import org.bukkit.Bukkit; diff --git a/src/main/java/me/trouper/sentinel/server/commands/ReplyCommand.java b/src/main/java/me/trouper/sentinel/server/commands/ReplyCommand.java index 44f878d..7cad64b 100644 --- a/src/main/java/me/trouper/sentinel/server/commands/ReplyCommand.java +++ b/src/main/java/me/trouper/sentinel/server/commands/ReplyCommand.java @@ -6,7 +6,6 @@ import io.github.itzispyder.pdk.commands.CustomCommand; import io.github.itzispyder.pdk.commands.Permission; import io.github.itzispyder.pdk.commands.completions.CompletionBuilder; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.server.functions.helpers.MessageHandler; import me.trouper.sentinel.utils.PlayerUtils; import me.trouper.sentinel.utils.Text; import org.bukkit.command.Command; diff --git a/src/main/java/me/trouper/sentinel/server/commands/SentinelCommand.java b/src/main/java/me/trouper/sentinel/server/commands/SentinelCommand.java index 4cd0140..5aef0cf 100644 --- a/src/main/java/me/trouper/sentinel/server/commands/SentinelCommand.java +++ b/src/main/java/me/trouper/sentinel/server/commands/SentinelCommand.java @@ -8,14 +8,14 @@ import io.github.itzispyder.pdk.commands.completions.CompletionBuilder; import io.papermc.paper.chat.ChatRenderer; import io.papermc.paper.event.player.AsyncChatEvent; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.data.types.SerialLocation; -import me.trouper.sentinel.data.types.CommandBlockHolder; +import me.trouper.sentinel.data.misc.CommandBlockHolder; +import me.trouper.sentinel.data.misc.Selection; +import me.trouper.sentinel.data.misc.SerialLocation; import me.trouper.sentinel.server.events.admin.WandEvents; import me.trouper.sentinel.server.functions.chatfilter.profanity.ProfanityFilter; import me.trouper.sentinel.server.functions.chatfilter.spam.SpamFilter; import me.trouper.sentinel.server.functions.chatfilter.unicode.UnicodeFilter; import me.trouper.sentinel.server.functions.chatfilter.url.UrlFilter; -import me.trouper.sentinel.data.types.Selection; import me.trouper.sentinel.server.gui.MainGUI; import me.trouper.sentinel.startup.drm.Loader; import me.trouper.sentinel.utils.PlayerUtils; @@ -35,7 +35,10 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.entity.minecart.CommandMinecart; -import java.util.*; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import java.util.UUID; @CommandRegistry(value = "sentinel", permission = @Permission("sentinel.staff"), printStackTrace = true) public class SentinelCommand implements CustomCommand { diff --git a/src/main/java/me/trouper/sentinel/server/commands/TrapCommand.java b/src/main/java/me/trouper/sentinel/server/commands/TrapCommand.java index e4f59fa..253f183 100644 --- a/src/main/java/me/trouper/sentinel/server/commands/TrapCommand.java +++ b/src/main/java/me/trouper/sentinel/server/commands/TrapCommand.java @@ -5,7 +5,6 @@ import io.github.itzispyder.pdk.commands.CommandRegistry; import io.github.itzispyder.pdk.commands.CustomCommand; import io.github.itzispyder.pdk.commands.completions.CompletionBuilder; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.utils.ServerUtils; import me.trouper.sentinel.utils.Text; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.event.ClickEvent; diff --git a/src/main/java/me/trouper/sentinel/server/events/admin/WandEvents.java b/src/main/java/me/trouper/sentinel/server/events/admin/WandEvents.java index f4944a8..225d265 100644 --- a/src/main/java/me/trouper/sentinel/server/events/admin/WandEvents.java +++ b/src/main/java/me/trouper/sentinel/server/events/admin/WandEvents.java @@ -4,12 +4,15 @@ import io.github.itzispyder.pdk.events.CustomListener; import io.github.itzispyder.pdk.plugin.builders.ItemBuilder; import io.github.itzispyder.pdk.utils.misc.SoundPlayer; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.data.types.CommandBlockHolder; -import me.trouper.sentinel.data.types.Selection; -import me.trouper.sentinel.utils.Text; +import me.trouper.sentinel.data.misc.CommandBlockHolder; +import me.trouper.sentinel.data.misc.Selection; import me.trouper.sentinel.utils.PlayerUtils; import me.trouper.sentinel.utils.ServerUtils; -import org.bukkit.*; +import me.trouper.sentinel.utils.Text; +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.Sound; import org.bukkit.block.CommandBlock; import org.bukkit.entity.Player; import org.bukkit.entity.minecart.CommandMinecart; diff --git a/src/main/java/me/trouper/sentinel/server/events/extras/ShadowRealmEvents.java b/src/main/java/me/trouper/sentinel/server/events/extras/ShadowRealmEvents.java index c24785e..fdfbfac 100644 --- a/src/main/java/me/trouper/sentinel/server/events/extras/ShadowRealmEvents.java +++ b/src/main/java/me/trouper/sentinel/server/events/extras/ShadowRealmEvents.java @@ -2,7 +2,6 @@ package me.trouper.sentinel.server.events.extras; import com.github.retrooper.packetevents.PacketEvents; import com.github.retrooper.packetevents.event.PacketListener; -import com.github.retrooper.packetevents.event.PacketListenerAbstract; import com.github.retrooper.packetevents.event.PacketReceiveEvent; import com.github.retrooper.packetevents.event.PacketSendEvent; import com.github.retrooper.packetevents.protocol.packettype.PacketType; diff --git a/src/main/java/me/trouper/sentinel/server/events/violations/blocks/command/CommandBlockBreak.java b/src/main/java/me/trouper/sentinel/server/events/violations/blocks/command/CommandBlockBreak.java index 27170f9..773f437 100644 --- a/src/main/java/me/trouper/sentinel/server/events/violations/blocks/command/CommandBlockBreak.java +++ b/src/main/java/me/trouper/sentinel/server/events/violations/blocks/command/CommandBlockBreak.java @@ -2,8 +2,7 @@ package me.trouper.sentinel.server.events.violations.blocks.command; import io.github.itzispyder.pdk.plugin.gui.CustomGui; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.data.types.SerialLocation; -import me.trouper.sentinel.data.types.CommandBlockHolder; +import me.trouper.sentinel.data.misc.CommandBlockHolder; import me.trouper.sentinel.server.events.violations.AbstractViolation; import me.trouper.sentinel.server.functions.helpers.ActionConfiguration; import me.trouper.sentinel.server.gui.Items; diff --git a/src/main/java/me/trouper/sentinel/server/events/violations/blocks/command/CommandBlockEdit.java b/src/main/java/me/trouper/sentinel/server/events/violations/blocks/command/CommandBlockEdit.java index 7386dae..7093b7b 100644 --- a/src/main/java/me/trouper/sentinel/server/events/violations/blocks/command/CommandBlockEdit.java +++ b/src/main/java/me/trouper/sentinel/server/events/violations/blocks/command/CommandBlockEdit.java @@ -1,16 +1,14 @@ package me.trouper.sentinel.server.events.violations.blocks.command; import com.github.retrooper.packetevents.event.PacketListener; -import com.github.retrooper.packetevents.event.PacketListenerAbstract; import com.github.retrooper.packetevents.event.PacketReceiveEvent; import com.github.retrooper.packetevents.protocol.packettype.PacketType; import com.github.retrooper.packetevents.protocol.player.User; import com.github.retrooper.packetevents.util.Vector3i; -import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientTabComplete; import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientUpdateCommandBlock; import io.github.itzispyder.pdk.plugin.gui.CustomGui; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.data.types.CommandBlockHolder; +import me.trouper.sentinel.data.misc.CommandBlockHolder; import me.trouper.sentinel.server.events.violations.AbstractViolation; import me.trouper.sentinel.server.functions.helpers.ActionConfiguration; import me.trouper.sentinel.server.gui.Items; @@ -22,11 +20,8 @@ import me.trouper.sentinel.utils.Text; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; -import org.bukkit.block.Block; import org.bukkit.block.CommandBlock; import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.entity.EntityChangeBlockEvent; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/me/trouper/sentinel/server/events/violations/blocks/command/CommandBlockPlace.java b/src/main/java/me/trouper/sentinel/server/events/violations/blocks/command/CommandBlockPlace.java index fbfe367..5b5b8be 100644 --- a/src/main/java/me/trouper/sentinel/server/events/violations/blocks/command/CommandBlockPlace.java +++ b/src/main/java/me/trouper/sentinel/server/events/violations/blocks/command/CommandBlockPlace.java @@ -2,7 +2,7 @@ package me.trouper.sentinel.server.events.violations.blocks.command; import io.github.itzispyder.pdk.plugin.gui.CustomGui; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.data.types.CommandBlockHolder; +import me.trouper.sentinel.data.misc.CommandBlockHolder; import me.trouper.sentinel.server.events.violations.AbstractViolation; import me.trouper.sentinel.server.functions.helpers.ActionConfiguration; import me.trouper.sentinel.server.gui.Items; diff --git a/src/main/java/me/trouper/sentinel/server/events/violations/blocks/command/CommandBlockUse.java b/src/main/java/me/trouper/sentinel/server/events/violations/blocks/command/CommandBlockUse.java index 224218f..4b16086 100644 --- a/src/main/java/me/trouper/sentinel/server/events/violations/blocks/command/CommandBlockUse.java +++ b/src/main/java/me/trouper/sentinel/server/events/violations/blocks/command/CommandBlockUse.java @@ -2,7 +2,7 @@ package me.trouper.sentinel.server.events.violations.blocks.command; import io.github.itzispyder.pdk.plugin.gui.CustomGui; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.data.types.CommandBlockHolder; +import me.trouper.sentinel.data.misc.CommandBlockHolder; import me.trouper.sentinel.server.events.violations.AbstractViolation; import me.trouper.sentinel.server.functions.helpers.ActionConfiguration; import me.trouper.sentinel.server.gui.Items; diff --git a/src/main/java/me/trouper/sentinel/server/events/violations/entities/CommandMinecartBreak.java b/src/main/java/me/trouper/sentinel/server/events/violations/entities/CommandMinecartBreak.java index 2ee70d8..957cbb0 100644 --- a/src/main/java/me/trouper/sentinel/server/events/violations/entities/CommandMinecartBreak.java +++ b/src/main/java/me/trouper/sentinel/server/events/violations/entities/CommandMinecartBreak.java @@ -2,7 +2,7 @@ package me.trouper.sentinel.server.events.violations.entities; import io.github.itzispyder.pdk.plugin.gui.CustomGui; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.data.types.CommandBlockHolder; +import me.trouper.sentinel.data.misc.CommandBlockHolder; import me.trouper.sentinel.server.events.violations.AbstractViolation; import me.trouper.sentinel.server.functions.helpers.ActionConfiguration; import me.trouper.sentinel.server.gui.Items; @@ -15,7 +15,6 @@ import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.entity.minecart.CommandMinecart; import org.bukkit.event.EventHandler; -import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.vehicle.VehicleDamageEvent; import org.bukkit.inventory.Inventory; diff --git a/src/main/java/me/trouper/sentinel/server/events/violations/entities/CommandMinecartEdit.java b/src/main/java/me/trouper/sentinel/server/events/violations/entities/CommandMinecartEdit.java index 47bdf2c..c50c0db 100644 --- a/src/main/java/me/trouper/sentinel/server/events/violations/entities/CommandMinecartEdit.java +++ b/src/main/java/me/trouper/sentinel/server/events/violations/entities/CommandMinecartEdit.java @@ -4,12 +4,10 @@ import com.github.retrooper.packetevents.event.PacketListener; import com.github.retrooper.packetevents.event.PacketReceiveEvent; import com.github.retrooper.packetevents.protocol.packettype.PacketType; import com.github.retrooper.packetevents.protocol.player.User; -import com.github.retrooper.packetevents.util.Vector3i; -import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientUpdateCommandBlock; import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientUpdateCommandBlockMinecart; import io.github.itzispyder.pdk.plugin.gui.CustomGui; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.data.types.CommandBlockHolder; +import me.trouper.sentinel.data.misc.CommandBlockHolder; import me.trouper.sentinel.server.events.violations.AbstractViolation; import me.trouper.sentinel.server.functions.helpers.ActionConfiguration; import me.trouper.sentinel.server.gui.Items; @@ -19,10 +17,8 @@ import me.trouper.sentinel.utils.PlayerUtils; import me.trouper.sentinel.utils.ServerUtils; import me.trouper.sentinel.utils.Text; import org.bukkit.Bukkit; -import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; -import org.bukkit.block.CommandBlock; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.entity.minecart.CommandMinecart; @@ -31,7 +27,6 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import java.util.List; -import java.util.UUID; public class CommandMinecartEdit extends AbstractViolation implements PacketListener { @Override diff --git a/src/main/java/me/trouper/sentinel/server/events/violations/entities/CommandMinecartPlace.java b/src/main/java/me/trouper/sentinel/server/events/violations/entities/CommandMinecartPlace.java index ba80c9d..8953727 100644 --- a/src/main/java/me/trouper/sentinel/server/events/violations/entities/CommandMinecartPlace.java +++ b/src/main/java/me/trouper/sentinel/server/events/violations/entities/CommandMinecartPlace.java @@ -2,7 +2,7 @@ package me.trouper.sentinel.server.events.violations.entities; import io.github.itzispyder.pdk.plugin.gui.CustomGui; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.data.types.CommandBlockHolder; +import me.trouper.sentinel.data.misc.CommandBlockHolder; import me.trouper.sentinel.server.events.violations.AbstractViolation; import me.trouper.sentinel.server.functions.helpers.ActionConfiguration; import me.trouper.sentinel.server.gui.Items; diff --git a/src/main/java/me/trouper/sentinel/server/events/violations/entities/CommandMinecartUse.java b/src/main/java/me/trouper/sentinel/server/events/violations/entities/CommandMinecartUse.java index 7c57eab..4e629c6 100644 --- a/src/main/java/me/trouper/sentinel/server/events/violations/entities/CommandMinecartUse.java +++ b/src/main/java/me/trouper/sentinel/server/events/violations/entities/CommandMinecartUse.java @@ -2,7 +2,7 @@ package me.trouper.sentinel.server.events.violations.entities; import io.github.itzispyder.pdk.plugin.gui.CustomGui; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.data.types.CommandBlockHolder; +import me.trouper.sentinel.data.misc.CommandBlockHolder; import me.trouper.sentinel.server.events.violations.AbstractViolation; import me.trouper.sentinel.server.functions.helpers.ActionConfiguration; import me.trouper.sentinel.server.gui.Items; @@ -12,7 +12,6 @@ import me.trouper.sentinel.utils.PlayerUtils; import me.trouper.sentinel.utils.ServerUtils; import me.trouper.sentinel.utils.Text; import org.bukkit.Material; -import org.bukkit.block.CommandBlock; import org.bukkit.entity.Player; import org.bukkit.entity.minecart.CommandMinecart; import org.bukkit.event.EventHandler; diff --git a/src/main/java/me/trouper/sentinel/server/events/violations/players/CreativeHotbar.java b/src/main/java/me/trouper/sentinel/server/events/violations/players/CreativeHotbar.java index 613ce1f..9c9e802 100644 --- a/src/main/java/me/trouper/sentinel/server/events/violations/players/CreativeHotbar.java +++ b/src/main/java/me/trouper/sentinel/server/events/violations/players/CreativeHotbar.java @@ -3,7 +3,6 @@ package me.trouper.sentinel.server.events.violations.players; import io.github.itzispyder.pdk.plugin.gui.CustomGui; import io.github.itzispyder.pdk.utils.misc.Pair; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.data.storage.NBTStorage; import me.trouper.sentinel.server.events.violations.AbstractViolation; import me.trouper.sentinel.server.functions.helpers.ActionConfiguration; import me.trouper.sentinel.server.functions.hotbar.items.ItemCheck; @@ -24,7 +23,6 @@ import org.bukkit.inventory.ItemStack; import java.util.ArrayList; import java.util.List; -import java.util.UUID; public class CreativeHotbar extends AbstractViolation { diff --git a/src/main/java/me/trouper/sentinel/server/events/violations/players/PluginCloakingPacket.java b/src/main/java/me/trouper/sentinel/server/events/violations/players/PluginCloakingPacket.java index 40bebc3..9821039 100644 --- a/src/main/java/me/trouper/sentinel/server/events/violations/players/PluginCloakingPacket.java +++ b/src/main/java/me/trouper/sentinel/server/events/violations/players/PluginCloakingPacket.java @@ -1,10 +1,10 @@ package me.trouper.sentinel.server.events.violations.players; -import com.github.retrooper.packetevents.event.*; +import com.github.retrooper.packetevents.event.PacketListener; +import com.github.retrooper.packetevents.event.PacketReceiveEvent; +import com.github.retrooper.packetevents.event.PacketSendEvent; import com.github.retrooper.packetevents.protocol.chat.Node; import com.github.retrooper.packetevents.protocol.packettype.PacketType; -import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientChatCommand; -import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientChatCommandUnsigned; import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientTabComplete; import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerDeclareCommands; import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerTabComplete; diff --git a/src/main/java/me/trouper/sentinel/server/events/violations/whitelist/CommandBlockExecute.java b/src/main/java/me/trouper/sentinel/server/events/violations/whitelist/CommandBlockExecute.java index 72da81a..5e54299 100644 --- a/src/main/java/me/trouper/sentinel/server/events/violations/whitelist/CommandBlockExecute.java +++ b/src/main/java/me/trouper/sentinel/server/events/violations/whitelist/CommandBlockExecute.java @@ -2,7 +2,7 @@ package me.trouper.sentinel.server.events.violations.whitelist; import io.github.itzispyder.pdk.plugin.gui.CustomGui; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.data.types.CommandBlockHolder; +import me.trouper.sentinel.data.misc.CommandBlockHolder; import me.trouper.sentinel.server.events.violations.AbstractViolation; import me.trouper.sentinel.server.functions.helpers.ActionConfiguration; import me.trouper.sentinel.server.gui.Items; diff --git a/src/main/java/me/trouper/sentinel/server/events/violations/whitelist/CommandMinecartExecute.java b/src/main/java/me/trouper/sentinel/server/events/violations/whitelist/CommandMinecartExecute.java index 09bcbd8..c5a3752 100644 --- a/src/main/java/me/trouper/sentinel/server/events/violations/whitelist/CommandMinecartExecute.java +++ b/src/main/java/me/trouper/sentinel/server/events/violations/whitelist/CommandMinecartExecute.java @@ -2,7 +2,7 @@ package me.trouper.sentinel.server.events.violations.whitelist; import io.github.itzispyder.pdk.plugin.gui.CustomGui; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.data.types.CommandBlockHolder; +import me.trouper.sentinel.data.misc.CommandBlockHolder; import me.trouper.sentinel.server.events.violations.AbstractViolation; import me.trouper.sentinel.server.functions.helpers.ActionConfiguration; import me.trouper.sentinel.utils.PlayerUtils; diff --git a/src/main/java/me/trouper/sentinel/server/functions/chatfilter/profanity/ProfanityFilter.java b/src/main/java/me/trouper/sentinel/server/functions/chatfilter/profanity/ProfanityFilter.java index 516e8e4..beb1ef1 100644 --- a/src/main/java/me/trouper/sentinel/server/functions/chatfilter/profanity/ProfanityFilter.java +++ b/src/main/java/me/trouper/sentinel/server/functions/chatfilter/profanity/ProfanityFilter.java @@ -4,7 +4,6 @@ import io.papermc.paper.event.player.AsyncChatEvent; import me.trouper.sentinel.Sentinel; import me.trouper.sentinel.utils.ServerUtils; import org.bukkit.entity.Player; -import org.bukkit.event.player.AsyncPlayerChatEvent; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/me/trouper/sentinel/server/functions/chatfilter/profanity/ProfanityResponse.java b/src/main/java/me/trouper/sentinel/server/functions/chatfilter/profanity/ProfanityResponse.java index ac9e812..596c102 100644 --- a/src/main/java/me/trouper/sentinel/server/functions/chatfilter/profanity/ProfanityResponse.java +++ b/src/main/java/me/trouper/sentinel/server/functions/chatfilter/profanity/ProfanityResponse.java @@ -2,7 +2,7 @@ package me.trouper.sentinel.server.functions.chatfilter.profanity; import io.papermc.paper.event.player.AsyncChatEvent; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.data.types.Emojis; +import me.trouper.sentinel.data.misc.Emojis; import me.trouper.sentinel.server.functions.chatfilter.FilterResponse; import me.trouper.sentinel.server.functions.helpers.Report; import me.trouper.sentinel.utils.ServerUtils; diff --git a/src/main/java/me/trouper/sentinel/server/functions/chatfilter/spam/SpamResponse.java b/src/main/java/me/trouper/sentinel/server/functions/chatfilter/spam/SpamResponse.java index 37d1156..0cd0e68 100644 --- a/src/main/java/me/trouper/sentinel/server/functions/chatfilter/spam/SpamResponse.java +++ b/src/main/java/me/trouper/sentinel/server/functions/chatfilter/spam/SpamResponse.java @@ -3,7 +3,6 @@ package me.trouper.sentinel.server.functions.chatfilter.spam; import io.github.retrooper.packetevents.adventure.serializer.legacy.LegacyComponentSerializer; import io.papermc.paper.event.player.AsyncChatEvent; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.server.functions.helpers.ReportHandler; import me.trouper.sentinel.server.functions.chatfilter.FilterResponse; import me.trouper.sentinel.server.functions.helpers.Report; import me.trouper.sentinel.utils.MathUtils; diff --git a/src/main/java/me/trouper/sentinel/server/functions/chatfilter/unicode/UnicodeResponse.java b/src/main/java/me/trouper/sentinel/server/functions/chatfilter/unicode/UnicodeResponse.java index 4fd216c..a9e43c8 100644 --- a/src/main/java/me/trouper/sentinel/server/functions/chatfilter/unicode/UnicodeResponse.java +++ b/src/main/java/me/trouper/sentinel/server/functions/chatfilter/unicode/UnicodeResponse.java @@ -3,7 +3,7 @@ package me.trouper.sentinel.server.functions.chatfilter.unicode; import io.github.retrooper.packetevents.adventure.serializer.legacy.LegacyComponentSerializer; import io.papermc.paper.event.player.AsyncChatEvent; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.data.types.Emojis; +import me.trouper.sentinel.data.misc.Emojis; import me.trouper.sentinel.server.functions.chatfilter.FilterResponse; import me.trouper.sentinel.server.functions.helpers.Report; import me.trouper.sentinel.utils.ServerUtils; diff --git a/src/main/java/me/trouper/sentinel/server/functions/chatfilter/url/UrlResponse.java b/src/main/java/me/trouper/sentinel/server/functions/chatfilter/url/UrlResponse.java index 8f7f75e..8f9cdf5 100644 --- a/src/main/java/me/trouper/sentinel/server/functions/chatfilter/url/UrlResponse.java +++ b/src/main/java/me/trouper/sentinel/server/functions/chatfilter/url/UrlResponse.java @@ -3,7 +3,7 @@ package me.trouper.sentinel.server.functions.chatfilter.url; import io.github.retrooper.packetevents.adventure.serializer.legacy.LegacyComponentSerializer; import io.papermc.paper.event.player.AsyncChatEvent; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.data.types.Emojis; +import me.trouper.sentinel.data.misc.Emojis; import me.trouper.sentinel.server.functions.chatfilter.FilterResponse; import me.trouper.sentinel.server.functions.helpers.Report; import me.trouper.sentinel.utils.ServerUtils; diff --git a/src/main/java/me/trouper/sentinel/server/functions/helpers/ActionConfiguration.java b/src/main/java/me/trouper/sentinel/server/functions/helpers/ActionConfiguration.java index 582121f..214a62a 100644 --- a/src/main/java/me/trouper/sentinel/server/functions/helpers/ActionConfiguration.java +++ b/src/main/java/me/trouper/sentinel/server/functions/helpers/ActionConfiguration.java @@ -1,9 +1,7 @@ package me.trouper.sentinel.server.functions.helpers; -import com.github.retrooper.packetevents.wrapper.PacketWrapper; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.data.types.CommandBlockHolder; -import me.trouper.sentinel.data.types.SerialLocation; +import me.trouper.sentinel.data.misc.CommandBlockHolder; import me.trouper.sentinel.utils.ServerUtils; import me.trouper.sentinel.utils.trees.Node; import org.bukkit.Material; diff --git a/src/main/java/me/trouper/sentinel/server/functions/helpers/CBWhitelistManager.java b/src/main/java/me/trouper/sentinel/server/functions/helpers/CBWhitelistManager.java index e9c7ded..a5017de 100644 --- a/src/main/java/me/trouper/sentinel/server/functions/helpers/CBWhitelistManager.java +++ b/src/main/java/me/trouper/sentinel/server/functions/helpers/CBWhitelistManager.java @@ -1,10 +1,10 @@ package me.trouper.sentinel.server.functions.helpers; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.data.types.SerialLocation; -import me.trouper.sentinel.data.types.CommandBlockHolder; +import me.trouper.sentinel.data.misc.CommandBlockHolder; +import me.trouper.sentinel.data.misc.Selection; +import me.trouper.sentinel.data.misc.SerialLocation; import me.trouper.sentinel.server.events.admin.WandEvents; -import me.trouper.sentinel.data.types.Selection; import me.trouper.sentinel.utils.ServerUtils; import me.trouper.sentinel.utils.Text; import org.bukkit.Location; diff --git a/src/main/java/me/trouper/sentinel/server/functions/helpers/ReportHandler.java b/src/main/java/me/trouper/sentinel/server/functions/helpers/ReportHandler.java index c3da9d2..91e59a0 100644 --- a/src/main/java/me/trouper/sentinel/server/functions/helpers/ReportHandler.java +++ b/src/main/java/me/trouper/sentinel/server/functions/helpers/ReportHandler.java @@ -2,7 +2,7 @@ package me.trouper.sentinel.server.functions.helpers; import io.github.itzispyder.pdk.utils.SchedulerUtils; import io.github.itzispyder.pdk.utils.discord.DiscordEmbed; -import me.trouper.sentinel.data.types.Emojis; +import me.trouper.sentinel.data.misc.Emojis; import me.trouper.sentinel.utils.Random; import me.trouper.sentinel.utils.trees.EmbedFormatter; import org.bukkit.entity.Player; diff --git a/src/main/java/me/trouper/sentinel/server/functions/hotbar/entities/EntityCheck.java b/src/main/java/me/trouper/sentinel/server/functions/hotbar/entities/EntityCheck.java index 092dda5..33b77fe 100644 --- a/src/main/java/me/trouper/sentinel/server/functions/hotbar/entities/EntityCheck.java +++ b/src/main/java/me/trouper/sentinel/server/functions/hotbar/entities/EntityCheck.java @@ -2,8 +2,8 @@ package me.trouper.sentinel.server.functions.hotbar.entities; import de.tr7zw.changeme.nbtapi.NBT; import me.trouper.sentinel.server.functions.hotbar.AbstractCheck; -import me.trouper.sentinel.server.functions.hotbar.misc.InventoryCheck; import me.trouper.sentinel.server.functions.hotbar.items.ItemCheck; +import me.trouper.sentinel.server.functions.hotbar.misc.InventoryCheck; import me.trouper.sentinel.utils.InventoryUtils; import me.trouper.sentinel.utils.ServerUtils; import org.bukkit.entity.Entity; diff --git a/src/main/java/me/trouper/sentinel/server/functions/hotbar/entities/EquipmentCheck.java b/src/main/java/me/trouper/sentinel/server/functions/hotbar/entities/EquipmentCheck.java index 023046f..3dbb8dd 100644 --- a/src/main/java/me/trouper/sentinel/server/functions/hotbar/entities/EquipmentCheck.java +++ b/src/main/java/me/trouper/sentinel/server/functions/hotbar/entities/EquipmentCheck.java @@ -4,8 +4,8 @@ import me.trouper.sentinel.server.functions.hotbar.AbstractCheck; import me.trouper.sentinel.server.functions.hotbar.items.ItemCheck; import me.trouper.sentinel.utils.ServerUtils; import org.bukkit.entity.Mob; -import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.EquipmentSlot; +import org.bukkit.inventory.ItemStack; public class EquipmentCheck extends AbstractCheck { diff --git a/src/main/java/me/trouper/sentinel/server/functions/hotbar/items/ItemCheck.java b/src/main/java/me/trouper/sentinel/server/functions/hotbar/items/ItemCheck.java index 9e0ce9a..a092241 100644 --- a/src/main/java/me/trouper/sentinel/server/functions/hotbar/items/ItemCheck.java +++ b/src/main/java/me/trouper/sentinel/server/functions/hotbar/items/ItemCheck.java @@ -11,7 +11,6 @@ import me.trouper.sentinel.utils.InventoryUtils; import me.trouper.sentinel.utils.ServerUtils; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.meta.ItemMeta; import java.util.Arrays; diff --git a/src/main/java/me/trouper/sentinel/server/gui/PaginatedGUI.java b/src/main/java/me/trouper/sentinel/server/gui/PaginatedGUI.java index 6bd4c1c..e44a406 100644 --- a/src/main/java/me/trouper/sentinel/server/gui/PaginatedGUI.java +++ b/src/main/java/me/trouper/sentinel/server/gui/PaginatedGUI.java @@ -5,7 +5,10 @@ import io.github.itzispyder.pdk.plugin.gui.CustomGui; import me.trouper.sentinel.Sentinel; import me.trouper.sentinel.utils.ServerUtils; import me.trouper.sentinel.utils.Text; -import org.bukkit.*; +import org.bukkit.Bukkit; +import org.bukkit.Material; +import org.bukkit.Sound; +import org.bukkit.SoundCategory; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; @@ -24,7 +27,7 @@ public abstract class PaginatedGUI { protected abstract CustomGui backGUI(); protected boolean isAsynchronous() { return false; - }; + } public CustomGui createGUI(Player p) { diff --git a/src/main/java/me/trouper/sentinel/server/gui/config/ConfigGUI.java b/src/main/java/me/trouper/sentinel/server/gui/config/ConfigGUI.java index 6d89d6e..adebbd4 100644 --- a/src/main/java/me/trouper/sentinel/server/gui/config/ConfigGUI.java +++ b/src/main/java/me/trouper/sentinel/server/gui/config/ConfigGUI.java @@ -18,11 +18,11 @@ public class ConfigGUI { .onDefine(this::blankPage) .defineMain(this::mainClick) .define(12, Items.ANTI_NUKE_CONFIG, e->{ - ((Player) e.getWhoClicked()).playSound(e.getWhoClicked(), Sound.UI_BUTTON_CLICK, SoundCategory.MASTER,1,0.8F); + ((Player) e.getWhoClicked()).playSound(e.getWhoClicked(), Sound.UI_BUTTON_CLICK, SoundCategory.MASTER,1,1F); e.getWhoClicked().openInventory(new AntiNukeGUI().home.getInventory()); }) .define(14,Items.CHAT_CONFIG,e->{ - ((Player) e.getWhoClicked()).playSound(e.getWhoClicked(), Sound.UI_BUTTON_CLICK, SoundCategory.MASTER,1,0.8F); + ((Player) e.getWhoClicked()).playSound(e.getWhoClicked(), Sound.UI_BUTTON_CLICK, SoundCategory.MASTER,1,1F); e.getWhoClicked().openInventory(new ChatGUI().home.getInventory()); }) .define(26,Items.BACK,e->{ diff --git a/src/main/java/me/trouper/sentinel/server/gui/config/chat/ChatGUI.java b/src/main/java/me/trouper/sentinel/server/gui/config/chat/ChatGUI.java index 718de25..28f175e 100644 --- a/src/main/java/me/trouper/sentinel/server/gui/config/chat/ChatGUI.java +++ b/src/main/java/me/trouper/sentinel/server/gui/config/chat/ChatGUI.java @@ -26,17 +26,19 @@ public class ChatGUI { e.getWhoClicked().openInventory(new ConfigGUI().home.getInventory()); }) .define(16,PROFANITY_FILTER,e->{ + ((Player) e.getWhoClicked()).playSound(e.getWhoClicked(), Sound.UI_BUTTON_CLICK, SoundCategory.MASTER,1,1.4F); e.getWhoClicked().openInventory(new ProfanityFilterGUI().home.getInventory()); }) .define(14,SPAM_FILTER,e->{ + ((Player) e.getWhoClicked()).playSound(e.getWhoClicked(), Sound.UI_BUTTON_CLICK, SoundCategory.MASTER,1,1.4F); e.getWhoClicked().openInventory(new SpamFilterGUI().home.getInventory()); }) .define(12,URL_FILTER,e->{ - ServerUtils.verbose("URL Filter Launching"); + ((Player) e.getWhoClicked()).playSound(e.getWhoClicked(), Sound.UI_BUTTON_CLICK, SoundCategory.MASTER,1,1.4F); e.getWhoClicked().openInventory(new UrlFilterGUI().home.getInventory()); }) .define(10,UNICODE_FILTER,e->{ - ServerUtils.verbose("Unicode Filter Launching"); + ((Player) e.getWhoClicked()).playSound(e.getWhoClicked(), Sound.UI_BUTTON_CLICK, SoundCategory.MASTER,1,1.4F); e.getWhoClicked().openInventory(new UnicodeFilterGUI().home.getInventory()); }) .build(); diff --git a/src/main/java/me/trouper/sentinel/server/gui/nbt/NBTGui.java b/src/main/java/me/trouper/sentinel/server/gui/nbt/NBTGui.java index d2a99b6..7ea8f3b 100644 --- a/src/main/java/me/trouper/sentinel/server/gui/nbt/NBTGui.java +++ b/src/main/java/me/trouper/sentinel/server/gui/nbt/NBTGui.java @@ -2,14 +2,6 @@ package me.trouper.sentinel.server.gui.nbt; import io.github.itzispyder.pdk.plugin.builders.ItemBuilder; import io.github.itzispyder.pdk.plugin.gui.CustomGui; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; -import java.util.stream.Collectors; import me.trouper.sentinel.Sentinel; import me.trouper.sentinel.data.storage.NBTStorage; import me.trouper.sentinel.server.gui.MainGUI; @@ -24,6 +16,9 @@ import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.ItemStack; +import java.util.*; +import java.util.stream.Collectors; + public class NBTGui extends PaginatedGUI> { private final NBTStorage nbtStorage; diff --git a/src/main/java/me/trouper/sentinel/server/gui/whitelist/WhitelistGUI.java b/src/main/java/me/trouper/sentinel/server/gui/whitelist/WhitelistGUI.java index 822bf2b..590875c 100644 --- a/src/main/java/me/trouper/sentinel/server/gui/whitelist/WhitelistGUI.java +++ b/src/main/java/me/trouper/sentinel/server/gui/whitelist/WhitelistGUI.java @@ -7,7 +7,7 @@ import io.github.itzispyder.pdk.utils.misc.config.ConfigUpdater; import io.papermc.paper.event.player.AsyncChatEvent; import me.trouper.sentinel.Sentinel; import me.trouper.sentinel.data.config.ViolationConfig; -import me.trouper.sentinel.data.types.CommandBlockHolder; +import me.trouper.sentinel.data.misc.CommandBlockHolder; import me.trouper.sentinel.server.gui.Items; import me.trouper.sentinel.server.gui.MainGUI; import me.trouper.sentinel.server.gui.PaginatedGUI; diff --git a/src/main/java/me/trouper/sentinel/startup/BackdoorDetection.java b/src/main/java/me/trouper/sentinel/startup/BackdoorDetection.java index 82ce87e..e2aa83f 100644 --- a/src/main/java/me/trouper/sentinel/startup/BackdoorDetection.java +++ b/src/main/java/me/trouper/sentinel/startup/BackdoorDetection.java @@ -6,7 +6,6 @@ import me.trouper.sentinel.utils.FileUtils; import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; -import java.lang.System; import java.util.Arrays; public final class BackdoorDetection { diff --git a/src/main/java/me/trouper/sentinel/startup/Telemetry.java b/src/main/java/me/trouper/sentinel/startup/Telemetry.java index 2bbc7e2..e729429 100644 --- a/src/main/java/me/trouper/sentinel/startup/Telemetry.java +++ b/src/main/java/me/trouper/sentinel/startup/Telemetry.java @@ -2,7 +2,6 @@ package me.trouper.sentinel.startup; import io.github.itzispyder.pdk.utils.discord.DiscordEmbed; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.data.config.MainConfig; import me.trouper.sentinel.utils.trees.EmbedFormatter; import java.net.URI; diff --git a/src/main/java/me/trouper/sentinel/startup/drm/Auth.java b/src/main/java/me/trouper/sentinel/startup/drm/Auth.java index 745f292..5fb4b3f 100644 --- a/src/main/java/me/trouper/sentinel/startup/drm/Auth.java +++ b/src/main/java/me/trouper/sentinel/startup/drm/Auth.java @@ -3,7 +3,6 @@ package me.trouper.sentinel.startup.drm; import com.google.common.reflect.TypeToken; import com.google.gson.Gson; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.data.config.AdvancedConfig; import me.trouper.sentinel.utils.HashUtils; import java.io.BufferedReader; diff --git a/src/main/java/me/trouper/sentinel/startup/drm/Loader.java b/src/main/java/me/trouper/sentinel/startup/drm/Loader.java index 644c9b8..c72a2e3 100644 --- a/src/main/java/me/trouper/sentinel/startup/drm/Loader.java +++ b/src/main/java/me/trouper/sentinel/startup/drm/Loader.java @@ -8,7 +8,11 @@ import me.trouper.sentinel.server.commands.*; import me.trouper.sentinel.server.events.admin.AntiBanEvents; import me.trouper.sentinel.server.events.admin.BlockDisplayHideEvent; import me.trouper.sentinel.server.events.admin.WandEvents; -import me.trouper.sentinel.server.events.violations.blocks.command.*; +import me.trouper.sentinel.server.events.extras.ShadowRealmEvents; +import me.trouper.sentinel.server.events.violations.blocks.command.CommandBlockBreak; +import me.trouper.sentinel.server.events.violations.blocks.command.CommandBlockEdit; +import me.trouper.sentinel.server.events.violations.blocks.command.CommandBlockPlace; +import me.trouper.sentinel.server.events.violations.blocks.command.CommandBlockUse; import me.trouper.sentinel.server.events.violations.blocks.jigsaw.JigsawBlockBreak; import me.trouper.sentinel.server.events.violations.blocks.jigsaw.JigsawBlockPlace; import me.trouper.sentinel.server.events.violations.blocks.jigsaw.JigsawBlockUse; @@ -18,13 +22,15 @@ import me.trouper.sentinel.server.events.violations.blocks.structure.StructureBl import me.trouper.sentinel.server.events.violations.command.DangerousCommand; import me.trouper.sentinel.server.events.violations.command.LoggedCommand; import me.trouper.sentinel.server.events.violations.command.SpecificCommand; -import me.trouper.sentinel.server.events.violations.entities.CommandMinecartEdit; -import me.trouper.sentinel.server.events.violations.players.*; -import me.trouper.sentinel.server.events.violations.whitelist.CommandBlockExecute; -import me.trouper.sentinel.server.events.extras.ShadowRealmEvents; import me.trouper.sentinel.server.events.violations.entities.CommandMinecartBreak; +import me.trouper.sentinel.server.events.violations.entities.CommandMinecartEdit; import me.trouper.sentinel.server.events.violations.entities.CommandMinecartPlace; import me.trouper.sentinel.server.events.violations.entities.CommandMinecartUse; +import me.trouper.sentinel.server.events.violations.players.ChatEvent; +import me.trouper.sentinel.server.events.violations.players.CreativeHotbar; +import me.trouper.sentinel.server.events.violations.players.PluginCloakingEvents; +import me.trouper.sentinel.server.events.violations.players.PluginCloakingPacket; +import me.trouper.sentinel.server.events.violations.whitelist.CommandBlockExecute; import me.trouper.sentinel.server.functions.chatfilter.profanity.ProfanityFilter; import me.trouper.sentinel.server.functions.chatfilter.spam.SpamFilter; import me.trouper.sentinel.server.functions.hotbar.items.RateLimitCheck; diff --git a/src/main/java/me/trouper/sentinel/utils/DisplayUtils.java b/src/main/java/me/trouper/sentinel/utils/DisplayUtils.java index 7bf1efe..13aa128 100644 --- a/src/main/java/me/trouper/sentinel/utils/DisplayUtils.java +++ b/src/main/java/me/trouper/sentinel/utils/DisplayUtils.java @@ -2,7 +2,7 @@ package me.trouper.sentinel.utils; import io.github.itzispyder.pdk.utils.misc.Randomizer; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.data.types.Selection; +import me.trouper.sentinel.data.misc.Selection; import me.trouper.sentinel.utils.display.BlockDisplayRaytracer; import org.bukkit.*; import org.bukkit.entity.Player; diff --git a/src/main/java/me/trouper/sentinel/utils/FileUtils.java b/src/main/java/me/trouper/sentinel/utils/FileUtils.java index d88a152..baa8874 100644 --- a/src/main/java/me/trouper/sentinel/utils/FileUtils.java +++ b/src/main/java/me/trouper/sentinel/utils/FileUtils.java @@ -2,7 +2,6 @@ package me.trouper.sentinel.utils; import io.github.itzispyder.pdk.utils.FileValidationUtils; import me.trouper.sentinel.Sentinel; -import org.bukkit.inventory.ItemStack; import java.io.BufferedWriter; import java.io.File; diff --git a/src/main/java/me/trouper/sentinel/utils/IPUtils.java b/src/main/java/me/trouper/sentinel/utils/IPUtils.java index d6c45ac..6b7a6e7 100644 --- a/src/main/java/me/trouper/sentinel/utils/IPUtils.java +++ b/src/main/java/me/trouper/sentinel/utils/IPUtils.java @@ -3,7 +3,7 @@ package me.trouper.sentinel.utils; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import me.trouper.sentinel.data.types.IPLocation; +import me.trouper.sentinel.data.misc.IPLocation; import java.net.InetAddress; import java.net.URI; diff --git a/src/main/java/me/trouper/sentinel/utils/MathUtils.java b/src/main/java/me/trouper/sentinel/utils/MathUtils.java index d5a647c..8ee263d 100644 --- a/src/main/java/me/trouper/sentinel/utils/MathUtils.java +++ b/src/main/java/me/trouper/sentinel/utils/MathUtils.java @@ -2,14 +2,6 @@ package me.trouper.sentinel.utils; import java.math.BigInteger; import java.nio.ByteBuffer; -import java.nio.charset.StandardCharsets; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; import java.util.UUID; public final class MathUtils { diff --git a/src/main/java/me/trouper/sentinel/utils/PlayerUtils.java b/src/main/java/me/trouper/sentinel/utils/PlayerUtils.java index eddf623..7e85210 100644 --- a/src/main/java/me/trouper/sentinel/utils/PlayerUtils.java +++ b/src/main/java/me/trouper/sentinel/utils/PlayerUtils.java @@ -1,14 +1,10 @@ package me.trouper.sentinel.utils; import me.trouper.sentinel.Sentinel; -import net.md_5.bungee.api.ChatMessageType; -import net.md_5.bungee.api.chat.TextComponent; import org.bukkit.Bukkit; -import org.bukkit.Material; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; import org.bukkit.entity.Player; -import org.bukkit.metadata.MetadataValue; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/me/trouper/sentinel/utils/ServerUtils.java b/src/main/java/me/trouper/sentinel/utils/ServerUtils.java index 56e2fe4..3d5ea20 100644 --- a/src/main/java/me/trouper/sentinel/utils/ServerUtils.java +++ b/src/main/java/me/trouper/sentinel/utils/ServerUtils.java @@ -1,23 +1,15 @@ package me.trouper.sentinel.utils; import me.trouper.sentinel.Sentinel; -import net.md_5.bungee.api.ChatMessageType; -import net.md_5.bungee.api.chat.TextComponent; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Player; -import org.bukkit.metadata.MetadataValue; import java.io.BufferedReader; import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.function.Consumer; -import java.util.function.Predicate; public final class ServerUtils { diff --git a/src/main/java/me/trouper/sentinel/utils/trees/EmbedFormatter.java b/src/main/java/me/trouper/sentinel/utils/trees/EmbedFormatter.java index c52727c..4619080 100644 --- a/src/main/java/me/trouper/sentinel/utils/trees/EmbedFormatter.java +++ b/src/main/java/me/trouper/sentinel/utils/trees/EmbedFormatter.java @@ -4,7 +4,7 @@ import io.github.itzispyder.pdk.utils.SchedulerUtils; import io.github.itzispyder.pdk.utils.discord.DiscordEmbed; import io.github.itzispyder.pdk.utils.discord.DiscordWebhook; import me.trouper.sentinel.Sentinel; -import me.trouper.sentinel.data.types.Emojis; +import me.trouper.sentinel.data.misc.Emojis; import me.trouper.sentinel.utils.Text; import java.io.IOException;