Merge branch 'main' into merge-branch-between-main-and-dev

Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
Co-authored-by: Paldiu <pawereus@gmail.com>

.github/workflows/codacy-analysis.yml

@@ -25,7 +25,7 @@ jobs:
 
       # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
       - name: Run Codacy Analysis CLI
-        uses: codacy/codacy-analysis-cli-action@v4
+        uses: codacy/codacy-analysis-cli-action@v4.2.0
         with:
           # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
           # You can also omit the token and run the tools that support default configurations

.github/workflows/codeql-analysis.yml

@@ -38,7 +38,7 @@ jobs:
       uses: actions/checkout@v3
       
     - name: Setup Java JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v3.9.0
       with:
         # The Java version to make available on the path. Takes a whole or semver Java version, or 1.x syntax (e.g. 1.8 => Java 8.x). Early access versions can be specified in the form of e.g. 14-ea, 14.0.0-ea, or 14.0.0-ea.28
         java-version: 17

.github/workflows/java17-maven.yml

@@ -13,7 +13,7 @@ jobs:
 
     # Java 16 Builds
     - name: Set up JDK 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v3.9.0
       with:
         java-version: 17
         distribution: 'adopt'

.gitignore

@@ -39,6 +39,3 @@ manifest.mf
 ehthumbs.db
 Thumbs.db
 .idea/inspectionProfiles/Project_Default.xml
-
-# Common working directory
-run/

pom.xml

@@ -65,6 +65,11 @@
             <url>https://maven.elmakers.com/repository/</url>
         </repository>
 
+        <repository>
+            <id>sk89q-snapshots</id>
+            <url>https://maven.sk89q.com/artifactory/repo</url>
+        </repository>
+
         <repository>
             <id>dv8tion</id>
             <name>m2-dv8tion</name>
@@ -86,6 +91,11 @@
             <url>https://repo.dmulloy2.net/nexus/repository/public/</url>
         </repository>
 
+        <repository>
+            <id>sk89q-repo</id>
+            <url>https://maven.sk89q.com/repo/</url>
+        </repository>
+
         <repository>
             <id>esentialsx-repo</id>
             <url>https://repo.essentialsx.net/releases/</url>
@@ -98,21 +108,21 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.13.0</version>
+            <version>2.11.0</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.13.0</version>
+            <version>3.12.0</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>3.0.2</version>
+            <version>3.0.0</version>
             <scope>compile</scope>
         </dependency>
 
@@ -147,28 +157,28 @@
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>4.4.1_353</version>
+            <version>4.4.0_352</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>net.coreprotect</groupId>
             <artifactId>coreprotect</artifactId>
-            <version>21.3</version>
+            <version>21.2</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.sk89q.worldguard</groupId>
             <artifactId>worldguard-bukkit</artifactId>
-            <version>7.0.8</version>
+            <version>7.0.7</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>io.papermc</groupId>
             <artifactId>paperlib</artifactId>
-            <version>1.0.8</version>
+            <version>1.0.7</version>
             <scope>compile</scope>
         </dependency>
 
@@ -182,7 +192,7 @@
         <dependency>
             <groupId>net.essentialsx</groupId>
             <artifactId>EssentialsX</artifactId>
-            <version>2.20.0</version>
+            <version>2.19.6</version>
             <scope>provided</scope>
         </dependency>
 
@@ -203,21 +213,21 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>24.0.1</version>
+            <version>23.0.0</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-checkstyle-plugin</artifactId>
-            <version>3.3.0</version>
+            <version>3.1.2</version>
             <scope>compile</scope>
         </dependency>
         
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.10.0</version>
+            <version>5.9.0</version>
             <scope>compile</scope>
         </dependency>
         
@@ -249,7 +259,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>3.10.1</version>
                 <configuration>
                     <outputFileName>TotalFreedomMod.jar</outputFileName>
                     <compilerVersion>17</compilerVersion>
@@ -333,7 +343,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>properties-maven-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.1.0</version>
                 <executions>
                     <execution>
                         <phase>initialize</phase>
@@ -353,7 +363,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>buildnumber-maven-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.0.0</version>
                 <executions>
                     <execution>
                         <phase>generate-resources</phase>
@@ -378,7 +388,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>

src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java

@@ -46,13 +46,8 @@ public class ChatManager extends FreedomService
     private void handleChatEvent(AsyncPlayerChatEvent event)
     {
         final Player player = event.getPlayer();
-        String originalMessage = event.getMessage();
-        if (plugin.mu.onPlayerChat(player) || plugin.sh.handlePlayerChat(player, originalMessage))
-        {
-            event.setCancelled(true);
-            return;
-        }
-        String message = originalMessage.trim();
+        String message = event.getMessage().trim();
+
         // Format colors and strip &k
         message = FUtil.colorize(message);
         message = message.replaceAll(ChatColor.MAGIC.toString(), "&k");
@@ -87,8 +82,6 @@ public class ChatManager extends FreedomService
             return;
         }
 
