(1.6.0) Switch to Paper plugin & support Folia

because of its deprecation in Paper 1.21.6, this event disabled re-configuration APIs when a listener is registered for it; we don't want that to happen

build.gradle

@@ -1,26 +1,55 @@
 plugins {
     id 'java'
+    id("xyz.jpenilla.run-paper") version "2.3.1"
 }
 
 group = 'de.shiewk'
 version = pluginVersion
 
-subprojects {
+repositories {
-    repositories {
+    mavenCentral()
-        mavenCentral()
+    maven {
-        maven {
+        name = "papermc-repo"
-            name = "papermc-repo"
+        url = "https://repo.papermc.io/repository/maven-public/"
-            url = "https://repo.papermc.io/repository/maven-public/"
-        }
-        maven {
-            name = "sonatype"
-            url = "https://oss.sonatype.org/content/groups/public/"
-        }
     }
 }
 
+processResources {
+    def props = [version: version]
+    inputs.properties props
+    filteringCharset 'UTF-8'
+    filesMatching('paper-plugin.yml') {
+        expand props
+    }
+}
 
-def targetJavaVersion = 17
+runPaper {
+    folia {
+        registerTask()
+    }
+}
+
+runServer {
+    minecraftVersion("1.21.7")
+    downloadPlugins {
+        // for testing from other client versions
+        modrinth("ViaVersion", "5.4.1")
+        modrinth("ViaBackwards", "5.4.1")
+    }
+}
+
+dependencies {
+    //compileOnly "io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT"
+    compileOnly 'dev.folia:folia-api:1.21.4-R0.1-SNAPSHOT'
+}
+
+jar {
+    archiveBaseName.set('SModeration-Paper')
+    archiveVersion.set(pluginVersion)
+}
+
+
+def targetJavaVersion = 21
 java {
     def javaVersion = JavaVersion.toVersion(targetJavaVersion)
     sourceCompatibility = javaVersion

docs/commands.md

@@ -13,6 +13,6 @@
 | /invsee \<player> equipment            | Views another player's equipment (armor and offhand).                        | smod.invsee        |
 | /enderchestsee <player>                | Views another player's ender chest.                                          | smod.enderchestsee |
 | /vanish                                | Toggles vanish mode so that other players can't see you're online.           | smod.vanish        |
-| /vanish toggle \<player>               | Toggles vanish mode for another player.                                      | smod.vanish        |
+| /vanish toggle \<players>              | Toggles vanish mode for other players.                                       | smod.vanish        |
 | /vanish list                           | Lists all vanished players.                                                  | smod.vanish.see    |
 | /socialspy                             | Enables SocialSpy mode where you can see other player's private messages.    | smod.socialspy     |

gradle.properties

@@ -1 +1 @@
-pluginVersion = 1.4.2
+pluginVersion = 1.6.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -1,2 +1 @@
 rootProject.name = 'SModeration'
-include 'smoderation-paper'

smoderation-paper/build.gradle

@@ -1,19 +0,0 @@
-apply plugin: 'java'
-
-dependencies {
-    compileOnly "io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT"
-}
-
-jar {
-    archiveBaseName.set('SModeration-Paper')
-    archiveVersion.set(pluginVersion)
-}
-
-processResources {
-    def props = [version: version]
-    inputs.properties props
-    filteringCharset 'UTF-8'
-    filesMatching('plugin.yml') {
-        expand props
-    }
-}

smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/BanCommand.java

@@ -1,124 +0,0 @@
-package de.shiewk.smoderation.paper.command;
-
-import de.shiewk.smoderation.paper.SModerationPaper;
-import de.shiewk.smoderation.paper.punishments.Punishment;
-import de.shiewk.smoderation.paper.util.PlayerUtil;
-import de.shiewk.smoderation.paper.util.TimeUtil;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.format.NamedTextColor;
-import org.bukkit.Bukkit;
-import org.bukkit.command.*;
-import org.bukkit.entity.Player;
-import org.bukkit.util.StringUtil;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import static net.kyori.adventure.text.Component.text;
-
-public class BanCommand implements TabExecutor {
-    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (args.length < 2){
-            return false;
-        } else {
-            UUID senderUUID;
-            if (sender instanceof ConsoleCommandSender){
-                senderUUID = PlayerUtil.UUID_CONSOLE;
-            } else if (sender instanceof Player pl){
-                senderUUID = pl.getUniqueId();
-            } else if (sender instanceof BlockCommandSender){
-                sender.sendMessage(Component.text("Blocks can't execute this command.").color(NamedTextColor.RED));
-                return true;
-            } else {
-                sender.sendMessage(Component.text("Your command sender type is unknown (%s).".formatted(sender.getClass().getName())).color(NamedTextColor.RED));
-                return true;
-            }
-            String playerName = args[0];
-            UUID uuid = PlayerUtil.offlinePlayerUUIDByName(playerName);
-            if (senderUUID.equals(uuid)) {
-                sender.sendMessage(Component.text("You can't ban yourself.").color(NamedTextColor.RED));
-                return true;
-            }
-            if (uuid == null) {
-                sender.sendMessage(Component.text("This player is either offline or was never on this server.").color(NamedTextColor.RED));
-                return true;
-            }
-            final Player toPlayer = Bukkit.getPlayer(uuid);
-            if (toPlayer != null && toPlayer.hasPermission("smod.preventban")){
-                sender.sendMessage(text().content("This player can't be banned.").color(NamedTextColor.RED));
-                return true;
-            }
-            long duration = 0;
-            int p = 1;
-            for (int i = 1 /* start with index 1 to avoid player name */; i < args.length; i++) {
-                String arg = args[i];
-                long parsedDuration = TimeUtil.parseDurationMillisSafely(arg);
-                if (parsedDuration == -1){
-                    p = i;
-                    break;
-                } else {
-                    duration += parsedDuration;
-                }
-                if (i == args.length - 1){ p = args.length; }
-            }
-            if (duration == 0){
-                sender.sendMessage(Component.text("Please provide a valid duration.").color(NamedTextColor.RED));
-                return false;
-            }
-            if (duration < 0){
-                sender.sendMessage(Component.text("Please provide a duration that's longer than 0ms.").color(NamedTextColor.RED));
-                return false;
-            }
-            StringBuilder reason = new StringBuilder();
-            for (int i = p; i < args.length; i++) {
-                if (!reason.isEmpty()){
-                    reason.append(" ");
-                }
-                reason.append(args[i]);
-            }
-            final Punishment punishment = Punishment.ban(System.currentTimeMillis(), System.currentTimeMillis() + duration, senderUUID, uuid, reason.isEmpty() ? Punishment.DEFAULT_REASON : reason.toString());
-            Punishment.issue(punishment, SModerationPaper.container);
-            return true;
-        }
-    }
-
-    @Override
-    public @Nullable List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (args.length < 2){
-            String toComplete = args.length > 0 ? args[0] : "";
-            ArrayList<String> names = new ArrayList<>();
-            for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
-                names.add(onlinePlayer.getName());
-            }
-            ArrayList<String> completions = new ArrayList<>();
-            StringUtil.copyPartialMatches(toComplete, names, completions);
-            return completions;
-        } else {
-            for (int i = 1; i < args.length; i++) {
-                if (TimeUtil.parseDurationMillisSafely(args[i]) == -1){
-                    try {
-                        Long.parseLong(args[i]);
-                    } catch (NumberFormatException ignored){
-                        if (i != 1){
-                            return List.of();
-                        }
-                    }
-                }
-            }
-            return List.of(
-                    "100ms",
-                    "15s", // some sample completions for duration
-                    "30min", // you can input your own ones as well
-                    "6h",
-                    "1d",
-                    "2w",
-                    "3mo",
-                    "1y"
-            );
-        }
-    }
-}

smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/EnderchestSeeCommand.java

@@ -1,59 +0,0 @@
-package de.shiewk.smoderation.paper.command;
-
-import de.shiewk.smoderation.paper.util.PlayerUtil;
-import net.kyori.adventure.text.Component;
-import org.bukkit.Bukkit;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.util.StringUtil;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static de.shiewk.smoderation.paper.SModerationPaper.*;
-
-public class EnderchestSeeCommand implements TabExecutor {
-
-
-    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (args.length < 1) {
-            return false;
-        }
-        if (sender instanceof HumanEntity human){
-            final Player player = PlayerUtil.findOnlinePlayer(args[0]);
-            if (player != null) {
-                human.sendMessage(CHAT_PREFIX.append(
-                        Component.text("Opening ender chest of ").color(PRIMARY_COLOR)
-                                .append(Component.text(player.getName()).color(SECONDARY_COLOR))
-                                .append(Component.text("."))
-                ));
-                human.openInventory(player.getEnderChest());
-            } else {
-                human.sendMessage(Component.text("This player is not online.").color(FAIL_COLOR));
-            }
-        } else {
-            sender.sendMessage(Component.text("Only an entity that can open inventories can execute this command!").color(FAIL_COLOR));
-        }
-        return true;
-    }
-
-    @Override
-    public @Nullable List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (args.length > 1){
-            return List.of();
-        }
-        List<String> available = new ArrayList<>();
-        for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
-            available.add(onlinePlayer.getName());
-        }
-        List<String> completions = new ArrayList<>();
-        StringUtil.copyPartialMatches(args.length > 0 ? args[0] : "", available, completions);
-        return completions;
-    }
-}

smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/InvseeCommand.java

@@ -1,83 +0,0 @@
-package de.shiewk.smoderation.paper.command;
-
-import de.shiewk.smoderation.paper.inventory.InvSeeEquipmentInventory;
-import de.shiewk.smoderation.paper.util.PlayerUtil;
-import net.kyori.adventure.text.Component;
-import org.bukkit.Bukkit;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.util.StringUtil;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static de.shiewk.smoderation.paper.SModerationPaper.*;
-
-public class InvseeCommand implements TabExecutor {
-
-    private enum InvseeType {
-        INVENTORY,
-        EQUIPMENT
-    }
-
-
-    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (args.length < 1) {
-            return false;
-        }
-        final InvseeType type;
-        if (args.length > 1){
-            switch (args[1].toLowerCase()){
-                case "armor", "equipment" -> type = InvseeType.EQUIPMENT;
-                default -> type = InvseeType.INVENTORY;
-            }
-        } else {
-            type = InvseeType.INVENTORY;
-        }
-        if (sender instanceof HumanEntity human){
-            final Player player = PlayerUtil.findOnlinePlayer(args[0]);
-            if (player != null) {
-                if (human.getUniqueId().equals(player.getUniqueId()) && type != InvseeType.EQUIPMENT){
-                    human.sendMessage(Component.text("You can't open your own inventory.").color(FAIL_COLOR));
-                } else {
-                    human.sendMessage(CHAT_PREFIX.append(
-                            Component.text("Opening inventory of ").color(PRIMARY_COLOR)
-                                    .append(Component.text(player.getName()).color(SECONDARY_COLOR))
-                                    .append(Component.text("."))
-                    ));
-                    switch (type){
-                        case INVENTORY -> human.openInventory(player.getInventory());
-                        case EQUIPMENT -> new InvSeeEquipmentInventory(human, player).open();
-                    }
-                }
-            } else {
-                human.sendMessage(Component.text("This player is not online.").color(FAIL_COLOR));
-            }
-        } else {
-            sender.sendMessage(Component.text("Only an entity that can open inventories can execute this command!").color(FAIL_COLOR));
-        }
-        return true;
-    }
-
-    @Override
-    public @Nullable List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (args.length > 2){
-            return List.of();
-        } else if (args.length > 1){
-            return List.of("armor", "equipment", "inventory");
-        }
-        List<String> available = new ArrayList<>();
-        for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
-            available.add(onlinePlayer.getName());
-        }
-        List<String> completions = new ArrayList<>();
-        StringUtil.copyPartialMatches(args.length > 0 ? args[0] : "", available, completions);
-        return completions;
-    }
-}

smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/KickCommand.java

