Merge pull request #230 from WhiteProject1/main

🐛 Fix 70+ bugs, add DeathMessage module, fix 1.21.11 compatibility

Author: Maxlego08

API/src/main/java/fr/maxlego08/essentials/api/cache/SimpleCache.java

@@ -42,6 +42,13 @@ public V get(K key, Loader<V> loader) {
     }
 
 
+    /**
+     * Clears all entries from the cache.
+     */
+    public void clear() {
+        this.cache.clear();
+    }
+
     /**
      * Functional interface for loading values into the cache. Implementations of this interface
      * provide a method to load a value, typically involving an operation such as fetching data

API/src/main/java/fr/maxlego08/essentials/api/commands/Permission.java

@@ -308,7 +308,10 @@ public enum Permission {
     ESSENTIALS_STEP_START,
     ESSENTIALS_STEP_FINISH,
     ESSENTIALS_ITEMFRAME,
-    ESSENTIALS_SILENT_DEATH("Allows you to die silently without a death message");
+    ESSENTIALS_SILENT_DEATH("Allows you to die silently without a death message"),
+    ESSENTIALS_DEATH_MESSAGE_TELEPORT("Allows clicking death messages to teleport to death location"),
+    ESSENTIALS_DEATH_MESSAGE_TOGGLE("Allows toggling death messages visibility"),
+    ESSENTIALS_DEATH_MESSAGE_TOGGLE_OTHER("Allows toggling death messages for other players");
 
     private final String description;
     private final String[] args;

API/src/main/java/fr/maxlego08/essentials/api/messages/Message.java

@@ -436,6 +436,9 @@ public enum Message {
 
     TELEPORT_DAMAGE("<error>You must not take damage during teleportation."),
     TELEPORT_ERROR_LOCATION("<error>Unable to teleport you safely."),
+    TELEPORT_CROSS_SERVER_NOT_SUPPORTED("<error>Cross-server teleportation is not supported on this server."),
+    TELEPORT_CROSS_SERVER_CONNECTING("<success>Connecting to server &f%server%<success>..."),
+    TELEPORT_CROSS_SERVER_PLAYER_NOT_FOUND("<error>Player &f%player% <error>was not found on any server."),
 
     // RTP Queue System Messages
     TELEPORT_ALREADY_IN_QUEUE("<error>You are already in the teleportation queue!"),
@@ -970,12 +973,41 @@ public enum Message {
     COMMAND_ITEMFRAME_VISIBLE("<success>Item frame is now <white>visible<success>."),
     COMMAND_ITEMFRAME_NOT_FOUND("<error>No item frame found. Look at an item frame and try again."),
 
-    // Death Messages
-    DEATH_MESSAGE_GENERIC("#99E0FF%player% &7died."),
-    DEATH_MESSAGE_PLAYER("#99E0FF%player% &7was slain by #34cfe0%killer% &7using %weapon%&7."),
-    DEATH_MESSAGE_FISTS("&7fists"),
-    DEATH_MESSAGE_MOB("#99E0FF%player% &7was killed by &c%mob%&7."),
-    DEATH_MESSAGE_MYTHIC_MOB("#99E0FF%player% &7was slain by <gradient:#ff6600:#ff0000>%mob%</gradient>&7!"),
+    // Death Message Module
+    DESCRIPTION_DEATH_MESSAGE("Custom death messages"),
+
+    DEATH_GENERIC("#C084FC☠ #E9D5FF%player% #B794F4died."),
+    DEATH_BY_PLAYER("#C084FC⚔ #E9D5FF%player% #B794F4was slain by #E9D5FF%killer%#B794F4."),
+    DEATH_BY_MOB("#C084FC☠ #E9D5FF%player% #B794F4was killed by #E9D5FF%killer%#B794F4."),
+    DEATH_BY_PROJECTILE("#C084FC🏹 #E9D5FF%player% #B794F4was shot by #E9D5FF%killer%#B794F4."),
+    DEATH_BY_MOB_EXPLOSION("#C084FC💥 #E9D5FF%player% #B794F4was blown up by #E9D5FF%killer%#B794F4."),
+    DEATH_BY_FALL("#C084FC⬇ #E9D5FF%player% #B794F4fell from a high place."),
+    DEATH_BY_FIRE("#C084FC🔥 #E9D5FF%player% #B794F4burned to death."),
+    DEATH_BY_LAVA("#C084FC🌋 #E9D5FF%player% #B794F4tried to swim in lava."),
+    DEATH_BY_DROWNING("#C084FC💧 #E9D5FF%player% #B794F4drowned."),
+    DEATH_BY_EXPLOSION("#C084FC💥 #E9D5FF%player% #B794F4was blown up."),
+    DEATH_BY_LIGHTNING("#C084FC⚡ #E9D5FF%player% #B794F4was struck by lightning."),
+    DEATH_BY_SUFFOCATION("#C084FC▓ #E9D5FF%player% #B794F4suffocated in a wall."),
+    DEATH_BY_STARVATION("#C084FC🍖 #E9D5FF%player% #B794F4starved to death."),
+    DEATH_BY_POISON("#C084FC☣ #E9D5FF%player% #B794F4was poisoned."),
+    DEATH_BY_MAGIC("#C084FC✦ #E9D5FF%player% #B794F4was killed by magic."),
+    DEATH_BY_WITHER("#C084FC💀 #E9D5FF%player% #B794F4withered away."),
+    DEATH_BY_FALLING_BLOCK("#C084FC▼ #E9D5FF%player% #B794F4was squashed by a falling block."),
+    DEATH_BY_FLY_INTO_WALL("#C084FC💨 #E9D5FF%player% #B794F4experienced kinetic energy."),
+    DEATH_BY_VOID("#C084FC✧ #E9D5FF%player% #B794F4fell out of the world."),
+    DEATH_BY_CACTUS("#C084FC🌵 #E9D5FF%player% #B794F4was pricked to death."),
+    DEATH_BY_CRAMMING("#C084FC⊞ #E9D5FF%player% #B794F4was squished too much."),
+    DEATH_BY_FREEZE("#C084FC❄ #E9D5FF%player% #B794F4froze to death."),
+    DEATH_BY_SONIC_BOOM("#C084FC◈ #E9D5FF%player% #B794F4was obliterated by a sonic boom."),
+    DEATH_BY_MAGMA("#C084FC♨ #E9D5FF%player% #B794F4discovered that the floor was lava."),
+    DEATH_BY_THORNS("#C084FC✵ #E9D5FF%player% #B794F4was killed trying to hurt someone."),
+    DEATH_BY_CAMPFIRE("#C084FC🔥 #E9D5FF%player% #B794F4walked into a campfire."),
+
+    DEATH_HOVER_DETAILS("#D8B4FE☠ Death Location#B794F4:\n#E9D5FF▸ World: #D8B4FE%world%\n#E9D5FF▸ Position: #D8B4FE%x%#E9D5FF, #D8B4FE%y%#E9D5FF, #D8B4FE%z%\n\n#9F7AEA&oClick to teleport"),
+
+    COMMAND_DEATH_MESSAGE_TOGGLE_DISABLE("#C084FC☠ #B794F4Death messages are now #E9D5FFhidden #B794F4for %player%#B794F4."),
+    COMMAND_DEATH_MESSAGE_TOGGLE_ENABLE("#C084FC☠ #B794F4Death messages are now #E9D5FFvisible #B794F4for %player%#B794F4."),
+    DESCRIPTION_DEATH_MESSAGE_TOGGLE("Toggle death messages visibility"),
     ;
 
     private EssentialsPlugin plugin;

API/src/main/java/fr/maxlego08/essentials/api/modules/Module.java

@@ -57,5 +57,11 @@ public interface Module extends Listener {
      */
     boolean isRegisterEvent();
 
