From 3870eed1b0e94849570392bec62f268b7f6ef3b4 Mon Sep 17 00:00:00 2001 From: RonanCraft Date: Fri, 12 May 2023 10:49:30 -0400 Subject: [PATCH] folia and legacy support --- pom.xml | 8 +++---- .../player/commands/types/CmdQueue.java | 3 --- .../BetterRTP/player/events/Join.java | 1 - .../BetterRTP/player/events/WorldLoad.java | 11 ++-------- .../BetterRTP/player/rtp/RTPDelay.java | 4 ++-- .../rtp/effects/RTPEffect_Particles.java | 2 -- .../database/DatabaseChunkData.java | 14 ------------ .../references/database/DatabaseHandler.java | 3 --- .../BetterRTP/references/database/SQLite.java | 5 ----- .../references/helpers/FoliaHelper.java | 10 --------- .../references/messages/Message.java | 3 --- .../references/rtpinfo/CooldownHandler.java | 2 -- .../references/rtpinfo/QueueGenerator.java | 3 ++- .../references/rtpinfo/QueueHandler.java | 2 -- .../BetterRTP/references/web/Metrics.java | 1 - .../BetterRTP/references/web/Updater.java | 1 - .../BetterRTP/versions/AsyncHandler.java | 22 +++++++++++-------- .../BetterRTP/versions/FoliaHandler.java | 9 ++++++++ 18 files changed, 32 insertions(+), 72 deletions(-) delete mode 100644 src/main/java/me/SuperRonanCraft/BetterRTP/references/helpers/FoliaHelper.java diff --git a/pom.xml b/pom.xml index 3f245e5..dd07232 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ me.SuperRonanCraft BetterRTP jar - 3.6.8-3 + 3.6.9-FOLIA @@ -337,12 +337,12 @@ provided - + diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdQueue.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdQueue.java index 605a60c..aa0aa68 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdQueue.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdQueue.java @@ -1,11 +1,8 @@ package me.SuperRonanCraft.BetterRTP.player.commands.types; -import me.SuperRonanCraft.BetterRTP.BetterRTP; import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand; import me.SuperRonanCraft.BetterRTP.player.rtp.RTPSetupInformation; import me.SuperRonanCraft.BetterRTP.references.PermissionNode; -import me.SuperRonanCraft.BetterRTP.references.database.DatabaseHandler; -import me.SuperRonanCraft.BetterRTP.references.helpers.FoliaHelper; import me.SuperRonanCraft.BetterRTP.references.helpers.HelperRTP; import me.SuperRonanCraft.BetterRTP.references.messages.Message; import me.SuperRonanCraft.BetterRTP.references.messages.Message_RTP; diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Join.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Join.java index d40e531..6a1d934 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Join.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Join.java @@ -4,7 +4,6 @@ import me.SuperRonanCraft.BetterRTP.BetterRTP; import me.SuperRonanCraft.BetterRTP.player.rtp.RTP_TYPE; import me.SuperRonanCraft.BetterRTP.references.PermissionNode; import me.SuperRonanCraft.BetterRTP.references.file.FileOther; -import me.SuperRonanCraft.BetterRTP.references.helpers.FoliaHelper; import me.SuperRonanCraft.BetterRTP.references.messages.Message_RTP; import me.SuperRonanCraft.BetterRTP.references.web.Updater; import me.SuperRonanCraft.BetterRTP.references.helpers.HelperRTP; diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/WorldLoad.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/WorldLoad.java index ef6407b..7fd1046 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/WorldLoad.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/WorldLoad.java @@ -1,21 +1,14 @@ package me.SuperRonanCraft.BetterRTP.player.events; +import com.tcoded.folialib.wrapper.WrappedTask; import me.SuperRonanCraft.BetterRTP.BetterRTP; -import me.SuperRonanCraft.BetterRTP.references.database.DatabaseHandler; -import me.SuperRonanCraft.BetterRTP.references.helpers.FoliaHelper; -import me.SuperRonanCraft.BetterRTP.references.player.HelperPlayer; -import me.SuperRonanCraft.BetterRTP.references.player.playerdata.PlayerData; import me.SuperRonanCraft.BetterRTP.versions.AsyncHandler; -import me.SuperRonanCraft.BetterRTP.versions.FoliaHandler; -import org.bukkit.World; -import org.bukkit.entity.Player; -import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.event.world.WorldLoadEvent; import org.bukkit.scheduler.BukkitTask; public class WorldLoad { - BukkitTask loader; + WrappedTask loader; void load(WorldLoadEvent e) { //BetterRTP.getInstance().getLogger().info("NEW WORLD!"); diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPDelay.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPDelay.java index 04f9097..ba836a6 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPDelay.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPDelay.java @@ -1,5 +1,6 @@ package me.SuperRonanCraft.BetterRTP.player.rtp; +import com.tcoded.folialib.wrapper.WrappedTask; import me.SuperRonanCraft.BetterRTP.BetterRTP; import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_CancelledEvent; import me.SuperRonanCraft.BetterRTP.versions.AsyncHandler; @@ -11,10 +12,9 @@ import org.bukkit.event.HandlerList; import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.player.PlayerMoveEvent; -import org.bukkit.scheduler.BukkitTask; class RTPDelay implements Listener { - private BukkitTask task; + private WrappedTask task; private final boolean cancelOnMove, cancelOnDamage; private final RTPPlayer rtp; diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/effects/RTPEffect_Particles.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/effects/RTPEffect_Particles.java index 07de738..fb22907 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/effects/RTPEffect_Particles.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/effects/RTPEffect_Particles.java @@ -2,9 +2,7 @@ package me.SuperRonanCraft.BetterRTP.player.rtp.effects; import me.SuperRonanCraft.BetterRTP.BetterRTP; import me.SuperRonanCraft.BetterRTP.references.file.FileOther; -import me.SuperRonanCraft.BetterRTP.references.helpers.FoliaHelper; import me.SuperRonanCraft.BetterRTP.versions.AsyncHandler; -import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.util.Vector; diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/database/DatabaseChunkData.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/database/DatabaseChunkData.java index 10d950c..6ff274f 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/database/DatabaseChunkData.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/database/DatabaseChunkData.java @@ -1,25 +1,11 @@ package me.SuperRonanCraft.BetterRTP.references.database; -import lombok.Getter; -import lombok.NonNull; -import me.SuperRonanCraft.BetterRTP.BetterRTP; -import me.SuperRonanCraft.BetterRTP.references.helpers.FoliaHelper; -import me.SuperRonanCraft.BetterRTP.references.player.playerdata.PlayerData; -import me.SuperRonanCraft.BetterRTP.references.rtpinfo.QueueData; -import me.SuperRonanCraft.BetterRTP.references.rtpinfo.QueueGenerator; -import me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds.RTPWorld; import me.SuperRonanCraft.BetterRTP.versions.AsyncHandler; -import org.bukkit.Bukkit; import org.bukkit.Chunk; -import org.bukkit.Location; -import org.bukkit.World; import org.bukkit.block.Biome; -import java.sql.*; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; -import java.util.logging.Level; public class DatabaseChunkData extends SQLite { diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/database/DatabaseHandler.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/database/DatabaseHandler.java index 0b3a2ba..fa0f49f 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/database/DatabaseHandler.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/database/DatabaseHandler.java @@ -2,10 +2,7 @@ package me.SuperRonanCraft.BetterRTP.references.database; import lombok.Getter; import me.SuperRonanCraft.BetterRTP.BetterRTP; -import me.SuperRonanCraft.BetterRTP.references.helpers.FoliaHelper; -import me.SuperRonanCraft.BetterRTP.references.rtpinfo.RandomLocation; import me.SuperRonanCraft.BetterRTP.versions.AsyncHandler; -import org.bukkit.Bukkit; public class DatabaseHandler { diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/database/SQLite.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/database/SQLite.java index 07e6515..788b26b 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/database/SQLite.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/database/SQLite.java @@ -1,13 +1,8 @@ package me.SuperRonanCraft.BetterRTP.references.database; -import lombok.Getter; import lombok.NonNull; import me.SuperRonanCraft.BetterRTP.BetterRTP; -import me.SuperRonanCraft.BetterRTP.references.helpers.FoliaHelper; -import me.SuperRonanCraft.BetterRTP.references.rtpinfo.QueueHandler; -import me.SuperRonanCraft.BetterRTP.references.rtpinfo.RandomLocation; import me.SuperRonanCraft.BetterRTP.versions.AsyncHandler; -import org.bukkit.Bukkit; import java.io.File; import java.io.IOException; diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/helpers/FoliaHelper.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/helpers/FoliaHelper.java deleted file mode 100644 index 405d27a..0000000 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/helpers/FoliaHelper.java +++ /dev/null @@ -1,10 +0,0 @@ -package me.SuperRonanCraft.BetterRTP.references.helpers; - - -import me.SuperRonanCraft.BetterRTP.BetterRTP; - -public class FoliaHelper { - - - -} diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/messages/Message.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/messages/Message.java index bd9abfd..56bdf04 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/messages/Message.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/messages/Message.java @@ -2,12 +2,9 @@ package me.SuperRonanCraft.BetterRTP.references.messages; import com.google.common.collect.ImmutableCollection; import lombok.NonNull; -import me.SuperRonanCraft.BetterRTP.BetterRTP; import me.SuperRonanCraft.BetterRTP.references.file.FileData; -import me.SuperRonanCraft.BetterRTP.references.helpers.FoliaHelper; import me.SuperRonanCraft.BetterRTP.references.messages.placeholder.PlaceholderAnalyzer; import me.SuperRonanCraft.BetterRTP.versions.AsyncHandler; -import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/CooldownHandler.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/CooldownHandler.java index 0ba4ae3..a2c148c 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/CooldownHandler.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/CooldownHandler.java @@ -6,7 +6,6 @@ import me.SuperRonanCraft.BetterRTP.references.PermissionNode; import me.SuperRonanCraft.BetterRTP.references.database.DatabaseCooldowns; import me.SuperRonanCraft.BetterRTP.references.database.DatabaseHandler; import me.SuperRonanCraft.BetterRTP.references.file.FileOther; -import me.SuperRonanCraft.BetterRTP.references.helpers.FoliaHelper; import me.SuperRonanCraft.BetterRTP.references.player.HelperPlayer; import me.SuperRonanCraft.BetterRTP.references.player.playerdata.PlayerData; import me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds.WorldPlayer; @@ -20,7 +19,6 @@ import javax.annotation.Nullable; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.concurrent.TimeUnit; public class CooldownHandler { diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/QueueGenerator.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/QueueGenerator.java index 04a7157..3f915e7 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/QueueGenerator.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/QueueGenerator.java @@ -1,5 +1,6 @@ package me.SuperRonanCraft.BetterRTP.references.rtpinfo; +import com.tcoded.folialib.wrapper.WrappedTask; import io.papermc.lib.PaperLib; import me.SuperRonanCraft.BetterRTP.BetterRTP; import me.SuperRonanCraft.BetterRTP.player.commands.RTP_SETUP_TYPE; @@ -26,7 +27,7 @@ public class QueueGenerator { public static final int queueMax = 32, queueMin = 2; //Amount to ready up for each rtp world private final int queueMaxAttempts = 50; boolean generating; - private BukkitTask task; + private WrappedTask task; public void unload() { if (task != null) diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/QueueHandler.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/QueueHandler.java index ff3ae3f..4d14ab7 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/QueueHandler.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/QueueHandler.java @@ -4,10 +4,8 @@ import me.SuperRonanCraft.BetterRTP.BetterRTP; import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_TeleportPostEvent; import me.SuperRonanCraft.BetterRTP.references.database.DatabaseHandler; import me.SuperRonanCraft.BetterRTP.references.database.DatabaseQueue; -import me.SuperRonanCraft.BetterRTP.references.helpers.FoliaHelper; import me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds.RTPWorld; import me.SuperRonanCraft.BetterRTP.versions.AsyncHandler; -import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/web/Metrics.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/web/Metrics.java index d8cfc25..a43b363 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/web/Metrics.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/web/Metrics.java @@ -1,6 +1,5 @@ package me.SuperRonanCraft.BetterRTP.references.web; -import me.SuperRonanCraft.BetterRTP.references.helpers.FoliaHelper; import me.SuperRonanCraft.BetterRTP.versions.AsyncHandler; import org.bukkit.Bukkit; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/web/Updater.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/web/Updater.java index c39e3b8..d343e4b 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/web/Updater.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/web/Updater.java @@ -1,7 +1,6 @@ package me.SuperRonanCraft.BetterRTP.references.web; import me.SuperRonanCraft.BetterRTP.BetterRTP; -import me.SuperRonanCraft.BetterRTP.references.helpers.FoliaHelper; import me.SuperRonanCraft.BetterRTP.versions.AsyncHandler; import org.bukkit.Bukkit; diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/versions/AsyncHandler.java b/src/main/java/me/SuperRonanCraft/BetterRTP/versions/AsyncHandler.java index b3416a4..db63ac6 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/versions/AsyncHandler.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/versions/AsyncHandler.java @@ -1,23 +1,27 @@ package me.SuperRonanCraft.BetterRTP.versions; -import me.SuperRonanCraft.BetterRTP.BetterRTP; -import org.bukkit.Bukkit; -import org.bukkit.scheduler.BukkitTask; +import com.tcoded.folialib.wrapper.WrappedTask; + +import java.util.concurrent.TimeUnit; public class AsyncHandler { public static void async(Runnable runnable) { - Bukkit.getScheduler().runTaskAsynchronously(BetterRTP.getInstance(), runnable); + FoliaHandler.get().runAsync(runnable); + //Bukkit.getScheduler().runTaskAsynchronously(BetterRTP.getInstance(), runnable); } public static void sync(Runnable runnable) { - Bukkit.getScheduler().runTask(BetterRTP.getInstance(), runnable); + FoliaHandler.get().runNextTick(runnable); + //Bukkit.getScheduler().runTask(BetterRTP.getInstance(), runnable); } - public static BukkitTask asyncLater(Runnable runnable, long ticks) { - return Bukkit.getScheduler().runTaskLaterAsynchronously(BetterRTP.getInstance(), runnable, ticks); + public static WrappedTask asyncLater(Runnable runnable, long ticks) { + return FoliaHandler.get().runLaterAsync(runnable, ticks * 50, TimeUnit.MILLISECONDS); + //return Bukkit.getScheduler().runTaskLaterAsynchronously(BetterRTP.getInstance(), runnable, ticks); } - public static BukkitTask syncLater(Runnable runnable, long ticks) { - return Bukkit.getScheduler().runTaskLater(BetterRTP.getInstance(), runnable, ticks); + public static WrappedTask syncLater(Runnable runnable, long ticks) { + return FoliaHandler.get().runLaterAsync(runnable, ticks * 50, TimeUnit.MILLISECONDS); + //return Bukkit.getScheduler().runTaskLater(BetterRTP.getInstance(), runnable, ticks); } } diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/versions/FoliaHandler.java b/src/main/java/me/SuperRonanCraft/BetterRTP/versions/FoliaHandler.java index a8dd6a3..f171ef8 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/versions/FoliaHandler.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/versions/FoliaHandler.java @@ -1,4 +1,13 @@ package me.SuperRonanCraft.BetterRTP.versions; +import com.tcoded.folialib.FoliaLib; +import com.tcoded.folialib.impl.ServerImplementation; +import me.SuperRonanCraft.BetterRTP.BetterRTP; + public class FoliaHandler { + + public static ServerImplementation get() { + return new FoliaLib(BetterRTP.getInstance()).getImpl(); + } + }