@@ -1,81 +0,0 @@
-package de.shiewk.smoderation.paper.command;
-
-import de.shiewk.smoderation.paper.SModerationPaper;
-import de.shiewk.smoderation.paper.punishments.Punishment;
-import de.shiewk.smoderation.paper.util.PlayerUtil;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.format.NamedTextColor;
-import org.bukkit.Bukkit;
-import org.bukkit.command.*;
-import org.bukkit.entity.Player;
-import org.bukkit.util.StringUtil;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import static net.kyori.adventure.text.Component.text;
-
-public class KickCommand implements TabExecutor {
-    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (args.length < 1){
-            return false;
-        } else {
-            UUID senderUUID;
-            if (sender instanceof ConsoleCommandSender){
-                senderUUID = PlayerUtil.UUID_CONSOLE;
-            } else if (sender instanceof Player pl){
-                senderUUID = pl.getUniqueId();
-            } else if (sender instanceof BlockCommandSender){
-                sender.sendMessage(Component.text("Blocks can't execute this command.").color(NamedTextColor.RED));
-                return true;
-            } else {
-                sender.sendMessage(Component.text("Your command sender type is unknown (%s).".formatted(sender.getClass().getName())).color(NamedTextColor.RED));
-                return true;
-            }
-            String playerName = args[0];
-            Player player = Bukkit.getPlayer(playerName);
-            if (player == null) {
-                sender.sendMessage(Component.text("This player is not online.").color(NamedTextColor.RED));
-                return true;
-            }
-            UUID uuid = player.getUniqueId();
-            if (senderUUID.equals(uuid)) {
-                sender.sendMessage(Component.text("You can't kick yourself.").color(NamedTextColor.RED));
-                return true;
-            }
-            if (player.hasPermission("smod.preventkick")){
-                sender.sendMessage(text().content("This player can't be kicked.").color(NamedTextColor.RED));
-                return true;
-            }
-            StringBuilder reason = new StringBuilder();
-            for (int i = 1; i < args.length; i++) {
-                if (!reason.isEmpty()){
-                    reason.append(" ");
-                }
-                reason.append(args[i]);
-            }
-            final Punishment punishment = Punishment.kick(System.currentTimeMillis(), senderUUID, uuid, reason.isEmpty() ? Punishment.DEFAULT_REASON : reason.toString());
-            Punishment.issue(punishment, SModerationPaper.container);
-            return true;
-        }
-    }
-
-    @Override
-    public @Nullable List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (args.length < 2){
-            String toComplete = args.length > 0 ? args[0] : "";
-            ArrayList<String> names = new ArrayList<>();
-            for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
-                names.add(onlinePlayer.getName());
-            }
-            ArrayList<String> completions = new ArrayList<>();
-            StringUtil.copyPartialMatches(toComplete, names, completions);
-            return completions;
-        }
-        return List.of();
-    }
-}

smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/ModLogsCommand.java

@@ -1,79 +0,0 @@
-package de.shiewk.smoderation.paper.command;
-
-import de.shiewk.smoderation.paper.SModerationPaper;
-import de.shiewk.smoderation.paper.punishments.Punishment;
-import de.shiewk.smoderation.paper.punishments.PunishmentType;
-import de.shiewk.smoderation.paper.util.PlayerUtil;
-import de.shiewk.smoderation.paper.util.TimeUtil;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.format.NamedTextColor;
-import org.bukkit.Bukkit;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import org.bukkit.entity.Player;
-import org.bukkit.util.StringUtil;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import static de.shiewk.smoderation.paper.SModerationPaper.*;
-
-public class ModLogsCommand implements TabExecutor {
-    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (args.length < 1){
-            return false;
-        } else {
-            String playername = args[0];
-            String name;
-            UUID uuid;
-            try {
-                uuid = UUID.fromString(playername);
-            } catch (IllegalArgumentException ignored){
-                uuid = PlayerUtil.offlinePlayerUUIDByName(playername);
-            }
-            if (uuid == null){
-                sender.sendMessage(Component.text("This player was not found. Try running /%s with an UUID instead.".formatted(label)).color(NamedTextColor.RED));
-                return true;
-            }
-            name = PlayerUtil.offlinePlayerName(uuid);
-            sender.sendMessage(CHAT_PREFIX.append(Component.text("Player ").color(PRIMARY_COLOR)
-                    .append(Component.text(name).color(SECONDARY_COLOR))
-                    .append(Component.text(" (%s)".formatted(uuid)).color(INACTIVE_COLOR))));
-            UUID finalUuid = uuid;
-            final List<Punishment> punishments = SModerationPaper.container.findAll(p -> p.to.equals(finalUuid) && p.isActive());
-            for (Punishment punishment : punishments) {
-                sender.sendMessage(Component.text("- is currently ").color(PRIMARY_COLOR)
-                        .append(Component.text(punishment.type == PunishmentType.BAN ? "banned" : "muted").color(SECONDARY_COLOR))
-                        .append(Component.text(" until ").color(PRIMARY_COLOR))
-                        .append(Component.text(TimeUtil.calendarTimestamp(punishment.until)).color(SECONDARY_COLOR))
-                        .append(Component.text(" (in %s)".formatted(TimeUtil.formatTimeLong(punishment.until - System.currentTimeMillis()))).color(INACTIVE_COLOR))
-                        .append(Component.text(". Reason: ").color(PRIMARY_COLOR))
-                        .append(Component.text(punishment.reason).color(SECONDARY_COLOR)));
-            }
-            if (punishments.isEmpty()){
-                sender.sendMessage(Component.text("- has no punishments.").color(PRIMARY_COLOR));
-            }
-            return true;
-        }
-    }
-
-    @Override
-    public @Nullable List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (args.length > 1){
-            return List.of();
-        }
-        String search = args.length > 0 ? args[0] : "";
-        List<String> playernames = new ArrayList<>();
-        for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
-            playernames.add(onlinePlayer.getName());
-        }
-        List<String> completions = new ArrayList<>();
-        StringUtil.copyPartialMatches(search, playernames, completions);
-        return completions;
-    }
-}

smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/MuteCommand.java

