From 8396c1d05b39f6143c23de09ea228fc43a9c2600 Mon Sep 17 00:00:00 2001 From: Tristan Vermeesch Date: Sat, 11 Oct 2025 10:33:19 +0200 Subject: [PATCH 1/2] fix: remove lang3 dependency for random char generation --- build.gradle | 4 ++-- java17-build.gradle | 4 ++-- java21-build.gradle | 5 ++--- .../me/playbosswar/com/tasks/TasksManager.java | 14 ++++++++++++-- src/main/resources/plugin.yml | 2 +- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index d1364cb..64c7221 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ java { } group = 'me.playbosswar.com' -version = '8.13.0' +version = '8.13.1' description = 'CommandTimer' repositories { @@ -74,7 +74,7 @@ publishing { maven(MavenPublication) { groupId = 'me.playbosswar.com' artifactId = 'commandtimer' - version = '8.13.0' + version = '8.13.1' from components.java } diff --git a/java17-build.gradle b/java17-build.gradle index 9ab37e2..b864341 100644 --- a/java17-build.gradle +++ b/java17-build.gradle @@ -10,7 +10,7 @@ java { group = 'me.playbosswar.com' -version = '8.13.0' +version = '8.13.1' description = 'CommandTimer' repositories { @@ -63,7 +63,7 @@ publishing { maven(MavenPublication) { groupId = 'me.playbosswar.com' artifactId = 'commandtimer-java17' - version = '8.13.0' + version = '8.13.1' from components.java } diff --git a/java21-build.gradle b/java21-build.gradle index e931248..bcb9931 100644 --- a/java21-build.gradle +++ b/java21-build.gradle @@ -10,7 +10,7 @@ java { group = 'me.playbosswar.com' -version = '8.13.0' +version = '8.13.1' description = 'CommandTimer' repositories { @@ -57,7 +57,6 @@ dependencies { implementation 'io.sentry:sentry:7.0.0' implementation 'com.j256.ormlite:ormlite-jdbc:6.1' implementation 'org.apache.commons:commons-pool2:2.12.0' - implementation 'org.apache.commons:commons-lang3:3.17.0' compileOnly 'org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT' compileOnly 'me.clip:placeholderapi:2.11.6' compileOnly 'org.jetbrains:annotations:23.1.0' @@ -68,7 +67,7 @@ publishing { maven(MavenPublication) { groupId = 'me.playbosswar.com' artifactId = 'commandtimer-java21' - version = '8.13.0' + version = '8.13.1' from components.java } } diff --git a/src/main/java/me/playbosswar/com/tasks/TasksManager.java b/src/main/java/me/playbosswar/com/tasks/TasksManager.java index 3c83179..5acbe04 100644 --- a/src/main/java/me/playbosswar/com/tasks/TasksManager.java +++ b/src/main/java/me/playbosswar/com/tasks/TasksManager.java @@ -14,8 +14,8 @@ import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; +import java.util.Random; -import org.apache.commons.lang3.RandomStringUtils; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandException; @@ -35,6 +35,8 @@ public class TasksManager { private static final String CONDITION_NO_MATCH = "Conditions did not match"; + private static final Random RANDOM = new Random(); + private static final String ALPHA_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; private List loadedTasks = new ArrayList<>(); private Thread runnerThread; public boolean stopRunner = false; @@ -67,13 +69,21 @@ public TasksManager() { } public Task createTask() { - String name = "Task_" + RandomStringUtils.randomAlphabetic(4); + String name = "Task_" + generateRandomAlphabetic(4); Task task = new Task(name); loadedTasks.add(task); return task; } + private static String generateRandomAlphabetic(int length) { + StringBuilder sb = new StringBuilder(length); + for (int i = 0; i < length; i++) { + sb.append(ALPHA_CHARS.charAt(RANDOM.nextInt(ALPHA_CHARS.length()))); + } + return sb.toString(); + } + @Nullable public Task getTaskByName(String name) { Optional optionalTask = diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index e2cb1c0..718e052 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ main: me.playbosswar.com.CommandTimerPlugin name: "CommandTimer" -version: "8.13.0" +version: "8.13.1" description: "Schedule commands like you want" author: PlayBossWar api-version: 1.13 From 686d0c10fd8131fcd3c538cb50f1b0f2deac5870 Mon Sep 17 00:00:00 2001 From: Tristan Vermeesch Date: Sat, 11 Oct 2025 10:37:46 +0200 Subject: [PATCH 2/2] fix: use gradle wrapper in cicd --- .github/workflows/cd.yml | 8 ++++---- .github/workflows/ci.yml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index aea8e37..10bde78 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -38,13 +38,13 @@ jobs: with: distribution: "adopt" java-version: "8" - - run: gradle :shadowJar + - run: ./gradlew :shadowJar - uses: actions/upload-artifact@v4 with: name: commandtimer-java8 path: build/libs/commandtimer-java8.jar - name: Publish package - run: gradle publishMavenPublicationToGitHubPackagesRepository + run: ./gradlew publishMavenPublicationToGitHubPackagesRepository env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} Build-Java-17: @@ -58,7 +58,7 @@ jobs: with: distribution: "adopt" java-version: "17" - - run: gradle :shadowJar -b java17-build.gradle + - run: ./gradlew :shadowJar -b java17-build.gradle Build-Java-21: runs-on: ubuntu-latest permissions: @@ -70,7 +70,7 @@ jobs: with: distribution: "adopt" java-version: "21" - - run: gradle :shadowJar -b java21-build.gradle + - run: ./gradlew :shadowJar -b java21-build.gradle Release: needs: - Build-Deploy-Java-8 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 06b89cd..4534b1f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: with: distribution: "adopt" java-version: "8" - - run: gradle :shadowJar -b build.gradle + - run: ./gradlew :shadowJar -b build.gradle Build-Java-17: runs-on: ubuntu-latest steps: @@ -23,7 +23,7 @@ jobs: with: distribution: "adopt" java-version: "17" - - run: gradle :shadowJar -b java17-build.gradle + - run: ./gradlew :shadowJar -b java17-build.gradle Build-Java-21: runs-on: ubuntu-latest steps: @@ -32,7 +32,7 @@ jobs: with: distribution: "adopt" java-version: "21" - - run: gradle :shadowJar -b java21-build.gradle + - run: ./gradlew :shadowJar -b java21-build.gradle test-documentation: name: Test Documentation runs-on: ubuntu-latest