mirrors/BetterRTP
1
0
Fork 0
mirror of https://github.com/RonanPlugins/BetterRTP.git synced 2025-08-17 09:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

removing folia support :(

Browse Source
This commit is contained in:
RonanCraft 2023-04-21 13:16:42 -04:00
parent 4712ab6479
commit 7332e7c237
19 changed files with 72 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -7,7 +7,7 @@
<groupId>me.SuperRonanCraft</groupId>
<artifactId>BetterRTP</artifactId>
<packaging>jar</packaging>
<version>3.6.8</version>
<version>3.6.8-1</version>
<properties>
<maven.compiler.release>8</maven.compiler.release>
@ -380,11 +380,11 @@
<scope>provided</scope>
</dependency>
<!-- FoliaLib -->
<dependency>
<!--dependency>
<groupId>com.tcoded</groupId>
<artifactId>FoliaLib</artifactId>
<version>0.2.0</version>
<scope>compile</scope>
</dependency>
</dependency-->
</dependencies>
</project>

2
src/main/java/me/SuperRonanCraft/BetterRTP/BetterRTP.java
View File

@ -1,6 +1,5 @@
package me.SuperRonanCraft.BetterRTP;
import com.tcoded.folialib.FoliaLib;
import lombok.Getter;
import me.SuperRonanCraft.BetterRTP.player.PlayerInfo;
import me.SuperRonanCraft.BetterRTP.player.commands.Commands;
@ -49,7 +48,6 @@ public class BetterRTP extends JavaPlugin {
//@Getter private BukkitAudiences adventure;
@Getter private boolean PlaceholderAPI;
@Getter private final RTPLogger rtpLogger = new RTPLogger();
@Getter FoliaLib folia = new FoliaLib(this);
@Override
public void onEnable() {

3
src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdQueue.java
View File

@ -13,6 +13,7 @@ import me.SuperRonanCraft.BetterRTP.references.rtpinfo.QueueData;
import me.SuperRonanCraft.BetterRTP.references.rtpinfo.QueueHandler;
import me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds.WorldPlayer;
import me.SuperRonanCraft.BetterRTP.references.web.LogUploader;
import me.SuperRonanCraft.BetterRTP.versions.AsyncHandler;
import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.ComponentBuilder;
import net.md_5.bungee.api.chat.HoverEvent;
@ -44,7 +45,7 @@ public class CmdQueue implements RTPCommand {
Player p = (Player) sendi;
//sendi.sendMessage("Loading...");
World world = args.length > 1 ? Bukkit.getWorld(args[1]) : null;
FoliaHelper.get().runAsync(() -> {
AsyncHandler.async(() -> {
if (world != null) {
sendInfo(sendi, queueGetWorld(p, world), label, args);
} else

3
src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Join.java
View File

@ -8,6 +8,7 @@ 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;
import me.SuperRonanCraft.BetterRTP.versions.AsyncHandler;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerJoinEvent;
@ -17,7 +18,7 @@ public class Join {
static void event(PlayerJoinEvent e) {
Player p = e.getPlayer();
updater(p);
FoliaHelper.get().runAsync(() -> {
AsyncHandler.async(() -> {
getPl().getCooldowns().loadPlayer(p);
});
rtpOnFirstJoin(p);

11
src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPDelay.java
View File

@ -1,9 +1,8 @@
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.references.helpers.FoliaHelper;
import me.SuperRonanCraft.BetterRTP.versions.AsyncHandler;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@ -12,12 +11,10 @@ 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.BukkitRunnable;
import java.util.concurrent.TimeUnit;
import org.bukkit.scheduler.BukkitTask;
class RTPDelay implements Listener {
private WrappedTask task;
private BukkitTask task;
private final boolean cancelOnMove, cancelOnDamage;
private final RTPPlayer rtp;
@ -30,7 +27,7 @@ class RTPDelay implements Listener {
private void delay(CommandSender sendi, int delay) {
if (!getPl().getRTP().getTeleport().beforeTeleportDelay(rtp.getPlayer(), delay)) {
task = FoliaHelper.get().runLater(run(sendi, this), (delay * 20L) * 50L, TimeUnit.MILLISECONDS);
task = AsyncHandler.asyncLater(run(sendi, this), delay * 20L);
if (cancelOnMove || cancelOnDamage)
Bukkit.getPluginManager().registerEvents(this, BetterRTP.getInstance());
}

9
src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java
View File

@ -1,15 +1,14 @@
package me.SuperRonanCraft.BetterRTP.player.rtp;
import com.tcoded.folialib.FoliaLib;
import io.papermc.lib.PaperLib;
import lombok.Getter;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_FindLocationEvent;
import me.SuperRonanCraft.BetterRTP.references.helpers.FoliaHelper;
import me.SuperRonanCraft.BetterRTP.references.rtpinfo.QueueData;
import me.SuperRonanCraft.BetterRTP.references.rtpinfo.QueueHandler;
import me.SuperRonanCraft.BetterRTP.references.rtpinfo.RandomLocation;
import me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds.WorldPlayer;
import me.SuperRonanCraft.BetterRTP.versions.AsyncHandler;
import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.Location;
@ -49,7 +48,7 @@ public class RTPPlayer {
attempts++;
return;
}
FoliaHelper.get().runAsync(() -> {
AsyncHandler.async(() -> {
Location loc;
if (event.getLocation() != null) // && WorldPlayer.checkIsValid(event.getLocation(), pWorld))
loc = event.getLocation();
@ -63,7 +62,7 @@ public class RTPPlayer {
}
attempts++; //Add an attempt
//Load chunk and find out if safe location (asynchronously)
FoliaHelper.get().runNextTick(() -> {
AsyncHandler.sync(() -> {
try { //Prior to 1.12 this async chunk will NOT work
CompletableFuture<Chunk> chunk = PaperLib.getChunkAtAsync(loc);
chunk.thenAccept(result -> {
@ -91,7 +90,7 @@ public class RTPPlayer {
if (getPl().getEco().charge(player, worldPlayer)) {
tpLoc.setYaw(player.getLocation().getYaw());
tpLoc.setPitch(player.getLocation().getPitch());
FoliaHelper.get().runNextTick(() ->
AsyncHandler.sync(() ->
settings.teleport.sendPlayer(sendi, player, tpLoc, worldPlayer, attempts, type));
}
} else {

3
src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/effects/RTPEffect_Particles.java
View File

@ -3,6 +3,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;
@ -71,7 +72,7 @@ public class RTPEffect_Particles {
public void display(Player p) {
if (!enabled) return;
FoliaHelper.get().runAsync(() -> {
AsyncHandler.async(() -> {
try { //Incase the library errors out
switch (shape) {
case "TELEPORT":

3
src/main/java/me/SuperRonanCraft/BetterRTP/references/database/DatabaseChunkData.java
View File

@ -8,6 +8,7 @@ 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;
@ -54,7 +55,7 @@ public class DatabaseChunkData extends SQLite {
public void addChunk(Chunk chunk, int maxy, Biome biome) {
FoliaHelper.get().runAsync(() -> {
AsyncHandler.async(() -> {
String pre = "INSERT OR REPLACE INTO ";
String sql = pre + tables.get(0) + " ("
+ COLUMNS.WORLD.name + ", "

3
src/main/java/me/SuperRonanCraft/BetterRTP/references/database/DatabaseHandler.java
View File

@ -4,6 +4,7 @@ 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 {
@ -14,7 +15,7 @@ public class DatabaseHandler {
@Getter private final DatabaseChunkData databaseChunks = new DatabaseChunkData();
public void load() {
FoliaHelper.get().runAsync(() -> {
AsyncHandler.async(() -> {
databasePlayers.load();
databaseCooldowns.load();
databaseQueue.load();

3
src/main/java/me/SuperRonanCraft/BetterRTP/references/database/SQLite.java
View File

@ -6,6 +6,7 @@ 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;
@ -61,7 +62,7 @@ public abstract class SQLite {
public void load() {
loaded = false;
tables = getTables();
FoliaHelper.get().runAsync(() -> {
AsyncHandler.async(() -> {
Connection connection = getSQLConnection();
try {
Statement s = connection.createStatement();

7
src/main/java/me/SuperRonanCraft/BetterRTP/references/helpers/FoliaHelper.java
View File

@ -1,13 +1,10 @@
package me.SuperRonanCraft.BetterRTP.references.helpers;
import com.tcoded.folialib.FoliaLib;
import com.tcoded.folialib.impl.ServerImplementation;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
public class FoliaHelper {
public static ServerImplementation get() {
return BetterRTP.getInstance().getFolia().getImpl();
}
}

9
src/main/java/me/SuperRonanCraft/BetterRTP/references/messages/Message.java
View File

@ -6,6 +6,7 @@ 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;
@ -24,25 +25,25 @@ public interface Message {
static void sms(Message messenger, CommandSender sendi, String msg) {
if (!msg.isEmpty())
FoliaHelper.get().runNextTick(() ->
AsyncHandler.sync(() ->
sendi.sendMessage(placeholder(sendi, getPrefix(messenger) + msg)));
}
static void sms(Message messenger, CommandSender sendi, String msg, Object placeholderInfo) {
if (!msg.isEmpty())
FoliaHelper.get().runNextTick(() ->
AsyncHandler.sync(() ->
sendi.sendMessage(Objects.requireNonNull(placeholder(sendi, getPrefix(messenger) + msg, placeholderInfo))));
}
static void sms(Message messenger, CommandSender sendi, String msg, List<Object> placeholderInfo) {
if (!msg.isEmpty())
FoliaHelper.get().runNextTick(() ->
AsyncHandler.sync(() ->
sendi.sendMessage(placeholder(sendi, getPrefix(messenger) + msg, placeholderInfo)));
}
static void sms(CommandSender sendi, List<String> msg, Object placeholderInfo) {
if (msg != null && !msg.isEmpty()) {
FoliaHelper.get().runNextTick(() -> {
AsyncHandler.sync(() -> {
msg.forEach(str -> msg.set(msg.indexOf(str), placeholder(sendi, str, placeholderInfo)));
sendi.sendMessage(msg.toArray(new String[0]));
});

7
src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/CooldownHandler.java
View File

@ -10,6 +10,7 @@ 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;
import me.SuperRonanCraft.BetterRTP.versions.AsyncHandler;
import org.bukkit.Bukkit;
import org.bukkit.World;
import org.bukkit.command.CommandSender;
@ -45,7 +46,7 @@ public class CooldownHandler {
}
private void queueDownload() {
FoliaHelper.get().runLaterAsync(() -> {
AsyncHandler.asyncLater(() -> {
if (cooldownByWorld && !DatabaseHandler.getCooldowns().isLoaded()) {
queueDownload();
return;
@ -59,7 +60,7 @@ public class CooldownHandler {
for (Player p : Bukkit.getOnlinePlayers())
loadPlayer(p);
loaded = true;
}, 10L * 50L, TimeUnit.MILLISECONDS);
}, 10L);
}
public void add(Player player, World world) {
@ -134,7 +135,7 @@ public class CooldownHandler {
}
private void savePlayer(Player player, @Nullable World world, @Nullable CooldownData data, boolean remove) {
FoliaHelper.get().runAsync(() -> {
AsyncHandler.async(() -> {
if (world != null && data != null && getDatabaseWorlds() != null) { //Per World enabled?
if (!remove)
getDatabaseWorlds().setCooldown(world, data);

20
src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/QueueGenerator.java
View File

@ -1,17 +1,14 @@
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;
import me.SuperRonanCraft.BetterRTP.player.rtp.RTP;
import me.SuperRonanCraft.BetterRTP.player.rtp.RTPPlayer;
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.rtpinfo.worlds.RTPWorld;
import me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds.WorldCustom;
import me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds.WorldPlayer;
import me.SuperRonanCraft.BetterRTP.versions.AsyncHandler;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;
@ -21,7 +18,6 @@ import org.jetbrains.annotations.Nullable;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
public class QueueGenerator {
@ -30,7 +26,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 WrappedTask task;
private BukkitTask task;
public void unload() {
if (task != null)
@ -45,7 +41,7 @@ public class QueueGenerator {
void generate(@Nullable RTPWorld rtpWorld) {
if (!QueueHandler.isEnabled()) return;
FoliaHelper.get().runLaterAsync(() -> {
AsyncHandler.asyncLater(() -> {
if (!DatabaseHandler.getQueue().isLoaded()) {
generate(rtpWorld);
return;
@ -55,12 +51,12 @@ public class QueueGenerator {
//Queue after everything was loaded
BetterRTP.debug("Attempting to queue up some more safe locations...");
queueGenerator(new ReQueueData(rtpWorld, queueMax, queueMin, 0, "noone", 0));
}, 10L * 50L, TimeUnit.MILLISECONDS);
}, 10L);
}
private void queueGenerator(ReQueueData data) {
generating = true;
task = FoliaHelper.get().runLaterAsync(() -> {
task = AsyncHandler.asyncLater(() -> {
//BetterRTP.debug("Generating a new position... attempt # " + data.attempts);
//Generate more locations
//Rare cases where a rtp world didn't have a location generated (Permission Groups?)
@ -109,7 +105,7 @@ public class QueueGenerator {
}
generating = false;
BetterRTP.debug("Queueing paused, max queue limit reached!");
}, 20L * 50L /*delay before starting queue generator*/, TimeUnit.MILLISECONDS);
}, 20L/*delay before starting queue generator*/);
}
static class ReQueueData {
@ -154,7 +150,7 @@ public class QueueGenerator {
private void addQueue(RTPWorld rtpWorld, String id, ReQueueData reQueueData) {
Location loc = RandomLocation.generateLocation(rtpWorld);
if (loc != null) {
FoliaHelper.get().runNextTick(() -> {
AsyncHandler.sync(() -> {
//BetterRTP.debug("Queued up a new position, attempts " + reQueueData.attempts);
PaperLib.getChunkAtAsync(loc)
.thenAccept(v -> {
@ -167,7 +163,7 @@ public class QueueGenerator {
rtpWorld.getBiomes());
//data.setLocation(safeLoc);
if (safeLoc != null) {
FoliaHelper.get().runAsync(() -> {
AsyncHandler.async(() -> {
QueueData data = DatabaseHandler.getQueue().addQueue(safeLoc);
if (data != null) {
//queueList.add(data);

3
src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/QueueHandler.java
View File

@ -6,6 +6,7 @@ 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;
@ -85,7 +86,7 @@ public class QueueHandler implements Listener { //Randomly queues up some safe l
public static void remove(Location loc) {
if (!isEnabled()) return;
FoliaHelper.get().runAsync(() -> {
AsyncHandler.async(() -> {
//Delete all queue data async
if (DatabaseHandler.getQueue().removeLocation(loc)) {
//BetterRTP.getInstance().getQueue().queueList.remove(data);

3
src/main/java/me/SuperRonanCraft/BetterRTP/references/web/Metrics.java
View File

@ -1,6 +1,7 @@
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;
import org.bukkit.plugin.ServicePriority;
@ -128,7 +129,7 @@ public class Metrics {
}
// Nevertheless we want our code to run in the Bukkit main thread, so we have to use the Bukkit scheduler
// Don't be afraid! The connection to the bStats server is still async, only the stats collection is sync ;)
FoliaHelper.get().runNextTick(() -> submitData());
AsyncHandler.sync(() -> submitData());
}
}, 1000*60*5, 1000*60*30);
// Submit the data every 30 minutes, first time after 5 minutes to give other plugins enough time to start

3
src/main/java/me/SuperRonanCraft/BetterRTP/references/web/Updater.java
View File

@ -2,6 +2,7 @@ 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;
import java.io.BufferedReader;
@ -14,7 +15,7 @@ public class Updater {
public static String updatedVersion = BetterRTP.getInstance().getDescription().getVersion();
public Updater(BetterRTP pl) {
FoliaHelper.get().runAsync(() -> {
AsyncHandler.async(() -> {
try {
URLConnection con = new URL(getUrl() + project()).openConnection();
updatedVersion = new BufferedReader(new InputStreamReader(con.getInputStream())).readLine();

20
src/main/java/me/SuperRonanCraft/BetterRTP/versions/AsyncHandler.java Normal file
View File

@ -0,0 +1,20 @@
package me.SuperRonanCraft.BetterRTP.versions;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
import org.bukkit.Bukkit;
import org.bukkit.scheduler.BukkitTask;
public class AsyncHandler {
public static void async(Runnable runnable) {
Bukkit.getScheduler().runTaskAsynchronously(BetterRTP.getInstance(), runnable);
}
public static void sync(Runnable runnable) {
Bukkit.getScheduler().runTask(BetterRTP.getInstance(), runnable);
}
public static BukkitTask asyncLater(Runnable runnable, long ticks) {
return Bukkit.getScheduler().runTaskLaterAsynchronously(BetterRTP.getInstance(), runnable, ticks);
}
}

4
src/main/java/me/SuperRonanCraft/BetterRTP/versions/FoliaHandler.java Normal file
View File

@ -0,0 +1,4 @@
package me.SuperRonanCraft.BetterRTP.versions;
public class FoliaHandler {
}