-        plugin.dc.onPlayerChat(player, ChatColor.stripColor(message));
-
         // Check for 4chan trigger
         if (ConfigEntry.FOURCHAN_ENABLED.getBoolean())
         {

src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java

@@ -1,7 +1,7 @@
 package me.totalfreedom.totalfreedommod;
 
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.event.ClickEvent;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
@@ -23,7 +23,7 @@ public class CommandSpy extends FreedomService
     {
         server.getOnlinePlayers().stream().filter(player -> plugin.al.isAdmin(player)
                 && plugin.al.getAdmin(player).getCommandSpy() && player != event.getPlayer()).forEach(player ->
-                player.sendMessage(Component.text(event.getPlayer().getName(), NamedTextColor.GRAY).append(Component.text(": ", NamedTextColor.GRAY))
-                        .append(Component.text(event.getMessage(), NamedTextColor.GRAY))));
+                player.sendMessage(Component.text(event.getPlayer().getName()).append(Component.text(": "))
+                        .append(Component.text(event.getMessage()))));
     }
 }

src/main/java/me/totalfreedom/totalfreedommod/Muter.java

@@ -3,6 +3,7 @@ package me.totalfreedom.totalfreedommod;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.util.FLog;
+import me.totalfreedom.totalfreedommod.util.FSync;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.ChatColor;
@@ -10,6 +11,7 @@ import org.bukkit.command.Command;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 
 public class Muter extends FreedomService
@@ -24,23 +26,26 @@ public class Muter extends FreedomService
     {
     }
 
-    public boolean onPlayerChat(Player player)
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onAsyncPlayerChatEvent(AsyncPlayerChatEvent event)
     {
+        Player player = event.getPlayer();
+
         FPlayer fPlayer = plugin.pl.getPlayerSync(player);
 
         if (!fPlayer.isMuted())
         {
-            return false;
+            return;
         }
 
         if (plugin.al.isAdminSync(player))
         {
             fPlayer.setMuted(false);
-            return false;
+            return;
         }
 
         player.sendMessage(Component.text("You are muted.", NamedTextColor.RED));
-        return true;
+        event.setCancelled(true);
     }
 
     @EventHandler(priority = EventPriority.LOW)

src/main/java/me/totalfreedom/totalfreedommod/admin/ActivityLogEntry.java

@@ -66,13 +66,8 @@ public class ActivityLogEntry implements IConfig
 
     public void addLogin()
     {
-        this.addLogin(System.currentTimeMillis());
-    }
-
-    public void addLogin(final long timestamp)
-    {
-        Date time = Date.from(Instant.ofEpochMilli(timestamp));
-        timestamps.add("Login: " + FUtil.dateToString(time));
+        Date currentTime = Date.from(Instant.now());
+        timestamps.add("Login: " + FUtil.dateToString(currentTime));
     }
 
     public void addLogout()

src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java

@@ -194,15 +194,6 @@ public class AdminList extends FreedomService
         // Save admin
         plugin.sql.addAdmin(admin);
 
-        // Add login time
-        UUID uuid = admin.getUuid();
-        Player player = Bukkit.getPlayer(uuid);
-
-        if (player != null)
-        {
-            plugin.acl.getActivityLog(player).addLogin(player.getLastLogin());
-        }
-
         return true;
     }
 
