mirrors/BetterRTP
1
0
Fork 0
mirror of https://github.com/RonanPlugins/BetterRTP.git synced 2026-02-16 02:21:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

non static folia grab

Browse Source
This commit is contained in:
RonanCraft
2023-06-15 09:21:36 -04:00
parent 64525691a8
commit 59f9283fef
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,6 +21,7 @@ import me.SuperRonanCraft.BetterRTP.references.rtpinfo.QueueHandler;
import me.SuperRonanCraft.BetterRTP.references.settings.Settings; import me.SuperRonanCraft.BetterRTP.references.settings.Settings;
import me.SuperRonanCraft.BetterRTP.references.web.Metrics; import me.SuperRonanCraft.BetterRTP.references.web.Metrics;
import me.SuperRonanCraft.BetterRTP.references.web.Updater; import me.SuperRonanCraft.BetterRTP.references.web.Updater;
import me.SuperRonanCraft.BetterRTP.versions.FoliaHandler;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@@ -47,6 +48,7 @@ public class BetterRTP extends JavaPlugin {
@Getter private final WarningHandler warningHandler = new WarningHandler(); @Getter private final WarningHandler warningHandler = new WarningHandler();
@Getter private boolean PlaceholderAPI; @Getter private boolean PlaceholderAPI;
@Getter private final RTPLogger rtpLogger = new RTPLogger(); @Getter private final RTPLogger rtpLogger = new RTPLogger();
@Getter private final FoliaHandler foliaHandler = new FoliaHandler();
@Override @Override
public void onEnable() { public void onEnable() {
@@ -99,6 +101,7 @@ public class BetterRTP extends JavaPlugin {
//(Re)Load all plugin systems/files/cache //(Re)Load all plugin systems/files/cache
private void loadAll() { private void loadAll() {
foliaHandler.load();
playerDataManager.clear(); playerDataManager.clear();
files.loadAll(); files.loadAll();
settings.load(); settings.load();

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

@@ -1,27 +1,33 @@
package me.SuperRonanCraft.BetterRTP.versions; package me.SuperRonanCraft.BetterRTP.versions;
import com.tcoded.folialib.impl.ServerImplementation;
import com.tcoded.folialib.wrapper.WrappedTask; import com.tcoded.folialib.wrapper.WrappedTask;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
public class AsyncHandler { public class AsyncHandler {
public static void async(Runnable runnable) { public static void async(Runnable runnable) {
FoliaHandler.get().runAsync(runnable); getFolia().runAsync(runnable);
//Bukkit.getScheduler().runTaskAsynchronously(BetterRTP.getInstance(), runnable); //Bukkit.getScheduler().runTaskAsynchronously(BetterRTP.getInstance(), runnable);
} }
public static void sync(Runnable runnable) { public static void sync(Runnable runnable) {
FoliaHandler.get().runNextTick(runnable); getFolia().runNextTick(runnable);
//Bukkit.getScheduler().runTask(BetterRTP.getInstance(), runnable); //Bukkit.getScheduler().runTask(BetterRTP.getInstance(), runnable);
} }
public static WrappedTask asyncLater(Runnable runnable, long ticks) { public static WrappedTask asyncLater(Runnable runnable, long ticks) {
return FoliaHandler.get().runLaterAsync(runnable, ticks * 50, TimeUnit.MILLISECONDS); return getFolia().runLaterAsync(runnable, ticks * 50, TimeUnit.MILLISECONDS);
//return Bukkit.getScheduler().runTaskLaterAsynchronously(BetterRTP.getInstance(), runnable, ticks); //return Bukkit.getScheduler().runTaskLaterAsynchronously(BetterRTP.getInstance(), runnable, ticks);
} }
public static WrappedTask syncLater(Runnable runnable, long ticks) { public static WrappedTask syncLater(Runnable runnable, long ticks) {
return FoliaHandler.get().runLater(runnable, ticks * 50, TimeUnit.MILLISECONDS); return getFolia().runLater(runnable, ticks * 50, TimeUnit.MILLISECONDS);
//return Bukkit.getScheduler().runTaskLater(BetterRTP.getInstance(), runnable, ticks); //return Bukkit.getScheduler().runTaskLater(BetterRTP.getInstance(), runnable, ticks);
} }
private static ServerImplementation getFolia() {
return BetterRTP.getInstance().getFoliaHandler().get();
}
} }

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

@@ -6,9 +6,13 @@ import me.SuperRonanCraft.BetterRTP.BetterRTP;
public class FoliaHandler { public class FoliaHandler {
private static final ServerImplementation SERVER_IMPLEMENTATION = new FoliaLib(BetterRTP.getInstance()).getImpl(); private ServerImplementation SERVER_IMPLEMENTATION;
public static ServerImplementation get() { public void load() {
this.SERVER_IMPLEMENTATION = new FoliaLib(BetterRTP.getInstance()).getImpl();
}
public ServerImplementation get() {
return SERVER_IMPLEMENTATION; return SERVER_IMPLEMENTATION;
} }