@@ -1,123 +0,0 @@
-package de.shiewk.smoderation.paper.command;
-
-import de.shiewk.smoderation.paper.SModerationPaper;
-import de.shiewk.smoderation.paper.punishments.Punishment;
-import de.shiewk.smoderation.paper.util.PlayerUtil;
-import de.shiewk.smoderation.paper.util.TimeUtil;
-import net.kyori.adventure.text.format.NamedTextColor;
-import org.bukkit.Bukkit;
-import org.bukkit.command.*;
-import org.bukkit.entity.Player;
-import org.bukkit.util.StringUtil;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import static net.kyori.adventure.text.Component.text;
-
-public class MuteCommand implements TabExecutor {
-    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (args.length < 2){
-            return false;
-        } else {
-            UUID senderUUID;
-            if (sender instanceof ConsoleCommandSender){
-                senderUUID = PlayerUtil.UUID_CONSOLE;
-            } else if (sender instanceof Player pl){
-                senderUUID = pl.getUniqueId();
-            } else if (sender instanceof BlockCommandSender){
-                sender.sendMessage(text("Blocks can't execute this command.").color(NamedTextColor.RED));
-                return true;
-            } else {
-                sender.sendMessage(text("Your command sender type is unknown (%s).".formatted(sender.getClass().getName())).color(NamedTextColor.RED));
-                return true;
-            }
-            String playerName = args[0];
-            UUID uuid = PlayerUtil.offlinePlayerUUIDByName(playerName);
-            if (senderUUID.equals(uuid)) {
-                sender.sendMessage(text("You can't mute yourself.").color(NamedTextColor.RED));
-                return true;
-            }
-            if (uuid == null) {
-                sender.sendMessage(text("This player is either offline or was never on this server.").color(NamedTextColor.RED));
-                return true;
-            }
-            final Player toPlayer = Bukkit.getPlayer(uuid);
-            if (toPlayer != null && toPlayer.hasPermission("smod.preventmute")){
-                sender.sendMessage(text().content("This player can't be muted.").color(NamedTextColor.RED));
-                return true;
-            }
-            long duration = 0;
-            int p = 1;
-            for (int i = 1 /* start with index 1 to avoid player name */; i < args.length; i++) {
-                String arg = args[i];
-                long parsedDuration = TimeUtil.parseDurationMillisSafely(arg);
-                if (parsedDuration == -1){
-                    p = i;
-                    break;
-                } else {
-                    duration += parsedDuration;
-                }
-                if (i == args.length - 1){ p = args.length; }
-            }
-            if (duration == 0){
-                sender.sendMessage(text("Please provide a valid duration.").color(NamedTextColor.RED));
-                return false;
-            }
-            if (duration < 0){
-                sender.sendMessage(text("Please provide a duration that's longer than 0ms.").color(NamedTextColor.RED));
-                return false;
-            }
-            StringBuilder reason = new StringBuilder();
-            for (int i = p; i < args.length; i++) {
-                if (!reason.isEmpty()){
-                    reason.append(" ");
-                }
-                reason.append(args[i]);
-            }
-            final Punishment punishment = Punishment.mute(System.currentTimeMillis(), System.currentTimeMillis() + duration, senderUUID, uuid, reason.isEmpty() ? Punishment.DEFAULT_REASON : reason.toString());
-            Punishment.issue(punishment, SModerationPaper.container);
-            return true;
-        }
-    }
-
-    @Override
-    public @Nullable List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (args.length < 2){
-            String toComplete = args.length > 0 ? args[0] : "";
-            ArrayList<String> names = new ArrayList<>();
-            for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
-                names.add(onlinePlayer.getName());
-            }
-            ArrayList<String> completions = new ArrayList<>();
-            StringUtil.copyPartialMatches(toComplete, names, completions);
-            return completions;
-        } else {
-            for (int i = 1; i < args.length; i++) {
-                if (TimeUtil.parseDurationMillisSafely(args[i]) == -1){
-                    try {
-                        Long.parseLong(args[i]);
-                    } catch (NumberFormatException ignored){
-                        if (i != 1){
-                            return List.of();
-                        }
-                    }
-                }
-            }
-            return List.of(
-                    "100ms",
-                    "15s", // some sample completions for duration
-                    "30min", // you can input your own ones as well
-                    "6h",
-                    "1d",
-                    "2w",
-                    "3mo",
-                    "1y"
-            );
-        }
-    }
-}

smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/SModCommand.java

@@ -1,27 +0,0 @@
-package de.shiewk.smoderation.paper.command;
-
-import de.shiewk.smoderation.paper.SModerationPaper;
-import de.shiewk.smoderation.paper.inventory.SModMenu;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-
-public class SModCommand implements TabExecutor {
-    @Override
-    public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
-        if (commandSender instanceof Player player){
-            new SModMenu(player, SModerationPaper.container).open();
-        }
-        return true;
-    }
-
-    @Override
-    public @Nullable List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
-        return List.of();
-    }
-}

smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/SocialSpyCommand.java

@@ -1,32 +0,0 @@
-package de.shiewk.smoderation.paper.command;
-
-import de.shiewk.smoderation.paper.listener.SocialSpyListener;
-import net.kyori.adventure.text.format.NamedTextColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-
-import static de.shiewk.smoderation.paper.SModerationPaper.CHAT_PREFIX;
-import static net.kyori.adventure.text.Component.text;
-
-public class SocialSpyCommand implements TabExecutor {
-    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        final boolean enabled = SocialSpyListener.toggle(sender);
-        sender.sendMessage(CHAT_PREFIX.append(text("SocialSpy ").append(
-                        enabled ?
-                                text("enabled").color(NamedTextColor.GREEN) :
-                                text("disabled").color(NamedTextColor.RED)
-        ).append(text("."))));
-        return true;
-    }
-
-    @Override
-    public @Nullable List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        return List.of();
-    }
-}

smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/UnbanCommand.java

@@ -1,64 +0,0 @@
-package de.shiewk.smoderation.paper.command;
-
-import de.shiewk.smoderation.paper.SModerationPaper;
-import de.shiewk.smoderation.paper.punishments.Punishment;
-import de.shiewk.smoderation.paper.punishments.PunishmentType;
-import de.shiewk.smoderation.paper.util.PlayerUtil;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.format.NamedTextColor;
-import org.bukkit.command.*;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-import java.util.UUID;
-
-public class UnbanCommand implements TabExecutor {
-    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (args.length < 1){
-            return false;
-        } else {
-
-            UUID senderUUID;
-            if (sender instanceof ConsoleCommandSender){
-                senderUUID = PlayerUtil.UUID_CONSOLE;
-            } else if (sender instanceof Player pl){
-                senderUUID = pl.getUniqueId();
-            } else if (sender instanceof BlockCommandSender){
-                sender.sendMessage(Component.text("Blocks can't execute this command.").color(NamedTextColor.RED));
-                return true;
-            } else {
-                sender.sendMessage(Component.text("Your command sender type is unknown (%s).".formatted(sender.getClass().getName())).color(NamedTextColor.RED));
-                return true;
-            }
-
-            String nameArg = args[0];
-            UUID uuid;
-            try {
-                uuid = UUID.fromString(nameArg);
-            } catch (IllegalArgumentException ignored){
-                uuid = PlayerUtil.offlinePlayerUUIDByName(nameArg);
-            }
-            if (uuid == null){
-                sender.sendMessage(Component.text("This player was not found. Try running /%s with an UUID instead.".formatted(label)).color(NamedTextColor.RED));
-                return true;
-            }
-            UUID finalUuid = uuid;
-            final Punishment punishment = SModerationPaper.container.find(p -> p.to.equals(finalUuid) && p.isActive() && p.type == PunishmentType.BAN);
-            if (punishment != null) {
-                punishment.undo(senderUUID);
-                punishment.broadcastUndo(SModerationPaper.container);
-            } else {
-                sender.sendMessage(Component.text("This player is not banned.").color(NamedTextColor.RED));
-            }
-            return true;
-        }
-    }
-
-    @Override
-    public @Nullable List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        return List.of();
-    }
-}

smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/UnmuteCommand.java

@@ -1,64 +0,0 @@
-package de.shiewk.smoderation.paper.command;
-
-import de.shiewk.smoderation.paper.SModerationPaper;
-import de.shiewk.smoderation.paper.punishments.Punishment;
-import de.shiewk.smoderation.paper.punishments.PunishmentType;
-import de.shiewk.smoderation.paper.util.PlayerUtil;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.format.NamedTextColor;
-import org.bukkit.command.*;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-import java.util.UUID;
-
-public class UnmuteCommand implements TabExecutor {
-    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (args.length < 1){
-            return false;
-        } else {
-
-            UUID senderUUID;
-            if (sender instanceof ConsoleCommandSender){
-                senderUUID = PlayerUtil.UUID_CONSOLE;
-            } else if (sender instanceof Player pl){
-                senderUUID = pl.getUniqueId();
-            } else if (sender instanceof BlockCommandSender){
-                sender.sendMessage(Component.text("Blocks can't execute this command.").color(NamedTextColor.RED));
-                return true;
-            } else {
-                sender.sendMessage(Component.text("Your command sender type is unknown (%s).".formatted(sender.getClass().getName())).color(NamedTextColor.RED));
-                return true;
-            }
-
-            String nameArg = args[0];
-            UUID uuid;
-            try {
-                uuid = UUID.fromString(nameArg);
-            } catch (IllegalArgumentException ignored){
-                uuid = PlayerUtil.offlinePlayerUUIDByName(nameArg);
-            }
-            if (uuid == null){
-                sender.sendMessage(Component.text("This player was not found. Try running /%s with an UUID instead.".formatted(label)).color(NamedTextColor.RED));
-                return true;
-            }
-            UUID finalUuid = uuid;
-            final Punishment punishment = SModerationPaper.container.find(p -> p.to.equals(finalUuid) && p.isActive() && p.type == PunishmentType.MUTE);
-            if (punishment != null) {
-                punishment.undo(senderUUID);
-                punishment.broadcastUndo(SModerationPaper.container);
-            } else {
-                sender.sendMessage(Component.text("This player is not muted.").color(NamedTextColor.RED));
-            }
-            return true;
-        }
-    }
-
-    @Override
-    public @Nullable List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        return List.of();
-    }
-}

smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/VanishCommand.java

@@ -1,139 +0,0 @@
-package de.shiewk.smoderation.paper.command;
-
-import de.shiewk.smoderation.paper.SModerationPaper;
-import de.shiewk.smoderation.paper.event.VanishToggleEvent;
-import de.shiewk.smoderation.paper.util.PlayerUtil;
-import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import it.unimi.dsi.fastutil.objects.ObjectListIterator;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.format.NamedTextColor;
-import org.bukkit.Bukkit;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-
-import static de.shiewk.smoderation.paper.SModerationPaper.*;
-import static net.kyori.adventure.text.Component.text;
-
-public class VanishCommand implements TabExecutor {
-
-    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (args.length == 0 || args[0].equalsIgnoreCase("toggle")){
-            Player player = null;
-            if (args.length > 1){
-                player = PlayerUtil.findOnlinePlayer(args[1]);
-            } else if (sender instanceof Player){
-                player = (Player) sender;
-            }
-            if (player != null){
-                toggleVanish(player);
-                return true;
-            } else {
-                return false;
-            }
-        } else if (args[0].equalsIgnoreCase("list")) {
-            if (sender.hasPermission("smod.vanish.see")){
-                listVanishedPlayersTo(sender);
-            } else {
-                sender.sendMessage(text().color(NamedTextColor.RED).content("You do not have permission to list all vanished players."));
-            }
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public @Nullable List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (args.length < 2){
-            return List.of("list", "toggle");
-        }
-        if (args.length < 3 && args[0].equalsIgnoreCase("toggle")){
-            return PlayerUtil.listPlayerNames(args[1]);
-        }
-        return List.of();
-    }
-
-    private static final ObjectArrayList<Player> vanishedPlayers = new ObjectArrayList<>();
-
-    public static void toggleVanish(Player player){
-        final boolean newStatus = !isVanished(player);
-        VanishToggleEvent event = new VanishToggleEvent(player, newStatus);
-        Bukkit.getPluginManager().callEvent(event);
-        if (event.isCancelled()){
-            return;
-        }
-        if (newStatus){
-            vanishedPlayers.add(player);
-            for (CommandSender sender : SModerationPaper.container.collectBroadcastTargets()) {
-                sender.sendMessage(CHAT_PREFIX.append(
-                        player.displayName()
-                                .colorIfAbsent(SECONDARY_COLOR)
-                ).append(
-                        text()
-                                .content(" vanished.")
-                                .color(PRIMARY_COLOR)
-                ));
-            }
-            player.sendMessage(CHAT_PREFIX.append(text("You are now vanished.").color(PRIMARY_COLOR)));
-            player.setVisibleByDefault(false);
-            for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
-                if (onlinePlayer.hasPermission("smod.vanish.see")){
-                    onlinePlayer.showEntity(PLUGIN, player);
-                }
-            }
-        } else {
-            vanishedPlayers.remove(player);
-            for (CommandSender sender : container.collectBroadcastTargets()) {
-                sender.sendMessage(CHAT_PREFIX.append(
-                        player.displayName()
-                                .colorIfAbsent(SECONDARY_COLOR)
-                ).append(
-                        text()
-                                .content(" re-appeared.")
-                                .color(PRIMARY_COLOR)
-                ));
-            }
-            player.sendMessage(CHAT_PREFIX.append(text("You are no longer vanished.").color(PRIMARY_COLOR)));
-            player.setVisibleByDefault(true);
-        }
-    }
-
-    public static boolean isVanished(Player player){
-        return vanishedPlayers.contains(player);
-    }
-
-    public static ObjectArrayList<Player> getVanishedPlayers() {
-        return vanishedPlayers.clone();
-    }
-
-    public static void listVanishedPlayersTo(CommandSender receiver){
-        if (vanishedPlayers.isEmpty()){
-            receiver.sendMessage(CHAT_PREFIX.append(
-                    text().content("No players are currently vanished.").color(PRIMARY_COLOR)
-            ));
-        } else {
-            Component vanishList = CHAT_PREFIX.append(
-                    text().content("The following players are currently vanished: ").color(PRIMARY_COLOR)
-            );
-            for (ObjectListIterator<Player> iterator = vanishedPlayers.iterator(); iterator.hasNext(); ) {
-                Player vanishedPlayer = iterator.next();
-                vanishList = vanishList.append(
-                        vanishedPlayer.displayName().colorIfAbsent(SECONDARY_COLOR)
-                );
-                if (iterator.hasNext()){
-                    vanishList = vanishList.append(
-                            text().content(", ").color(PRIMARY_COLOR)
-                    );
-                }
-            }
-            receiver.sendMessage(vanishList);
-        }
-    }
-}