@@ -274,8 +265,7 @@ public class AdminList extends FreedomService
             ResultSet currentSave = plugin.sql.getAdminByUuid(admin.getUuid());
             for (Map.Entry<String, Object> entry : admin.toSQLStorable().entrySet())
             {
-                Object storedValue = plugin.sql.getValue(currentSave, entry.getKey(), entry.getValue());
-                if (storedValue != null && !storedValue.equals(entry.getValue()) || storedValue == null && entry.getValue() != null || entry.getValue() == null)
+                Object storedValue = plugin.sql.getValue(currentSave, entry.getKey(), entry.getValue());                if (storedValue != null && !storedValue.equals(entry.getValue()) || storedValue == null && entry.getValue() != null || entry.getValue() == null)
                 {
                     plugin.sql.setAdminValue(admin, entry.getKey(), entry.getValue());
                 }

src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java

@@ -109,6 +109,16 @@ public class EventBlocker extends FreedomService
         event.setRadius(ConfigEntry.EXPLOSIVE_RADIUS.getDouble().floatValue());
     }
     
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onBlockExplode(BlockExplodeEvent event) {
+        if(!ConfigEntry.ALLOW_EXPLOSIONS.getBoolean()) {
+            event.setCancelled(true);
+            return;
+        }
+
+        event.setYield(ConfigEntry.EXPLOSIVE_RADIUS.getDouble().floatValue());
+    }
+
     @EventHandler(priority = EventPriority.HIGH)
     public void onBlockExplode(BlockExplodeEvent event)
     {
@@ -172,7 +182,7 @@ public class EventBlocker extends FreedomService
     @EventHandler(priority = EventPriority.NORMAL)
     public void onPlayerDropItem(PlayerDropItemEvent event)
     {
-        if (!plugin.al.isAdmin(event.getPlayer()) && !ConfigEntry.ALLOW_ITEM_DROPS.getBoolean())
+        if (!plugin.al.isAdmin(event.getPlayer()))
         {
             event.setCancelled(true);
         }

src/main/java/me/totalfreedom/totalfreedommod/blocking/InteractBlocker.java

@@ -4,7 +4,6 @@ import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.Groups;
 import org.bukkit.ChatColor;
-import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.EntityType;
@@ -27,7 +26,7 @@ public class InteractBlocker extends FreedomService
     {
     }
 
-    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerInteract(PlayerInteractEvent event)
     {
         switch (event.getAction())
@@ -70,10 +69,6 @@ public class InteractBlocker extends FreedomService
     private void handleRightClick(PlayerInteractEvent event)
     {
         final Player player = event.getPlayer();
-        if (player.getGameMode().equals(GameMode.SPECTATOR)) {
-            return;
-        }
-
         final Block clickedBlock = event.getClickedBlock();
 
         if (clickedBlock != null && clickedBlock.getType() == Material.RESPAWN_ANCHOR && !ConfigEntry.ALLOW_RESPAWN_ANCHORS.getBoolean())

src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlocker.java

@@ -30,6 +30,24 @@ public class CommandBlocker extends FreedomService
     private final Map<String, CommandBlockerEntry> entryList = Maps.newHashMap();
     private final List<String> unknownCommands = Lists.newArrayList();
 
+    public static CommandMap getCommandMap()
+    {
+        try
+        {
+            SimplePluginManager simplePluginManager = (SimplePluginManager)Bukkit.getServer().getPluginManager();
+
+            Field commandMapField = SimplePluginManager.class.getDeclaredField("commandMap");
+            commandMapField.setAccessible(true);
+
+            return (SimpleCommandMap)commandMapField.get(simplePluginManager);
+        }
+        catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e)
+        {
+            FLog.severe("Failed to get command map field (" + e.getMessage() + ")");
+        }
+        return null;
+    }
+
     @Override
     public void onStart()
     {
@@ -47,7 +65,7 @@ public class CommandBlocker extends FreedomService
         entryList.clear();
         unknownCommands.clear();
 
-        final CommandMap commandMap = Bukkit.getCommandMap();
+        final CommandMap commandMap = getCommandMap();
 
         @SuppressWarnings("unchecked")
         List<String> blockedCommands = (List<String>)ConfigEntry.BLOCKED_COMMANDS.getList();

src/main/java/me/totalfreedom/totalfreedommod/bridge/EssentialsBridge.java

@@ -6,6 +6,7 @@ import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FLog;
+import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -13,6 +14,7 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.plugin.Plugin;
@@ -127,7 +129,7 @@ public class EssentialsBridge extends FreedomService
         try
         {
             User user = getEssentialsUser(username);
-            if (user != null && user.getBase().isOnline())
+            if (user != null)
             {
                 user.setVanished(vanished);
             }

src/main/java/me/totalfreedom/totalfreedommod/command/Command_report.java

@@ -1,8 +1,6 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import me.totalfreedom.totalfreedommod.rank.Rank;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.format.NamedTextColor;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
@@ -10,28 +8,11 @@ import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.jetbrains.annotations.Nullable;
 
 @CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME, blockHostConsole = true)
 @CommandParameters(description = "Report a player for all admins to see.", usage = "/<command> <player> <reason>")
 public class Command_report extends FreedomCommand
 {
-    private void handleLog(final @Nullable Boolean value, final @Nullable Throwable ex, final CommandSender sender)
-    {
-        if (ex != null)
-        {
-            sender.sendMessage(Component.text("An error occurred while attempting to log your previously filed report to a Discord channel.", NamedTextColor.RED));
-            ex.printStackTrace();
-            return;
-        }
-
-        if (Boolean.FALSE.equals(value))
-        {
-            return;
-        }
-
-        sender.sendMessage(Component.text("The report you previously filed has been successfully logged to a Discord channel. Please note that spamming reports is not allowed, and you will be sanctioned if you are found to be doing it.", NamedTextColor.GRAY));
-    }
 
     @Override
     public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
@@ -69,16 +50,18 @@ public class Command_report extends FreedomCommand
         }
 
         String report = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " ");
-        String reportedUsername = (player == null) ? offlinePlayer.getName() : player.getName();
-        plugin.cm.reportAction(playerSender, reportedUsername, report);
+        plugin.cm.reportAction(playerSender, (player == null) ? offlinePlayer.getName() : player.getName(), report);
 
-        msg(ChatColor.GREEN + "Thank you, your report is being processed.");
+        boolean logged = false;
 
         if (plugin.dc.enabled)
         {
-            plugin.dc.sendReport(playerSender.getName(), reportedUsername, report).whenCompleteAsync((logged, ex) -> handleLog(logged, ex, sender));
+            logged = (player == null) ? plugin.dc.sendReportOffline(playerSender, offlinePlayer, report) : plugin.dc.sendReport(playerSender, player, report);
         }
 
+        msg(ChatColor.GREEN + "Thank you, your report has been successfully logged."
+                + (logged ? ChatColor.RED + "\nNote: This report has been logged to a discord channel, as with any report system, spamming reports can lead to you getting banned." : ""));
+
         return true;
     }
 }

src/main/java/me/totalfreedom/totalfreedommod/command/Command_toggle.java

@@ -19,9 +19,9 @@ public class Command_toggle extends FreedomCommand
     private final List<String> toggles = Arrays.asList(
             "waterplace", "fireplace", "lavaplace", "fluidspread", "lavadmg", "firespread", "frostwalk",
             "firework", "prelog", "lockdown", "petprotect", "entitywipe", "nonuke [range] [count]",
-            "explosives [radius]", "unsafeenchs", "bells", "armorstands", "masterblocks", "item_drops",
-            "grindstones", "jukeboxes", "spawners", "4chan", "beehives", "respawnanchors", "autotp", "autoclear", "minecarts",
-            "mp44", "landmines", "tossmob", "gravity");
+            "explosives [radius]", "unsafeenchs", "bells", "armorstands", "masterblocks", "books", "grindstones",
+            "jukeboxes", "spawners", "4chan", "beehives", "respawnanchors", "autotp", "autoclear", "minecarts", "mp44",
+            "landmines", "tossmob", "gravity");
 
     @Override
     public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
