Support Folia

Author: Rothes

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.rothes</groupId>
     <artifactId>ProtocolStringReplacer</artifactId>
-    <version>2.18.1</version>
+    <version>2.18.2-DEV</version>
     <packaging>jar</packaging>
 
     <repositories>
@@ -16,7 +16,7 @@
         </repository>
         <repository>
             <id>papermc</id>
-            <url>https://papermc.io/repo/repository/maven-public/</url>
+            <url>https://repo.papermc.io/repository/maven-public/</url>
         </repository>
         <repository>
             <id>dmulloy2-repo</id>
@@ -97,16 +97,22 @@
             <version>2.6</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>dev.folia</groupId>
+            <artifactId>folia-api</artifactId>
+            <version>1.20.1-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.20-R0.1-SNAPSHOT</version>
+            <version>1.20.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.20-R0.1-SNAPSHOT</version>
+            <version>1.20.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -130,7 +136,7 @@
         <dependency>
             <groupId>com.comphenix.protocol</groupId>
             <artifactId>ProtocolLib</artifactId>
-            <version>5.0.0-SNAPSHOT</version>
+            <version>5.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -150,7 +156,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>16</maven.compiler.source>
+        <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <maven.compiler.release>8</maven.compiler.release>
         <maven.javadoc.skip>true</maven.javadoc.skip>

src/main/java/com/sk89q/protocolstringreplacer/PsrDisguisePlugin.java

@@ -1,5 +1,6 @@
 package com.sk89q.protocolstringreplacer;
 
+import io.papermc.paper.plugin.configuration.PluginMeta;
 import me.rothes.protocolstringreplacer.ProtocolStringReplacer;
 import org.apache.commons.lang.Validate;
 import org.bukkit.Server;
@@ -49,6 +50,11 @@ public PluginDescriptionFile getDescription() {
         return plugin.getDescription();
     }
 
