Merge branch 'release/1.0.3.6'

Maxlego08 · Maxlego08 · commit 47eceb804c79 · 2026-05-21T13:48:47.000+02:00
diff --git a/API/build.gradle.kts b/API/build.gradle.kts
@@ -8,9 +8,9 @@ rootProject.extra.properties["sha"]?.let { sha ->
 
 dependencies {
     compileOnly("io.papermc.paper:paper-api:1.21.5-R0.1-SNAPSHOT")
-    compileOnly(files("../libs/zMenu-1.1.1.0.jar"))
+    compileOnly(files("../libs/zMenu-1.1.1.2.jar"))
 
-    implementation("fr.maxlego08.sarah:sarah:1.20")
+    implementation("fr.maxlego08.sarah:sarah:1.23")
     implementation("com.tcoded:FoliaLib:0.5.1")
     implementation("fr.mrmicky:fastboard:2.1.5")
 }
diff --git a/API/src/main/java/fr/maxlego08/essentials/api/worldedit/WorldEditTask.java b/API/src/main/java/fr/maxlego08/essentials/api/worldedit/WorldEditTask.java
@@ -72,14 +72,18 @@ public void calculatePrice(Consumer<BigDecimal> consumer) {
             this.loadBlocks();
 
             // Process the blocks in batches and calculate the total price
-            processNextBatch(blocks.stream().filter(b -> worldeditManager.hasPermission(user.getPlayer(), b)).map(b -> new BlockInfo(b, null, BigDecimal.ZERO)).collect(Collectors.toList()), 0, this.worldeditManager.getBatchSize(), () -> {
+            processNextBatch(blocks.stream().map(b -> new BlockInfo(b, null, BigDecimal.ZERO)).collect(Collectors.toList()), 0, this.worldeditManager.getBatchSize(), () -> {
 
                 this.totalPrice = this.blockInfos.stream().map(BlockInfo::price).reduce(BigDecimal.ZERO, BigDecimal::add);
                 this.materials = this.blockInfos.stream().collect(Collectors.groupingBy(BlockInfo::newMaterial, Collectors.counting()));
                 this.worldeditStatus = WorldeditStatus.WAITING_RESPONSE_PRICE;
 
                 consumer.accept(totalPrice);
-            }, blocks -> blocks.forEach(block -> this.processBlock(block.block())));
+            }, batchBlocks -> batchBlocks.forEach(block -> {
+                if (worldeditManager.hasPermission(user.getPlayer(), block.block())) {
+                    this.processBlock(block.block());
+                }
+            }));
         });
     }
 
diff --git a/DiscordBot/src/main/java/fr/maxlego08/essentials/bot/storage/StorageManager.java b/DiscordBot/src/main/java/fr/maxlego08/essentials/bot/storage/StorageManager.java
@@ -9,6 +9,7 @@
 import fr.maxlego08.sarah.DatabaseConnection;
 import fr.maxlego08.sarah.HikariDatabaseConnection;
 import fr.maxlego08.sarah.RequestHelper;
+import fr.maxlego08.sarah.logger.JULogger;
 import fr.maxlego08.sarah.logger.Logger;
 
 import java.util.Optional;
