Cleanup and migrate to Adventure

build.gradle.kts

@@ -41,14 +41,20 @@ publishing {
 
 tasks {
     processResources {
+        val description = project.description
+        val version = project.version.toString()
+        val commitHash = project.latestCommitHash()
+
         filesMatching(listOf("plugin.yml")) {
             expand(
-                "name" to project.name,
-                "description" to project.description,
-                "mainClass" to "dev.pgm.events.EventsPlugin",
-                "version" to project.version,
-                "commitHash" to project.latestCommitHash(),
-                "url" to "https://pgm.dev/"
+                mapOf(
+                    "description" to description,
+                    "apiVersion" to "1.21.11",
+                    "mainClass" to "dev.pgm.events.EventsPlugin",
+                    "version" to version,
+                    "commitHash" to commitHash,
+                    "url" to "https://pgm.dev/"
+                )
             )
         }
     }

buildSrc/build.gradle.kts

@@ -9,7 +9,7 @@ repositories {
 }
 
 dependencies {
-    implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.0")
-    implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.0.BETA4")
-    implementation("de.skuzzle.restrictimports:restrict-imports-gradle-plugin:2.6.0")
+    implementation("com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:9.4.1")
+    implementation("com.diffplug.gradle.spotless:com.diffplug.gradle.spotless.gradle.plugin:8.4.0")
+    implementation("de.skuzzle.restrictimports:de.skuzzle.restrictimports.gradle.plugin:3.0.0")
 }

buildSrc/src/main/kotlin/buildlogic.java-conventions.gradle.kts

@@ -14,43 +14,49 @@ repositories {
     mavenLocal()
     mavenCentral()
     maven("https://oss.sonatype.org/content/repositories/snapshots/") // Snapshots
-    maven("https://repo.pgm.fyi/snapshots/") // PGM-specific depdencies
-    maven("https://repo.papermc.io/repository/maven-public/") // Needed for bungeecord-chat
+    maven("https://repo.pgm.fyi/snapshots/") // PGM-specific dependencies
+    maven("https://repo.papermc.io/repository/maven-public/")
+
 }
 
 dependencies {
-    compileOnly("dev.pgm.paper:paper-api:1.8_1.21.1-SNAPSHOT")
-    compileOnly("tc.oc.pgm:core:0.16-SNAPSHOT")
-    compileOnly("net.md-5:bungeecord-chat:1.20-R0.2-deprecated+build.18")
+    // Annotations
+    api("org.jspecify:jspecify:1.0.0")
+    compileOnly("org.jetbrains:annotations:26.1.0")
     compileOnly("org.incendo:cloud-annotations:2.0.0")
-    compileOnly("org.jetbrains:annotations:22.0.0")
+
+    // Provided dependencies
+    compileOnly("dev.pgm.paper:paper-api:1.8_1.21.11-SNAPSHOT")
+    compileOnly("tc.oc.pgm:core:0.16-SNAPSHOT") { isTransitive = false }
+    compileOnly("net.kyori:adventure-api:4.26.1")
+    compileOnly("com.google.guava:guava:17.0")
 }
 
 group = "dev.pgm"
 version = "1.0.0-SNAPSHOT"
 description = "Manage PvP tournament events"
 
 tasks {
-    withType<JavaCompile>() {
+    withType<JavaCompile> {
         options.encoding = "UTF-8"
     }
-    withType<Javadoc>() {
+    withType<Javadoc> {
         options.encoding = "UTF-8"
     }
 }
 
 spotless {
-    ratchetFrom = "origin/master"
     java {
         removeUnusedImports()
-        palantirJavaFormat("2.47.0").style("GOOGLE").formatJavadoc(true)
+        trimTrailingWhitespace()
+        formatAnnotations()
+        palantirJavaFormat("2.90.0").style("GOOGLE").formatJavadoc(true)
     }
 }
 
-
 restrictImports {
     group {
-        reason = "Use org.jetbrains.annotations to add annotations"
+        reason = "Use org.jspecify.annotations to add annotations, or org.jetbrains.annotations if needed"
         bannedImports = listOf("javax.annotation.**")
     }
     group {

buildSrc/src/main/kotlin/extensions.kt

@@ -1,16 +1,13 @@
 import org.gradle.api.Project
-import java.io.ByteArrayOutputStream
 
 
 fun Project.latestCommitHash(): String {
     return runGitCommand(listOf("rev-parse", "--short", "HEAD"))
 }
 
 fun Project.runGitCommand(args: List<String>): String {
-    val byteOut = ByteArrayOutputStream()
-    exec {
-        commandLine = listOf("git") + args
-        standardOutput = byteOut
-    }
-    return byteOut.toString(Charsets.UTF_8.name()).trim()
+    return providers.exec {
+        commandLine("git")
+        args(args)
+    }.standardOutput.asText.get().trim()
 }

gradle.properties

@@ -0,0 +1 @@
+org.gradle.configuration-cache=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/dev/pgm/events/api/teams/ConfigTeams.java

@@ -8,7 +8,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import java.util.stream.Collectors;
+import java.util.logging.Logger;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 
@@ -22,50 +22,75 @@ public List<? extends TournamentTeam> getTeams() {
   }
 
   private static List<TournamentTeam> parseTournamentTeams(File teamsFolder, File teamsFile) {
-    if (!teamsFolder.exists()) teamsFolder.mkdirs();
+    Logger logger = EventsPlugin.get().getLogger();
+    if (!teamsFolder.exists() && !teamsFolder.mkdirs()) {
+      logger.warning("Failed to create teams folder: " + teamsFolder.getPath());
+    }
 
-    List<TournamentTeam> teamList = new ArrayList<TournamentTeam>();
-    for (File child :
-        teamsFolder.listFiles((file) -> file.getName().toLowerCase().endsWith(".yml"))) {
-      FileConfiguration config = YamlConfiguration.loadConfiguration(child);
-      String teamName = config.getString("name");
-      List<TournamentPlayer> players =
-          config.getStringList("players").stream()
-              .map(String::trim)
-              .map(UUID::fromString)
-              .map(x -> TournamentPlayer.create(x, true))
-              .collect(Collectors.toList());
+    List<TournamentTeam> teamList = new ArrayList<>();
 
-      teamList.add(TournamentTeam.create(teamName, players));
+    File[] teamFiles = teamsFolder.listFiles(f -> f.getName().toLowerCase().endsWith(".yml"));
+    if (teamFiles != null) {
+      for (File child : teamFiles) {
+        FileConfiguration config = YamlConfiguration.loadConfiguration(child);
+        String teamName = config.getString("name");
+        List<TournamentPlayer> players = parsePlayers(config.getStringList("players"), logger);
+        teamList.add(TournamentTeam.create(teamName, players));
+      }
     }
 
     if (teamsFile.exists()) {
       YamlConfiguration teamsConfig = YamlConfiguration.loadConfiguration(teamsFile);
       for (Object object : teamsConfig.getList("teams")) {
-        if (!(object instanceof Map<?, ?>)) {
-          System.out.println(
-              "Invalid type in teams.yml ("
-                  + object.getClass().getName()
-                  + ": "
-                  + object.toString()
-                  + ")! Skipping...");
+        if (!(object instanceof Map<?, ?> rawTeam)) {
+          logger.warning("Invalid type in teams.yml ("
+              + object.getClass().getName()
+              + ": "
+              + object
+              + ")! Skipping...");
           continue;
         }
 
-        Map<Object, Object> team = (Map<Object, Object>) object;
-        String teamName = (String) team.get("name");
-        List<TournamentPlayer> players =
-            ((List<String>) team.get("players"))
-                .stream()
-                    .map(String::trim)
-                    .map(UUID::fromString)
-                    .map(x -> TournamentPlayer.create(x, true))
-                    .collect(Collectors.toList());
+        Object nameObj = rawTeam.get("name");
+        Object playersObj = rawTeam.get("players");
 
-        teamList.add(TournamentTeam.create(teamName, players));
+        if (!(nameObj instanceof String teamName)) {
+          logger.warning("Team entry in teams.yml is missing a valid 'name'. Skipping...");
+          continue;
+        }
+
+        if (!(playersObj instanceof List<?> rawPlayers)) {
+          logger.warning(
+              "Team '" + nameObj + "' in teams.yml is missing a valid 'players' list. Skipping...");
+          continue;
+        }
+
+        List<String> playerStrings = new ArrayList<>();
+        for (Object p : rawPlayers) {
+          if (p instanceof String s) {
+            playerStrings.add(s);
+          } else {
+            logger.warning(
+                "Non-string player entry in team '" + nameObj + "': " + p + ". Skipping entry...");
+          }
+        }
+
+        teamList.add(TournamentTeam.create(teamName, parsePlayers(playerStrings, logger)));
       }
     }
 
     return teamList;
   }
+
+  private static List<TournamentPlayer> parsePlayers(List<String> uuids, Logger logger) {
+    List<TournamentPlayer> players = new ArrayList<>();
+    for (String raw : uuids) {
+      try {
+        players.add(TournamentPlayer.create(UUID.fromString(raw.trim()), true));
+      } catch (IllegalArgumentException e) {
+        logger.warning("Invalid UUID '" + raw + "' in team config. Skipping...");
+      }
+    }
+    return players;
+  }
 }