@@ -205,12 +205,6 @@ public class Command_toggle extends FreedomCommand
                 break;
             }
 
-            case "item_drops":
-            {
-                toggle("Item drops are", ConfigEntry.ALLOW_ITEM_DROPS);
-                break;
-            }
-
             case "grindstones":
             {
                 toggle("Grindstones are", ConfigEntry.ALLOW_GRINDSTONES);

src/main/java/me/totalfreedom/totalfreedommod/config/ConfigEntry.java

@@ -35,7 +35,6 @@ public enum ConfigEntry
     ALLOW_GRAVITY(Boolean.class, "allow.gravity"),
     ALLOW_MASTERBLOCKS(Boolean.class, "allow.masterblocks"),
     ALLOW_BOOKS(Boolean.class, "allow.books"),
-    ALLOW_ITEM_DROPS(Boolean.class, "allow.item_drops"),
     //
     BLOCKED_CHATCODES(String.class, "blocked_chatcodes"),
     //

src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java

@@ -3,7 +3,10 @@ package me.totalfreedom.totalfreedommod.discord;
 import com.google.common.base.Strings;
 import java.time.Instant;
 import java.time.ZonedDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import javax.security.auth.login.LoginException;
@@ -23,9 +26,11 @@ import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.MessageEmbed;
+import net.dv8tion.jda.api.entities.PrivateChannel;
 import net.dv8tion.jda.api.entities.Role;
 import net.dv8tion.jda.api.entities.SelfUser;
 import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.events.ReadyEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import net.dv8tion.jda.api.requests.GatewayIntent;
@@ -37,18 +42,16 @@ import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 import net.md_5.bungee.api.ChatColor;
 import org.apache.commons.lang.WordUtils;
 import org.apache.commons.lang3.RandomStringUtils;
-import org.bukkit.Bukkit;
 import org.bukkit.GameRule;
-import org.bukkit.Location;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public class Discord extends FreedomService
 {
@@ -279,6 +282,12 @@ public class Discord extends FreedomService
     {
         String newMessage = message;
 
+        if (message.contains("@"))
+        {
+            // \u200B is Zero Width Space, invisible on Discord
+            newMessage = message.replaceAll("@", "@\u200B");
+        }
+
         if (message.toLowerCase().contains("discord.gg")) // discord.gg/invite works as an invite
         {
             return "";
@@ -294,10 +303,10 @@ public class Discord extends FreedomService
 
         if (message.contains("§"))
         {
-            newMessage = message.replace("§", "");
+            newMessage = message.replaceAll("§", "");
         }
 
-        return newMessage;
+        return deformat(newMessage);
     }
 
     public void messageChatChannel(String message)
@@ -315,7 +324,7 @@ public class Discord extends FreedomService
 
         if (enabled && !chat_channel_id.isEmpty())
         {
-            CompletableFuture<Message> sentMessage = Objects.requireNonNull(bot.getTextChannelById(chat_channel_id)).sendMessage(sanitizedMessage).allowedMentions(Collections.emptyList()).submit(true);
+            CompletableFuture<Message> sentMessage = Objects.requireNonNull(bot.getTextChannelById(chat_channel_id)).sendMessage(sanitizedMessage).submit(true);
             sentMessages.add(sentMessage);
         }
     }
@@ -335,7 +344,7 @@ public class Discord extends FreedomService
 
         if (enabled && !chat_channel_id.isEmpty())
         {
-            CompletableFuture<Message> sentMessage = Objects.requireNonNull(bot.getTextChannelById(chat_channel_id)).sendMessage(sanitizedMessage).allowedMentions(Collections.emptyList()).submit(true);
+            CompletableFuture<Message> sentMessage = Objects.requireNonNull(bot.getTextChannelById(chat_channel_id)).sendMessage(sanitizedMessage).submit(true);
             sentMessages.add(sentMessage);
         }
     }
@@ -393,9 +402,7 @@ public class Discord extends FreedomService
         return true;
     }
 