@@ -25,14 +26,14 @@ public class StorageManager {
     public void connect(Configuration configuration) {
 
         DatabaseConfiguration databaseConfiguration = configuration.getDatabaseConfiguration().toDatabaseConfiguration();
-        DatabaseConnection databaseConnection = new HikariDatabaseConnection(databaseConfiguration);
+        Logger logger = System.out::println;
+        DatabaseConnection databaseConnection = new HikariDatabaseConnection(databaseConfiguration, logger);
 
         if (!databaseConnection.isValid()) {
             System.err.println("Database connection failed.");
             return;
         }
 
-        Logger logger = System.out::println;
         this.requestHelper = new RequestHelper(databaseConnection, logger);
     }
 
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "fr.maxlego08.essentials"
-version = "1.0.3.5"
+version = "1.0.3.6"
 
 extra.set("targetFolder", file("target/"))
 extra.set("targetFolderDiscord", file("target-discord/"))
@@ -67,9 +67,9 @@ allprojects {
 
     dependencies {
 //        compileOnly("fr.maxlego08.menu:zmenu-api:1.1.0.0")
-        compileOnly(files("libs/zMenu-1.1.1.0.jar"))
+        compileOnly(files("libs/zMenu-1.1.1.2.jar"))
 
-        compileOnly("fr.maxlego08.sarah:sarah:1.20")
+        compileOnly("fr.maxlego08.sarah:sarah:1.23")
         compileOnly("com.tcoded:FoliaLib:0.5.1")
         compileOnly("fr.mrmicky:fastboard:2.1.5")
     }
diff --git a/changelog.md b/changelog.md
@@ -6,6 +6,19 @@
 
 # Unreleased
 
+# 1.0.3.6
+
+- Updated zMenu to version 1.1.1.2
+- Updated Sarah to version 1.23
+- Added generic Bukkit event-based permission checker for WorldEdit module — blocks in protected claims (HuskClaims, GriefPrevention, Lands, Towny, etc.) are now automatically skipped without needing a specific hook [#237](https://github.com/Maxlego08/zEssentials/issues/237)
+- Added configurable sounds for teleportation countdown and completion (`countdown-sound` and `complete-sound` in `modules/teleportation/config.yml`), supports custom sounds via the zMenu XSound API
+- Added warp lookup cache with O(1) HashMap for improved performance [#239](https://github.com/Maxlego08/zEssentials/pull/239)
+- Fixed home deletion from donut GUI showing "The home ? does not exist." — `/delhome` now opens the confirmation GUI when `homeDeleteConfirm` is enabled
+- Fixed cancelled TPA requests still being accepted — `/tpacancel` now properly removes the request from the target player's incoming requests
+- Fixed vault admin command permission check bypassed for admin access
+- Fixed chat URL pattern not matching URLs with special characters (`~`, `+`, `#`)
+- Fixed chat link transform regex replacement error with special characters
+
 # 1.0.3.5
 
 - Added `/itemframe` command (`/iframe` alias), toggles visibility of the item frame you're looking at
diff --git a/libs/zMenu-1.1.1.2.jar b/libs/zMenu-1.1.1.2.jar
diff --git a/src/main/java/fr/maxlego08/essentials/ZEssentialsPlugin.java b/src/main/java/fr/maxlego08/essentials/ZEssentialsPlugin.java
@@ -149,6 +149,8 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -163,6 +165,7 @@ public final class ZEssentialsPlugin extends ZPlugin implements EssentialsPlugin
     private final List<Material> materials = Arrays.stream(Material.values()).filter(e -> !e.name().startsWith("LEGACY_")).toList();
     private final Enchantments enchantments = new ZEnchantments();
     private final List<PermissionChecker> permissionCheckers = new ArrayList<>();
+    private volatile Map<String, Warp> warpsByName = Collections.emptyMap();
     private EssentialsUtils essentialsUtils;
     private ServerStorage serverStorage = new ZServerStorage(this);
     private InventoryManager inventoryManager;
@@ -220,6 +223,7 @@ public void onEnable() {
         // Load configuration files
         this.configurationFiles.forEach(ConfigurationFile::load);
         ConfigStorage.getInstance().load(getPersist());
+        rebuildWarpCache();
 
         // Commands
         this.registerListener(this.commandManager = new ZCommandManager(this));
@@ -523,9 +527,23 @@ public List<Warp> getWarps() {
         return ConfigStorage.warps;
     }
 
+    public void rebuildWarpCache() {
+        Map<String, Warp> map = new HashMap<>();
+        for (Warp warp : ConfigStorage.warps) {
+            map.put(warp.name().toLowerCase(), warp);
+        }
+        this.warpsByName = Collections.unmodifiableMap(map);
+    }
+
     @Override
     public Optional<Warp> getWarp(String name) {
-        return getWarps().stream().filter(warp -> warp.name().equalsIgnoreCase(name)).findFirst();
+        Warp warp = this.warpsByName.get(name.toLowerCase());
+        if (warp != null) return Optional.of(warp);
+        if (this.warpsByName.size() != ConfigStorage.warps.size()) {
+            rebuildWarpCache();
+            return Optional.ofNullable(this.warpsByName.get(name.toLowerCase()));
+        }
+        return Optional.empty();
     }
 
     @Override
@@ -844,5 +862,8 @@ private void loadHooks() {
                 this.getLogger().info("Register MythicMobsHook.");
             });
         }
+
+        this.permissionCheckers.add(new fr.maxlego08.essentials.hooks.BukkitEventPermissionChecker());
+        this.getLogger().info("Register Bukkit Event Permission Checker.");
     }
 }
diff --git a/src/main/java/fr/maxlego08/essentials/commands/commands/home/CommandDelHome.java b/src/main/java/fr/maxlego08/essentials/commands/commands/home/CommandDelHome.java
@@ -45,7 +45,12 @@ protected CommandResultType perform(EssentialsPlugin plugin) {
         }
 
         if (homeManager.isHomeDeleteConfirm()) {
-            message(user, Message.COMMAND_HOME_DELETE_CONFIRM, "%name%", homeName);
+            Home home = user.getHome(homeName).orElse(null);
+            if (home == null) {
+                message(user, Message.COMMAND_HOME_DOESNT_EXIST, "%name%", homeName);
+                return CommandResultType.DEFAULT;
+            }
+            homeManager.openInventoryConfirmHome(user, home);
             return CommandResultType.SUCCESS;
         }
 
diff --git a/src/main/java/fr/maxlego08/essentials/commands/commands/warp/CommandDelWarp.java b/src/main/java/fr/maxlego08/essentials/commands/commands/warp/CommandDelWarp.java
@@ -1,5 +1,6 @@
 package fr.maxlego08.essentials.commands.commands.warp;
 
+import fr.maxlego08.essentials.ZEssentialsPlugin;
 import fr.maxlego08.essentials.api.EssentialsPlugin;
 import fr.maxlego08.essentials.api.commands.CommandResultType;
 import fr.maxlego08.essentials.api.commands.Permission;
@@ -35,6 +36,7 @@ protected CommandResultType perform(EssentialsPlugin plugin) {
 
         ConfigStorage.warps.removeIf(warp -> warp.name().equalsIgnoreCase(warpName));
         ConfigStorage.getInstance().save(plugin.getPersist());
+        ((ZEssentialsPlugin) plugin).rebuildWarpCache();
 
         message(sender, Message.COMMAND_WARP_DELETE, "%name%", warpName);
 
diff --git a/src/main/java/fr/maxlego08/essentials/commands/commands/warp/CommandSetWarp.java b/src/main/java/fr/maxlego08/essentials/commands/commands/warp/CommandSetWarp.java
@@ -1,5 +1,6 @@
 package fr.maxlego08.essentials.commands.commands.warp;
 
+import fr.maxlego08.essentials.ZEssentialsPlugin;
 import fr.maxlego08.essentials.api.EssentialsPlugin;
 import fr.maxlego08.essentials.api.commands.CommandResultType;
 import fr.maxlego08.essentials.api.commands.Permission;
@@ -40,6 +41,7 @@ protected CommandResultType perform(EssentialsPlugin plugin) {
         ConfigStorage.warps.removeIf(warp -> warp.name().equalsIgnoreCase(warpName));
         ConfigStorage.warps.add(new Warp(warpName, new SafeLocation(this.player.getLocation())));
         ConfigStorage.getInstance().save(plugin.getPersist());
+        ((ZEssentialsPlugin) plugin).rebuildWarpCache();
 
         message(sender, Message.COMMAND_WARP_CREATE, "%name%", warpName);
 
diff --git a/src/main/java/fr/maxlego08/essentials/convert/cmi/CMIConvert.java b/src/main/java/fr/maxlego08/essentials/convert/cmi/CMIConvert.java
@@ -13,8 +13,7 @@
 import fr.maxlego08.sarah.DatabaseConfiguration;
 import fr.maxlego08.sarah.RequestHelper;
 import fr.maxlego08.sarah.SqliteConnection;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
+import fr.maxlego08.sarah.logger.Logger;
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 
@@ -50,14 +49,15 @@ public void convert(CommandSender sender) {
     }
 
     private void startConvertDatabase(CommandSender sender, SqlStorage sqlStorage) {
-        var databaseConnection = new SqliteConnection(DatabaseConfiguration.sqlite(sqlStorage.getConnection().getDatabaseConfiguration().isDebug()), plugin.getDataFolder());
+        Logger logger = message -> this.plugin.getLogger().info(message);
+        var databaseConnection = new SqliteConnection(DatabaseConfiguration.sqlite(sqlStorage.getConnection().getDatabaseConfiguration().isDebug()), this.plugin.getDataFolder(), logger);
         databaseConnection.setFileName("cmi.sqlite.db");
 
         if (!databaseConnection.isValid()) {
             message(sender, "&cUnable to connect to database.");
         }
 
-        RequestHelper requestHelper = new RequestHelper(databaseConnection, message -> plugin.getLogger().info(message));
+        RequestHelper requestHelper = new RequestHelper(databaseConnection, logger);
         List<CMIUser> cmiUsers = requestHelper.select("users", CMIUser.class, table -> {
         });
 
diff --git a/src/main/java/fr/maxlego08/essentials/convert/coinsengine/CoinsEngineConvert.java b/src/main/java/fr/maxlego08/essentials/convert/coinsengine/CoinsEngineConvert.java
@@ -57,7 +57,7 @@ public void convert(CommandSender sender) {
     }
 
     private void startConvertDatabase(CommandSender sender, SqlStorage sqlStorage, File folder) throws SQLException {
-        var databaseConnection = new SqliteConnection(DatabaseConfiguration.sqlite(sqlStorage.getConnection().getDatabaseConfiguration().isDebug()), folder);
+        var databaseConnection = new SqliteConnection(DatabaseConfiguration.sqlite(sqlStorage.getConnection().getDatabaseConfiguration().isDebug()), folder, JULogger.from(plugin.getLogger()));
         databaseConnection.setFileName("data.db");
 
         if (!databaseConnection.isValid()) {
diff --git a/src/main/java/fr/maxlego08/essentials/convert/huskhomes/HuskHomesConvert.java b/src/main/java/fr/maxlego08/essentials/convert/huskhomes/HuskHomesConvert.java
@@ -12,6 +12,7 @@
 import fr.maxlego08.sarah.DatabaseConnection;
 import fr.maxlego08.sarah.RequestHelper;
 import fr.maxlego08.sarah.SqliteConnection;
+import fr.maxlego08.sarah.logger.JULogger;
 import org.bukkit.command.CommandSender;
 
 import java.io.File;
@@ -48,7 +49,7 @@ private void startConvertDatabase(CommandSender sender, SqlStorage sqlStorage) {
         DatabaseConnection databaseConnection = sqlStorage.getConnection();
         File file = new File(this.plugin.getDataFolder(), "HuskHomesData.db");
         if (file.exists()) {
-            var sqliteConnection = new SqliteConnection(DatabaseConfiguration.sqlite(sqlStorage.getConnection().getDatabaseConfiguration().isDebug()), this.plugin.getDataFolder());
+            var sqliteConnection = new SqliteConnection(DatabaseConfiguration.sqlite(sqlStorage.getConnection().getDatabaseConfiguration().isDebug()), this.plugin.getDataFolder(), JULogger.from(plugin.getLogger()));
             sqliteConnection.setFileName("HuskHomesData.db");
             databaseConnection = sqliteConnection;
 
diff --git a/src/main/java/fr/maxlego08/essentials/convert/sunlight/SunlightConvert.java b/src/main/java/fr/maxlego08/essentials/convert/sunlight/SunlightConvert.java
@@ -11,6 +11,7 @@
 import fr.maxlego08.sarah.DatabaseConfiguration;
 import fr.maxlego08.sarah.RequestHelper;
 import fr.maxlego08.sarah.SqliteConnection;
+import fr.maxlego08.sarah.logger.JULogger;
 import org.bukkit.command.CommandSender;
 
 import java.io.File;
@@ -44,7 +45,7 @@ public void convert(CommandSender sender) {
     }
 
     private void startConvertDatabase(CommandSender sender, SqlStorage sqlStorage) {
-        var databaseConnection = new SqliteConnection(DatabaseConfiguration.sqlite(sqlStorage.getConnection().getDatabaseConfiguration().isDebug()), plugin.getDataFolder());
+        var databaseConnection = new SqliteConnection(DatabaseConfiguration.sqlite(sqlStorage.getConnection().getDatabaseConfiguration().isDebug()), plugin.getDataFolder(), JULogger.from(plugin.getLogger()));
         databaseConnection.setFileName("data.db");
 
         if (!databaseConnection.isValid()) {
diff --git a/src/main/java/fr/maxlego08/essentials/hooks/BukkitEventPermissionChecker.java b/src/main/java/fr/maxlego08/essentials/hooks/BukkitEventPermissionChecker.java
@@ -0,0 +1,17 @@
+package fr.maxlego08.essentials.hooks;
+
+import fr.maxlego08.essentials.api.permission.PermissionChecker;
+import org.bukkit.Bukkit;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.block.BlockBreakEvent;
+
+public class BukkitEventPermissionChecker implements PermissionChecker {
+
+    @Override
+    public boolean hasPermission(Player player, Block block) {
+        BlockBreakEvent event = new BlockBreakEvent(block, player);
+        Bukkit.getPluginManager().callEvent(event);
+        return !event.isCancelled();
+    }
+}
diff --git a/src/main/java/fr/maxlego08/essentials/module/modules/TeleportationModule.java b/src/main/java/fr/maxlego08/essentials/module/modules/TeleportationModule.java
@@ -8,16 +8,22 @@
 import fr.maxlego08.essentials.api.teleportation.WorldOverride;
 import fr.maxlego08.essentials.api.user.User;
 import fr.maxlego08.essentials.module.ZModule;
+import fr.maxlego08.menu.api.sound.SoundOption;
+import fr.maxlego08.menu.hooks.xseries.XSound;
+import fr.maxlego08.menu.sound.ZSoundOption;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Queue;
 import java.util.Random;
 import java.util.UUID;
@@ -55,6 +61,10 @@ public class TeleportationModule extends ZModule {
     private Map<String, RandomTeleportWorld> rtpWorldMap = new HashMap<>();
     @NonLoadable
     private boolean isProcessingQueue = false;
+    @NonLoadable
+    private SoundOption countdownSound;
+    @NonLoadable
+    private SoundOption completeSound;
 
 
     public TeleportationModule(ZEssentialsPlugin plugin) {
@@ -70,6 +80,32 @@ public void loadConfiguration() {
 
         this.rtpWorldMap = this.rtpWorlds.stream().collect(Collectors.toMap(RandomTeleportWorld::world, r -> r));
         this.worldOverrides = this.rtpWorldOverrides.stream().filter(e -> e.to() != null && e.from() != null).collect(Collectors.toMap(WorldOverride::from, WorldOverride::to));
+
+        YamlConfiguration configuration = getConfiguration();
+        this.countdownSound = loadSoundOption(configuration, "countdown-sound");
+        this.completeSound = loadSoundOption(configuration, "complete-sound");
+    }
+
+    private SoundOption loadSoundOption(YamlConfiguration configuration, String path) {
+        ConfigurationSection section = configuration.getConfigurationSection(path);
+        if (section == null || !section.getBoolean("enabled", false)) return null;
+
+        String soundName = section.getString("sound", "");
+        if (soundName == null || soundName.isEmpty()) return null;
+
+        float volume = (float) section.getDouble("volume", 1.0);
+        float pitch = (float) section.getDouble("pitch", 1.0);
+        Optional<XSound> xSound = XSound.of(soundName);
+
+        return new ZSoundOption(xSound.orElse(null), "MASTER", soundName, pitch, volume, xSound.isEmpty());
+    }
+
+    public SoundOption getCountdownSound() {
+        return countdownSound;
+    }
+
+    public SoundOption getCompleteSound() {
+        return completeSound;
     }
 
     public boolean isTeleportSafety() {
diff --git a/src/main/java/fr/maxlego08/essentials/module/modules/chat/ChatModule.java b/src/main/java/fr/maxlego08/essentials/module/modules/chat/ChatModule.java
@@ -51,7 +51,7 @@ public class ChatModule extends ZModule {
     private final List<ShowItem> showItems = new ArrayList<>();
     private final List<ChatDisplay> chatDisplays = new ArrayList<>();
     private final ExpiringCache<UUID, List<ChatMessageDTO>> chatMessagesCache = new ExpiringCache<>(1000 * 60);
-    private final Pattern urlPattern = Pattern.compile("(https?://[\\w-\\.]+(\\:[0-9]+)?(/[\\w- ./?%&=]*)?)", Pattern.CASE_INSENSITIVE);
+    private final Pattern urlPattern = Pattern.compile("(https?://[\\w-\\.]+(\\:[0-9]+)?(/[\\w-./?%&=~+#]*)?)", Pattern.CASE_INSENSITIVE);
     private final List<ChatCooldown> chatCooldowns = new ArrayList<>();
     private final List<ChatFormat> chatFormats = new ArrayList<>();
     private final List<ChatPlaceholder> chatPlaceholders = new ArrayList<>();
@@ -299,7 +299,7 @@ private String transformUrlsToMiniMessage(String input) {
         StringBuilder result = new StringBuilder();
         while (matcher.find()) {
             String url = matcher.group(1);
-            matcher.appendReplacement(result, getMessage(this.linkTransform, "%url%", url));
+            matcher.appendReplacement(result, Matcher.quoteReplacement(getMessage(this.linkTransform, "%url%", url)));
         }
         matcher.appendTail(result);
 
diff --git a/src/main/java/fr/maxlego08/essentials/module/modules/vault/VaultModule.java b/src/main/java/fr/maxlego08/essentials/module/modules/vault/VaultModule.java
@@ -118,10 +118,10 @@ public void openVault(Player player, OfflinePlayer target, int vaultId) {
             return;
         }
 
-        if (!hasPermission(target.getUniqueId(), vaultId)) {
+        /*if (!hasPermission(target.getUniqueId(), vaultId)) {
             message(player, Message.COMMAND_VAULT_NO_PERMISSION);
             return;
-        }
+        }*/
 
         PlayerVaults targetVaults = getPlayerVaults(target);
         Vault vault = targetVaults.getVault(vaultId);
diff --git a/src/main/java/fr/maxlego08/essentials/module/modules/worldedit/WorldeditModule.java b/src/main/java/fr/maxlego08/essentials/module/modules/worldedit/WorldeditModule.java
diff --git a/src/main/java/fr/maxlego08/essentials/storage/storages/SqlStorage.java b/src/main/java/fr/maxlego08/essentials/storage/storages/SqlStorage.java
diff --git a/src/main/java/fr/maxlego08/essentials/user/ZUser.java b/src/main/java/fr/maxlego08/essentials/user/ZUser.java
diff --git a/src/main/resources/modules/teleportation/config.yml b/src/main/resources/modules/teleportation/config.yml
diff --git a/src/main/resources/patterns/home_down.yml b/src/main/resources/patterns/home_down.yml

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,12 @@ protected CommandResultType perform(EssentialsPlugin plugin) {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`if (homeManager.isHomeDeleteConfirm()) {`
`48`		`- message(user, Message.COMMAND_HOME_DELETE_CONFIRM, "%name%", homeName);`
	`48`	`+ Home home = user.getHome(homeName).orElse(null);`
	`49`	`+ if (home == null) {`
	`50`	`+ message(user, Message.COMMAND_HOME_DOESNT_EXIST, "%name%", homeName);`
	`51`	`+ return CommandResultType.DEFAULT;`
	`52`	`+ }`
	`53`	`+ homeManager.openInventoryConfirmHome(user, home);`
`49`	`54`	`return CommandResultType.SUCCESS;`
`50`	`55`	`}`
`51`	`56`