From 125bcf79ed0f87c56f8aadce7a65361d1e8b6dcb Mon Sep 17 00:00:00 2001 From: Panav Bindal <102317251+Pan-nav@users.noreply.github.com> Date: Sat, 11 Oct 2025 23:57:10 +0100 Subject: [PATCH 1/3] (fix) Fixed premature command addition in lib --- build.gradle | 2 +- paynow-fabric/gradle.properties | 2 +- .../src/main/java/gg/paynow/paynowlib/PayNowLib.java | 7 +++++-- .../main/java/gg/paynow/paynowvelocity/PayNowVelocity.java | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index f6001cd..6a909c6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ allprojects { group = 'gg.paynow' - version = '0.0.7' + version = '0.0.8' afterEvaluate { project -> if (project.tasks.findByName('build')) { diff --git a/paynow-fabric/gradle.properties b/paynow-fabric/gradle.properties index 62babba..281a79c 100644 --- a/paynow-fabric/gradle.properties +++ b/paynow-fabric/gradle.properties @@ -6,7 +6,7 @@ minecraft_version=1.21.1 yarn_mappings=1.21.1+build.3 loader_version=0.16.5 # Mod Properties -mod_version=0.0.7 +mod_version=0.0.8 maven_group=gg.paynow archives_base_name=paynow-fabric # Dependencies diff --git a/paynow-lib/src/main/java/gg/paynow/paynowlib/PayNowLib.java b/paynow-lib/src/main/java/gg/paynow/paynowlib/PayNowLib.java index 08ad1be..6b6c18f 100644 --- a/paynow-lib/src/main/java/gg/paynow/paynowlib/PayNowLib.java +++ b/paynow-lib/src/main/java/gg/paynow/paynowlib/PayNowLib.java @@ -26,7 +26,7 @@ public class PayNowLib { - private static final String VERSION = "0.0.7"; + private static final String VERSION = "0.0.8"; private static final URI API_QUEUE_URL = URI.create("https://api.paynow.gg/v1/delivery/command-queue/"); private static final URI API_LINK_URL = URI.create("https://api.paynow.gg/v1/delivery/gameserver/link"); @@ -129,7 +129,6 @@ private int processCommands(List commands) { boolean success = this.executeCommandCallback.apply(command.getCommand()); if(success) { this.successfulCommands.add(command.getAttemptId()); - this.executedCommands.add(command.getAttemptId()); } else { this.warn("Failed to execute command: " + command.getCommand()); } @@ -166,6 +165,10 @@ private void acknowledgeCommands(List commandsIds) { String body = response.getEntity() == null ? null : EntityUtils.toString(response.getEntity()); if(!PayNowUtils.isSuccess(response.getStatusLine().getStatusCode())) { this.warn("Failed to acknowledge commands: " + body); + } else { + for (String commandId : commandsIds) { + this.executedCommands.add(commandId); + } } return body; diff --git a/paynow-velocity/src/main/java/gg/paynow/paynowvelocity/PayNowVelocity.java b/paynow-velocity/src/main/java/gg/paynow/paynowvelocity/PayNowVelocity.java index c204790..2701f38 100644 --- a/paynow-velocity/src/main/java/gg/paynow/paynowvelocity/PayNowVelocity.java +++ b/paynow-velocity/src/main/java/gg/paynow/paynowvelocity/PayNowVelocity.java @@ -27,7 +27,7 @@ @Plugin( id = "paynow-velocity", name = "PayNow", - version = "0.0.7", + version = "0.0.8", authors = {"PayNow"}, url = "https://paynow.gg" ) From a155ea8b77f1b560f4ba61f8eed9ee3c0fe475a6 Mon Sep 17 00:00:00 2001 From: Panav Bindal <102317251+Pan-nav@users.noreply.github.com> Date: Sun, 12 Oct 2025 22:06:48 +0100 Subject: [PATCH 2/3] Updated oss repositories --- paynow-bukkit-legacy/build.gradle | 2 -- paynow-bukkit-modern/build.gradle | 2 -- paynow-bungeecord/build.gradle | 1 - 3 files changed, 5 deletions(-) diff --git a/paynow-bukkit-legacy/build.gradle b/paynow-bukkit-legacy/build.gradle index 432af23..497850f 100644 --- a/paynow-bukkit-legacy/build.gradle +++ b/paynow-bukkit-legacy/build.gradle @@ -17,8 +17,6 @@ repositories { } } - maven { url = 'https://oss.sonatype.org/content/repositories/snapshots' } - maven { url = 'https://oss.sonatype.org/content/repositories/central' } } dependencies { diff --git a/paynow-bukkit-modern/build.gradle b/paynow-bukkit-modern/build.gradle index 5b19021..cc21571 100644 --- a/paynow-bukkit-modern/build.gradle +++ b/paynow-bukkit-modern/build.gradle @@ -17,8 +17,6 @@ repositories { } } - maven { url = 'https://oss.sonatype.org/content/repositories/snapshots' } - maven { url = 'https://oss.sonatype.org/content/repositories/central' } } dependencies { diff --git a/paynow-bungeecord/build.gradle b/paynow-bungeecord/build.gradle index e73214d..c3d16fe 100644 --- a/paynow-bungeecord/build.gradle +++ b/paynow-bungeecord/build.gradle @@ -5,7 +5,6 @@ plugins { repositories { mavenCentral() - maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } } dependencies { From dd721c171328fc713982547979a0bd2226a287a2 Mon Sep 17 00:00:00 2001 From: Panav Bindal <102317251+Pan-nav@users.noreply.github.com> Date: Sun, 12 Oct 2025 22:41:56 +0100 Subject: [PATCH 3/3] Bungee and Brigadier repo migrations --- paynow-bukkit-legacy/build.gradle | 12 +++++------- paynow-bukkit-modern/build.gradle | 12 +++++------- paynow-bungeecord/build.gradle | 13 +++++++++++++ 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/paynow-bukkit-legacy/build.gradle b/paynow-bukkit-legacy/build.gradle index 497850f..146535a 100644 --- a/paynow-bukkit-legacy/build.gradle +++ b/paynow-bukkit-legacy/build.gradle @@ -8,19 +8,17 @@ repositories { maven { url = 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' - - // As of Gradle 5.1, you can limit this to only those - // dependencies you expect from it - content { - includeGroup 'org.bukkit' - includeGroup 'org.spigotmc' - } + } + + maven { + url = 'https://repo.papermc.io/repository/maven-public/' } } dependencies { compileOnly 'org.spigotmc:spigot-api:1.8-R0.1-SNAPSHOT' + compileOnly 'net.md-5:bungeecord-chat:1.8-SNAPSHOT' shadow(implementation project(":paynow-lib")) implementation group: 'com.google.code.gson', name: 'gson', version: '2.11.0' } diff --git a/paynow-bukkit-modern/build.gradle b/paynow-bukkit-modern/build.gradle index cc21571..1b5e057 100644 --- a/paynow-bukkit-modern/build.gradle +++ b/paynow-bukkit-modern/build.gradle @@ -8,19 +8,17 @@ repositories { maven { url = 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' - - // As of Gradle 5.1, you can limit this to only those - // dependencies you expect from it - content { - includeGroup 'org.bukkit' - includeGroup 'org.spigotmc' - } + } + + maven { + url = 'https://repo.papermc.io/repository/maven-public/' } } dependencies { compileOnly 'org.spigotmc:spigot-api:1.13-R0.1-SNAPSHOT' + compileOnly 'net.md-5:bungeecord-chat:1.13-SNAPSHOT' shadow(implementation project(":paynow-lib")) implementation group: 'com.google.code.gson', name: 'gson', version: '2.11.0' } diff --git a/paynow-bungeecord/build.gradle b/paynow-bungeecord/build.gradle index c3d16fe..29bd1fa 100644 --- a/paynow-bungeecord/build.gradle +++ b/paynow-bungeecord/build.gradle @@ -5,10 +5,23 @@ plugins { repositories { mavenCentral() + + maven { + url = 'https://repo.papermc.io/repository/maven-public/' + } + + maven { + url = 'https://libraries.minecraft.net/' + } + + maven { + url = 'https://maven.elmakers.com/repository/' + } } dependencies { compileOnly 'net.md-5:bungeecord-api:1.16-R0.4' + compileOnly 'net.md-5:brigadier:1.0.16-SNAPSHOT' shadow(implementation project(":paynow-lib")) }