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

folia and legacy support

Browse Source
This commit is contained in:
RonanCraft 2023-05-12 10:49:30 -04:00
parent 72c2248934
commit 3870eed1b0
18 changed files with 32 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@ -7,7 +7,7 @@
<groupId>me.SuperRonanCraft</groupId>
<artifactId>BetterRTP</artifactId>
<packaging>jar</packaging>
<version>3.6.8-3</version>
<version>3.6.9-FOLIA</version>
<!-- Upload patches to https://repo.ronanplugins.com/#/ -->
@ -337,12 +337,12 @@
<scope>provided</scope>
</dependency>
<!-- FoliaLib -->
<!--dependency>
<dependency>
<groupId>com.tcoded</groupId>
<artifactId>FoliaLib</artifactId>
<version>0.2.0</version>
<version>0.2.3-legacy-support</version>
<scope>compile</scope>
</dependency-->
</dependency>
<!-- Private Repoed -->
<!-- This is uploaded to our private repo on https://repo.ronanplugins.com -->
<!-- hClaims (https://www.spigotmc.org/resources/90540/) -->

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

@ -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;

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

@ -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;

11
src/main/java/me/SuperRonanCraft/BetterRTP/player/events/WorldLoad.java
View File

@ -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!");

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

@ -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;

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

@ -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;

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

@ -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 {

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

@ -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 {

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

@ -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;

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

@ -1,10 +0,0 @@
package me.SuperRonanCraft.BetterRTP.references.helpers;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
public class FoliaHelper {
}

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

@ -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;

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

@ -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 {

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

@ -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)

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

@ -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;

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

@ -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;

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

@ -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;

22
src/main/java/me/SuperRonanCraft/BetterRTP/versions/AsyncHandler.java
View File

@ -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);
}
}

9
src/main/java/me/SuperRonanCraft/BetterRTP/versions/FoliaHandler.java
View File

@ -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();
}
}