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

completable future tasks and quick requeue's

Browse Source
This commit is contained in:
RonanCraft
2022-06-15 16:03:40 -04:00
parent 83cc8e4124
commit e1ac5206c5
1 changed files with 67 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/QueueHandler.java
+67 -44
View File
@@ -1,7 +1,6 @@
package me.SuperRonanCraft.BetterRTP.references.rtpinfo; package me.SuperRonanCraft.BetterRTP.references.rtpinfo;
import io.papermc.lib.PaperLib; import io.papermc.lib.PaperLib;
import lombok.NonNull;
import me.SuperRonanCraft.BetterRTP.BetterRTP; import me.SuperRonanCraft.BetterRTP.BetterRTP;
import me.SuperRonanCraft.BetterRTP.player.commands.RTP_SETUP_TYPE; import me.SuperRonanCraft.BetterRTP.player.commands.RTP_SETUP_TYPE;
import me.SuperRonanCraft.BetterRTP.player.rtp.RTP; import me.SuperRonanCraft.BetterRTP.player.rtp.RTP;
@@ -20,7 +19,6 @@ import org.bukkit.plugin.PluginManager;
import org.bukkit.scheduler.BukkitTask; import org.bukkit.scheduler.BukkitTask;
import java.util.*; import java.util.*;
import java.util.concurrent.CompletableFuture;
public class QueueHandler implements Listener { //Randomly queues up some safe locations public class QueueHandler implements Listener { //Randomly queues up some safe locations
@@ -65,7 +63,7 @@ public class QueueHandler implements Listener { //Randomly queues up some safe l
BetterRTP.debug("Loaded " + queueList.size() + " previously generated safe locations!"); BetterRTP.debug("Loaded " + queueList.size() + " previously generated safe locations!");
//Queue after everything was loaded //Queue after everything was loaded
BetterRTP.debug("Attempting to queue up some more safe locations..."); BetterRTP.debug("Attempting to queue up some more safe locations...");
queueGenerator(null, queueMax, queueMin, 0, "noone", 0); queueGenerator(new ReQueueData(null, queueMax, queueMin, 0, "noone", 0));
}, 10L); }, 10L);
} }
@@ -78,7 +76,7 @@ public class QueueHandler implements Listener { //Randomly queues up some safe l
e.setLocation(data.location); e.setLocation(data.location);
} }
if (!generating) if (!generating)
queueGenerator(e.getWorld(), queueMax, queueMin, 0, "noone", 0); queueGenerator(new ReQueueData(e.getWorld(), queueMax, queueMin, 0, "noone", 0));
} }
@EventHandler @EventHandler
@@ -90,29 +88,29 @@ public class QueueHandler implements Listener { //Randomly queues up some safe l
}); });
} }
private void queueGenerator(RTPWorld rtpWorld, int queueMax, int queueMin, int lastCount, @NonNull String lastType, int attempts) { private void queueGenerator(ReQueueData data) {
generating = true; generating = true;
task = Bukkit.getScheduler().runTaskLaterAsynchronously(BetterRTP.getInstance(), () -> { task = Bukkit.getScheduler().runTaskLaterAsynchronously(BetterRTP.getInstance(), () -> {
//BetterRTP.debug("Generating a new position... attemp # " + data.attempts);
//Generate more locations //Generate more locations
//Rare cases where a rtp world didnt have a location generated (Permission Groups?) //Rare cases where a rtp world didnt have a location generated (Permission Groups?)
if (rtpWorld != null) { if (data.rtpWorld != null) {
List<QueueData> applicable = getApplicable(rtpWorld); List<QueueData> applicable = getApplicable(data.rtpWorld);
String type = "rtp_" + (rtpWorld.getID() != null ? rtpWorld.getID() : rtpWorld.getWorld().getName()); String type = "rtp_" + (data.rtpWorld.getID() != null ? data.rtpWorld.getID() : data.rtpWorld.getWorld().getName());
int newCount = lastType.equalsIgnoreCase(type) ? lastCount : applicable.size(); int newCount = data.lastType.equalsIgnoreCase(type) ? data.lastCount : applicable.size();
int attempt = lastType.equalsIgnoreCase(type) ? attempts + 1: 0; int attempt = data.lastType.equalsIgnoreCase(type) ? data.attempts + 1: 0;
if (newCount < queueMin && applicable.size() < queueMax) { if (newCount < queueMin && applicable.size() < queueMax) {
if (attempt > queueMaxAttempts) { if (attempt > queueMaxAttempts) {
BetterRTP.debug("Max attempts to create a Queue reached for " + type + " (amount: " + applicable.size() + ")"); BetterRTP.debug("Max attempts to create a Queue reached for " + type + " (amount: " + applicable.size() + ")");
return; return;
} }
generateFromWorld(rtpWorld, type); //Generate a location sync to bukkit api generateFromWorld(data.rtpWorld, type, new ReQueueData(data.rtpWorld, queueMax, queueMin, newCount, type, attempt)); //Generate another later
queueGenerator(rtpWorld, queueMax, queueMin, newCount, type, attempt); //Generate another later
return; return;
} }
if (lastType.equalsIgnoreCase(type)) if (data.lastType.equalsIgnoreCase(type))
BetterRTP.debug("Queue max reached for " + type + " (amount: " + applicable.size() + ") lastCount: " + lastCount); BetterRTP.debug("Queue max reached for " + type + " (amount: " + applicable.size() + ") lastCount: " + data.lastCount);
} }
//Queue up all setup types //Queue up all setup types
@@ -123,25 +121,40 @@ public class QueueHandler implements Listener { //Randomly queues up some safe l
RTPWorld world = rtpWorldEntry.getValue(); RTPWorld world = rtpWorldEntry.getValue();
String type = getId(setup, rtpWorldEntry.getKey()); String type = getId(setup, rtpWorldEntry.getKey());
List<QueueData> applicable = getApplicable(world); List<QueueData> applicable = getApplicable(world);
int newCount = lastType.equalsIgnoreCase(type) ? lastCount : applicable.size(); int newCount = data.lastType.equalsIgnoreCase(type) ? data.lastCount : applicable.size();
int attempt = lastType.equalsIgnoreCase(type) ? attempts + 1 : 0; int attempt = data.lastType.equalsIgnoreCase(type) ? data.attempts + 1 : 0;
if (newCount < queueMin && applicable.size() < queueMax) { if (newCount < queueMin && applicable.size() < queueMax) {
if (attempt > queueMaxAttempts) { if (attempt > queueMaxAttempts) {
BetterRTP.debug("Max attempts to create a Queue reached for " + type + " (amount: " + applicable.size() + ")"); BetterRTP.debug("Max attempts to create a Queue reached for " + type + " (amount: " + applicable.size() + ")");
continue; continue;
} }
generateFromWorld(world, type); //Generate a location sync to bukkit api //Generate a location sync to bukkit api
queueGenerator(null, queueMax, queueMin, newCount, type, attempt); //Generate another when done later generateFromWorld(world, type, new ReQueueData(null, queueMax, queueMin, newCount, type, attempt)); //Generate another when done later
return; return;
} }
if (lastType.equalsIgnoreCase(type)) if (data.lastType.equalsIgnoreCase(type))
BetterRTP.debug("Max queue reached for " + type + " (amount: " + applicable.size() + ") lastCount: " + lastCount); BetterRTP.debug("Max queue reached for " + type + " (amount: " + applicable.size() + ") lastCount: " + data.lastCount);
} }
} }
generating = false; generating = false;
BetterRTP.debug("Queueing paused, max queue limit reached!"); BetterRTP.debug("Queueing paused, max queue limit reached!");
}, 20L * 5 /*delay before starting queue generator*/); }, 20L /*delay before starting queue generator*/);
}
static class ReQueueData {
RTPWorld rtpWorld;
int queueMax, queueMin, lastCount, attempts;
String lastType;
ReQueueData(RTPWorld rtpWorld, int queueMax, int queueMin, int lastCount, String lastType, int attempts) {
this.rtpWorld = rtpWorld;
this.queueMax = queueMax;
this.queueMin = queueMin;
this.lastCount = lastCount;
this.lastType = lastType;
this.attempts = attempts;
}
} }
private static HashMap<String, RTPWorld> getFromSetup(RTP_SETUP_TYPE type) { private static HashMap<String, RTPWorld> getFromSetup(RTP_SETUP_TYPE type) {
@@ -169,35 +182,45 @@ public class QueueHandler implements Listener { //Randomly queues up some safe l
} }
//Generate a safe location //Generate a safe location
private void generateFromWorld(RTPWorld world, String id) { private void generateFromWorld(RTPWorld world, String id, ReQueueData reQueueData) {
QueueData data = new QueueData(world); addQueue(world, new QueueData(world), id, reQueueData);
addQueue(world, data, id);
} }
private void addQueue(RTPWorld rtpWorld, QueueData data, String id) { private void addQueue(RTPWorld rtpWorld, QueueData data, String id, ReQueueData reQueueData) {
if (data.getLocation() != null) { if (data.getLocation() != null) {
Bukkit.getScheduler().runTask(BetterRTP.getInstance(), () -> { Bukkit.getScheduler().runTask(BetterRTP.getInstance(), () -> {
PaperLib.getChunkAtAsync(data.getLocation()).thenAccept(result -> { //BetterRTP.debug("Queued up a new position, attempts " + reQueueData.attempts);
Location loc = RTPPlayer.getSafeLocation( PaperLib.getChunkAtAsync(data.getLocation())
RTP.getWorldType(rtpWorld), .thenAccept(v -> {
data.getLocation().getWorld(), Location loc = RTPPlayer.getSafeLocation(
data.getLocation(), RTP.getWorldType(rtpWorld),
rtpWorld.getMinY(), data.getLocation().getWorld(),
rtpWorld.getMaxY(), data.getLocation(),
rtpWorld.getBiomes()); rtpWorld.getMinY(),
data.setLocation(loc); rtpWorld.getMaxY(),
if (DatabaseHandler.getQueue().addQueue(data)) { rtpWorld.getBiomes());
queueList.add(data); data.setLocation(loc);
String _x = String.valueOf(data.getLocation().getBlockX()); if (loc != null) {
String _z = String.valueOf(data.getLocation().getBlockZ()); Bukkit.getScheduler().runTaskAsynchronously(BetterRTP.getInstance(), () -> {
String _world = data.getLocation().getWorld().getName(); if (DatabaseHandler.getQueue().addQueue(data)) {
BetterRTP.debug("Queue position generated id= " + id + ", location= x:" + _x + ", z:" + _z + ", world:" + _world); queueList.add(data);
} else String _x = String.valueOf(data.getLocation().getBlockX());
BetterRTP.debug("Database error occured for a queue! " + data.getLocation().toString()); String _y = String.valueOf(data.getLocation().getBlockY());
}); String _z = String.valueOf(data.getLocation().getBlockZ());
String _world = data.getLocation().getWorld().getName();
BetterRTP.debug("Queue position generated #" + queueList.size() + ": id= " + id + ", location= x:" + _x + ", y:" + _y + ", z:" + _z + ", world:" + _world);
} else
BetterRTP.debug("Database error occurred for a queue! " + data.getLocation().toString());
queueGenerator(reQueueData);
});
} else
queueGenerator(reQueueData);
});
}); });
} else } else {
BetterRTP.debug("Queue position wasn't able to generate a location!"); BetterRTP.debug("Queue position wasn't able to generate a location!");
queueGenerator(reQueueData);
}
} }
public static List<QueueData> getApplicable(RTPWorld rtpWorld) { public static List<QueueData> getApplicable(RTPWorld rtpWorld) {