Update dependencies and Gradle, along with small cleanup

Author: ncurran02

build.gradle.kts

@@ -21,18 +21,18 @@ repositories {
 }
 
 dependencies {
-    compileOnly("org.projectlombok:lombok:1.18.38")
-    annotationProcessor("org.projectlombok:lombok:1.18.38")
-    compileOnly("io.papermc.paper:paper-api:1.21.7-R0.1-SNAPSHOT")
-    implementation("org.apache.commons:commons-lang3:3.17.0")
-    compileOnly("dev.plex:server:1.5")
+    compileOnly("org.projectlombok:lombok:1.18.42")
+    annotationProcessor("org.projectlombok:lombok:1.18.42")
+    compileOnly("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT")
+    implementation("org.apache.commons:commons-lang3:3.19.0")
+    compileOnly("dev.plex:server:1.6")
     compileOnly("com.infernalsuite.aswm:api:1.20.6-R0.1-SNAPSHOT") {
         exclude(group = "com.flowpowered")
     }
 }
 
 group = "dev.plex"
-version = "1.5"
+version = "1.6"
 description = "Module-TFMExtras"
 
 java {

gradle/wrapper/gradle-wrapper.properties

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

src/main/java/dev/plex/extras/TFMExtras.java

@@ -153,7 +153,7 @@ public static Location getRandomLocation(World world)
 
     private Set<Class<?>> getClassesFrom(String packageName)
     {
-        Set<Class<?>> classes = new HashSet();
+        Set<Class<?>> classes = new HashSet<>();
 
         try
         {

src/main/java/dev/plex/extras/command/CartSitCommand.java

@@ -70,12 +70,9 @@ public CompletableFuture<Entity> findNearestEntity(Player player, List<Entity> e
     {
         return CompletableFuture.supplyAsync(() ->
         {
-            Entity nearest = entities.get(0);
-            for (int i = 0; i < entities.size(); i++)
-            {
-                Entity e = entities.get(i);
-                if (player.getLocation().distance(e.getLocation()) < player.getLocation().distance(nearest.getLocation()))
-                {
+            Entity nearest = entities.getFirst();
+            for (Entity e : entities) {
+                if (player.getLocation().distance(e.getLocation()) < player.getLocation().distance(nearest.getLocation())) {
                     nearest = e;
                 }
             }

src/main/java/dev/plex/extras/command/EnchantCommand.java

@@ -6,6 +6,8 @@
 import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.source.RequiredCommandSource;
 
+import io.papermc.paper.registry.RegistryAccess;
+import io.papermc.paper.registry.RegistryKey;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -79,7 +81,7 @@ protected Component execute(@NotNull CommandSender sender, @Nullable Player play
                     return messageComponent("enchantSpecify");
                 }
 
-                Enchantment enchantmentToRemove = Registry.ENCHANTMENT.get(NamespacedKey.minecraft(args[1].toLowerCase()));
+                Enchantment enchantmentToRemove = RegistryAccess.registryAccess().getRegistry(RegistryKey.ENCHANTMENT).get(NamespacedKey.minecraft(args[1].toLowerCase()));
                 if (enchantmentToRemove == null || !item.containsEnchantment(enchantmentToRemove))
                 {
                     return messageComponent("enchantInvalid");
@@ -108,7 +110,7 @@ protected Component execute(@NotNull CommandSender sender, @Nullable Player play
     private List<Enchantment> getEnchantments(ItemStack item)
     {
         List<Enchantment> enchants = Lists.newArrayList();
-        Arrays.stream(Enchantment.values()).filter(enchantment -> enchantment.canEnchantItem(item)).forEach(enchants::add);
+        RegistryAccess.registryAccess().getRegistry(RegistryKey.ENCHANTMENT).stream().filter(enchantment -> enchantment.canEnchantItem(item)).forEach(enchants::add);
         return enchants;
     }
 

src/main/java/dev/plex/extras/listener/ClownfishListener.java

@@ -2,6 +2,8 @@
 
 import dev.plex.extras.TFMExtras;
 import dev.plex.listener.PlexListener;
+import io.papermc.paper.registry.RegistryAccess;
+import io.papermc.paper.registry.RegistryKey;
 import net.kyori.adventure.text.Component;
 
 import net.kyori.adventure.text.minimessage.MiniMessage;
@@ -74,7 +76,7 @@ public void onPlayerInteract(PlayerInteractEvent event)
                         {
                             target.setFlying(false);
 
-                            for (Sound sound : Sound.values())
+                            for (Sound sound : RegistryAccess.registryAccess().getRegistry(RegistryKey.SOUND_EVENT))
                             {
                                 if (sound.toString().contains("HIT"))
                                 {
@@ -91,7 +93,7 @@ public void onPlayerInteract(PlayerInteractEvent event)
 
                     if (!pushedPlayers.isEmpty())
                     {
-                        for (Sound sound : Sound.values())
+                        for (Sound sound : RegistryAccess.registryAccess().getRegistry(RegistryKey.SOUND_EVENT))
                         {
                             if (sound.toString().contains("HIT"))
                             {

src/main/java/dev/plex/extras/listener/WorldListener.java

@@ -6,7 +6,6 @@
 import dev.plex.listener.PlexListener;
 import dev.plex.util.PlexUtils;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.player.PlayerChangedWorldEvent;
@@ -103,7 +102,6 @@ public void onWorldChange(PlayerChangedWorldEvent event)
         {
             event.getPlayer().sendMessage(PlexUtils.messageComponent("cantVisitIsland"));
             event.getPlayer().teleportAsync(event.getFrom().getSpawnLocation());
-            return;
         }
     }
 }

src/main/resources/module.yml

@@ -1,4 +1,4 @@
 name: Module-TFMExtras
 main: dev.plex.extras.TFMExtras
 description: TFM extras for Plex
-version: 1.5
+version: 1.6