+    /**
+     * Called when the module is being disabled.
+     */
+    default void onDisable() {
+    }
+
 }
 

API/src/main/java/fr/maxlego08/essentials/api/user/Option.java

@@ -32,4 +32,5 @@ public enum Option {
     WORLDEDIT_INVENTORY,
     WORLDEDIT_BOSSBAR_DISABLE,
     TELEPORT_REQUEST_DISABLE,
+    DEATH_MESSAGE_DISABLE,
 }

API/src/main/java/fr/maxlego08/essentials/api/utils/SafeLocation.java

@@ -78,7 +78,9 @@ public void setPitch(float pitch) {
 
     public Location getLocation() {
         if (this.location == null) {
-            this.location = new Location(Bukkit.getWorld(this.world), this.x, this.y, this.z, this.yaw, this.pitch);
+            var bukkitWorld = Bukkit.getWorld(this.world);
+            if (bukkitWorld == null) return null;
+            this.location = new Location(bukkitWorld, this.x, this.y, this.z, this.yaw, this.pitch);
         }
         return location;
     }

build.gradle.kts

@@ -32,6 +32,14 @@ allprojects {
         maven(url = "https://repo.tcoded.com/releases")
     }
 
+    configurations.all {
+        resolutionStrategy.eachDependency {
+            if (requested.group == "net.kyori" && requested.name == "adventure-text-serializer-ansi" && (requested.version.isNullOrBlank() || requested.version == ".")) {
+                useVersion("4.20.0")
+            }
+        }
+    }
+
     java {
         withSourcesJar()
 

src/main/java/fr/maxlego08/essentials/buttons/sanction/ButtonSanctions.java

@@ -60,8 +60,8 @@ private void displaySanction(int slot, Sanction sanction, Player player, User ta
         placeholders.register("reason", sanction.getReason());
         placeholders.register("duration", TimerBuilder.getStringTime(sanction.getDuration()));
         placeholders.register("remaining", sanction.isActive() ? TimerBuilder.getStringTime(sanction.getDurationRemaining().toMillis()) : Message.EXPIRED.getMessageAsString());
-        placeholders.register("created_at", simpleDateFormat.format(sanction.getCreatedAt()));
-        placeholders.register("expired_at", simpleDateFormat.format(sanction.getExpiredAt()));
+        placeholders.register("created_at", sanction.getCreatedAt() != null ? simpleDateFormat.format(sanction.getCreatedAt()) : "N/A");
+        placeholders.register("expired_at", sanction.getExpiredAt() != null ? simpleDateFormat.format(sanction.getExpiredAt()) : "N/A");
         placeholders.register("sender", sanctionModule.getSanctionBy(sanction.getSenderUniqueId()));
 
         inventory.addItem(slot, menuItemStack.build(player, false, placeholders));

src/main/java/fr/maxlego08/essentials/commands/CommandLoader.java

@@ -12,6 +12,7 @@
 import fr.maxlego08.essentials.commands.commands.chat.CommandShowItem;
 import fr.maxlego08.essentials.commands.commands.clearinventory.ClearInventoryCommand;
 import fr.maxlego08.essentials.commands.commands.cooldown.CommandCooldown;
+import fr.maxlego08.essentials.commands.commands.deathmessage.CommandDeathMessageToggle;
 import fr.maxlego08.essentials.commands.commands.discord.CommandLink;
 import fr.maxlego08.essentials.commands.commands.discord.CommandUnLink;
 import fr.maxlego08.essentials.commands.commands.economy.CommandBalanceTop;
@@ -285,6 +286,7 @@ public void loadCommands(CommandManager commandManager) {
         register("pub", CommandPub.class);
         register("step", CommandStep.class);
         register("itemframe", CommandItemFrame.class, "iframe");
+        register("deathmessage", CommandDeathMessageToggle.class, "dm", "deathmsg");
 
         for (RegisterCommand registerCommand : this.commands) {
             try {

src/main/java/fr/maxlego08/essentials/commands/ZCommandManager.java

@@ -45,7 +45,9 @@ public class ZCommandManager extends ZUtils implements CommandManager {
             commandMap = (CommandMap) bukkitCommandMap.get(Bukkit.getServer());
             constructor = PluginCommand.class.getDeclaredConstructor(String.class, Plugin.class);
             constructor.setAccessible(true);
-        } catch (Exception ignored) {
+        } catch (Exception exception) {
+            Bukkit.getLogger().severe("[zEssentials] Failed to initialize command map or PluginCommand constructor: " + exception.getMessage());
+            exception.printStackTrace();
         }
     }
 
@@ -283,6 +285,11 @@ public void registerCommand(Plugin plugin, String mainCommand, EssentialsCommand
         }
 
         try {
+            if (constructor == null || commandMap == null) {
+                this.plugin.getLogger().severe("Cannot register command '" + mainCommand + "': CommandMap or PluginCommand constructor is not initialized!");
+                return;
+            }
+
             PluginCommand command = constructor.newInstance(mainCommand, plugin);
             command.setExecutor(this);
             command.setTabCompleter(this);
@@ -296,7 +303,7 @@ public void registerCommand(Plugin plugin, String mainCommand, EssentialsCommand
             commands.add(essentialsCommand);
 
             if (!commandMap.register(command.getName(), plugin.getDescription().getName(), command)) {
-                plugin.getLogger().info("Unable to add the command " + essentialsCommand.getSyntax());
+                plugin.getLogger().warning("Unable to add the command /" + mainCommand + " (already registered by another plugin). Use /zessentials:" + mainCommand + " instead.");
             }
 
             if (essentialsCommand.getPermission() != null) {
@@ -307,6 +314,7 @@ public void registerCommand(Plugin plugin, String mainCommand, EssentialsCommand
                 Bukkit.getPluginManager().addPermission(new Permission(essentialsCommand.getPermission(), essentialsCommand.getDescription() == null ? "No description" : essentialsCommand.getDescription()));
             }
         } catch (Exception exception) {
+            this.plugin.getLogger().severe("Failed to register command '" + mainCommand + "': " + exception.getMessage());
             exception.printStackTrace();
         }
     }