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

Merge pull request #8 from JT122406/master

Browse Source 
Clean up and improvements
This commit is contained in:
ajgeiss0702
2022-07-19 09:36:28 -07:00
committed by GitHub
parent f0c415285e 48b10777e2
commit 7e3f2e8eef
11 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/us/ajg0702/queue/commands/commands/SlashServer/SlashServerCommand.java
-1
View File
@@ -8,7 +8,6 @@ import us.ajg0702.utils.common.Messages;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
public class SlashServerCommand extends BaseCommand {
common/src/main/java/us/ajg0702/queue/commands/commands/manage/Kick.java
-3
View File
@@ -1,9 +1,6 @@
package us.ajg0702.queue.commands.commands.manage;
import com.google.common.collect.ImmutableList;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
import org.spongepowered.configurate.ConfigurateException;
import us.ajg0702.queue.api.commands.ICommandSender;
import us.ajg0702.queue.api.players.QueuePlayer;
import us.ajg0702.queue.api.queues.QueueServer;
common/src/main/java/us/ajg0702/queue/commands/commands/manage/KickAll.java
-1
View File
@@ -9,7 +9,6 @@ import us.ajg0702.queue.common.QueueMain;
import us.ajg0702.utils.common.Messages;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
public class KickAll extends SubCommand {
gradle/wrapper/gradle-wrapper.properties
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
platforms/bungeecord/build.gradle.kts
+2 -2
View File
@@ -25,9 +25,9 @@ dependencies {
implementation("net.kyori:adventure-platform-bungeecord:4.0.0")
compileOnly("net.kyori:adventure-text-serializer-plain:4.9.3")
compileOnly("com.viaversion:viaversion-api:4.2.0-SNAPSHOT")
compileOnly("com.viaversion:viaversion-api:4.3.1")
implementation("org.bstats:bstats-bungeecord:2.2.1")
implementation("org.bstats:bstats-bungeecord:3.0.0")
implementation(project(":common"))
implementation(project(":api"))
platforms/velocity/build.gradle.kts
+5 -5
View File
@@ -8,7 +8,7 @@ group = "us.ajg0702.queue.platforms.velocity"
repositories {
//mavenLocal()
maven { url = uri("https://repo.ajg0702.us") }
maven { url = uri("https://nexus.velocitypowered.com/repository/maven-public/") }
maven { url = uri("https://repo.papermc.io/repository/maven-public/") }
maven { url = uri("https://repo.viaversion.com/") }
mavenCentral()
}
@@ -18,13 +18,13 @@ dependencies {
compileOnly("com.google.guava:guava:30.1.1-jre")
compileOnly("us.ajg0702:ajUtils:1.2.10")
compileOnly("com.velocitypowered:velocity-api:3.0.0")
annotationProcessor("com.velocitypowered:velocity-api:3.0.0")
compileOnly("com.velocitypowered:velocity-api:3.1.1")
annotationProcessor("com.velocitypowered:velocity-api:3.1.1")
implementation("net.kyori:adventure-text-minimessage:4.10.0")
compileOnly("com.viaversion:viaversion-api:4.2.0-SNAPSHOT")
compileOnly("com.viaversion:viaversion-api:4.3.1")
implementation("org.bstats:bstats-velocity:2.2.1")
implementation("org.bstats:bstats-velocity:3.0.0")
implementation(project(":common"))
implementation(project(":api"))
platforms/velocity/src/main/java/us/ajg0702/queue/platforms/velocity/server/VelocityServer.java
-1
View File
@@ -12,7 +12,6 @@ import us.ajg0702.queue.platforms.velocity.players.VelocityPlayer;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
public class VelocityServer implements AdaptedServer {
premium/build.gradle.kts
+1 -1
View File
@@ -30,7 +30,7 @@ dependencies {
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")
compileOnly("net.luckperms:api:5.4")
}
tasks.shadowJar {
premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/LuckPermsHook.java
+1 -2
View File
@@ -6,11 +6,10 @@ import net.luckperms.api.context.Context;
import net.luckperms.api.model.user.User;
import net.luckperms.api.node.Node;
import net.luckperms.api.node.NodeType;
import net.luckperms.api.query.QueryMode;
import net.luckperms.api.query.QueryOptions;
import us.ajg0702.queue.api.players.AdaptedPlayer;
import us.ajg0702.queue.common.QueueMain;
import us.ajg0702.queue.api.premium.PermissionHook;
import us.ajg0702.queue.common.QueueMain;
import java.util.*;
spigot/build.gradle.kts
+1 -1
View File
@@ -22,7 +22,7 @@ dependencies {
implementation("net.kyori:adventure-api:4.9.3")
compileOnly("com.google.guava:guava:30.1.1-jre")
compileOnly("org.spongepowered:configurate-yaml:4.0.0")
compileOnly("org.spongepowered:configurate-yaml:4.1.2")
compileOnly("us.ajg0702:ajUtils:1.2.10")
spigot/src/main/java/us/ajg0702/queue/spigot/utils/ActionBar.java
+1 -1
View File
@@ -8,7 +8,7 @@ import java.lang.reflect.Method;
/**
* A cross-version actionbar class
* @author Based on ActionBarAPI from https://github.com/ConnorLinfoot
* @author Based on ActionBarAPI from <a href="https://github.com/ConnorLinfoot">...</a>
*
*/
public class ActionBar {