diff --git a/api/build.gradle.kts b/api/build.gradle.kts index e0874fc..bc5cc11 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -17,7 +17,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.7") + compileOnly("us.ajg0702:ajUtils:1.1.8") } publishing { diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 4cdefba..84d0606 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -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.7") + compileOnly("us.ajg0702:ajUtils:1.1.8") compileOnly("org.slf4j:slf4j-log4j12:1.7.29") 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 d380ad0..3fcf3e4 100644 --- a/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java +++ b/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java @@ -145,6 +145,17 @@ public class QueueManagerImpl implements QueueManager { "SERVERNAME:"+server.getName() ) ); + if(main.getConfig().getBoolean("enable-priority-messages")) { + for(String rawPriorityMessage : main.getConfig().getStringList("priority-messages")) { + String[] parts = rawPriorityMessage.split(":"); + if(parts.length != 2) continue; + String level = parts[0]; + String messageRaw = parts[1]; + if(level.equals("*") || level.equals(queuePlayer.getPriority()+"")) { + player.sendMessage(main.getMessages().toComponent(messageRaw)); + } + } + } } if(!server.isJoinable(player)) { diff --git a/common/src/main/resources/config.yml b/common/src/main/resources/config.yml index 319edb8..ed6edaf 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: 22 +config-version: 23 # The time the server will wait between sending people in the queue # Default: 5 @@ -176,4 +176,17 @@ 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 -enable-server-command: false \ No newline at end of file +enable-server-command: false + +# Should we enable priority messages? +# Configure the priority messages in the option below. +enable-priority-messages: false + +# Messages we send to players with priority queue when they join the queue +# In the free version, "priority" is 1. +# The * will send when a player joins with any priority. +# The format is : +# Example: 1:You have a priority of 1! +priority-messages: + - "*:Joining the queue with priority!" + - "100:Wow! You have a priority of 100!" \ No newline at end of file diff --git a/free/build.gradle.kts b/free/build.gradle.kts index 289c987..023ba38 100644 --- a/free/build.gradle.kts +++ b/free/build.gradle.kts @@ -18,7 +18,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.7") + implementation("us.ajg0702:ajUtils:1.1.8") implementation(project(":platforms:velocity")) implementation(project(":platforms:bungeecord")) diff --git a/platforms/bungeecord/build.gradle.kts b/platforms/bungeecord/build.gradle.kts index 136f1e8..e710573 100644 --- a/platforms/bungeecord/build.gradle.kts +++ b/platforms/bungeecord/build.gradle.kts @@ -15,7 +15,7 @@ repositories { dependencies { compileOnly("net.kyori:adventure-api:4.8.1") compileOnly("com.google.guava:guava:30.1.1-jre") - compileOnly("us.ajg0702:ajUtils:1.1.7") + compileOnly("us.ajg0702:ajUtils:1.1.8") compileOnly("net.md-5:bungeecord-api:1.16-R0.4") diff --git a/platforms/velocity/build.gradle.kts b/platforms/velocity/build.gradle.kts index 48d296f..7feb6c7 100644 --- a/platforms/velocity/build.gradle.kts +++ b/platforms/velocity/build.gradle.kts @@ -15,7 +15,7 @@ repositories { dependencies { compileOnly("net.kyori:adventure-api:4.8.1") compileOnly("com.google.guava:guava:30.1.1-jre") - compileOnly("us.ajg0702:ajUtils:1.1.7") + compileOnly("us.ajg0702:ajUtils:1.1.8") compileOnly("com.velocitypowered:velocity-api:3.0.0") annotationProcessor("com.velocitypowered:velocity-api:3.0.0") diff --git a/premium/build.gradle.kts b/premium/build.gradle.kts index f6e9ee7..dd1d016 100644 --- a/premium/build.gradle.kts +++ b/premium/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { compileOnly("com.google.guava:guava:30.1.1-jre") - compileOnly("us.ajg0702:ajUtils:1.1.7") + compileOnly("us.ajg0702:ajUtils:1.1.8") compileOnly("net.kyori:adventure-api:4.8.1") diff --git a/spigot/build.gradle.kts b/spigot/build.gradle.kts index aec53f1..53b7364 100644 --- a/spigot/build.gradle.kts +++ b/spigot/build.gradle.kts @@ -20,7 +20,7 @@ dependencies { implementation("net.kyori:adventure-api:4.8.1") compileOnly("com.google.guava:guava:30.1.1-jre") - compileOnly("us.ajg0702:ajUtils:1.1.7") + compileOnly("us.ajg0702:ajUtils:1.1.8") compileOnly(group = "org.spigotmc", name = "spigot", version = "1.16.5-R0.1-SNAPSHOT") compileOnly("me.clip:placeholderapi:2.10.4")