diff --git a/.gitignore b/.gitignore index 915ff76..ddb816f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ dependency-reduced-pom.xml build .DS_Store .nosync -libs/**.* +libs/private/* +!libs/private/README.md diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 77be3e6..8b2c76d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: gradle:6.8.2-jdk8 +image: gradle:7.2.0-jdk8 # Cache downloaded dependencies and plugins between builds. # To keep cache across branches add 'key: "$CI_JOB_NAME"' @@ -9,10 +9,10 @@ cache: build: + retry: 2 stage: build script: - - rm -rf build - - gradle :free:shadowJar + - gradle clean :free:shadowJar artifacts: paths: - free/build/libs diff --git a/README.md b/README.md index ca3914c..556f3b5 100644 --- a/README.md +++ b/README.md @@ -5,11 +5,17 @@ [Spigot (premium)](https://www.spigotmc.org/resources/ajqueueplus.79123/) ajQueue is (as far as I can tell) the best queue plugin out there. -It was made because I wasn't satisfied with the existing queue plugins, all of them either being massively overpriced, -or lacking basic features +It was made because I wasn't satisfied with the existing queue plugins, +all of them either being massively overpriced, or lacking basic features # Contributing -As long as you don't break anything, i'll probably accept any merge requests you submit. -I like to have the least number of steps possible for server owners updating my plugin. +As long as you don't break anything, +i'll probably accept any merge requests you submit. +I like to have the least number of steps possible for server owners +updating my plugin. -If you need *any* help making your changes, feel free to contact me on discord. The invite link is on the plugin page ;) +If you need *any* help making your changes, feel free to contact me +on discord. The invite link is on the plugin page ;) + +# Note on compiling ajQueuePlus +If you want to compile ajQueuePlus, please read the readme file that is in libs/private \ No newline at end of file diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 6f6db74..59da92f 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -7,9 +7,10 @@ group = "us.ajg0702.queue.api" repositories { //mavenLocal() - mavenCentral() maven { url = uri("https://repo.ajg0702.us") } + + mavenCentral() } dependencies { @@ -17,7 +18,7 @@ dependencies { implementation("net.kyori:adventure-text-serializer-plain:4.0.0-SNAPSHOT") compileOnly("com.google.guava:guava:30.1.1-jre") - compileOnly("us.ajg0702:ajUtils:1.1.9") + compileOnly("us.ajg0702:ajUtils:1.1.10") } publishing { diff --git a/api/src/main/java/us/ajg0702/queue/api/QueueManager.java b/api/src/main/java/us/ajg0702/queue/api/QueueManager.java index f8f49f0..acb39d7 100644 --- a/api/src/main/java/us/ajg0702/queue/api/QueueManager.java +++ b/api/src/main/java/us/ajg0702/queue/api/QueueManager.java @@ -64,6 +64,11 @@ public interface QueueManager { */ void sendActionBars(); + /** + * Sends queue status titles to players in queues + */ + void sendTitles(); + /** * Tell the spigot sides to call the queue scoreboard event */ diff --git a/api/src/main/java/us/ajg0702/queue/api/Logic.java b/api/src/main/java/us/ajg0702/queue/api/premium/Logic.java similarity index 82% rename from api/src/main/java/us/ajg0702/queue/api/Logic.java rename to api/src/main/java/us/ajg0702/queue/api/premium/Logic.java index 781a944..b7aa8e4 100644 --- a/api/src/main/java/us/ajg0702/queue/api/Logic.java +++ b/api/src/main/java/us/ajg0702/queue/api/premium/Logic.java @@ -1,4 +1,4 @@ -package us.ajg0702.queue.api; +package us.ajg0702.queue.api.premium; import us.ajg0702.queue.api.players.AdaptedPlayer; import us.ajg0702.queue.api.players.QueuePlayer; @@ -26,4 +26,10 @@ public interface Logic { * @return true if the player has been disconnected for too long and should be removed from the queue */ boolean playerDisconnectedTooLong(QueuePlayer player); + + /** + * Gets the permissionGetter. Only available on ajQueuePlus + * @return the permission getter + */ + PermissionGetter getPermissionGetter(); } diff --git a/api/src/main/java/us/ajg0702/queue/api/LogicGetter.java b/api/src/main/java/us/ajg0702/queue/api/premium/LogicGetter.java similarity index 65% rename from api/src/main/java/us/ajg0702/queue/api/LogicGetter.java rename to api/src/main/java/us/ajg0702/queue/api/premium/LogicGetter.java index af2b7e9..b8f5b6a 100644 --- a/api/src/main/java/us/ajg0702/queue/api/LogicGetter.java +++ b/api/src/main/java/us/ajg0702/queue/api/premium/LogicGetter.java @@ -1,6 +1,8 @@ -package us.ajg0702.queue.api; +package us.ajg0702.queue.api.premium; +import us.ajg0702.queue.api.AliasManager; import us.ajg0702.queue.api.players.AdaptedPlayer; +import us.ajg0702.queue.api.premium.Logic; import us.ajg0702.utils.common.Config; import java.util.List; @@ -10,4 +12,5 @@ public interface LogicGetter { Logic constructLogic(); AliasManager constructAliasManager(Config config); List getPermissions(AdaptedPlayer player); + PermissionGetter getPermissionGetter(); } diff --git a/api/src/main/java/us/ajg0702/queue/api/premium/PermissionGetter.java b/api/src/main/java/us/ajg0702/queue/api/premium/PermissionGetter.java new file mode 100644 index 0000000..d050a44 --- /dev/null +++ b/api/src/main/java/us/ajg0702/queue/api/premium/PermissionGetter.java @@ -0,0 +1,14 @@ +package us.ajg0702.queue.api.premium; + +import us.ajg0702.queue.api.players.AdaptedPlayer; +import us.ajg0702.queue.api.premium.PermissionHook; + +public interface PermissionGetter { + PermissionHook getSelected(); + + int getMaxOfflineTime(AdaptedPlayer player); + + int getPriority(AdaptedPlayer player); + + int getServerPriotity(String server, AdaptedPlayer player); +} diff --git a/premium/src/main/java/us/ajg0702/queue/logic/permissions/PermissionHook.java b/api/src/main/java/us/ajg0702/queue/api/premium/PermissionHook.java similarity index 82% rename from premium/src/main/java/us/ajg0702/queue/logic/permissions/PermissionHook.java rename to api/src/main/java/us/ajg0702/queue/api/premium/PermissionHook.java index b9b7e97..94105e0 100644 --- a/premium/src/main/java/us/ajg0702/queue/logic/permissions/PermissionHook.java +++ b/api/src/main/java/us/ajg0702/queue/api/premium/PermissionHook.java @@ -1,4 +1,4 @@ -package us.ajg0702.queue.logic.permissions; +package us.ajg0702.queue.api.premium; import us.ajg0702.queue.api.players.AdaptedPlayer; diff --git a/build.gradle.kts b/build.gradle.kts index 2f9ba5d..99e913c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,13 +5,14 @@ plugins { } repositories { - mavenCentral() maven { url = uri("https://repo.ajg0702.us") } maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots") } + + mavenCentral() } allprojects { - version = "2.0.3" + version = "2.0.4" group = "us.ajg0702" plugins.apply("java") diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 9661044..511b94d 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -7,8 +7,8 @@ group = "us.ajg0702.queue.common" repositories { //mavenLocal() - mavenCentral() maven { url = uri("https://repo.ajg0702.us") } + mavenCentral() } dependencies { @@ -16,7 +16,7 @@ dependencies { compileOnly("net.kyori:adventure-text-serializer-plain:4.0.0-SNAPSHOT") compileOnly("com.google.guava:guava:30.1.1-jre") - compileOnly("us.ajg0702:ajUtils:1.1.9") + compileOnly("us.ajg0702:ajUtils:1.1.10") compileOnly("org.slf4j:slf4j-log4j12:1.7.29") diff --git a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/ManageCommand.java b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/ManageCommand.java index 1febb34..6a5c701 100644 --- a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/ManageCommand.java +++ b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/ManageCommand.java @@ -83,6 +83,7 @@ public class ManageCommand extends BaseCommand { if(args.length > 1) { for(ISubCommand subCommand : subCommands) { if(args[0].equalsIgnoreCase(subCommand.getName()) || subCommand.getAliases().contains(args[0].toLowerCase(Locale.ROOT))) { + if(!sender.hasPermission(subCommand.getPermission())) continue; return subCommand.autoComplete(sender, Arrays.copyOfRange(args, 1, args.length)); } } @@ -91,6 +92,7 @@ public class ManageCommand extends BaseCommand { List commands = new ArrayList<>(); for(ISubCommand subCommand : subCommands) { if(!subCommand.showInTabComplete()) continue; + if(!sender.hasPermission(subCommand.getPermission())) continue; commands.add(subCommand.getName()); commands.addAll(subCommand.getAliases()); } diff --git a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Pause.java b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Pause.java index a165642..05e28c0 100644 --- a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Pause.java +++ b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Pause.java @@ -9,6 +9,7 @@ import us.ajg0702.utils.common.Messages; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; public class Pause extends SubCommand { @@ -47,26 +48,36 @@ public class Pause extends SubCommand { return; } - QueueServer server = main.getQueueManager().findServer(args[0]); - if(server == null) { + List servers; + QueueServer queueServer = main.getQueueManager().findServer(args[0]); + if(queueServer == null && !args[0].equalsIgnoreCase("all")) { sender.sendMessage(getMessages().getComponent("commands.pause.no-server", "SERVER:"+args[1])); return; - } - if(args.length == 1) { - server.setPaused(!server.isPaused()); + } else if(queueServer == null && args[0].equalsIgnoreCase("all")) { + servers = main.getQueueManager().getServers(); } else { - server.setPaused(args[1].equalsIgnoreCase("on") || args[1].equalsIgnoreCase("true")); + servers = Collections.singletonList(queueServer); + } + + for(QueueServer server : servers) { + if(args.length == 1) { + server.setPaused(!server.isPaused()); + } else { + server.setPaused(args[1].equalsIgnoreCase("on") || args[1].equalsIgnoreCase("true")); + } + sender.sendMessage(getMessages().getComponent("commands.pause.success", + "SERVER:"+server.getName(), + "PAUSED:"+getMessages().getString("commands.pause.paused."+server.isPaused()) + )); } - sender.sendMessage(getMessages().getComponent("commands.pause.success", - "SERVER:"+server.getName(), - "PAUSED:"+getMessages().getString("commands.pause.paused."+server.isPaused()) - )); } @Override public List autoComplete(ICommandSender sender, String[] args) { if(args.length == 1) { - return main.getQueueManager().getServerNames(); + List servers = new ArrayList<>(main.getQueueManager().getServerNames()); + servers.add("all"); + return servers; } if(args.length == 2) { return Arrays.asList("on", "off", "true", "false"); diff --git a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/debug/PermissionList.java b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/debug/PermissionList.java index a92a229..06b73eb 100644 --- a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/debug/PermissionList.java +++ b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/debug/PermissionList.java @@ -65,6 +65,11 @@ public class PermissionList extends SubCommand { if(!s.toLowerCase(Locale.ROOT).contains("ajqueue")) return; sender.sendMessage(Component.text(s)); }); + sender.sendMessage( + Component.text( + "Using: "+main.getLogicGetter().getPermissionGetter().getSelected().getName()) + .color(NamedTextColor.GOLD) + ); } @Override diff --git a/common/src/main/java/us/ajg0702/queue/common/AjQueueAPI.java b/common/src/main/java/us/ajg0702/queue/common/AjQueueAPI.java new file mode 100644 index 0000000..6bf12ff --- /dev/null +++ b/common/src/main/java/us/ajg0702/queue/common/AjQueueAPI.java @@ -0,0 +1,112 @@ +package us.ajg0702.queue.common; + +import us.ajg0702.queue.api.AliasManager; +import us.ajg0702.queue.api.EventHandler; +import us.ajg0702.queue.api.PlatformMethods; +import us.ajg0702.queue.api.QueueManager; +import us.ajg0702.queue.api.premium.Logic; +import us.ajg0702.queue.api.premium.LogicGetter; +import us.ajg0702.queue.api.util.QueueLogger; +import us.ajg0702.utils.common.Config; +import us.ajg0702.utils.common.Messages; + +public abstract class AjQueueAPI { + + public static AjQueueAPI INSTANCE; + + /** + * Gets the instance of the ajQueue API + * @return the ajQueue API + */ + @SuppressWarnings("unused") + public static AjQueueAPI getInstance() { + return INSTANCE; + } + + + /** + * Gets the time that ajQueue will wait between sending players. In seconds + * @return The time, in seconds, ajQueue will wait between attempting to send players + */ + public abstract double getTimeBetweenPlayers(); + + /** + * Updates the time between players. Takes it from the config. + */ + public abstract void setTimeBetweenPlayers(); + + /** + * Gets the ajQueue config + * @return the ajQueue config + */ + public abstract Config getConfig(); + + /** + * Gets the ajQueue messages manager + * @return the messages manager + */ + public abstract Messages getMessages(); + + /** + * Gets the alias manager. Used to get aliases of servers set in ajqueue's config. + * Note that the alias manager on the free version will just return the server's name + * @return The alias manager + */ + public abstract AliasManager getAliasManager(); + + /** + * Gets the priority logic. Note that the priority logic for the free version does nothing. + * @return The priority logic + */ + public abstract Logic getLogic(); + + /** + * Checks if the plugin is the premium version or not. + * @return True if ajQueuePlus, false if ajQueue + */ + public abstract boolean isPremium(); + + /** + * Gets the PlatformMethods for the platform (e.g. bungee, velocity) + * The methods in this class do things that the code for each is different on the platform. + * @return the PlatformMethods + */ + public abstract PlatformMethods getPlatformMethods(); + + /** + * Gets the ajQueue logger. If you are using this, please add your own prefix to it. + * @return The ajQueue logger + */ + public abstract QueueLogger getLogger(); + + /** + * Gets the repeating task manager + * @return The TaskManager + */ + public abstract TaskManager getTaskManager(); + + /** + * Gets the event handler. + * + * This class will probably be replaced in the future with an actual event system + * @return the EventHandler + */ + public abstract EventHandler getEventHandler(); + + /** + * Gets the queue manager. Most things you do interacting with queues will be through this. + * @return the QueueManager + */ + public abstract QueueManager getQueueManager(); + + /** + * Gets the logic getter. + * @return The logic getter + */ + public abstract LogicGetter getLogicGetter(); + + /** + * Tells ajQueue to shut down. + */ + public abstract void shutdown(); +} diff --git a/common/src/main/java/us/ajg0702/queue/common/QueueMain.java b/common/src/main/java/us/ajg0702/queue/common/QueueMain.java index 77b435f..00a9224 100644 --- a/common/src/main/java/us/ajg0702/queue/common/QueueMain.java +++ b/common/src/main/java/us/ajg0702/queue/common/QueueMain.java @@ -2,6 +2,8 @@ package us.ajg0702.queue.common; import org.spongepowered.configurate.ConfigurateException; import us.ajg0702.queue.api.*; +import us.ajg0702.queue.api.premium.Logic; +import us.ajg0702.queue.api.premium.LogicGetter; import us.ajg0702.queue.api.util.QueueLogger; import us.ajg0702.queue.common.utils.LogConverter; import us.ajg0702.queue.logic.LogicGetterImpl; @@ -11,7 +13,7 @@ import us.ajg0702.utils.common.Messages; import java.io.File; import java.util.LinkedHashMap; -public class QueueMain { +public class QueueMain extends AjQueueAPI { private static QueueMain instance; public static QueueMain getInstance() { @@ -19,67 +21,81 @@ public class QueueMain { } private double timeBetweenPlayers; + @Override public double getTimeBetweenPlayers() { return timeBetweenPlayers; } + @Override public void setTimeBetweenPlayers() { this.timeBetweenPlayers = config.getDouble("wait-time"); } private Config config; + @Override public Config getConfig() { return config; } private Messages messages; + @Override public Messages getMessages() { return messages; } private AliasManager aliasManager; + @Override public AliasManager getAliasManager() { return aliasManager; } private Logic logic; + @Override public Logic getLogic() { return logic; } + @Override public boolean isPremium() { return getLogic().isPremium(); } private final PlatformMethods platformMethods; + @Override public PlatformMethods getPlatformMethods() { return platformMethods; } private final QueueLogger logger; + @Override public QueueLogger getLogger() { return logger; } private final TaskManager taskManager = new TaskManager(this); + @Override public TaskManager getTaskManager() { return taskManager; } private final EventHandler eventHandler = new EventHandlerImpl(this); + @Override public EventHandler getEventHandler() { return eventHandler; } private QueueManager queueManager; + @Override public QueueManager getQueueManager() { return queueManager; } private final LogicGetter logicGetter; + @Override public LogicGetter getLogicGetter() { return logicGetter; } + @Override public void shutdown() { taskManager.shutdown(); } @@ -101,6 +117,8 @@ public class QueueMain { } instance = this; + AjQueueAPI.INSTANCE = this; + this.logger = logger; this.platformMethods = platformMethods; @@ -175,6 +193,9 @@ public class QueueMain { d.put("placeholders.queued.none", "None"); d.put("placeholders.position.none", "None"); + d.put("title.title", ""); + d.put("title.subtitle", "You are #{POS} in the queue!"); + d.put("commands.leave.more-args", "&cPlease specify which queue you want to leave! &7You are in these queues: {QUEUES}"); d.put("commands.leave.queues-list-format", "&f{NAME}&7, "); d.put("commands.leave.not-queued", "&cYou are not queued for that server! &7You are in these queues: {QUEUES}"); diff --git a/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java b/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java index 5af0907..6dc192f 100644 --- a/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java +++ b/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java @@ -1,6 +1,8 @@ package us.ajg0702.queue.common; import com.google.common.collect.ImmutableList; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.title.Title; import us.ajg0702.queue.api.QueueManager; import us.ajg0702.queue.api.players.AdaptedPlayer; import us.ajg0702.queue.api.players.QueuePlayer; @@ -11,6 +13,7 @@ import us.ajg0702.queue.common.queues.QueueServerImpl; import us.ajg0702.utils.common.Messages; import us.ajg0702.utils.common.TimeUtils; +import java.time.Duration; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -309,6 +312,45 @@ public class QueueManagerImpl implements QueueManager { "TIME:"+ TimeUtils.timeString(time, msgs.getString("format.time.mins"), msgs.getString("format.time.secs")) )); } + + } + } + } + + @Override + public void sendTitles() { + if(!main.getConfig().getBoolean("send-title")) return; + + for(QueueServer server : servers) { + String status = server.getStatusString(); + for(QueuePlayer queuePlayer : server.getQueue()) { + + int pos = queuePlayer.getPosition(); + if(pos == 0) { + server.removePlayer(queuePlayer); + continue; + } + + AdaptedPlayer player = queuePlayer.getPlayer(); + if(player == null) continue; + + if(!getSingleServer(player).equals(server)) continue; + + Component titleMessage = msgs.getComponent("title.title", + "POS:"+pos, + "LEN:"+server.getQueue().size(), + "SERVER:"+server.getAlias(), + "STATUS:"+status + ); + Component subTitleMessage = msgs.getComponent("title.subtitle", + "POS:"+pos, + "LEN:"+server.getQueue().size(), + "SERVER:"+server.getAlias(), + "STATUS:"+status + ); + + Title title = Title.title(titleMessage, subTitleMessage, Title.Times.of(Duration.ZERO, Duration.ofSeconds(2L), Duration.ZERO)); + player.showTitle(title); } } } diff --git a/common/src/main/java/us/ajg0702/queue/common/TaskManager.java b/common/src/main/java/us/ajg0702/queue/common/TaskManager.java index 2db235f..e9932e9 100644 --- a/common/src/main/java/us/ajg0702/queue/common/TaskManager.java +++ b/common/src/main/java/us/ajg0702/queue/common/TaskManager.java @@ -24,7 +24,7 @@ public class TaskManager { } public String taskStatus() { - List> tasks = Arrays.asList(sendTask, updateTask, messageTask, actionBarTask, queueEventTask, reloadServerTask); + List> tasks = Arrays.asList(sendTask, updateTask, messageTask, actionBarTask, titleTask, queueEventTask, reloadServerTask); StringBuilder sb = new StringBuilder(); for(ScheduledFuture task : tasks) { sb.append(task == null ? "null" : task.isDone() ? "canceled/done" : "running"); @@ -37,6 +37,7 @@ public class TaskManager { ScheduledFuture updateTask; ScheduledFuture messageTask; ScheduledFuture actionBarTask; + ScheduledFuture titleTask; ScheduledFuture queueEventTask; ScheduledFuture reloadServerTask; public void rescheduleTasks() { @@ -67,6 +68,12 @@ public class TaskManager { TimeUnit.MILLISECONDS ); + titleTask = scheduleAtFixedRate( + main.getQueueManager()::sendTitles, + 1500L, + TimeUnit.MILLISECONDS + ); + queueEventTask = scheduleAtFixedRate( main.getQueueManager()::sendQueueEvents, 1500L, @@ -96,6 +103,9 @@ public class TaskManager { if(actionBarTask != null && !actionBarTask.isCancelled()) { actionBarTask.cancel(true); } + if(titleTask != null && !titleTask.isCancelled()) { + titleTask.cancel(true); + } if(queueEventTask != null && !queueEventTask.isCancelled()) { queueEventTask.cancel(true); } diff --git a/common/src/main/java/us/ajg0702/queue/logic/FreeLogic.java b/common/src/main/java/us/ajg0702/queue/logic/FreeLogic.java index 6e26917..b9a902f 100644 --- a/common/src/main/java/us/ajg0702/queue/logic/FreeLogic.java +++ b/common/src/main/java/us/ajg0702/queue/logic/FreeLogic.java @@ -1,8 +1,9 @@ package us.ajg0702.queue.logic; -import us.ajg0702.queue.api.Logic; +import us.ajg0702.queue.api.premium.Logic; import us.ajg0702.queue.api.players.AdaptedPlayer; import us.ajg0702.queue.api.players.QueuePlayer; +import us.ajg0702.queue.api.premium.PermissionGetter; import us.ajg0702.queue.api.queues.QueueServer; public class FreeLogic implements Logic { @@ -20,4 +21,9 @@ public class FreeLogic implements Logic { public boolean playerDisconnectedTooLong(QueuePlayer player) { return player.getMaxOfflineTime() < player.getTimeSinceOnline()*1000; } + + @Override + public PermissionGetter getPermissionGetter() { + return null; + } } diff --git a/common/src/main/java/us/ajg0702/queue/logic/LogicGetterImpl.java b/common/src/main/java/us/ajg0702/queue/logic/LogicGetterImpl.java index 37598cc..8a6a706 100644 --- a/common/src/main/java/us/ajg0702/queue/logic/LogicGetterImpl.java +++ b/common/src/main/java/us/ajg0702/queue/logic/LogicGetterImpl.java @@ -1,13 +1,15 @@ package us.ajg0702.queue.logic; import us.ajg0702.queue.api.AliasManager; -import us.ajg0702.queue.api.Logic; +import us.ajg0702.queue.api.premium.Logic; import us.ajg0702.queue.api.players.AdaptedPlayer; +import us.ajg0702.queue.api.premium.LogicGetter; +import us.ajg0702.queue.api.premium.PermissionGetter; import us.ajg0702.utils.common.Config; import java.util.List; -public class LogicGetterImpl implements us.ajg0702.queue.api.LogicGetter { +public class LogicGetterImpl implements LogicGetter { @Override public Logic constructLogic() { @@ -23,4 +25,9 @@ public class LogicGetterImpl implements us.ajg0702.queue.api.LogicGetter { public List getPermissions(AdaptedPlayer player) { return null; } + + @Override + public PermissionGetter getPermissionGetter() { + return null; + } } diff --git a/common/src/main/resources/config.yml b/common/src/main/resources/config.yml index 736c47b..38b014d 100644 --- a/common/src/main/resources/config.yml +++ b/common/src/main/resources/config.yml @@ -1,5 +1,5 @@ # Dont touch this number please -config-version: 24 +config-version: 25 # The time the server will wait between sending people in the queue # Default: 5 @@ -31,9 +31,7 @@ kick-reasons: # Should we remove a player from the queue if they move servers? -# If they join another queue, they will be removed from the previous one no matter what -# This is more meant for if you have multiple lobbies if you want to let the player switch -# between them without losing their queue position +# This will remove the player from if they switch to any other server # Default: false remove-player-on-server-switch: false @@ -53,17 +51,19 @@ wait-to-load-servers-delay: 500 # How often (in seconds) we should check for new servers to add queues for. # If you dynamicly add servers, set this to something other than 0. # To disable, set to 0 +# Default: 0 reload-servers-interval: 0 # Should we require permissions for players to be able to join queues? -# If enabled, players will be required to have the permission ajqueue.queue. +# If enabled, players will be required to have the permission ajqueue.queue. to be able to join queues # Default: false require-permission: false # Should we let players join more than one queue? # If enabled, players will be able to be in multiple queues at once. +# If disabled, players will be removed from the previous queue when joining a new queue # Default: true allow-multiple-queues: true @@ -163,6 +163,7 @@ priority-queue-debug: false auto-add-to-queue-on-kick: false # The delay for the above option. # In seconds, decimals supported. +# Default: 1 auto-add-to-queue-on-kick-delay: 1 # With what kick reasons should we auto-add the player to the queue @@ -176,10 +177,12 @@ auto-add-kick-reasons: # Should we enable the server command being a queue command? # This may require extra setup on bungeecord. See the wiki: # https://wiki.ajg0702.us/ajqueue/setup/replacing-server-command +# Default: false enable-server-command: false # Should we enable priority messages? # Configure the priority messages in the option below. +# Default: false enable-priority-messages: false # Messages we send to players with priority queue when they join the queue @@ -189,4 +192,9 @@ enable-priority-messages: false # Example: 1:You have a priority of 1! priority-messages: - "*:Joining the queue with a priority of {PRIORITY}!" - - "100:Wow! You have a priority of 100!" \ No newline at end of file + - "100:Wow! You have a priority of 100!" + +# Should the plugin send a title to the player? +# The title shows what position the player is in the queue +# Default: false +send-title: false \ No newline at end of file diff --git a/free/build.gradle.kts b/free/build.gradle.kts index d75bcbd..642c029 100644 --- a/free/build.gradle.kts +++ b/free/build.gradle.kts @@ -7,10 +7,9 @@ plugins { group = "us.ajg0702.queue" repositories { - //mavenLocal() - mavenCentral() maven { url = uri("https://repo.ajg0702.us") } maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots") } + mavenCentral() } dependencies { @@ -18,7 +17,7 @@ dependencies { compileOnly("com.google.guava:guava:30.1.1-jre") compileOnly("org.spongepowered:configurate-yaml:4.0.0") - implementation("us.ajg0702:ajUtils:1.1.9") + implementation("us.ajg0702:ajUtils:1.1.10") implementation(project(":platforms:velocity")) implementation(project(":platforms:bungeecord")) diff --git a/libs/private/README.md b/libs/private/README.md new file mode 100644 index 0000000..d84eb3f --- /dev/null +++ b/libs/private/README.md @@ -0,0 +1,6 @@ +If you want to compile ajQueuePlus, you will need to put the UltraPermissions jar here. + +Either that, or remove the UltraPermissionsHook and its 1 reference + +eventually I will make a fake dependency with just the class structure so you dont have to do this, +but i havent done that yet :p \ No newline at end of file diff --git a/libs/public/AquaCoreAPI.jar b/libs/public/AquaCoreAPI.jar new file mode 100644 index 0000000..b50f85b Binary files /dev/null and b/libs/public/AquaCoreAPI.jar differ diff --git a/platforms/bungeecord/build.gradle.kts b/platforms/bungeecord/build.gradle.kts index 96b77ac..0b3934d 100644 --- a/platforms/bungeecord/build.gradle.kts +++ b/platforms/bungeecord/build.gradle.kts @@ -7,15 +7,15 @@ group = "us.ajg0702.queue.platforms.bungeecord" repositories { //mavenLocal() - mavenCentral() maven { url = uri("https://repo.ajg0702.us") } maven { url = uri("https://nexus.velocitypowered.com/repository/maven-public/") } + mavenCentral() } dependencies { compileOnly("net.kyori:adventure-api:4.8.1") compileOnly("com.google.guava:guava:30.1.1-jre") - compileOnly("us.ajg0702:ajUtils:1.1.9") + compileOnly("us.ajg0702:ajUtils:1.1.10") compileOnly("net.md-5:bungeecord-api:1.16-R0.4") diff --git a/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/BungeeMethods.java b/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/BungeeMethods.java index 9a6ef6e..c09244e 100644 --- a/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/BungeeMethods.java +++ b/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/BungeeMethods.java @@ -5,6 +5,7 @@ import com.google.common.io.ByteStreams; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.api.connection.ProxiedPlayer; +import net.md_5.bungee.api.connection.Server; import us.ajg0702.queue.api.PlatformMethods; import us.ajg0702.queue.api.commands.IBaseCommand; import us.ajg0702.queue.api.commands.ICommandSender; @@ -40,13 +41,15 @@ public class BungeeMethods implements PlatformMethods { ByteArrayDataOutput out = ByteStreams.newDataOutput(); out.writeUTF(channel); out.writeUTF(player.getName()); - int length = data.length; for (String s : data) { out.writeUTF(s); } - - ((BungeePlayer) player).getHandle().getServer().sendData("ajqueue:tospigot", out.toByteArray()); + ProxiedPlayer proxiedPlayer = ((BungeePlayer) player).getHandle(); + if(proxiedPlayer == null) return; + Server server = proxiedPlayer.getServer(); + if(server == null) return; + server.sendData("ajqueue:tospigot", out.toByteArray()); } } diff --git a/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/BungeeQueue.java b/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/BungeeQueue.java index 7675a92..2aeae29 100644 --- a/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/BungeeQueue.java +++ b/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/BungeeQueue.java @@ -2,11 +2,16 @@ package us.ajg0702.queue.platforms.bungeecord; import net.kyori.adventure.platform.bungeecord.BungeeAudiences; import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer; +import net.kyori.adventure.title.Title; +import net.md_5.bungee.api.chat.BaseComponent; +import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.event.*; import net.md_5.bungee.api.plugin.Listener; import net.md_5.bungee.api.plugin.Plugin; +import net.md_5.bungee.chat.BaseComponentSerializer; import net.md_5.bungee.event.EventHandler; import org.bstats.bungeecord.Metrics; import org.bstats.charts.SimplePie; @@ -24,6 +29,7 @@ import us.ajg0702.queue.platforms.bungeecord.players.BungeePlayer; import us.ajg0702.queue.platforms.bungeecord.server.BungeeServer; import java.io.File; +import java.time.Duration; import java.util.Arrays; import java.util.List; diff --git a/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/players/BungeePlayer.java b/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/players/BungeePlayer.java index c45b73f..50c1b62 100644 --- a/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/players/BungeePlayer.java +++ b/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/players/BungeePlayer.java @@ -1,8 +1,13 @@ package us.ajg0702.queue.platforms.bungeecord.players; import net.kyori.adventure.audience.Audience; +import net.kyori.adventure.bossbar.BossBar; +import net.kyori.adventure.sound.Sound; +import net.kyori.adventure.sound.SoundStop; import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.ComponentLike; import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; +import net.kyori.adventure.title.Title; import net.md_5.bungee.api.connection.ProxiedPlayer; import org.jetbrains.annotations.NotNull; import us.ajg0702.queue.api.players.AdaptedPlayer; @@ -15,6 +20,60 @@ import java.util.List; import java.util.UUID; public class BungeePlayer implements AdaptedPlayer, Audience { + @Override + public void sendActionBar(@NotNull ComponentLike message) { + getAudience().sendActionBar(message); + } + + @Override + public void showTitle(@NotNull Title title) { + getAudience().showTitle(title); + } + + @Override + public void clearTitle() { + getAudience().clearTitle(); + } + + @Override + public void resetTitle() { + getAudience().resetTitle(); + } + + @Override + public void showBossBar(@NotNull BossBar bar) { + getAudience().showBossBar(bar); + } + + @Override + public void hideBossBar(@NotNull BossBar bar) { + getAudience().hideBossBar(bar); + } + + @Override + public void playSound(@NotNull Sound sound) { + getAudience().playSound(sound); + } + + @Override + public void playSound(@NotNull Sound sound, double x, double y, double z) { + getAudience().playSound(sound, x, y, z); + } + + @Override + public void stopSound(@NotNull Sound sound) { + getAudience().stopSound(sound); + } + + @Override + public void playSound(@NotNull Sound sound, Sound.@NotNull Emitter emitter) { + getAudience().playSound(sound, emitter); + } + + @Override + public void stopSound(@NotNull SoundStop stop) { + getAudience().stopSound(stop); + } final ProxiedPlayer handle; @@ -30,19 +89,19 @@ public class BungeePlayer implements AdaptedPlayer, Audience { @Override public void sendMessage(@NotNull Component message) { if(PlainTextComponentSerializer.plainText().serialize(message).isEmpty()) return; - BungeeQueue.adventure().player(handle).sendMessage(message); + getAudience().sendMessage(message); } @Override public void sendActionBar(@NotNull Component message) { if(PlainTextComponentSerializer.plainText().serialize(message).isEmpty()) return; - BungeeQueue.adventure().player(handle).sendActionBar(message); + getAudience().sendActionBar(message); } @Override public void sendMessage(String message) { if(message.isEmpty()) return; - BungeeQueue.adventure().player(handle).sendMessage(Component.text(message)); + getAudience().sendMessage(Component.text(message)); } @Override @@ -79,4 +138,8 @@ public class BungeePlayer implements AdaptedPlayer, Audience { public ProxiedPlayer getHandle() { return handle; } + + private Audience getAudience() { + return BungeeQueue.adventure().player(handle); + } } diff --git a/platforms/velocity/build.gradle.kts b/platforms/velocity/build.gradle.kts index bd142b7..2c4df54 100644 --- a/platforms/velocity/build.gradle.kts +++ b/platforms/velocity/build.gradle.kts @@ -6,16 +6,15 @@ plugins { group = "us.ajg0702.queue.platforms.velocity" repositories { - //mavenLocal() - mavenCentral() maven { url = uri("https://repo.ajg0702.us") } maven { url = uri("https://nexus.velocitypowered.com/repository/maven-public/") } + mavenCentral() } dependencies { compileOnly("net.kyori:adventure-api:4.8.1") compileOnly("com.google.guava:guava:30.1.1-jre") - compileOnly("us.ajg0702:ajUtils:1.1.9") + compileOnly("us.ajg0702:ajUtils:1.1.10") compileOnly("com.velocitypowered:velocity-api:3.0.0") annotationProcessor("com.velocitypowered:velocity-api:3.0.0") diff --git a/platforms/velocity/src/main/java/us/ajg0702/queue/platforms/velocity/players/VelocityPlayer.java b/platforms/velocity/src/main/java/us/ajg0702/queue/platforms/velocity/players/VelocityPlayer.java index 350f165..cf77ebb 100644 --- a/platforms/velocity/src/main/java/us/ajg0702/queue/platforms/velocity/players/VelocityPlayer.java +++ b/platforms/velocity/src/main/java/us/ajg0702/queue/platforms/velocity/players/VelocityPlayer.java @@ -4,8 +4,12 @@ import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ServerConnection; import com.velocitypowered.api.proxy.server.RegisteredServer; import net.kyori.adventure.audience.Audience; +import net.kyori.adventure.bossbar.BossBar; +import net.kyori.adventure.sound.Sound; +import net.kyori.adventure.sound.SoundStop; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; +import net.kyori.adventure.title.Title; import org.jetbrains.annotations.NotNull; import us.ajg0702.queue.api.players.AdaptedPlayer; import us.ajg0702.queue.api.server.AdaptedServer; @@ -16,6 +20,55 @@ import java.util.Optional; import java.util.UUID; public class VelocityPlayer implements AdaptedPlayer, Audience { + @Override + public void showTitle(@NotNull Title title) { + handle.showTitle(title); + } + + @Override + public void clearTitle() { + handle.clearTitle(); + } + + @Override + public void resetTitle() { + handle.resetTitle(); + } + + @Override + public void showBossBar(@NotNull BossBar bar) { + handle.showBossBar(bar); + } + + @Override + public void hideBossBar(@NotNull BossBar bar) { + handle.hideBossBar(bar); + } + + @Override + public void playSound(@NotNull Sound sound) { + handle.playSound(sound); + } + + @Override + public void playSound(@NotNull Sound sound, double x, double y, double z) { + handle.playSound(sound, x, y, z); + } + + @Override + public void stopSound(@NotNull Sound sound) { + handle.stopSound(sound); + } + + @Override + public void playSound(@NotNull Sound sound, Sound.@NotNull Emitter emitter) { + handle.playSound(sound, emitter); + } + + @Override + public void stopSound(@NotNull SoundStop stop) { + handle.stopSound(stop); + } final Player handle; diff --git a/premium/build.gradle.kts b/premium/build.gradle.kts index 35a51ec..14d53f7 100644 --- a/premium/build.gradle.kts +++ b/premium/build.gradle.kts @@ -8,10 +8,9 @@ group = "us.ajg0702.queue" repositories { //mavenLocal() - mavenCentral() maven { url = uri("https://repo.ajg0702.us") } maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots") } - + mavenCentral() } dependencies { @@ -22,11 +21,12 @@ dependencies { compileOnly("com.google.guava:guava:30.1.1-jre") - compileOnly("us.ajg0702:ajUtils:1.1.9") + compileOnly("us.ajg0702:ajUtils:1.1.10") compileOnly("net.kyori:adventure-api:4.8.1") - compileOnly(fileTree(mapOf("dir" to "../libs", "include" to listOf("*.jar")))) + compileOnly(fileTree(mapOf("dir" to "../libs/private", "include" to listOf("*.jar")))) + compileOnly(fileTree(mapOf("dir" to "../libs/public", "include" to listOf("*.jar")))) compileOnly("net.luckperms:api:5.0") } diff --git a/premium/src/main/java/us/ajg0702/queue/logic/LogicGetterImpl.java b/premium/src/main/java/us/ajg0702/queue/logic/LogicGetterImpl.java index 1613779..36b111c 100644 --- a/premium/src/main/java/us/ajg0702/queue/logic/LogicGetterImpl.java +++ b/premium/src/main/java/us/ajg0702/queue/logic/LogicGetterImpl.java @@ -1,11 +1,11 @@ package us.ajg0702.queue.logic; import us.ajg0702.queue.api.AliasManager; -import us.ajg0702.queue.api.Logic; -import us.ajg0702.queue.api.LogicGetter; +import us.ajg0702.queue.api.premium.Logic; +import us.ajg0702.queue.api.premium.LogicGetter; import us.ajg0702.queue.api.players.AdaptedPlayer; +import us.ajg0702.queue.api.premium.PermissionGetter; import us.ajg0702.queue.common.QueueMain; -import us.ajg0702.queue.logic.permissions.PermissionGetter; import us.ajg0702.utils.common.Config; import java.util.List; @@ -31,4 +31,9 @@ public class LogicGetterImpl implements LogicGetter { if(logic == null) return null; return logic.getPermissionGetter().getSelected().getPermissions(player); } + + @Override + public PermissionGetter getPermissionGetter() { + return logic.getPermissionGetter(); + } } diff --git a/premium/src/main/java/us/ajg0702/queue/logic/PremiumLogic.java b/premium/src/main/java/us/ajg0702/queue/logic/PremiumLogic.java index 7cdd042..a9bcc87 100644 --- a/premium/src/main/java/us/ajg0702/queue/logic/PremiumLogic.java +++ b/premium/src/main/java/us/ajg0702/queue/logic/PremiumLogic.java @@ -1,14 +1,15 @@ package us.ajg0702.queue.logic; import com.google.common.collect.ImmutableList; -import us.ajg0702.queue.api.Logic; +import us.ajg0702.queue.api.premium.Logic; import us.ajg0702.queue.api.players.AdaptedPlayer; import us.ajg0702.queue.api.players.QueuePlayer; import us.ajg0702.queue.api.queues.QueueServer; import us.ajg0702.queue.api.util.QueueLogger; import us.ajg0702.queue.common.QueueMain; import us.ajg0702.queue.common.players.QueuePlayerImpl; -import us.ajg0702.queue.logic.permissions.PermissionGetter; +import us.ajg0702.queue.api.premium.PermissionGetter; +import us.ajg0702.queue.logic.permissions.PermissionGetterImpl; public class PremiumLogic implements Logic { @@ -18,7 +19,7 @@ public class PremiumLogic implements Logic { private final PermissionGetter permissionGetter; public PremiumLogic(QueueMain main) { - permissionGetter = new PermissionGetter(main); + permissionGetter = new PermissionGetterImpl(main); } @Override diff --git a/premium/src/main/java/us/ajg0702/queue/logic/permissions/PermissionGetter.java b/premium/src/main/java/us/ajg0702/queue/logic/permissions/PermissionGetterImpl.java similarity index 85% rename from premium/src/main/java/us/ajg0702/queue/logic/permissions/PermissionGetter.java rename to premium/src/main/java/us/ajg0702/queue/logic/permissions/PermissionGetterImpl.java index cd46361..6ca9d1a 100644 --- a/premium/src/main/java/us/ajg0702/queue/logic/permissions/PermissionGetter.java +++ b/premium/src/main/java/us/ajg0702/queue/logic/permissions/PermissionGetterImpl.java @@ -1,28 +1,33 @@ package us.ajg0702.queue.logic.permissions; import us.ajg0702.queue.api.players.AdaptedPlayer; +import us.ajg0702.queue.api.premium.PermissionGetter; +import us.ajg0702.queue.api.premium.PermissionHook; import us.ajg0702.queue.common.QueueMain; +import us.ajg0702.queue.logic.permissions.hooks.AquaCoreHook; import us.ajg0702.queue.logic.permissions.hooks.BuiltInHook; import us.ajg0702.queue.logic.permissions.hooks.LuckPermsHook; import us.ajg0702.queue.logic.permissions.hooks.UltraPermissionsHook; import java.util.*; -public class PermissionGetter { +public class PermissionGetterImpl implements PermissionGetter { private final List hooks; private final QueueMain main; - public PermissionGetter(QueueMain main) { + public PermissionGetterImpl(QueueMain main) { hooks = Arrays.asList( new BuiltInHook(main), new LuckPermsHook(main), - new UltraPermissionsHook(main) + new UltraPermissionsHook(main), + new AquaCoreHook(main) ); this.main = main; } private PermissionHook selected; + @Override public PermissionHook getSelected() { if(selected != null) return selected; if(hooks == null) { @@ -40,14 +45,17 @@ public class PermissionGetter { return selected; } + @Override public int getMaxOfflineTime(AdaptedPlayer player) { return getHighestPermission(player, "ajqueue.stayqueued."); } + @Override public int getPriority(AdaptedPlayer player) { return getHighestPermission(player, "ajqueue.priority."); } + @Override public int getServerPriotity(String server, AdaptedPlayer player) { return getHighestPermission(player, "ajqueue.serverpriority."+server+"."); } diff --git a/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/AquaCoreHook.java b/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/AquaCoreHook.java new file mode 100644 index 0000000..328ce80 --- /dev/null +++ b/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/AquaCoreHook.java @@ -0,0 +1,51 @@ +package us.ajg0702.queue.logic.permissions.hooks; + +import me.activated.core.plugin.AquaCoreAPI; +import us.ajg0702.queue.api.players.AdaptedPlayer; +import us.ajg0702.queue.common.QueueMain; +import us.ajg0702.queue.api.premium.PermissionHook; + +import java.util.ArrayList; +import java.util.List; + +public class AquaCoreHook implements PermissionHook { + + private final QueueMain main; + public AquaCoreHook(QueueMain main) { + this.main = main; + } + + @Override + public String getName() { + return "AquaCore"; + } + + @Override + public boolean canUse() { + if(!main.getPlatformMethods().hasPlugin("AquaProxy") ) return false; + try { + if(AquaCoreAPI.INSTANCE == null) { + main.getLogger().warn("AquaCore is installed, but its INSTANCE returned null! Unable to hook into it."); + return false; + } + } catch(NoClassDefFoundError e) { + main.getLogger().warning("AquaCore seems to be installed, but its api doesnt seem to be!"); + return false; + } + return true; + } + + @Override + public List getPermissions(AdaptedPlayer player) { + AquaCoreAPI api = AquaCoreAPI.INSTANCE; + + List permissions = new ArrayList<>(); + + api.getPlayerData(player.getUniqueId()).getActiveGrants().forEach(grant -> { + if(!grant.isActiveSomewhere() || grant.hasExpired()) return; + permissions.addAll(grant.getRank().getAvailablePermissions()); + }); + + return permissions; + } +} diff --git a/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/BuiltInHook.java b/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/BuiltInHook.java index 80ad546..1ea1391 100644 --- a/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/BuiltInHook.java +++ b/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/BuiltInHook.java @@ -2,7 +2,7 @@ package us.ajg0702.queue.logic.permissions.hooks; import us.ajg0702.queue.api.players.AdaptedPlayer; import us.ajg0702.queue.common.QueueMain; -import us.ajg0702.queue.logic.permissions.PermissionHook; +import us.ajg0702.queue.api.premium.PermissionHook; import java.util.ArrayList; import java.util.List; diff --git a/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/LuckPermsHook.java b/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/LuckPermsHook.java index 1b21b79..ed892ce 100644 --- a/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/LuckPermsHook.java +++ b/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/LuckPermsHook.java @@ -8,7 +8,7 @@ import net.luckperms.api.node.NodeType; import net.luckperms.api.query.QueryOptions; import us.ajg0702.queue.api.players.AdaptedPlayer; import us.ajg0702.queue.common.QueueMain; -import us.ajg0702.queue.logic.permissions.PermissionHook; +import us.ajg0702.queue.api.premium.PermissionHook; import java.util.*; diff --git a/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/UltraPermissionsHook.java b/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/UltraPermissionsHook.java index 837dd7e..4aebd0f 100644 --- a/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/UltraPermissionsHook.java +++ b/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/UltraPermissionsHook.java @@ -5,7 +5,7 @@ import me.TechsCode.UltraPermissions.UltraPermissionsAPI; import me.TechsCode.UltraPermissions.storage.objects.User; import us.ajg0702.queue.api.players.AdaptedPlayer; import us.ajg0702.queue.common.QueueMain; -import us.ajg0702.queue.logic.permissions.PermissionHook; +import us.ajg0702.queue.api.premium.PermissionHook; import java.util.ArrayList; import java.util.List; @@ -27,7 +27,7 @@ public class UltraPermissionsHook implements PermissionHook { public boolean canUse() { if(!main.getPlatformMethods().hasPlugin("UltraPermissions") ) return false; if(UltraPermissions.getAPI() == null) { - main.getLogger().warn("UltraPermissions getApi() method returned null! Unable to hook into it."); + main.getLogger().warn("UltraPermissions is installed, but its getApi() method returned null! Unable to hook into it."); return false; } return true; diff --git a/spigot/build.gradle.kts b/spigot/build.gradle.kts index a24dff6..576b723 100644 --- a/spigot/build.gradle.kts +++ b/spigot/build.gradle.kts @@ -7,13 +7,15 @@ group = "us.ajg0702.queue.spigot" repositories { //mavenLocal() - mavenCentral() + maven { url = uri("https://repo.extendedclip.com/content/repositories/placeholderapi/") } maven { url = uri("https://repo.codemc.io/repository/nms/") } maven { url = uri("https://repo.ajg0702.us") } + + mavenCentral() } dependencies { @@ -22,7 +24,7 @@ dependencies { compileOnly("org.spongepowered:configurate-yaml:4.0.0") - compileOnly("us.ajg0702:ajUtils:1.1.9") + compileOnly("us.ajg0702:ajUtils:1.1.10") compileOnly(group = "org.spigotmc", name = "spigot", version = "1.16.5-R0.1-SNAPSHOT") compileOnly("me.clip:placeholderapi:2.10.4")