-    public CompletableFuture<Boolean> sendReport(String reporterName, String reportedName, String reason)
-    {
-        return CompletableFuture.supplyAsync(() ->
+    public boolean sendReportOffline(Player reporter, OfflinePlayer reported, String reason)
     {
         if (!shouldISendReport())
         {
@@ -418,49 +425,73 @@ public class Discord extends FreedomService
             return false;
         }
 
-            Player onlinePlayer = Bukkit.getPlayer(reportedName);
-            boolean online = onlinePlayer != null;
+        final EmbedBuilder embedBuilder = new EmbedBuilder();
+        embedBuilder.setTitle("Report for " + reported.getName() + " (offline)");
+        embedBuilder.setDescription(reason);
+        embedBuilder.setFooter("Reported by " + reporter.getName(), "https://minotar.net/helm/" + reporter.getName() + ".png");
+        embedBuilder.setTimestamp(Instant.from(ZonedDateTime.now()));
+        if (plugin.esb.isEnabled())
+        {
+            com.earth2me.essentials.User user = plugin.esb.getEssentialsUser(reported.getName());
+            String location = "World: " + Objects.requireNonNull(user.getLastLocation().getWorld()).getName() + ", X: " + user.getLastLocation().getBlockX() + ", Y: " + user.getLastLocation().getBlockY() + ", Z: " + user.getLastLocation().getBlockZ();
+            embedBuilder.addField("Location", location, true);
+            embedBuilder.addField("God Mode", WordUtils.capitalizeFully(String.valueOf(user.isGodModeEnabled())), true);
+            if (user.getNickname() != null)
+            {
+                embedBuilder.addField("Nickname", user.getNickname(), true);
+            }
+        }
+        MessageEmbed embed = embedBuilder.build();
+        Message message = channel.sendMessageEmbeds(embed).complete();
+
+        if (!ConfigEntry.DISCORD_REPORT_ARCHIVE_CHANNEL_ID.getString().isEmpty())
+        {
+            message.addReaction("\uD83D\uDCCB").complete();
+        }
+
+        return true;
+    }
+
+    public boolean sendReport(Player reporter, Player reported, String reason)
+    {
+        if (!shouldISendReport())
+        {
+            return false;
+        }
+
+        final Guild server = bot.getGuildById(ConfigEntry.DISCORD_SERVER_ID.getString());
+
+        if (server == null)
+        {
+            FLog.severe("The guild ID specified in the config is invalid.");
+            return false;
+        }
+
+        final TextChannel channel = server.getTextChannelById(ConfigEntry.DISCORD_REPORT_CHANNEL_ID.getString());
+
+        if (channel == null)
+        {
+            FLog.severe("The report channel ID specified in the config is invalid.");
+            return false;
+        }
 
         final EmbedBuilder embedBuilder = new EmbedBuilder();
-            embedBuilder.setTitle("Report for " + reportedName + (online ? "" : " (offline)"));
+        embedBuilder.setTitle("Report for " + reported.getName());
         embedBuilder.setDescription(reason);
-            embedBuilder.setFooter("Reported by " + reporterName, "https://minotar.net/helm/" + reporterName + ".png");
+        embedBuilder.setFooter("Reported by " + reporter.getName(), "https://minotar.net/helm/" + reporter.getName() + ".png");
         embedBuilder.setTimestamp(Instant.from(ZonedDateTime.now()));
-
-            Location location = null;
-            Boolean godMode = null;
-            String nickName = null;
+        String location = "World: " + Objects.requireNonNull(reported.getLocation().getWorld()).getName() + ", X: " + reported.getLocation().getBlockX() + ", Y: " + reported.getLocation().getBlockY() + ", Z: " + reported.getLocation().getBlockZ();
+        embedBuilder.addField("Location", location, true);
+        embedBuilder.addField("Game Mode", WordUtils.capitalizeFully(reported.getGameMode().name()), true);
 
         if (plugin.esb.isEnabled())
         {
-                com.earth2me.essentials.User user = plugin.esb.getEssentialsUser(reportedName);
-                if (!online)
+            com.earth2me.essentials.User user = plugin.esb.getEssentialsUser(reported.getName());
+            embedBuilder.addField("God Mode", WordUtils.capitalizeFully(String.valueOf(user.isGodModeEnabled())), true);
+            if (user.getNickname() != null)
             {
-                    location = user.getLastLocation();
+                embedBuilder.addField("Nickname", user.getNickname(), true);
             }
-
-                godMode = user.isGodModeEnabled();
-                nickName = user.getNickname();
-            }
-
-            if (location == null && online)
-            {
-                location = onlinePlayer.getLocation();
-            }
-
-            if (location != null)
-            {
-                embedBuilder.addField("Location", "World: " + location.getWorld().getName() + ", X: " + location.getBlockX() + ", Y: " + location.getBlockY() + ", Z: " + location.getBlockZ(), true);
-            }
-
-            if (godMode != null)
-            {
-                embedBuilder.addField("God Mode", WordUtils.capitalizeFully(godMode.toString()), true);
-            }
-
-            if (nickName != null)
-            {
-                embedBuilder.addField("Nickname", nickName, true);
         }
 
         MessageEmbed embed = embedBuilder.build();
@@ -472,7 +503,6 @@ public class Discord extends FreedomService
         }
 
         return true;
-        }, t -> Bukkit.getScheduler().runTaskAsynchronously(plugin, t));
     }
 
     // Do no ask why this is here. I spent two hours trying to make a simple thing work
