diff --git a/build.gradle.kts b/build.gradle.kts index 110ac40..8e34264 100755 --- a/build.gradle.kts +++ b/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 { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d4081da..bad7c24 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/src/main/java/dev/plex/extras/TFMExtras.java b/src/main/java/dev/plex/extras/TFMExtras.java index 912163e..f0038e3 100755 --- a/src/main/java/dev/plex/extras/TFMExtras.java +++ b/src/main/java/dev/plex/extras/TFMExtras.java @@ -153,7 +153,7 @@ public class TFMExtras extends PlexModule private Set> getClassesFrom(String packageName) { - Set> classes = new HashSet(); + Set> classes = new HashSet<>(); try { diff --git a/src/main/java/dev/plex/extras/command/CartSitCommand.java b/src/main/java/dev/plex/extras/command/CartSitCommand.java index c5acde4..67b5814 100755 --- a/src/main/java/dev/plex/extras/command/CartSitCommand.java +++ b/src/main/java/dev/plex/extras/command/CartSitCommand.java @@ -70,12 +70,9 @@ public class CartSitCommand extends PlexCommand { 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; } } diff --git a/src/main/java/dev/plex/extras/command/EnchantCommand.java b/src/main/java/dev/plex/extras/command/EnchantCommand.java index b7b4488..67601da 100755 --- a/src/main/java/dev/plex/extras/command/EnchantCommand.java +++ b/src/main/java/dev/plex/extras/command/EnchantCommand.java @@ -6,6 +6,8 @@ import dev.plex.command.annotation.CommandParameters; 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 @@ public class EnchantCommand extends PlexCommand 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 @@ public class EnchantCommand extends PlexCommand private List getEnchantments(ItemStack item) { List 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; } diff --git a/src/main/java/dev/plex/extras/listener/ClownfishListener.java b/src/main/java/dev/plex/extras/listener/ClownfishListener.java index 26e0940..641e114 100644 --- a/src/main/java/dev/plex/extras/listener/ClownfishListener.java +++ b/src/main/java/dev/plex/extras/listener/ClownfishListener.java @@ -2,6 +2,8 @@ package dev.plex.extras.listener; 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 class ClownfishListener extends PlexListener { 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 class ClownfishListener extends PlexListener if (!pushedPlayers.isEmpty()) { - for (Sound sound : Sound.values()) + for (Sound sound : RegistryAccess.registryAccess().getRegistry(RegistryKey.SOUND_EVENT)) { if (sound.toString().contains("HIT")) { diff --git a/src/main/java/dev/plex/extras/listener/WorldListener.java b/src/main/java/dev/plex/extras/listener/WorldListener.java index 78014f8..143764b 100644 --- a/src/main/java/dev/plex/extras/listener/WorldListener.java +++ b/src/main/java/dev/plex/extras/listener/WorldListener.java @@ -6,7 +6,6 @@ import dev.plex.extras.island.info.IslandPermissions; 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 class WorldListener extends PlexListener { event.getPlayer().sendMessage(PlexUtils.messageComponent("cantVisitIsland")); event.getPlayer().teleportAsync(event.getFrom().getSpawnLocation()); - return; } } } diff --git a/src/main/resources/module.yml b/src/main/resources/module.yml index fe00574..c32b106 100755 --- a/src/main/resources/module.yml +++ b/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 \ No newline at end of file +version: 1.6 \ No newline at end of file