smoderation-paper/src/main/java/de/shiewk/smoderation/paper/config/SModerationConfig.java

@@ -1,30 +0,0 @@
-package de.shiewk.smoderation.paper.config;
-
-import de.shiewk.smoderation.paper.SModerationPaper;
-import org.bukkit.configuration.file.FileConfiguration;
-
-import java.util.List;
-
-public class SModerationConfig {
-
-    private final FileConfiguration config;
-    private final SModerationPaper plugin;
-
-    public SModerationConfig(FileConfiguration config, SModerationPaper plugin) {
-        this.config = config;
-        this.plugin = plugin;
-    }
-
-    public List<String> getSocialSpyCommands(List<String> default_){
-        final String path = "socialspy-commands";
-        if (!config.contains(path)){
-            config.set(path, default_);
-            plugin.saveConfig();
-        }
-        return config.getStringList(path);
-    }
-
-    public FileConfiguration getConfig() {
-        return config;
-    }
-}

smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/VanishListener.java

@@ -1,58 +0,0 @@
-package de.shiewk.smoderation.paper.listener;
-
-import de.shiewk.smoderation.paper.SModerationPaper;
-import de.shiewk.smoderation.paper.command.VanishCommand;
-import net.kyori.adventure.text.Component;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.PlayerDeathEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-
-import static de.shiewk.smoderation.paper.SModerationPaper.SECONDARY_COLOR;
-import static net.kyori.adventure.text.Component.text;
-
-public class VanishListener implements Listener {
-
-    @EventHandler public void onPlayerQuit(PlayerQuitEvent event){
-        final Player player = event.getPlayer();
-        if (VanishCommand.isVanished(player)){
-            VanishCommand.toggleVanish(player);
-        }
-        for (Player vanishedPlayer : VanishCommand.getVanishedPlayers()) {
-            // to clean up visibility status
-            player.hideEntity(SModerationPaper.PLUGIN, vanishedPlayer);
-        }
-    }
-
-    @EventHandler(priority = EventPriority.MONITOR) public void onPlayerJoin(PlayerJoinEvent event){
-        Bukkit.getScheduler().scheduleSyncDelayedTask(SModerationPaper.PLUGIN, () -> {
-            final Player player = event.getPlayer().getPlayer();
-            assert player != null;
-            if (player.hasPermission("smod.vanish.see")){
-                for (Player vanishedPlayer : VanishCommand.getVanishedPlayers()) {
-                    // to show visible vanished players
-                    player.showEntity(SModerationPaper.PLUGIN, vanishedPlayer);
-                }
-                VanishCommand.listVanishedPlayersTo(player);
-            }
-        });
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onPlayerDeath(PlayerDeathEvent event){
-        final Component message = event.deathMessage();
-        if (VanishCommand.isVanished(event.getPlayer()) && message != null){
-            event.deathMessage(null);
-            for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
-                if (onlinePlayer.hasPermission("smod.vanish.see")){
-                    onlinePlayer.sendMessage(text("[VANISH] ").color(SECONDARY_COLOR).append(message));
-                }
-            }
-        }
-    }
-
-}

smoderation-paper/src/main/resources/plugin.yml

@@ -1,155 +0,0 @@
-name: SModeration
-version: '1.4.2'
-main: de.shiewk.smoderation.paper.SModerationPaper
-api-version: '1.20'
-load: STARTUP
-authors:
-  - Shiewk
-description: "SModeration is an easy-to-use minecraft plugin for moderating your server."
-commands:
-  modlogs:
-    usage: "§cUsage: /modlogs <player|uuid>"
-    aliases:
-      - logs
-      - seen
-      - smodlogs
-    permission: smod.logs
-  mute:
-    usage: "§cUsage: /mute <player> <duration> <reason>"
-    aliases:
-      - smodmute
-    permission: smod.mute
-    description: Mutes a player, either temporarily or permanently.
-  ban:
-    usage: "§cUsage: /ban <player> <duration> <reason>"
-    aliases:
-      - smodban
-      - tempban
-    permission: smod.ban
-    description: Bans a player, either temporarily or permanently.
-  kick:
-    usage: "§cUsage: /kick <player> <reason>"
-    aliases:
-      - smodkick
-    permission: smod.kick
-    description: Kicks a player
-  smod:
-    usage: "§cUsage: /smod"
-    aliases:
-      - smodmenu
-      - smoderation
-    permission: smod.menu
-    description: Shows the SModeration menu.
-  unmute:
-    usage: "§cUsage: /unmute <player|uuid>"
-    aliases:
-      - sunmute
-    permission: smod.unmute
-    description: Unmutes a muted player.
-  unban:
-    usage: "§cUsage: /unban <player|uuid>"
-    aliases:
-      - sunban
-      - pardon
-      - spardon
-    permission: smod.unban
-    description: Unbans a banned player.
-  invsee:
-    usage: "§cUsage: /invsee <player>"
-    aliases:
-      - sinvsee
-      - smodinvsee
-      - invs
-    permission: smod.invsee
-    description: Views the inventory of another player.
-  enderchestsee:
-    usage: "§cUsage: /enderchestsee <player>"
-    aliases:
-      - secsee
-      - senderchestsee
-      - ecsee
-      - ecs
-    permission: smod.enderchestsee
-    description: Views the ender chest of another player.
-  vanish:
-    usage: "§cUsage: /vanish list or /vanish toggle <player>"
-    aliases:
-      - smvanish
-      - smodvanish
-      - v
-      - smv
-    permission: smod.vanish
-    description: Toggles vanish mode which prevents other players from seeing you're online
-  socialspy:
-    usage: "§cUsage: /socialspy"
-    description: Enables socialspy mode (you can see private messages of other players)
-    permission: smod.socialspy
-    aliases:
-      - smodsocialspy
-      - smsocialspy
-      - smss
-      - ss
-permissions:
-  smod.mute:
-    default: op
-    description: Allows the player to mute other players.
-  smod.ban:
-    default: op
-    description: Allows the player to ban and kick other players.
-    children:
-      - smod.kick
-  smod.kick:
-    default: op
-    description: Allows the player to kick other players.
-  smod.menu:
-    default: op
-    description: Allows the player to use the SModeration menu.
-  smod.notifications:
-    default: op
-    description: Allows the player to be notified when a punishment is issued.
-  smod.unmute:
-    default: op
-    description: Allows the player to unmute other players.
-  smod.unban:
-    default: op
-    description: Allows the player to unban other players.
-  smod.logs:
-    default: op
-    description: Allows the player to view mod logs.
-  smod.invsee:
-    default: op
-    description: Allows the player to view other players inventories.
-  smod.invsee.modify:
-    default: op
-    description: Allows the player to view and modify other players inventories.
-    children:
-      - smod.invsee
-  smod.invsee.preventmodify:
-    default: op
-    description: When giving this permission to a player, prevents their inventory from being modified.
-  smod.enderchestsee:
-    default: op
-    description: Allows the player to view other players ender chests.
-  smod.enderchestsee.modify:
-    default: op
-    description: Allows the player to view and modify other players ender chests.
-    children:
-      - smod.enderchestsee
-  smod.preventmute:
-    default: op
-    description: Prevents the player from being muted (if online)
-  smod.preventkick:
-    default: op
-    description: Prevents the player from being muted (if online)
-  smod.preventban:
-    default: op
-    description: Prevents the player from being muted (if online)
-  smod.vanish:
-    default: op
-    description: Allows the player to use /vanish
-  smod.vanish.see:
-    default: op
-    description: Allows the player to see vanished players
-  smod.socialspy:
-    default: op
-    description: Allows the player to enable SocialSpy

