caching the CommandSender

Author: WizardlyBump17

core/src/main/java/com/wizardlybump17/wlib/WLib.java

@@ -14,6 +14,7 @@
 import com.wizardlybump17.wlib.command.listener.BukkitCommandManagerListener;
 import com.wizardlybump17.wlib.command.manager.CommandManager;
 import com.wizardlybump17.wlib.command.registry.MethodCommandNodeFactoryRegistry;
+import com.wizardlybump17.wlib.command.sender.BukkitCommandSender;
 import com.wizardlybump17.wlib.config.holder.BukkitConfigHolderFactory;
 import com.wizardlybump17.wlib.config.registry.ConfigHandlerRegistry;
 import com.wizardlybump17.wlib.config.registry.ConfigHolderFactoryRegistry;
@@ -127,6 +128,8 @@ private void clearCommandSystem() {
         commandExecutor = null;
 
         commandManagerListener = null;
+
+        BukkitCommandSender.clearCache();
     }
 
     private void initSerializables() {

core/src/main/java/com/wizardlybump17/wlib/command/WLibCommandExecutor.java

@@ -37,7 +37,7 @@ public WLibCommandExecutor(@NotNull CommandManager commandManager, @NotNull Logg
 
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        com.wizardlybump17.wlib.command.sender.CommandSender<?> wlibSender = new BukkitCommandSender(sender);
+        com.wizardlybump17.wlib.command.sender.CommandSender<?> wlibSender = BukkitCommandSender.from(sender);
 
         String wlibArgs = command.getName() + " " + String.join(" ", args);
 
@@ -65,7 +65,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
 
     @Override
     public @NotNull List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        com.wizardlybump17.wlib.command.sender.CommandSender<?> wlibSender = new BukkitCommandSender(sender);
+        com.wizardlybump17.wlib.command.sender.CommandSender<?> wlibSender = BukkitCommandSender.from(sender);
 
         String[] wlibArgs = new String[args.length + 1];
         wlibArgs[0] = command.getName();

core/src/main/java/com/wizardlybump17/wlib/command/sender/BukkitCommandSender.java

@@ -8,16 +8,20 @@
 import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class BukkitCommandSender implements CommandSender<org.bukkit.command.CommandSender> {
 
     public static final @NotNull BukkitCommandSender CONSOLE = new BukkitCommandSender(Bukkit.getConsoleSender());
+    private static final @NotNull Map<UUID, BukkitCommandSender> SENDERS_BY_ID = new ConcurrentHashMap<>();
 
     private final @NotNull org.bukkit.command.CommandSender handle;
 
@@ -96,4 +100,22 @@ public boolean hasPermission(String permission) {
     public boolean hasId(@NotNull UUID id) {
         return handle instanceof Entity entity && entity.getUniqueId().equals(id);
     }
+
+    @ApiStatus.Internal
+    public static void clearCache() {
+        SENDERS_BY_ID.clear();
+    }
+
+    public static @NotNull BukkitCommandSender from(@NotNull org.bukkit.command.CommandSender sender) {
+        return switch (sender) {
+            case ConsoleCommandSender ignored -> BukkitCommandSender.CONSOLE;
+            case Entity entity -> SENDERS_BY_ID.computeIfAbsent(entity.getUniqueId(), $ -> new BukkitCommandSender(sender));
+            default -> new BukkitCommandSender(sender);
+        };
+    }
+
+    @ApiStatus.Internal
+    public static void removeFromCache(@NotNull UUID id) {
+        SENDERS_BY_ID.remove(id);
+    }
 }

core/src/main/java/com/wizardlybump17/wlib/listener/EntityListener.java

@@ -1,5 +1,7 @@
 package com.wizardlybump17.wlib.listener;
 
+import com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent;
+import com.wizardlybump17.wlib.command.sender.BukkitCommandSender;
 import com.wizardlybump17.wlib.inventory.CustomInventory;
 import com.wizardlybump17.wlib.inventory.CustomInventoryHolder;
 import com.wizardlybump17.wlib.inventory.item.ClickAction;
@@ -15,6 +17,7 @@
 import org.bukkit.event.inventory.InventoryDragEvent;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
+import org.jetbrains.annotations.NotNull;
 
 @RequiredArgsConstructor
 public class EntityListener implements Listener {
@@ -63,4 +66,9 @@ public void onClose(InventoryCloseEvent event) {
 
         paginatedInventory.stopListeners();
     }
+
+    @EventHandler
+    public void onRemove(@NotNull EntityRemoveFromWorldEvent event) {
+        BukkitCommandSender.removeFromCache(event.getEntity().getUniqueId());
+    }
 }