Stop inspect offline UUID fallback and centralize kit caching

rossnoah · rossnoah · commit a28c846cdce9 · 2026-03-10T15:36:24.000-04:00
- Add `cacheKit` helper in `KitManager` and route cache writes through it
- Remove deterministic offline-mode UUID fallback in inspect resolution
- Update inspect tests to expect `null` when all UUID lookups miss
diff --git a/src/main/java/dev/noah/perplayerkit/KitManager.java b/src/main/java/dev/noah/perplayerkit/KitManager.java
@@ -59,6 +59,15 @@ public ItemStack[] getItemStackArrayById(String id) {
         return kitByKitIDMap.get(id);
     }
 
+    private void cacheKit(String id, ItemStack[] kit) {
+        if (kit == null) {
+            kitByKitIDMap.remove(id);
+            return;
+        }
+
+        kitByKitIDMap.put(id, kit);
+    }
+
     public List<PublicKit> getPublicKitList() {
         return publicKitList;
     }
@@ -105,7 +114,7 @@ public boolean savekit(UUID uuid, int slot, ItemStack[] kit) {
                         }
                     }
 
-                    kitByKitIDMap.put(IDUtil.getPlayerKitId(uuid, slot), kit);
+                    cacheKit(IDUtil.getPlayerKitId(uuid, slot), kit);
                     player.sendMessage(ChatColor.GREEN + "Kit " + slot + " saved!");
 
                     Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> savePlayerKitToDB(uuid, slot));
@@ -150,7 +159,7 @@ public boolean savePublicKit(Player player, String publickit, ItemStack[] kit) {
                 }
             }
 
-            kitByKitIDMap.put(IDUtil.getPublicKitId(publickit), kit);
+            cacheKit(IDUtil.getPublicKitId(publickit), kit);
             player.sendMessage(ChatColor.GREEN + "Public Kit " + publickit + " saved!");
 
             Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> savePublicKitToDB(publickit));
@@ -193,7 +202,7 @@ public boolean savePublicKit(String id, ItemStack[] kit) {
                 }
             }
 
-            kitByKitIDMap.put(IDUtil.getPublicKitId(id), kit);
+            cacheKit(IDUtil.getPublicKitId(id), kit);
             return true;
         }
         return false;
@@ -213,7 +222,7 @@ public boolean saveEC(UUID uuid, int slot, ItemStack[] kit) {
                 }
 
                 if (notEmpty) {
-                    kitByKitIDMap.put(IDUtil.getECId(uuid, slot), kit);
+                    cacheKit(IDUtil.getECId(uuid, slot), kit);
                     player.sendMessage(ChatColor.GREEN + "Enderchest " + slot + " saved!");
                     Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> saveEnderchestToDB(uuid, slot));
                     return true;
@@ -238,7 +247,7 @@ public boolean saveECSilent(UUID uuid, int slot, ItemStack[] kit) {
             return false;
         }
 
-        kitByKitIDMap.put(IDUtil.getECId(uuid, slot), kit);
+        cacheKit(IDUtil.getECId(uuid, slot), kit);
         Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> saveEnderchestToDB(uuid, slot));
         return true;
     }
@@ -270,7 +279,7 @@ public boolean savekit(UUID uuid, int slot, ItemStack[] kit, boolean silent) {
                 kit[39] = null;
             }
 