@@ -484,28 +514,16 @@ public class Discord extends FreedomService
         }
     }
 
-    public void onPlayerChat(Player player, String message)
+    @EventHandler(ignoreCancelled = true)
+    public void onAsyncPlayerChat(AsyncPlayerChatEvent event)
     {
-        if (ConfigEntry.ADMIN_ONLY_MODE.getBoolean())
-        {
-            return;
-        }
+        Player player = event.getPlayer();
+        String message = event.getMessage();
 
-        if (server.hasWhitelist())
+        if (!ConfigEntry.ADMIN_ONLY_MODE.getBoolean() && !server.hasWhitelist()
+                && !plugin.pl.getPlayer(player).isMuted() && bot != null)
         {
-            return;
-        }
-
-        if (plugin.pl.getPlayer(player).isMuted())
-        {
-            return;
-        }
-
-        if (bot == null)
-        {
-            return;
-        }
-
-        messageChatChannel(deformat(player.getName()) + " \u00BB " + ChatColor.stripColor(message));
+            messageChatChannel(player.getName() + " \u00BB " + ChatColor.stripColor(message));
+        }
     }
 }

src/main/java/me/totalfreedom/totalfreedommod/discord/DiscordToMinecraftListener.java

@@ -58,8 +58,9 @@ public class DiscordToMinecraftListener extends ListenerAdapter
         final Message msg = event.getMessage();
         final String content = msg.getContentStripped();
 
-        if (content.toLowerCase().startsWith(ConfigEntry.DISCORD_PREFIX.getString().toLowerCase()) && Discord.DISCORD_COMMAND_MANAGER.parse(content, member, textChannel))
+        if (content.startsWith(ConfigEntry.DISCORD_PREFIX.getString()))
         {
+            Discord.DISCORD_COMMAND_MANAGER.parse(content, member, textChannel);
             return;
         }
 

