Merge release/1.0.3.5 into main

Author: Maxlego08

API/build.gradle.kts

@@ -8,7 +8,7 @@ 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.0.9.jar"))
+    compileOnly(files("../libs/zMenu-1.1.1.0.jar"))
 
     implementation("fr.maxlego08.sarah:sarah:1.20")
     implementation("com.tcoded:FoliaLib:0.5.1")

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

@@ -193,6 +193,8 @@ public enum Permission {
     ESSENTIALS_PAY_TOGGLE,
     ESSENTIALS_PAY_TOGGLE_OTHER,
     ESSENTIALS_MESSAGE_TOGGLE_OTHER,
+    ESSENTIALS_TP_TOGGLE("Toggle receiving teleport requests"),
+    ESSENTIALS_TP_TOGGLE_OTHER("Toggle receiving teleport requests for other players"),
     ESSENTIALS_GIVE,
     ESSENTIALS_GIVE_ALL,
     ESSENTIALS_ITEM_LORE_CLEAR,
@@ -303,7 +305,13 @@ public enum Permission {
     ESSENTIALS_SIGN_RESET("Allows you to use the <reset> mini message format"),
     ESSENTIALS_SIGN_FONT("Allows you to use the <font> mini message format"),
     ESSENTIALS_SIGN_KEYBIND("Allows you to use the <key> mini message format"),
-    ESSENTIALS_STEP_START, ESSENTIALS_STEP_FINISH;
+    ESSENTIALS_STEP_START,
+    ESSENTIALS_STEP_FINISH,
+    ESSENTIALS_ITEMFRAME,
+    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

@@ -140,6 +140,9 @@ public enum Message {
     COMMAND_TELEPORT_WORLD("<error>You need to be in the same world to teleport."),
     COMMAND_TPA_ERROR_TO_LATE("<error>You do not have a teleport request."),
     COMMAND_TPA_ERROR_TO_LATE_2("<error>The request has expired."),
+    COMMAND_TPA_ERROR_NO_REQUEST_FROM_PLAYER("<error>You do not have a teleport request from &f%player%<error>."),
+    COMMAND_TPA_ACCEPT_ALL_SUCCESS("<success>You have accepted &f%count% <success>teleport request(s)."),
+    COMMAND_TPA_DENY_ALL_SUCCESS("<success>You have denied &f%count% <success>teleport request(s)."),
     COMMAND_TP_DENY_SENDER("Denied %player% teleport request."),
     COMMAND_TP_DENY_RECEIVER("%player% has denied your teleport request"),
     COMMAND_TP_CANCEL_ERROR("<error>You did not send a teleport request at &f%player%<error>."),
@@ -278,6 +281,7 @@ public enum Message {
     DESCRIPTION_MESSAGE("Send a private message to a player"),
     DESCRIPTION_REPLY("Reply to a private message"),
     DESCRIPTION_MESSAGE_TOGGLE("Toggle private message"),
+    DESCRIPTION_TP_TOGGLE("Toggle receiving teleport requests"),
     DESCRIPTION_POWER_TOOLS_TOGGLE("Toggle power tools"),
     DESCRIPTION_SOCIALSPY("Display private messages of players"),
     DESCRIPTION_COMPACT_ALL("Compact items in your inventories"),
@@ -432,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!"),
@@ -685,6 +692,9 @@ public enum Message {
     COMMAND_PAY_TOGGLE_DISABLE("<error>All of your power tools have been disabled &7for &f%player%<error>."),
     COMMAND_POWER_TOOLS_TOGGLE_ENABLE("<success>All of your power tools have been enabled &7for &f%player%<success>."),
     COMMAND_POWER_TOOLS_TOGGLE_DISABLE("&7Pay <error>disable &7for &f%player%<error>."),
+    COMMAND_TELEPORT_REQUEST_DISABLED("<error>The player &f%player%<error> has disabled teleport requests."),
+    COMMAND_TP_TOGGLE_ENABLE("&7Teleport requests <success>enabled &7for &f%player%<success>."),
+    COMMAND_TP_TOGGLE_DISABLE("&7Teleport requests <error>disabled &7for &f%player%<error>."),
 
     COMMAND_FURNACE_TYPE("<error>Impossible to smelt the material &f%material%<error>."),
     COMMAND_FURNACE_ERROR("<error>You have no &f%item%<error> in your inventory."),
@@ -956,6 +966,55 @@ public enum Message {
     STEP_DOESNT_EXIST("<error>Step &f%step% <error>does not exist."),
     STEP_ALREADY_EXIST("<error>Step &f%step% <error>already started."),
     STEP_DOESNT_STARTED("<error>Step &f%step% <error>doesn't started."),
+
+    // ItemFrame
+    DESCRIPTION_ITEMFRAME("Toggle item frame visibility"),
+    COMMAND_ITEMFRAME_INVISIBLE("<success>Item frame is now <white>invisible<success>."),
+    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 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"),
+
+    // Death messages used by DeathMessageModule (fallback messages when no custom config is set)
+    DEATH_MESSAGE_GENERIC("#99E0FF%player% &7died."),
+    DEATH_MESSAGE_PLAYER("#99E0FF%player% &7was slain by #34cfe0%killer% &7using %weapon%&7."),
+    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_FISTS("&7fists"),
     ;
 
     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/modules/death/DeathMessageType.java

@@ -0,0 +1,9 @@
+package fr.maxlego08.essentials.api.modules.death;
+
+public enum DeathMessageType {
+
+    DISABLE,
+    DEFAULT,
+    CUSTOM
+
+}

API/src/main/java/fr/maxlego08/essentials/api/modules/death/MythicMobsHook.java

@@ -0,0 +1,25 @@
+package fr.maxlego08.essentials.api.modules.death;
+
+import org.bukkit.entity.Entity;
+
+import java.util.Optional;
+
+public interface MythicMobsHook {
+
+    /**
+     * Checks if the given entity is a MythicMob.
+     *
+     * @param entity the entity to check
+     * @return true if the entity is a MythicMob, false otherwise
+     */
+    boolean isMythicMob(Entity entity);
+
+    /**
+     * Gets the display name of a MythicMob entity.
+     *
+     * @param entity the entity to get the name of
+     * @return an Optional containing the MythicMob's display name, or empty if not a MythicMob
+     */
+    Optional<String> getMythicMobName(Entity entity);
+
+}

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

@@ -31,4 +31,6 @@ public enum Option {
     PHANTOMS_DISABLE,
     WORLDEDIT_INVENTORY,
     WORLDEDIT_BOSSBAR_DISABLE,
+    TELEPORT_REQUEST_DISABLE,
+    DEATH_MESSAGE_DISABLE,
 }

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

@@ -135,6 +135,35 @@ public interface User {
      */
     void removeTeleportRequest(User user);
 
+    /**
+     * Gets teleport request from specific player.
+     *
+     * @param fromUser The player who sent the request
+     * @return The request from specified player, or null if none exists
+     */
+    TeleportRequest getTeleportRequestFrom(User fromUser);
+
+    /**
+     * Gets all incoming teleport requests.
+     *
+     * @return Collection of all valid incoming requests
+     */
+    Collection<TeleportRequest> getIncomingTeleportRequests();
+
+    /**
+     * Adds or updates incoming teleport request.
+     *
+     * @param teleportRequest The request to add/update
+     */
+    void setIncomingTeleportRequest(TeleportRequest teleportRequest);
+
+    /**
+     * Removes incoming request from specific player.
+     *
+     * @param fromUser The player whose request should be removed
+     */
+    void removeIncomingTeleportRequest(User fromUser);
+
     /**
      * Teleports the user to the specified location immediately.
      *

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;
     }