Misc updates and fixes to align with PGM

buildSrc/build.gradle.kts

@@ -9,7 +9,7 @@ repositories {
 }
 
 dependencies {
-    implementation("com.gradleup.shadow:shadow-gradle-plugin:9.0.0-rc2")
-    implementation("com.diffplug.spotless:spotless-plugin-gradle:7.2.1")
-    implementation("de.skuzzle.restrictimports:restrict-imports-gradle-plugin:2.6.1")
+    implementation("com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:9.3.0")
+    implementation("com.diffplug.gradle.spotless:com.diffplug.gradle.spotless.gradle.plugin:8.1.0")
+    implementation("de.skuzzle.restrictimports:de.skuzzle.restrictimports.gradle.plugin:3.0.0")
 }

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

@@ -16,7 +16,6 @@ repositories {
     maven("https://repo.pgm.fyi/snapshots") // Sportpaper & other pgm-specific stuff
     maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") // Spigot repo
     maven("https://repo.aikar.co/content/groups/aikar/") // aikar repo
-    maven("https://jitpack.io") // Backup: jitpack
 }
 
 dependencies {
@@ -26,8 +25,8 @@ dependencies {
     implementation("redis.clients:jedis:3.5.1")
     implementation("co.aikar:idb-core:1.0.0-SNAPSHOT")
     implementation("co.aikar:idb-bukkit:1.0.0-SNAPSHOT")
-    implementation("net.kyori:adventure-api:4.24.0")
-    implementation("net.kyori:adventure-text-serializer-plain:4.24.0")
+    implementation("net.kyori:adventure-api:4.25.0")
+    implementation("net.kyori:adventure-text-serializer-plain:4.25.0")
     implementation("net.kyori:adventure-platform-bukkit:4.4.1")
     implementation("org.reflections:reflections:0.10.2")
 
@@ -36,11 +35,10 @@ dependencies {
     compileOnly("tc.oc.occ:AFK:1.0.0-SNAPSHOT")
     compileOnly("tc.oc.occ:Environment:1.0.0-SNAPSHOT")
     compileOnly("org.incendo:cloud-annotations:2.0.0")
-    compileOnly("org.jetbrains:annotations:22.0.0")
-    compileOnly("com.github.dmulloy2:ProtocolLib:5.3.0")
+    compileOnly("org.jetbrains:annotations:26.0.2")
+    compileOnly("net.dmulloy2:ProtocolLib:5.4.0")
 
     // Minecraft includes these (or equivalents)
-    compileOnly("com.mojang:authlib:6.0.54")
     compileOnly("it.unimi.dsi:fastutil:8.1.0")
     compileOnly("com.google.guava:guava:17.0")
     compileOnly("com.google.code.gson:gson:2.10.1")
@@ -52,10 +50,10 @@ version = "0.2-SNAPSHOT"
 description = "A plugin for managing a Minecraft community"
 
 tasks {
-    withType<JavaCompile>() {
+    withType<JavaCompile> {
         options.encoding = "UTF-8"
     }
-    withType<Javadoc>() {
+    withType<Javadoc> {
         options.encoding = "UTF-8"
     }
 }
@@ -64,7 +62,7 @@ spotless {
     ratchetFrom = "origin/dev"
     java {
         removeUnusedImports()
-        palantirJavaFormat("2.73.0").style("GOOGLE").formatJavadoc(true)
+        palantirJavaFormat("2.83.0").style("GOOGLE").formatJavadoc(true)
     }
 }
 

core/build.gradle.kts

@@ -28,6 +28,7 @@ tasks.named<ShadowJar>("shadowJar") {
     }
 
     dependencies {
+        exclude(dependency("org.jspecify:jspecify"))
         exclude(dependency("org.jetbrains:annotations"))
     }
 
@@ -66,12 +67,14 @@ tasks {
                 mapOf(
                     "name" to name,
                     "description" to description,
+                    "apiVersion" to "1.21.10",
                     "mainClass" to "dev.pgm.community.Community",
                     "version" to version,
                     "commitHash" to commitHash,
                     "author" to "applenick",
-                    "url" to "https://pgm.dev/")
+                    "url" to "https://pgm.dev/"
                 )
+            )
         }
     }
 

core/src/main/java/dev/pgm/community/mutations/types/mechanics/MobMutation.java

@@ -41,7 +41,7 @@ public class MobMutation extends ScheduledMutationBase {
   private static final int RANDOM_DISTANCE = 45;
   private static final String MOB_METADATA = "mob-mutation";
 
-  private static MutationListOption<Integer> TOTAL_MOBS = new MutationListOption(
+  private static MutationListOption<Integer> TOTAL_MOBS = new MutationListOption<>(
       "Total Mobs",
       "Total number of mobs spawned",
       MutationType.MOBS.getMaterial(),

core/src/main/java/dev/pgm/community/party/menu/MapPartyMainMenu.java

@@ -1,5 +1,6 @@
 package dev.pgm.community.party.menu;
 
+import static dev.pgm.community.util.PlayerUtils.PLAYER_UTILS;
 import static tc.oc.pgm.util.bukkit.BukkitUtils.colorize;
 
 import com.google.common.collect.Lists;
@@ -12,7 +13,6 @@
 import dev.pgm.community.party.menu.modifiers.MapPartyModifierMenu;
 import dev.pgm.community.party.menu.settings.MapPartySettingsMenu;
 import dev.pgm.community.party.presets.MapPartyPreset;
-import dev.pgm.community.utils.SkullUtils;
 import dev.pgm.community.utils.compatibility.Materials;
 import fr.minuskube.inv.ClickableItem;
 import fr.minuskube.inv.content.InventoryContents;
@@ -245,15 +245,15 @@ private ClickableItem getEmptyItem(int i) {
   private static final String END_PARTY_SKIN =
       "http://textures.minecraft.net/texture/e9cdb9af38cf41daa53bc8cda7665c509632d14e678f0f19f263f46e541d8a30";
 
-  private static final ItemStack START_ITEM = SkullUtils.customSkull(
+  private static final ItemStack START_ITEM = PLAYER_UTILS.customSkull(
       START_PARTY_SKIN,
       "&a&lStart Event",
       "&2Left-Click&7 to start the event now",
       "&2Right-Click&7 to start event after current match ends");
 
-  private static final ItemStack RESTART_ITEM = SkullUtils.customSkull(
+  private static final ItemStack RESTART_ITEM = PLAYER_UTILS.customSkull(
       RESTART_PARTY_SKIN, "&2&lRestart Event", "&7Click to restart the event");
 
   private static final ItemStack END_ITEM =
-      SkullUtils.customSkull(END_PARTY_SKIN, "&4&lEnd Event", "&7Click to end the event");
+      PLAYER_UTILS.customSkull(END_PARTY_SKIN, "&4&lEnd Event", "&7Click to end the event");
 }

core/src/main/java/dev/pgm/community/party/menu/hosts/HostMenu.java

@@ -1,12 +1,12 @@
 package dev.pgm.community.party.menu.hosts;
 
+import static dev.pgm.community.util.PlayerUtils.PLAYER_UTILS;
 import static tc.oc.pgm.util.bukkit.BukkitUtils.colorize;
 
 import com.google.common.collect.Lists;
 import dev.pgm.community.party.feature.MapPartyFeature;
 import dev.pgm.community.party.hosts.MapPartyHosts;
 import dev.pgm.community.party.menu.MapPartyMenu;
-import dev.pgm.community.utils.SkullUtils;
 import dev.pgm.community.utils.compatibility.Materials;
 import fr.minuskube.inv.ClickableItem;
 import fr.minuskube.inv.content.InventoryContents;
@@ -74,7 +74,8 @@ public void render(Player player, InventoryContents contents) {
           4,
           4,
           ClickableItem.of(
-              SkullUtils.customSkull(ADD_SKIN, "&a&lAdd Host", "&7Click to add event host"), c -> {
+              PLAYER_UTILS.customSkull(ADD_SKIN, "&a&lAdd Host", "&7Click to add event host"),
+              c -> {
                 new HostAddMenu(hosts).open(getViewer());
               }));
 

core/src/main/java/dev/pgm/community/party/menu/maps/MapMenu.java

@@ -1,13 +1,13 @@
 package dev.pgm.community.party.menu.maps;
 
+import static dev.pgm.community.util.PlayerUtils.PLAYER_UTILS;
 import static tc.oc.pgm.util.bukkit.BukkitUtils.colorize;
 
 import dev.pgm.community.party.feature.MapPartyFeature;
 import dev.pgm.community.party.menu.MapPartyMenu;
 import dev.pgm.community.party.types.CustomPoolParty;
 import dev.pgm.community.party.types.RegularPoolParty;
 import dev.pgm.community.utils.PGMUtils;
-import dev.pgm.community.utils.SkullUtils;
 import dev.pgm.community.utils.compatibility.Enchantments;
 import dev.pgm.community.utils.compatibility.Materials;
 import fr.minuskube.inv.ClickableItem;
@@ -75,7 +75,7 @@ private void render(Player player, InventoryContents contents) {
           4,
           4,
           ClickableItem.of(
-              SkullUtils.customSkull(
+              PLAYER_UTILS.customSkull(
                   ADD_SKIN, "&a&lAdd Map", "&7Click to add a map to the selection"),
               c -> {
                 new MapAddMenu(getFeature(), getViewer());

core/src/main/resources/plugin.yml

@@ -1,5 +1,6 @@
 name: Community
 description: ${description}
+api-version: ${apiVersion}
 main: ${mainClass}
 version: ${version} (git-${commitHash})
 website: ${url}

gradle/wrapper/gradle-wrapper.properties

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

platform/platform-modern/build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
 }
 
 dependencies {
+    implementation(project(":core"))
     implementation(project(":util"))
     paperweight.paperDevBundle("1.21.10-R0.1-SNAPSHOT")
 }