cdanesi/ajQueue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restricted server support

Browse Source
This commit is contained in:
ajgeiss0702
2020-06-29 09:29:51 -07:00
parent f5394de98d
commit f143e42a93
4 changed files with 77 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/us/ajg0702/queue/Main.java
+41
View File
@@ -3,6 +3,7 @@ package us.ajg0702.queue;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.IOException;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.concurrent.Callable;
@@ -44,6 +45,46 @@ public class Main extends Plugin implements Listener {
public void onEnable() {
plugin = this;
/*LinkedHashMap<String, String> d = new LinkedHashMap<>();
d.put("status.offline.base", "&cThe server you are queued for is {STATUS}. &7You are in position &f{POS}&7 of &f{LEN}&7.");
d.put("status.offline.offline", "offline");
d.put("status.offline.restarting", "restarting");
d.put("status.offline.full", "full");
d.put("status.online.base", "&7You are in position &f{POS}&7 of &f{LEN}&7. Estimated time: {TIME}");
d.put("status.left-last-queue", "&aYou left the last queue you were in.");
d.put("status.now-in-queue", "&aYou are now queued for {SERVER}! &7You are in position &f{POS}&7 of &f{LEN}&7.\n&7Type &f/leavequeue&7 to leave the queue!");
d.put("status.now-in-empty-queue", "");
d.put("status.sending-now", "&aSending you to &f{SERVER} &anow..");
d.put("errors.server-not-exist", "&cThat server does not exist!");
d.put("errors.already-queued", "&cYou are already queued for that server!");
d.put("errors.player-only", "&cThis command can only be executed as a player!");
d.put("errors.already-connected", "&cYou are already connected to this server!");
d.put("commands.leave-queue", "&aYou left the queue!");
d.put("commands.reload", "&aConfig and messages reloaded successfully!");
d.put("noperm", "&cYou do not have permission to do this!");
d.put("format.time.mins", "{m}m {s}s");
d.put("format.time.secs", "{s} seconds");
d.put("list.format", "&b{SERVER} &7({COUNT}): {LIST}");
d.put("list.playerlist", "&9{NAME}&7, ");
d.put("list.total", "&7Total players in queues: &f{TOTAL}");
d.put("list.none", "&7None");
d.put("spigot.actionbar.online", "&7You are queued for &f{SERVER}&7. You are in position &f{POS}&7 of &f{LEN}&7. Estimated time: {TIME}");
d.put("spigot.actionbar.offline", "&7You are queued for &f{SERVER}&7. &7You are in position &f{POS}&7 of &f{LEN}&7.");
d.put("send", "&aAdded &f{PLAYER}&a to the queue for &f{SERVER}");
d.put("placeholders.queued.none", "None");
d.put("placeholders.position.none", "None");
msgs = BungeeMessages.getInstance(this, d);*/
msgs = BungeeMessages.getInstance(this);
config = new BungeeConfig(this);
src/main/java/us/ajg0702/queue/Manager.java
+28 -9
View File
@@ -158,17 +158,26 @@ public class Manager {
plys.remove(ply);
continue;
}
int len = plys.size();
if(!s.isOnline() || s.isFull()) {
String or = msgs.get("status.offline.restarting");
if(!s.isOnline() || s.isFull() || !s.canAccess(ply)) {
String status = msgs.get("status.offline.restarting");
if(ot > pl.config.getInt("offline-time")) {
or = msgs.get("status.offline.offline");
status = msgs.get("status.offline.offline");
}
if(!s.canAccess(ply)) {
status = msgs.get("status.offline.restricted");
}
BungeeUtils.sendCustomData(ply, "actionbar", msgs.get("spigot.actionbar.offline")
.replaceAll("\\{POS\\}", pos+"")
.replaceAll("\\{LEN\\}", len+"")
.replaceAll("\\{SERVER\\}", s.getName())
.replaceAll("\\{STATUS\\}", or)+";time="+pl.timeBetweenPlayers);
.replaceAll("\\{STATUS\\}", status)+";time="+pl.timeBetweenPlayers);
} else {
int time = pos*pl.timeBetweenPlayers;
int min = (int) Math.floor((time) / (60));
@@ -208,17 +217,25 @@ public class Manager {
continue;
}
int len = plys.size();
if(!s.isOnline() || s.isFull()) {
String or = msgs.get("status.offline.restarting");
if(!s.isOnline() || s.isFull() || !s.canAccess(ply)) {
String status = msgs.get("status.offline.restarting");
if(ot > pl.config.getInt("offline-time")) {
or = msgs.get("status.offline.offline");
status = msgs.get("status.offline.offline");
}
if(s.isFull() && s.isOnline()) {
or = msgs.get("status.offline.full");
status = msgs.get("status.offline.full");
}
if(!s.canAccess(ply)) {
status = msgs.get("status.offline.restricted");
}
ply.sendMessage(Main.formatMessage(
msgs.get("status.offline.base")
.replaceAll("\\{STATUS\\}", or)
.replaceAll("\\{STATUS\\}", status)
.replaceAll("\\{POS\\}", pos+"")
.replaceAll("\\{LEN\\}", len+"")
.replaceAll("\\{SERVER\\}", s.getName())
@@ -293,6 +310,8 @@ public class Manager {
ProxiedPlayer nextplayer = s.getQueue().get(0);
if(!s.canAccess(nextplayer)) continue;
while(nextplayer.getServer().getInfo().getName().equals(s.getName())) {
s.getQueue().remove(nextplayer);
if(s.getQueue().size() <= 0) break;
src/main/java/us/ajg0702/queue/Server.java
+5
View File
@@ -76,6 +76,11 @@ public class Server {
}
public boolean canAccess(ProxiedPlayer ply) {
return info.canAccess(ply);
}
boolean whitelisted = false;
List<String> whitelistedplayers = new ArrayList<>();
public void setWhitelisted(boolean b) {
src/main/java/us/ajg0702/queue/utils/BungeeMessages.java
+3
View File
@@ -55,9 +55,12 @@ public class BungeeMessages {
d.put("status.offline.base", "&cThe server you are queued for is {STATUS}. &7You are in position &f{POS}&7 of &f{LEN}&7.");
d.put("status.offline.offline", "offline");
d.put("status.offline.restarting", "restarting");
d.put("status.offline.full", "full");
d.put("status.offline.restricted", "restricted");
d.put("status.online.base", "&7You are in position &f{POS}&7 of &f{LEN}&7. Estimated time: {TIME}");
d.put("status.left-last-queue", "&aYou left the last queue you were in.");
d.put("status.now-in-queue", "&aYou are now queued for {SERVER}! &7You are in position &f{POS}&7 of &f{LEN}&7.\n&7Type &f/leavequeue&7 to leave the queue!");