From bfe4403c94b889b412e46d82b28028912f480850 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Fri, 21 May 2021 12:21:29 -0700 Subject: [PATCH 1/5] Fix error when player leaves after getting kicked, and message for auto queue --- src/main/java/us/ajg0702/queue/Main.java | 9 +++++++-- src/main/java/us/ajg0702/queue/Manager.java | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/us/ajg0702/queue/Main.java b/src/main/java/us/ajg0702/queue/Main.java index 3eaab6a..98c815b 100644 --- a/src/main/java/us/ajg0702/queue/Main.java +++ b/src/main/java/us/ajg0702/queue/Main.java @@ -119,6 +119,7 @@ public class Main extends Plugin implements Listener { d.put("commands.listqueues.format", "{COLOR}{NAME}&7: {COUNT} queued"); d.put("max-tries-reached", "&cUnable to connect to {SERVER}. Max retries reached."); + d.put("auto-queued", "&aYou've been auto-queued for {SERVER} because you were kicked."); msgs = BungeeMessages.getInstance(this, d); @@ -215,7 +216,7 @@ public class Main extends Plugin implements Listener { @EventHandler public void onFailedMove(ServerKickEvent e) { - ProxiedPlayer p = e.getPlayer(); + final ProxiedPlayer p = e.getPlayer(); List queuedServers = man.findPlayerInQueue(p); @@ -236,7 +237,11 @@ public class Main extends Plugin implements Listener { } if(shouldqueue || reasons.isEmpty()) { plugin.getProxy().getScheduler().schedule(this, () -> { - man.addToQueue(p, e.getKickedFrom().getName()); + if(!p.isConnected()) return; + + String toName = e.getKickedFrom().getName(); + p.sendMessage(msgs.getBC("auto-queued", "SERVER:"+toName)); + man.addToQueue(p, toName); }, (long) (config.getDouble("auto-add-to-queue-on-kick-delay")*1000), TimeUnit.MILLISECONDS); } diff --git a/src/main/java/us/ajg0702/queue/Manager.java b/src/main/java/us/ajg0702/queue/Manager.java index 208d1b8..95ec37c 100644 --- a/src/main/java/us/ajg0702/queue/Manager.java +++ b/src/main/java/us/ajg0702/queue/Manager.java @@ -615,11 +615,13 @@ public class Manager { * @param s The name of the server */ public void addToQueue(ProxiedPlayer p, String s) { + if(p == null || s == null) return; QueueServer server = findServer(s); if(server == null) { p.sendMessage(msgs.getBC("errors.server-not-exist")); return; } + if(!p.isConnected()) return; if(pl.config.getBoolean("joinfrom-server-permission") && !p.hasPermission("ajqueue.joinfrom."+p.getServer().getInfo().getName())) { p.sendMessage(msgs.getBC("errors.deny-joining-from-server")); From 09fe8c6a097836b46e485dc1cb8f47decfcf3071 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Fri, 21 May 2021 15:21:19 -0700 Subject: [PATCH 2/5] 1.9.4 --- .gitlab-ci.yml | 34 +++++++++++++++++++++++++++++----- build.gradle.kts | 12 +++++------- 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3ea7d8b..0b7518b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,20 +5,44 @@ image: gradle:6.8.2-jdk8 cache: paths: - .gradle + - ~/.gradle build: + stage: build script: - - gradle shadowJar + - rm -rf build + - gradle shadowJar artifacts: paths: - - build/libs + - build/libs pages: + stage: build image: gradle:6.8.3-jdk15 + only: + - master script: - - gradle javadoc - - mv build/docs/javadoc public + - gradle javadoc + - mv build/docs/javadoc public artifacts: paths: - - public + - public + +test: + stage: test + dependencies: + - build + script: + - gradle test + +upload to updater: + stage: deploy + only: + - master + dependencies: + - build + script: + - cd build/libs + - files=(*) + - curl -i -F "submit=true" -F "secret=$UPLOAD_SECRET" -F "file=@${files[0]}" https://ajg0702.us/pl/updater/upload.php diff --git a/build.gradle.kts b/build.gradle.kts index fc111c4..df5aa3b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } group = "us.ajg0702" -version = "1.9.3" +version = "1.9.4" repositories { mavenCentral() @@ -30,6 +30,7 @@ dependencies { implementation("org.bstats:bstats-bungeecord:2.2.1") } + tasks.withType { include("**/*.yml") filter( @@ -47,12 +48,9 @@ tasks.shadowJar { publishing { publications { - create("maven") { - groupId = project.group.toString(); - artifactId = project.name - version = project.version.toString() - - from(components["java"]) + create("mavenJava") { + //artifact(tasks["sourcesJar"]) + artifact(tasks["jar"]) } } } From c0532ffd7943ef2c11af9a78bc33297a8736214f Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Fri, 21 May 2021 16:41:27 -0700 Subject: [PATCH 3/5] Publish to gitlab repo --- .gitlab-ci.yml | 9 +++++++++ build.gradle.kts | 18 +++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b7518b..42c5084 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,6 +36,15 @@ test: script: - gradle test +deploy to maven repo: + stage: deploy + only: + - master + dependencies: + - build + script: + - gradle publish + upload to updater: stage: deploy only: diff --git a/build.gradle.kts b/build.gradle.kts index df5aa3b..c6fb4f1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -49,8 +49,24 @@ tasks.shadowJar { publishing { publications { create("mavenJava") { - //artifact(tasks["sourcesJar"]) artifact(tasks["jar"]) } } + + repositories { + val mavenUrl = "https://gitlab.com/api/v4/projects/18580345/packages/maven" + val mavenSnapshotUrl = "https://gitlab.com/api/v4/projects/18580345/packages/maven" + + maven { + url = uri(mavenUrl) + name = "Gitlab" + credentials(HttpHeaderCredentials::class.java) { + name = "Private-Token" + value = System.getenv("CI_JOB_TOKEN") + } + authentication { + container(HttpHeaderAuthentication::class.java) + } + } + } } From 1ae0c793d463dc15bb06c1f47444a62dfea2c3f3 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Fri, 21 May 2021 16:41:54 -0700 Subject: [PATCH 4/5] whoops --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index c6fb4f1..abf5c29 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -61,7 +61,7 @@ publishing { url = uri(mavenUrl) name = "Gitlab" credentials(HttpHeaderCredentials::class.java) { - name = "Private-Token" + name = "Job-Token" value = System.getenv("CI_JOB_TOKEN") } authentication { From 7474e649d5139b7e26421b1a83c5dd461135ac59 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Fri, 21 May 2021 16:43:03 -0700 Subject: [PATCH 5/5] Fix warnings --- build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index abf5c29..3c02f03 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -43,7 +43,7 @@ tasks.withType { tasks.shadowJar { relocate("us.ajg0702.utils", "us.ajg0702.queue.utils") relocate("org.bstats", "us.ajg0702.bstats") - archiveFileName.set("${baseName}-${version}.${extension}") + archiveFileName.set("${archiveBaseName}-${archiveVersion}.${archiveExtension}") } publishing { @@ -55,7 +55,7 @@ publishing { repositories { val mavenUrl = "https://gitlab.com/api/v4/projects/18580345/packages/maven" - val mavenSnapshotUrl = "https://gitlab.com/api/v4/projects/18580345/packages/maven" + //val mavenSnapshotUrl = "https://gitlab.com/api/v4/projects/18580345/packages/maven" maven { url = uri(mavenUrl)