src/main/java/me/totalfreedom/totalfreedommod/discord/MessageReactionListener.java

@@ -10,8 +10,6 @@ import net.dv8tion.jda.api.entities.TextChannel;
 import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 
-import java.util.Collections;
-
 public class MessageReactionListener extends ListenerAdapter
 {
     public void onMessageReactionAdd(MessageReactionAddEvent messageReactionAddEvent)
@@ -61,8 +59,7 @@ public class MessageReactionListener extends ListenerAdapter
         final MessageEmbed embed = message.getEmbeds().get(0);
         final MessageBuilder archiveMessageBuilder = new MessageBuilder();
         archiveMessageBuilder.setContent("Report completed by " + completer.getUser().getAsMention() + " (" + Discord.deformat(completer.getUser().getAsTag() + ")"));
-        archiveMessageBuilder.setAllowedMentions(Collections.emptyList());
-        archiveMessageBuilder.setEmbeds(embed);
+        archiveMessageBuilder.setEmbed(embed);
         final Message archiveMessage = archiveMessageBuilder.build();
 
         archiveChannel.sendMessage(archiveMessage).complete();

src/main/java/me/totalfreedom/totalfreedommod/discord/command/DiscordCommandManager.java

@@ -46,21 +46,11 @@ public class DiscordCommandManager
         FLog.info("Loaded " + commands.size() + " Discord commands.");
     }
 
-    public boolean parse(String content, Member member, TextChannel channel)
+    public void parse(String content, Member member, TextChannel channel)
     {
-        final String actualContent = content.substring(PREFIX.length()).trim();
-        List<String> args = new ArrayList<>(Arrays.asList(actualContent.split(" ")));
-        if (args.isEmpty())
-        {
-            return false;
-        }
+        List<String> args = new ArrayList<>(Arrays.asList(content.split(" ")));
 
-        final String alias = args.get(0);
-
-        if (alias.isEmpty())
-        {
-            return false;
-        }
+        final String alias = args.remove(0).split(PREFIX)[1]; // The joys of command parsing
 
         for (DiscordCommand command : commands)
         {
@@ -73,7 +63,6 @@ public class DiscordCommandManager
                     final CompletableFuture<Message> futureMessage = channel.sendMessage(message).submit(true);
 
                     this.discord.sentMessages.add(futureMessage);
-                    return true;
                 }
                 else
                 {
@@ -82,17 +71,14 @@ public class DiscordCommandManager
                     embedBuilder.setTitle("Command error");
                     embedBuilder.setColor(Color.RED);
                     embedBuilder.setDescription("You don't have permission to execute this command.");
-                    messageBuilder.setEmbeds(embedBuilder.build());
+                    messageBuilder.setEmbed(embedBuilder.build());
                     final Message message = messageBuilder.build();
 
                     final CompletableFuture<Message> futureMessage = channel.sendMessage(message).submit(true);
 
                     this.discord.sentMessages.add(futureMessage);
-                    return true;
                 }
             }
         }
-
-        return false;
     }
 }

src/main/java/me/totalfreedom/totalfreedommod/fun/ItemFun.java

@@ -13,7 +13,13 @@ import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
 import me.totalfreedom.totalfreedommod.shop.ShopItem;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.*;
+import org.bukkit.ChatColor;
+import org.bukkit.Color;
+import org.bukkit.FireworkEffect;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.SoundCategory;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Arrow;
 import org.bukkit.entity.EnderPearl;
@@ -89,16 +95,11 @@ public class ItemFun extends FreedomService
     {
     }
 
-    @EventHandler(ignoreCancelled = true)
+    @EventHandler
     public void onPlayerEntityInteract(PlayerInteractEntityEvent event)
     {
 
         Player player = event.getPlayer();
-        if (player.getGameMode().equals(GameMode.SPECTATOR))
-        {
-            return;
-        }
-
         Entity entity = event.getRightClicked();
         FPlayer fPlayer = plugin.pl.getPlayer(player);
 

src/main/java/me/totalfreedom/totalfreedommod/shop/Shop.java

@@ -21,6 +21,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
@@ -411,35 +412,23 @@ public class Shop extends FreedomService
 
     }
 