-            kitByKitIDMap.put(IDUtil.getPlayerKitId(uuid, slot), ItemFilter.get().filterItemStack(kit));
+            cacheKit(IDUtil.getPlayerKitId(uuid, slot), ItemFilter.get().filterItemStack(kit));
             Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> savePlayerKitToDB(uuid, slot));
             return true;
         } else {
@@ -437,7 +446,8 @@ public void loadPlayerDataFromDB(UUID uuid) {
             if (!data.equalsIgnoreCase("error")) {
                 try {
                     ItemStack[] kit = Serializer.itemStackArrayFromBase64(data);
-                    kitByKitIDMap.put(IDUtil.getPlayerKitId(uuid, slot), ItemFilter.get().filterItemStack(Serializer.itemStackArrayFromBase64(data)));
+                    cacheKit(IDUtil.getPlayerKitId(uuid, slot),
+                            ItemFilter.get().filterItemStack(Serializer.itemStackArrayFromBase64(data)));
                 } catch (IOException ignored) {
                 }
             }
@@ -447,7 +457,8 @@ public void loadPlayerDataFromDB(UUID uuid) {
             if (!data.equalsIgnoreCase("error")) {
                 try {
                     ItemStack[] kit = Serializer.itemStackArrayFromBase64(data);
-                    kitByKitIDMap.put(IDUtil.getECId(uuid, slot), ItemFilter.get().filterItemStack(Serializer.itemStackArrayFromBase64(data)));
+                    cacheKit(IDUtil.getECId(uuid, slot),
+                            ItemFilter.get().filterItemStack(Serializer.itemStackArrayFromBase64(data)));
                 } catch (IOException ignored) {
                 }
             }
@@ -487,7 +498,7 @@ public void loadPublicKitFromDB(String id) {
         if (!data.equalsIgnoreCase("error")) {
             try {
                 ItemStack[] kit = Serializer.itemStackArrayFromBase64(data);
-                kitByKitIDMap.put(IDUtil.getPublicKitId(id), ItemFilter.get().filterItemStack(kit));
+                cacheKit(IDUtil.getPublicKitId(id), ItemFilter.get().filterItemStack(kit));
             } catch (IOException ignored) {
                 plugin.getLogger().info("Error loading public kit " + id);
             }
diff --git a/src/main/java/dev/noah/perplayerkit/commands/inspect/InspectCommandUtil.java b/src/main/java/dev/noah/perplayerkit/commands/inspect/InspectCommandUtil.java
@@ -32,7 +32,6 @@
 
 import java.io.IOException;
 import java.lang.reflect.Method;
-import java.nio.charset.StandardCharsets;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Supplier;
@@ -50,13 +49,13 @@ private InspectCommandUtil() {
     /**
      * Attempts to resolve a player identifier (name or UUID) to a UUID asynchronously.
      * This method first tries to parse as UUID, then checks online players synchronously,
-     * and finally searches cached offline players and Mojang asynchronously before
-     * falling back to the deterministic offline-mode UUID.
+     * and finally searches cached offline players and Mojang asynchronously.
      *
      * @param identifier Player name or UUID string
-     * @return CompletableFuture containing the resolved UUID
+     * @return CompletableFuture containing the resolved UUID, or null when the player
+     * could not be identified from local cache or Mojang
      */
-    public static CompletableFuture<UUID> resolvePlayerIdentifierAsync(String identifier) {
+    public static CompletableFuture<@Nullable UUID> resolvePlayerIdentifierAsync(String identifier) {
         // First try to parse as UUID
         try {
             UUID uuid = UUID.fromString(identifier);
@@ -160,8 +159,8 @@ public static void showUsage(@NotNull Player player, @NotNull String commandName
         }
     }
 
-    static @NotNull UUID selectResolvedUuid(@NotNull String identifier, @Nullable UUID cachedOfflinePlayer,
-                                            @NotNull Supplier<UUID> mojangLookup) {
+    static @Nullable UUID selectResolvedUuid(@NotNull String identifier, @Nullable UUID cachedOfflinePlayer,
+                                             @NotNull Supplier<UUID> mojangLookup) {
         if (cachedOfflinePlayer != null) {
             return cachedOfflinePlayer;
         }
@@ -171,6 +170,6 @@ public static void showUsage(@NotNull Player player, @NotNull String commandName
             return mojangUuid;
         }
 
-        return UUID.nameUUIDFromBytes(("OfflinePlayer:" + identifier).getBytes(StandardCharsets.UTF_8));
+        return null;
     }
 }
diff --git a/src/test/java/dev/noah/perplayerkit/commands/inspect/InspectCommandUtilTest.java b/src/test/java/dev/noah/perplayerkit/commands/inspect/InspectCommandUtilTest.java
@@ -6,7 +6,6 @@
 import org.mockito.MockedStatic;
 
 import java.lang.reflect.Method;
-import java.nio.charset.StandardCharsets;
 import java.util.UUID;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -39,13 +38,10 @@ void selectResolvedUuidUsesMojangResultWhenCacheMisses() {
     }
 
     @Test
-    void selectResolvedUuidUsesOfflineFallbackWhenMojangLookupMisses() {
-        String identifier = "TargetPlayer";
+    void selectResolvedUuidReturnsNullWhenAllLookupsMiss() {
+        UUID resolvedUuid = InspectCommandUtil.selectResolvedUuid("TargetPlayer", null, () -> null);
 
-        UUID resolvedUuid = InspectCommandUtil.selectResolvedUuid(identifier, null, () -> null);
-
-        assertEquals(UUID.nameUUIDFromBytes(("OfflinePlayer:" + identifier).getBytes(StandardCharsets.UTF_8)),
-                resolvedUuid);
+        assertNull(resolvedUuid);
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,15 @@ public ItemStack[] getItemStackArrayById(String id) {`
`59`	`59`	`return kitByKitIDMap.get(id);`
`60`	`60`	`}`
`61`	`61`
	`62`	`+ private void cacheKit(String id, ItemStack[] kit) {`
	`63`	`+ if (kit == null) {`
	`64`	`+ kitByKitIDMap.remove(id);`
	`65`	`+ return;`
	`66`	`+ }`
	`67`	`+`
	`68`	`+ kitByKitIDMap.put(id, kit);`
	`69`	`+ }`
	`70`	`+`
`62`	`71`	`public List<PublicKit> getPublicKitList() {`
`63`	`72`	`return publicKitList;`
`64`	`73`	`}`
`@@ -105,7 +114,7 @@ public boolean savekit(UUID uuid, int slot, ItemStack[] kit) {`
`105`	`114`	`}`
`106`	`115`	`}`
`107`	`116`
`108`		`- kitByKitIDMap.put(IDUtil.getPlayerKitId(uuid, slot), kit);`
	`117`	`+ cacheKit(IDUtil.getPlayerKitId(uuid, slot), kit);`
`109`	`118`	`player.sendMessage(ChatColor.GREEN + "Kit " + slot + " saved!");`
`110`	`119`
`111`	`120`	`Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> savePlayerKitToDB(uuid, slot));`
`@@ -150,7 +159,7 @@ public boolean savePublicKit(Player player, String publickit, ItemStack[] kit) {`
`150`	`159`	`}`
`151`	`160`	`}`
`152`	`161`
`153`		`- kitByKitIDMap.put(IDUtil.getPublicKitId(publickit), kit);`
	`162`	`+ cacheKit(IDUtil.getPublicKitId(publickit), kit);`
`154`	`163`	`player.sendMessage(ChatColor.GREEN + "Public Kit " + publickit + " saved!");`
`155`	`164`
`156`	`165`	`Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> savePublicKitToDB(publickit));`
`@@ -193,7 +202,7 @@ public boolean savePublicKit(String id, ItemStack[] kit) {`
`193`	`202`	`}`
`194`	`203`	`}`
`195`	`204`
`196`		`- kitByKitIDMap.put(IDUtil.getPublicKitId(id), kit);`
	`205`	`+ cacheKit(IDUtil.getPublicKitId(id), kit);`
`197`	`206`	`return true;`
`198`	`207`	`}`
`199`	`208`	`return false;`
`@@ -213,7 +222,7 @@ public boolean saveEC(UUID uuid, int slot, ItemStack[] kit) {`
`213`	`222`	`}`
`214`	`223`
`215`	`224`	`if (notEmpty) {`
`216`		`- kitByKitIDMap.put(IDUtil.getECId(uuid, slot), kit);`
	`225`	`+ cacheKit(IDUtil.getECId(uuid, slot), kit);`
`217`	`226`	`player.sendMessage(ChatColor.GREEN + "Enderchest " + slot + " saved!");`
`218`	`227`	`Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> saveEnderchestToDB(uuid, slot));`
`219`	`228`	`return true;`
`@@ -238,7 +247,7 @@ public boolean saveECSilent(UUID uuid, int slot, ItemStack[] kit) {`
`238`	`247`	`return false;`
`239`	`248`	`}`
`240`	`249`
`241`		`- kitByKitIDMap.put(IDUtil.getECId(uuid, slot), kit);`
	`250`	`+ cacheKit(IDUtil.getECId(uuid, slot), kit);`
`242`	`251`	`Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> saveEnderchestToDB(uuid, slot));`
`243`	`252`	`return true;`
`244`	`253`	`}`
`@@ -270,7 +279,7 @@ public boolean savekit(UUID uuid, int slot, ItemStack[] kit, boolean silent) {`
`270`	`279`	`kit[39] = null;`
`271`	`280`	`}`
`272`	`281`
`273`		`- kitByKitIDMap.put(IDUtil.getPlayerKitId(uuid, slot), ItemFilter.get().filterItemStack(kit));`
	`282`	`+ cacheKit(IDUtil.getPlayerKitId(uuid, slot), ItemFilter.get().filterItemStack(kit));`
`274`	`283`	`Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> savePlayerKitToDB(uuid, slot));`
`275`	`284`	`return true;`
`276`	`285`	`} else {`
`@@ -437,7 +446,8 @@ public void loadPlayerDataFromDB(UUID uuid) {`
`437`	`446`	`if (!data.equalsIgnoreCase("error")) {`
`438`	`447`	`try {`
`439`	`448`	`ItemStack[] kit = Serializer.itemStackArrayFromBase64(data);`
`440`		`- kitByKitIDMap.put(IDUtil.getPlayerKitId(uuid, slot), ItemFilter.get().filterItemStack(Serializer.itemStackArrayFromBase64(data)));`
	`449`	`+ cacheKit(IDUtil.getPlayerKitId(uuid, slot),`
	`450`	`+ ItemFilter.get().filterItemStack(Serializer.itemStackArrayFromBase64(data)));`
`441`	`451`	`} catch (IOException ignored) {`
`442`	`452`	`}`
`443`	`453`	`}`
`@@ -447,7 +457,8 @@ public void loadPlayerDataFromDB(UUID uuid) {`
`447`	`457`	`if (!data.equalsIgnoreCase("error")) {`
`448`	`458`	`try {`
`449`	`459`	`ItemStack[] kit = Serializer.itemStackArrayFromBase64(data);`
`450`		`- kitByKitIDMap.put(IDUtil.getECId(uuid, slot), ItemFilter.get().filterItemStack(Serializer.itemStackArrayFromBase64(data)));`
	`460`	`+ cacheKit(IDUtil.getECId(uuid, slot),`
	`461`	`+ ItemFilter.get().filterItemStack(Serializer.itemStackArrayFromBase64(data)));`
`451`	`462`	`} catch (IOException ignored) {`
`452`	`463`	`}`
`453`	`464`	`}`
`@@ -487,7 +498,7 @@ public void loadPublicKitFromDB(String id) {`
`487`	`498`	`if (!data.equalsIgnoreCase("error")) {`
`488`	`499`	`try {`
`489`	`500`	`ItemStack[] kit = Serializer.itemStackArrayFromBase64(data);`
`490`		`- kitByKitIDMap.put(IDUtil.getPublicKitId(id), ItemFilter.get().filterItemStack(kit));`
	`501`	`+ cacheKit(IDUtil.getPublicKitId(id), ItemFilter.get().filterItemStack(kit));`
`491`	`502`	`} catch (IOException ignored) {`
`492`	`503`	`plugin.getLogger().info("Error loading public kit " + id);`
`493`	`504`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@`
`32`	`32`
`33`	`33`	`import java.io.IOException;`
`34`	`34`	`import java.lang.reflect.Method;`
`35`		`-import java.nio.charset.StandardCharsets;`
`36`	`35`	`import java.util.UUID;`
`37`	`36`	`import java.util.concurrent.CompletableFuture;`
`38`	`37`	`import java.util.function.Supplier;`
`@@ -50,13 +49,13 @@ private InspectCommandUtil() {`
`50`	`49`	`/**`
`51`	`50`	`* Attempts to resolve a player identifier (name or UUID) to a UUID asynchronously.`
`52`	`51`	`* This method first tries to parse as UUID, then checks online players synchronously,`
`53`		`- * and finally searches cached offline players and Mojang asynchronously before`
`54`		`- * falling back to the deterministic offline-mode UUID.`
	`52`	`+ * and finally searches cached offline players and Mojang asynchronously.`
`55`	`53`	`*`
`56`	`54`	`* @param identifier Player name or UUID string`
`57`		`- * @return CompletableFuture containing the resolved UUID`
	`55`	`+ * @return CompletableFuture containing the resolved UUID, or null when the player`
	`56`	`+ * could not be identified from local cache or Mojang`
`58`	`57`	`*/`
`59`		`- public static CompletableFuture<UUID> resolvePlayerIdentifierAsync(String identifier) {`
	`58`	`+ public static CompletableFuture<@Nullable UUID> resolvePlayerIdentifierAsync(String identifier) {`
`60`	`59`	`// First try to parse as UUID`
`61`	`60`	`try {`
`62`	`61`	`UUID uuid = UUID.fromString(identifier);`
`@@ -160,8 +159,8 @@ public static void showUsage(@NotNull Player player, @NotNull String commandName`
`160`	`159`	`}`
`161`	`160`	`}`
`162`	`161`
`163`		`- static @NotNull UUID selectResolvedUuid(@NotNull String identifier, @Nullable UUID cachedOfflinePlayer,`
`164`		`- @NotNull Supplier<UUID> mojangLookup) {`
	`162`	`+ static @Nullable UUID selectResolvedUuid(@NotNull String identifier, @Nullable UUID cachedOfflinePlayer,`
	`163`	`+ @NotNull Supplier<UUID> mojangLookup) {`
`165`	`164`	`if (cachedOfflinePlayer != null) {`
`166`	`165`	`return cachedOfflinePlayer;`
`167`	`166`	`}`
`@@ -171,6 +170,6 @@ public static void showUsage(@NotNull Player player, @NotNull String commandName`
`171`	`170`	`return mojangUuid;`
`172`	`171`	`}`
`173`	`172`
`174`		`- return UUID.nameUUIDFromBytes(("OfflinePlayer:" + identifier).getBytes(StandardCharsets.UTF_8));`
	`173`	`+ return null;`
`175`	`174`	`}`
`176`	`175`	`}`