+    @Override
+    public @NotNull PluginMeta getPluginMeta() {
+        return null;
+    }
+
     @Override
     public FileConfiguration getConfig() {
         return null;

src/main/java/me/rothes/protocolstringreplacer/ProtocolStringReplacer.java

@@ -13,6 +13,7 @@
 import me.rothes.protocolstringreplacer.listeners.PlayerQuitListener;
 import me.rothes.protocolstringreplacer.packetlisteners.PacketListenerManager;
 import me.rothes.protocolstringreplacer.replacer.ReplacerManager;
+import me.rothes.protocolstringreplacer.scheduler.PsrScheduler;
 import me.rothes.protocolstringreplacer.upgrades.AbstractUpgradeHandler;
 import me.rothes.protocolstringreplacer.upgrades.UpgradeEnum;
 import me.rothes.protocolstringreplacer.utils.FileUtils;
@@ -57,6 +58,7 @@ public class ProtocolStringReplacer extends JavaPlugin {
     private byte serverMinorVersion;
     private boolean isSpigot;
     private boolean isPaper;
+    private boolean isFolia;
     private boolean hasPaperComponent;
     private boolean hasStarted;
     private boolean reloading;
@@ -88,6 +90,12 @@ public ProtocolStringReplacer() {
             e.printStackTrace();
         }
         logger = this.getLogger();
+        try {
+            Class.forName("io.papermc.paper.threadedregions.RegionizedServer");
+            isFolia = true;
+        } catch (ClassNotFoundException e) {
+            isFolia = false;
+        }
 
         // Start Console Replacer first to remove the Ansi in log files.
         String[] split = Bukkit.getServer().getBukkitVersion().split("-")[0].split("\\.");
@@ -199,7 +207,7 @@ public void onDisable() {
         if (replacerManager != null) {
             replacerManager.saveReplacerConfigs();
         }
-        Bukkit.getScheduler().cancelTasks(instance);
+        PsrScheduler.cancelTasks();
     }
 
     public byte getServerMajorVersion() {
@@ -218,6 +226,10 @@ public boolean isPaper() {
         return isPaper;
     }
 
+    public boolean isFolia() {
+        return isFolia;
+    }
+
     public boolean hasPaperComponent() {
         return hasPaperComponent;
     }
@@ -438,12 +450,12 @@ public void reload(@Nonnull PsrUser user) {
         reloading = true;
         Validate.notNull(user, "user cannot be null");
         PsrReloadEvent event = new PsrReloadEvent(PsrReloadEvent.ReloadState.BEFORE, user);
-        Bukkit.getServer().getPluginManager().callEvent(event);
+        PsrScheduler.runTask(() -> Bukkit.getServer().getPluginManager().callEvent(event));
         if (event.isCancelled()) {
             reloading = false;
             return;
         }
-        Bukkit.getScheduler().runTaskAsynchronously(instance, () -> {
+        PsrScheduler.runTaskAsynchronously(() -> {
             try {
                 user.sendFilteredText(PsrLocalization.getPrefixedLocaledMessage("Sender.Commands.Reload.Async-Reloading"));
                 loadConfigAndLocale();
@@ -460,7 +472,7 @@ public void reload(@Nonnull PsrUser user) {
                     player.updateInventory();
                 }
                 user.sendFilteredText(PsrLocalization.getPrefixedLocaledMessage("Sender.Commands.Reload.Complete"));
-                Bukkit.getScheduler().runTask(instance, () -> {
+                PsrScheduler.runTask(() -> {
                     // Don't need to check cancelled here
                     Bukkit.getServer().getPluginManager().callEvent(new PsrReloadEvent(PsrReloadEvent.ReloadState.FINISH, user));
                 });

src/main/java/me/rothes/protocolstringreplacer/Updater.java

@@ -6,6 +6,7 @@
 import com.google.gson.JsonParser;
 import me.rothes.protocolstringreplacer.api.replacer.ReplacerConfig;
 import me.rothes.protocolstringreplacer.replacer.ReplaceMode;
+import me.rothes.protocolstringreplacer.scheduler.PsrScheduler;
 import org.bstats.bukkit.Metrics;
 import org.bstats.charts.DrilldownPie;
 import org.bukkit.Bukkit;
@@ -40,7 +41,7 @@ public class Updater implements Listener {
     public void start() {
         initMetrics();
         Bukkit.getPluginManager().registerEvents(this, plugin);
-        Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, () -> {
+        PsrScheduler.runTaskTimerAsynchronously(() -> {
             try {
                 String json = getJson();
                 if (json == null) {
@@ -56,7 +57,7 @@ public void start() {
 
     @EventHandler
     public void playerJoin(PlayerJoinEvent e) {
-        Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+        PsrScheduler.runTaskAsynchronously(() -> {
             if (e.getPlayer().hasPermission("protocolstringreplacer.updater.notify")) {
                 for (String message : messages) {
                     e.getPlayer().sendMessage(PsrLocalization.getLocaledMessage("Sender.Prefix") + message);

src/main/java/me/rothes/protocolstringreplacer/commands/subcommands/Capture.java

@@ -1,14 +1,14 @@
 package me.rothes.protocolstringreplacer.commands.subcommands;
 
-import me.rothes.protocolstringreplacer.PsrLocalization;
 import me.rothes.protocolstringreplacer.ProtocolStringReplacer;
+import me.rothes.protocolstringreplacer.PsrLocalization;
 import me.rothes.protocolstringreplacer.api.capture.CaptureInfo;
 import me.rothes.protocolstringreplacer.api.user.PsrUser;
-import me.rothes.protocolstringreplacer.replacer.ListenType;
 import me.rothes.protocolstringreplacer.commands.SubCommand;
+import me.rothes.protocolstringreplacer.replacer.ListenType;
+import me.rothes.protocolstringreplacer.scheduler.PsrScheduler;
 import me.rothes.protocolstringreplacer.utils.MessageUtils;
 import org.apache.commons.lang.StringUtils;
-import org.bukkit.Bukkit;
 import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.Nonnull;
@@ -109,7 +109,7 @@ private void removeCommand(@Nonnull PsrUser user, @Nonnull String[] args) {
 
     private void listCommand(@Nonnull PsrUser user, @Nonnull String[] args) {
         if (args.length == 3 || args.length == 4) {
-            Bukkit.getScheduler().runTaskAsynchronously(ProtocolStringReplacer.getInstance(), () -> {
+            PsrScheduler.runTaskAsynchronously(() -> {
                 ListenType listenType = ListenType.getType(args[2]);
                 if (listenType == null) {
                     user.sendFilteredText(PsrLocalization.getPrefixedLocaledMessage(
@@ -157,7 +157,7 @@ private void listCommand(@Nonnull PsrUser user, @Nonnull String[] args) {
 
     private void clipboardCommand(@Nonnull PsrUser user, @Nonnull String[] args) {
         if (args.length == 4) {
-            Bukkit.getScheduler().runTaskAsynchronously(ProtocolStringReplacer.getInstance(), () -> {
+            PsrScheduler.runTaskAsynchronously(() -> {
                 ListenType listenType = ListenType.getType(args[2]);
                 if (!user.isCapturing(listenType)) {
                     user.sendFilteredText(PsrLocalization.getPrefixedLocaledMessage(

src/main/java/me/rothes/protocolstringreplacer/commands/subcommands/Parse.java

@@ -6,6 +6,7 @@
 import me.rothes.protocolstringreplacer.api.user.PsrUser;
 import me.rothes.protocolstringreplacer.replacer.ListenType;
 import me.rothes.protocolstringreplacer.replacer.ReplaceMode;
+import me.rothes.protocolstringreplacer.scheduler.PsrScheduler;
 import me.rothes.protocolstringreplacer.utils.ColorUtils;
 import me.rothes.protocolstringreplacer.commands.SubCommand;
 import net.md_5.bungee.api.ChatColor;
@@ -67,7 +68,7 @@ public void onExecute(@NotNull PsrUser user, @NotNull String[] args) {
 
             user.sendFilteredText(PsrLocalization.getPrefixedLocaledMessage("Sender.Commands.Parse.Start-Parse"));
             ReplaceMode finalReplaceMode = replaceMode;
-            Bukkit.getScheduler().runTaskAsynchronously(ProtocolStringReplacer.getInstance(), () ->
+            PsrScheduler.runTaskAsynchronously(() ->
                     startParse(user, args[1], player, listenType, finalReplaceMode));
             return;
         }

src/main/java/me/rothes/protocolstringreplacer/console/PsrJndiLookup.java

@@ -1,10 +1,10 @@
 package me.rothes.protocolstringreplacer.console;
 
 import me.rothes.protocolstringreplacer.ProtocolStringReplacer;
+import me.rothes.protocolstringreplacer.scheduler.PsrScheduler;
 import org.apache.logging.log4j.core.LogEvent;
 import org.apache.logging.log4j.core.config.plugins.Plugin;
 import org.apache.logging.log4j.core.lookup.StrLookup;
-import org.bukkit.Bukkit;
 
 @Plugin(name = "jndi", category = StrLookup.CATEGORY)
 public class PsrJndiLookup implements StrLookup {
@@ -22,8 +22,7 @@ public String lookup(LogEvent event, String key) {
             return null;
         }
         // runTaskLater to avoid errors.
-        Bukkit.getScheduler().runTaskLater(ProtocolStringReplacer.getInstance()
-                , () -> ProtocolStringReplacer.info("Blocked not whitelisted Jndi looking up [" + key + "]")
+        PsrScheduler.runTaskLater(() -> ProtocolStringReplacer.info("Blocked not whitelisted Jndi looking up [" + key + "]")
                 , 0L);
         return null;
 

src/main/java/me/rothes/protocolstringreplacer/packetlisteners/client/CloseWindow.java

@@ -2,10 +2,9 @@
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.events.PacketEvent;
-import me.rothes.protocolstringreplacer.ProtocolStringReplacer;
 import me.rothes.protocolstringreplacer.api.user.PsrUser;
 import me.rothes.protocolstringreplacer.packetlisteners.client.itemstack.AbstractClientItemPacketListener;
-import org.bukkit.Bukkit;
+import me.rothes.protocolstringreplacer.scheduler.PsrScheduler;
 
 public class CloseWindow extends AbstractClientItemPacketListener {
 
@@ -20,7 +19,7 @@ protected void process(PacketEvent packetEvent) {
         if (user.isInMerchant()) {
             user.setInMerchant(false);
             // Must be called in other threads or the inventory won't update.
-            Bukkit.getScheduler().runTaskAsynchronously(ProtocolStringReplacer.getInstance(), () -> user.getPlayer().updateInventory());
+            PsrScheduler.runTaskAsynchronously(() -> user.getPlayer().updateInventory());
         }
     }
 

src/main/java/me/rothes/protocolstringreplacer/replacer/ReplacerManager.java

@@ -1,20 +1,20 @@
 package me.rothes.protocolstringreplacer.replacer;
 
 import de.tr7zw.changeme.nbtapi.NBTItem;
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.rothes.protocolstringreplacer.ProtocolStringReplacer;
 import me.rothes.protocolstringreplacer.PsrLocalization;
 import me.rothes.protocolstringreplacer.api.configuration.CommentYamlConfiguration;
 import me.rothes.protocolstringreplacer.api.replacer.ReplacerConfig;
+import me.rothes.protocolstringreplacer.api.user.PsrUser;
 import me.rothes.protocolstringreplacer.replacer.containers.Container;
-import me.rothes.protocolstringreplacer.ProtocolStringReplacer;
 import me.rothes.protocolstringreplacer.replacer.containers.Replaceable;
-import me.rothes.protocolstringreplacer.api.user.PsrUser;
-import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.rothes.protocolstringreplacer.scheduler.PsrScheduler;
+import me.rothes.protocolstringreplacer.scheduler.PsrTask;
 import me.rothes.protocolstringreplacer.utils.FileUtils;
 import org.apache.commons.lang.Validate;
-import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.scheduler.BukkitTask;
 import org.jetbrains.annotations.NotNull;
 import org.neosearch.stringsearcher.Emit;
 
@@ -41,7 +41,7 @@ public class ReplacerManager {
     private char papiTail;
     private final List<ReplacerConfig> replacerConfigList = new ArrayList<>();
     private final EnumMap<Material, HashMap<ItemMeta, ItemMetaCache>> replacedItemCache = new EnumMap<>(Material.class);
-    private BukkitTask cleanTask;
+    private PsrTask cleanTask;
 
     public static class ItemMetaCache {
 
@@ -105,7 +105,7 @@ public static HashMap<File, CommentYamlConfiguration> loadReplacesFiles(@Nonnull
         return loaded;
     }
 
-    public BukkitTask getCleanTask() {
+    public PsrTask getCleanTask() {
         return cleanTask;
     }
 
@@ -119,7 +119,7 @@ public void registerTask() {
         ProtocolStringReplacer instance = ProtocolStringReplacer.getInstance();
         long cleanAccessInterval = instance.getConfigManager().cleanAccessInterval;
         long cleanTaskInterval = instance.getConfigManager().cleanTaskInterval;
-        cleanTask = Bukkit.getScheduler().runTaskTimerAsynchronously(instance, () -> {
+        cleanTask = PsrScheduler.runTaskTimerAsynchronously(() -> {
             long currentTime = System.currentTimeMillis();
             int purged = 0;
 
@@ -141,9 +141,9 @@ public void registerTask() {
 
             }
             if (purged != 0) {
-                int finalPurged = purged;
-                Bukkit.getScheduler().runTask(instance, () -> ProtocolStringReplacer.info(PsrLocalization.getLocaledMessage("Console-Sender.Messages.Schedule.Purging-Item-Cache",
-                        String.valueOf(finalPurged))));
+                ProtocolStringReplacer.info(
+                        PsrLocalization.getLocaledMessage("Console-Sender.Messages.Schedule.Purging-Item-Cache",
+                        String.valueOf(purged)));
             }
         }, 0L, cleanTaskInterval);
     }