-    public boolean handlePlayerChat(Player player, String message)
+    @EventHandler
+    public void onPlayerChat(AsyncPlayerChatEvent event)
     {
-        if (!ConfigEntry.SHOP_ENABLED.getBoolean())
-        {
-            return false;
-        }
+        String message = event.getMessage();
+        Player player = event.getPlayer();
 
-        if (!ConfigEntry.SHOP_REACTIONS_ENABLED.getBoolean())
+        if (ConfigEntry.SHOP_ENABLED.getBoolean() && ConfigEntry.SHOP_REACTIONS_ENABLED.getBoolean()
+                && !plugin.sh.reactionString.isEmpty() && message.equals(plugin.sh.reactionString))
         {
-            return false;
-        }
-
-        if (plugin.sh.reactionString.isEmpty())
-        {
-            return false;
-        }
-
-        if (!message.equals(plugin.sh.reactionString))
-        {
-            return false;
-        }
-
+            event.setCancelled(true);
             PlayerData data = plugin.pl.getData(player);
             data.setCoins(data.getCoins() + plugin.sh.coinsPerReactionWin);
             plugin.pl.save(data);
             plugin.sh.endReaction(player.getName());
             player.sendMessage(ChatColor.GREEN + "You have been given " + ChatColor.GOLD
                     + plugin.sh.coinsPerReactionWin + ChatColor.GREEN + " coins!");
-        return true;
+        }
     }
 
     public ShopItem getShopItem(int slot)

src/main/java/me/totalfreedom/totalfreedommod/sql/SQLite.java

@@ -90,15 +90,6 @@ public class SQLite extends FreedomService
                 {
                     FLog.severe("Failed to create the admins table: " + e.getMessage());
                 }
-            } else
-            {
-                try
-                {
-                    connection.createStatement().execute("ALTER TABLE `admins` DROP COLUMN `ptero_id`");
-                } catch (SQLException e)
-                {
-                    // Ignore the error. If someone else wants to add WORKING AND TESTED CODE to check if the `ptero_id` column exists, they can, but I couldn't find a good way.
-                }
             }
             if (tableExists(meta, "players"))
             {

src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java

@@ -21,7 +21,6 @@ import java.time.Instant;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 import static org.bukkit.Bukkit.getServer;
 
@@ -50,10 +49,7 @@ public class FUtil
             "78408086-1991-4c33-a571-d8fa325465b2", // Telesphoreo
             "f5cd54c4-3a24-4213-9a56-c06c49594dff", // Taahh
             "a52f1f08-a398-400a-bca4-2b74b81feae6", // G6_
-            "ca83b658-c03b-4106-9edc-72f70a80656d", // ayunami2000
-            "4d708f0c-cb2a-4a1e-928f-214daccc9d18", // evakc
-            "38e38fbd-c027-4cac-8e37-4158710a287d", // EnZaXD
-            "7076dcf5-b940-4e86-9a6d-a3b1d16b3649" // Gommeh
+            "ca83b658-c03b-4106-9edc-72f70a80656d" // ayunami2000
     );
     public static final List<String> DEVELOPER_NAMES = Arrays.asList(
             "Madgeek1450",
@@ -74,10 +70,7 @@ public class FUtil
             "videogamesm12",
             "Taahh",
             "G6_",
-            "ayunami2000",
-            "evakc",
-            "EnZaXD",
-            "Gommeh");
+            "ayunami2000");
     public static final Map<String, ChatColor> CHAT_COLOR_NAMES = new HashMap<>();
     public static final List<ChatColor> CHAT_COLOR_POOL = Arrays.asList(
             ChatColor.DARK_RED,
@@ -151,11 +144,10 @@ public class FUtil
         return (count == 1 ? "" : "s");
     }
 
-    @SuppressWarnings("java:S6204")
     public static List<String> getPlayerList()
     {
         return getServer().getOnlinePlayers().stream().filter(player ->
-                !TotalFreedomMod.getPlugin().al.isVanished(player.getUniqueId())).map(HumanEntity::getName).collect(Collectors.toList());
+                !TotalFreedomMod.getPlugin().al.isVanished(player.getUniqueId())).map(HumanEntity::getName).toList();
     }
 
     public static String listToString(List<String> list)

src/main/resources/config.yml

@@ -221,7 +221,6 @@ allow:
   gravity: false
   masterblocks: false
   books: true
-  item_drops: false
 
 blocked_commands:
   #

src/main/resources/plugin.yml

@@ -13,9 +13,9 @@ softdepend:
   - JDA
   - Votifier
 authors: [Madgeek1450, Prozza]
-api-version: "1.20"
+api-version: "1.19"
 libraries:
-  - org.apache.commons:commons-lang3:3.13.0
-  - commons-io:commons-io:2.13.0
+  - org.apache.commons:commons-lang3:3.12.0
+  - commons-io:commons-io:2.11.0
   - org.jetbrains:annotations:23.0.0
   - org.javassist:javassist:3.29.1-GA