feat: Added Folia Support

Removed Paper <1.20 Support

resolves #68

core/src/main/java/me/xneox/epicguard/core/command/sub/AnalyzeCommand.java

@@ -59,8 +59,8 @@ public void execute(@NotNull Audience audience, @NotNull String[] args, @NotNull
           .replace("{ADDRESS}", address)
           .replace("{COUNTRY}", epicGuard.geoManager().countryCode(address))
           .replace("{CITY}", epicGuard.geoManager().city(address))
-          .replace("{WHITELISTED}", meta.whitelisted() ? "&a✔" : "&c✖")
-          .replace("{BLACKLISTED}", meta.blacklisted() ? "&a✔" : "&c✖")
+          .replace("{WHITELISTED}", meta.whitelisted() ? "<green>✔" : "<red>✖")
+          .replace("{BLACKLISTED}", meta.blacklisted() ? "<green>✔" : "<red>✖")
           .replace("{ACCOUNT-AMOUNT}", Integer.toString(meta.nicknames().size()))
           .replace("{NICKNAMES}", String.join(", ", meta.nicknames()))));
     }

core/src/main/java/me/xneox/epicguard/core/command/sub/HelpCommand.java

@@ -32,7 +32,7 @@ public void execute(@NotNull Audience audience, @NotNull String[] args, @NotNull
           .replace("{BLACKLISTED-IPS}", Integer.toString(epicGuard.storageManager().viewAddresses(AddressMeta::blacklisted).size()))
           .replace("{WHITELISTED-IPS}", Integer.toString(epicGuard.storageManager().viewAddresses(AddressMeta::whitelisted).size()))
           .replace("{CPS}", Integer.toString(epicGuard.attackManager().connectionCounter()))
-          .replace("{ATTACK}", epicGuard.attackManager().isUnderAttack() ? "&a✔" : "&c✖")));
+          .replace("{ATTACK}", epicGuard.attackManager().isUnderAttack() ? "<green>✔" : "<red>✖")));
     }
   }
 }

gradle/libs.versions.toml

@@ -5,7 +5,7 @@ metadata.format.version = "1.1"
 # Compile only
 velocity = "3.2.0-SNAPSHOT"
 waterfall="1.19-R0.1-SNAPSHOT"
-paper = "1.19.4-R0.1-SNAPSHOT"
+paper = "1.20.1-R0.1-SNAPSHOT"
 
 libby = "1.2.0"
 configurate = "4.1.2"
@@ -22,9 +22,6 @@ indra = "3.1.1"
 slf4j = "2.0.7"
 log4j2 = "2.20.0"
 
-# Required by Configurate 4
-geantyref = "1.3.13"
-
 adventure-api = "4.13.1"
 adventure-platform = "4.3.0"
 

paper/src/main/java/me/xneox/epicguard/paper/EpicGuardPaper.java

@@ -15,25 +15,21 @@
 
 package me.xneox.epicguard.paper;
 
-import java.util.UUID;
-import java.util.stream.Stream;
-
 import me.xneox.epicguard.core.EpicGuard;
 import me.xneox.epicguard.core.Platform;
 import me.xneox.epicguard.core.placeholder.Placeholders;
-import me.xneox.epicguard.paper.listener.PlayerPostLoginListener;
-import me.xneox.epicguard.paper.listener.PlayerPreLoginListener;
-import me.xneox.epicguard.paper.listener.PlayerQuitListener;
-import me.xneox.epicguard.paper.listener.PlayerSettingsListener;
-import me.xneox.epicguard.paper.listener.ServerPingListener;
+import me.xneox.epicguard.paper.listener.*;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
-import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Stream;
+
 public class EpicGuardPaper extends JavaPlugin implements Platform {
   private EpicGuard epicGuard;
   private final Logger logger = this.getSLF4JLogger();
@@ -43,7 +39,7 @@ public void onEnable() {
     this.epicGuard = new EpicGuard(this, getDataFolder().toPath());
 
     var pluginManager = getServer().getPluginManager();
-    final Listener listener = new Listener() {};
+
     Stream.of(
             new PlayerPreLoginListener(this.epicGuard),
             new PlayerQuitListener(this.epicGuard),
@@ -52,7 +48,7 @@ public void onEnable() {
             new PlayerSettingsListener(this.epicGuard)
     ).forEach(handler -> pluginManager.registerEvent(
             handler.clazz(),
-            listener,
+            handler,
             handler.priority(),
             (l, event) -> handler.handle(event),
             this,
@@ -83,25 +79,25 @@ public void onDisable() {
   }
 
   @Override
-  public @Nullable Audience audience(@NotNull UUID uuid) {
+  public @Nullable Audience audience(final @NotNull UUID uuid) {
     return getServer().getPlayer(uuid);
   }
 
   @Override
-  public void disconnectUser(@NotNull UUID uuid, @NotNull Component message) {
-    var player = getServer().getPlayer(uuid);
+  public void disconnectUser(final @NotNull UUID uuid, final @NotNull Component message) {
+    final var player = getServer().getPlayer(uuid);
     if (player != null) {
       player.kick(message);
     }
   }
 
   @Override
-  public void runTaskLater(@NotNull Runnable task, long seconds) {
-    getServer().getScheduler().runTaskLaterAsynchronously(this, task, seconds * 20L);
+  public void runTaskLater(final @NotNull Runnable task, final long seconds) {
+    getServer().getAsyncScheduler().runDelayed(this, $ -> task.run(), seconds, TimeUnit.SECONDS);
   }
 
   @Override
-  public void scheduleRepeatingTask(@NotNull Runnable task, long seconds) {
-    getServer().getScheduler().runTaskTimerAsynchronously(this, task, 20L, seconds * 20L);
+  public void scheduleRepeatingTask(final @NotNull Runnable task, final long seconds) {
+    getServer().getAsyncScheduler().runAtFixedRate(this, $ -> task.run(), 0, seconds, TimeUnit.SECONDS);
   }
 }

paper/src/main/java/me/xneox/epicguard/paper/listener/PaperListener.java

@@ -2,8 +2,9 @@
 
 import org.bukkit.event.Event;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
 
-public interface PaperListener<E extends Event> {
+public interface PaperListener<E extends Event> extends Listener {
     @SuppressWarnings("unchecked")
     default void handle(Object o) {
         this.handle((E)o);

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

@@ -4,5 +4,6 @@ main: me.xneox.epicguard.paper.EpicGuardPaper
 description: Bot protection system for Minecraft servers.
 website: https://github.com/4drian3d/EpicGuard
 authors: [4drian3d, xneox]
-api-version: '1.19'
-loader: me.xneox.epicguard.paper.LibraryLoader
+api-version: '1.20'
+loader: me.xneox.epicguard.paper.LibraryLoader
+folia-supported: true