src/main/java/de/shiewk/smoderation/paper/SModerationPaper.java

@@ -2,16 +2,18 @@ package de.shiewk.smoderation.paper;
 
 import de.shiewk.smoderation.paper.command.*;
 import de.shiewk.smoderation.paper.config.SModerationConfig;
+import de.shiewk.smoderation.paper.input.ChatInput;
 import de.shiewk.smoderation.paper.input.ChatInputListener;
 import de.shiewk.smoderation.paper.listener.*;
 import de.shiewk.smoderation.paper.storage.PunishmentContainer;
+import de.shiewk.smoderation.paper.util.SchedulerUtil;
+import io.papermc.paper.command.brigadier.Commands;
+import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents;
 import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
 import org.bukkit.Bukkit;
-import org.bukkit.command.PluginCommand;
-import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -29,11 +31,11 @@ public final class SModerationPaper extends JavaPlugin {
     public static SModerationPaper PLUGIN = null;
     public static SModerationConfig CONFIG = null;
     public static File SAVE_FILE = null;
+    private static SkinTextureProvider textureProvider = null;
 
     public static final TextColor PRIMARY_COLOR = TextColor.color(212, 0, 255);
     public static final TextColor SECONDARY_COLOR = TextColor.color(52, 143, 255);
     public static final TextColor INACTIVE_COLOR = NamedTextColor.GRAY;
-    public static final TextColor FAIL_COLOR = NamedTextColor.RED;
     public static final TextComponent CHAT_PREFIX = text("SM \u00BB ").color(PRIMARY_COLOR);
 
     @Override
@@ -46,6 +48,8 @@ public final class SModerationPaper extends JavaPlugin {
 
     @Override
     public void onEnable() {
+        CONFIG.reload();
+
         getPluginManager().registerEvents(new PunishmentListener(), this);
         getPluginManager().registerEvents(new CustomInventoryListener(), this);
         getPluginManager().registerEvents(new InvSeeListener(), this);
@@ -54,29 +58,36 @@ public final class SModerationPaper extends JavaPlugin {
         getPluginManager().registerEvents(new ChatInputListener(), this);
         getPluginManager().registerEvents(new SocialSpyListener(), this);
 
-        registerCommand("mute", new MuteCommand());
+        getLifecycleManager().registerEventHandler(LifecycleEvents.COMMANDS, event -> {
-        registerCommand("ban", new BanCommand());
+            Commands commands = event.registrar();
-        registerCommand("kick", new KickCommand());
+
-        registerCommand("smod", new SModCommand());
+            registerCommand(commands, new KickCommand());
-        registerCommand("modlogs", new ModLogsCommand());
+            registerCommand(commands, new ModLogsCommand());
-        registerCommand("unmute", new UnmuteCommand());
+            registerCommand(commands, new SModCommand());
-        registerCommand("unban", new UnbanCommand());
+            registerCommand(commands, new InvseeCommand());
-        registerCommand("invsee", new InvseeCommand());
+            registerCommand(commands, new EnderchestSeeCommand());
-        registerCommand("enderchestsee", new EnderchestSeeCommand());
+            registerCommand(commands, new SocialSpyCommand());
-        registerCommand("vanish", new VanishCommand());
+            registerCommand(commands, new VanishCommand());
-        registerCommand("socialspy", new SocialSpyCommand());
+            registerCommand(commands, new UnmuteCommand());
+            registerCommand(commands, new UnbanCommand());
+            registerCommand(commands, new MuteCommand());
+            registerCommand(commands, new BanCommand());
+        });
+
+        SchedulerUtil.scheduleGlobalRepeating(PLUGIN, CustomInventoryListener::onTick, 1, 1);
+        SchedulerUtil.scheduleGlobalRepeating(PLUGIN, ChatInput::tickAll, 1, 1);
 
         container.load(SAVE_FILE);
+
+        LOGGER.info("Folia: {}", SchedulerUtil.isFolia ? "yes" : "no");
     }
 
-    private void registerCommand(String label, TabExecutor executor){
+    private void registerCommand(Commands commands, CommandProvider provider){
-        final PluginCommand command = getCommand(label);
+        commands.register(
-        if (command != null) {
+                provider.getCommandNode(),
-            command.setExecutor(executor);
+                provider.getCommandDescription(),
-            command.setTabCompleter(executor);
+                provider.getAliases()
-        } else {
+        );
-            LOGGER.warn("Command %s failed to register: This command does not exist".formatted(label));
-        }
     }
 
     @Override
@@ -89,4 +100,12 @@ public final class SModerationPaper extends JavaPlugin {
             }
         }
     }
+
+    public static SkinTextureProvider getTextureProvider() {
+        return textureProvider;
+    }
+
+    public static void setTextureProvider(SkinTextureProvider textureProvider) {
+        SModerationPaper.textureProvider = textureProvider;
+    }
 }

src/main/java/de/shiewk/smoderation/paper/SkinTextureProvider.java

@@ -0,0 +1,10 @@
+package de.shiewk.smoderation.paper;
+
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+
+public interface SkinTextureProvider {
+
+    CompletableFuture<String> textureProperty(UUID player);
+
+}

src/main/java/de/shiewk/smoderation/paper/command/BanCommand.java

@@ -0,0 +1,98 @@
+package de.shiewk.smoderation.paper.command;
+
+import com.mojang.brigadier.Command;
+import com.mojang.brigadier.arguments.StringArgumentType;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mojang.brigadier.tree.LiteralCommandNode;
+import de.shiewk.smoderation.paper.SModerationPaper;
+import de.shiewk.smoderation.paper.command.argument.DurationArgument;
+import de.shiewk.smoderation.paper.command.argument.PlayerUUIDArgument;
+import de.shiewk.smoderation.paper.punishments.Punishment;
+import de.shiewk.smoderation.paper.util.CommandUtil;
+import io.papermc.paper.command.brigadier.CommandSourceStack;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.UUID;
+
+import static io.papermc.paper.command.brigadier.Commands.argument;
+import static io.papermc.paper.command.brigadier.Commands.literal;
+
+public final class BanCommand implements CommandProvider {
+
+    @Override
+    public LiteralCommandNode<CommandSourceStack> getCommandNode() {
+        return literal("ban")
+                .requires(CommandUtil.requirePermission("smod.ban"))
+                .then(argument("player", new PlayerUUIDArgument())
+                        .then(argument("duration", new DurationArgument())
+                                .executes(this::banWithoutReason)
+                                .then(argument("reason", StringArgumentType.greedyString())
+                                        .executes(this::banWithReason)
+                                )
+                        )
+                )
+                .build();
+    }
+
+    private int banWithoutReason(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        if (SModerationPaper.CONFIG.shouldForceReason()){
+            CommandUtil.error("Please provide a reason.");
+        }
+        UUID sender = CommandUtil.getSenderUUID(context.getSource());
+        UUID target = context.getArgument("player", UUID.class);
+        long duration = context.getArgument("duration", Long.class);
+        executeBan(sender, target, duration, Punishment.DEFAULT_REASON);
+        return Command.SINGLE_SUCCESS;
+    }
+
+    private int banWithReason(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        UUID sender = CommandUtil.getSenderUUID(context.getSource());
+        UUID target = context.getArgument("player", UUID.class);
+        long duration = context.getArgument("duration", Long.class);
+        String reason = StringArgumentType.getString(context, "reason");
+        executeBan(sender, target, duration, reason);
+        return Command.SINGLE_SUCCESS;
+    }
+
+    public static void executeBan(UUID sender, UUID target, long duration, String reason) throws CommandSyntaxException {
+        Player targetPlayer = Bukkit.getPlayer(target);
+        if (duration == 0){
+            if (targetPlayer == null){
+                CommandUtil.error("You can't ban an offline player for less than 1ms.");
+            } else {
+                KickCommand.executeKick(sender, targetPlayer, reason);
+            }
+            return;
+        }
+        if (sender.equals(target)) {
+            CommandUtil.error("You can't ban yourself.");
+        } else {
+            if (targetPlayer != null && targetPlayer.hasPermission("smod.preventban")){
+                CommandUtil.error("This player can't be banned.");
+            } else {
+                final Punishment punishment = Punishment.ban(
+                        System.currentTimeMillis(),
+                        System.currentTimeMillis() + duration,
+                        sender,
+                        target,
+                        reason
+                );
+                Punishment.issue(punishment, SModerationPaper.container);
+            }
+        }
+    }
+
+    @Override
+    public String getCommandDescription() {
+        return "Bans a player for a customizable duration.";
+    }
+
+    @Override
+    public Collection<String> getAliases() {
+        return List.of("smodban");
+    }
+}

src/main/java/de/shiewk/smoderation/paper/command/CommandProvider.java

@@ -0,0 +1,19 @@
+package de.shiewk.smoderation.paper.command;
+
+import com.mojang.brigadier.tree.LiteralCommandNode;
+import io.papermc.paper.command.brigadier.CommandSourceStack;
+
+import java.util.Collection;
+import java.util.List;
+
+public interface CommandProvider {
+
+    LiteralCommandNode<CommandSourceStack> getCommandNode();
+
+    String getCommandDescription();
+
import com.mojang.brigadier.suggestion.SuggestionsBuilder;
+import de.shiewk.smoderation.paper.util.CommandUtil;
+import io.papermc.paper.command.brigadier.argument.CustomArgumentType;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
-imlass="lines-num lines-num-old" data-line-num="39">
-        } else {
-            sender.sendMessage(Component.text("Only an entity that can open inventories can execute this command!").color(FAIL_COLOR));
-        }
-        return true;
-    }
-
-    @Override
-    public @Nullable List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (args.length > 1){
-
-    @Override
-    public void onDisable() {
-        SModerationPaper.container.save(SModerationPaper.SAVE_FILE);
-        for (Player player : Bukkit.getOnlinePlayers()) {
-            // in case players are still vanished when the server shuts down
-            if (isVanished(player)){
-                toggleVanish(player);
+@@ -0,0 +1,53 @@
+
+package de.shiewk.smoderation.paper.command;
+
+
+
+import com.mojang.brigadier.Command;
+
+import com.mojang.brigadier.context.CommandContext;
+
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+
+import com.mojang.brigadier.tree.LiteralCommandNode;
+
+import de.shiewk.smoderation.paper.util.CommandUtil;
+
+import io.papermc.paper.command.brigadier.CommandSourceStack;
@@ -0,0 +1,53 @@
+package de.shiewk.smoderation.paper.command;
+
+import com.mojang.brigadier.Command;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mojang.brigadier.tree.LiteralCommandNode;
+import de.shiewk.smoderation.paper.util.CommandUtil;
+import io.papermc.paper.command.brigadier.CommandSourceStack;
+import io.papermc.paper.command.brigadier.argument.ArgumentTypes;
+import net.kyori.adventure.text.Component;
+import org.bukkit.entity.Player;
+
+import java.util.Collection;
+import java.util.List;
+
+import static de.shiewk.smoderation.paper.SModerationPaper.*;
+import static io.papermc.paper.command.brigadier.Commands.argument;