Isolate UUID lookup regression test

Author: BenCodez

AdvancedCore/src/main/java/com/bencodez/advancedcore/api/player/UuidLookup.java

@@ -18,19 +18,20 @@
 
 public class UuidLookup {
 
-	private static final UuidLookup instance = new UuidLookup();
+	private static final UuidLookup instance = new UuidLookup(AdvancedCorePlugin.getInstance());
 
 	public static UuidLookup getInstance() {
 		return instance;
 	}
 
-	private final AdvancedCorePlugin plugin = AdvancedCorePlugin.getInstance();
+	private final AdvancedCorePlugin plugin;
 
 	// Fast local caches
 	private final ConcurrentHashMap<String, String> uuidToName = new ConcurrentHashMap<>();
 	private final ConcurrentHashMap<String, String> nameToUuid = new ConcurrentHashMap<>();
 
-	private UuidLookup() {
+	private UuidLookup(AdvancedCorePlugin plugin) {
+		this.plugin = plugin;
 		// Cache is owned here.
 	}
 

AdvancedCore/src/test/java/com/bencodez/advancedcore/tests/user/SharedCacheCleanupPrimaryThreadTest.java

@@ -61,11 +61,10 @@ void primaryThreadIdentityLookupUsesOnlyKnownOnlineOfflineOrCachedIdentity() thr
 		AdvancedCoreConfigOptions options = mock(AdvancedCoreConfigOptions.class);
 		when(plugin.getOptions()).thenReturn(options);
 		when(options.isOnlineMode()).thenReturn(true);
-		try (var plugins = mockStatic(AdvancedCorePlugin.class); var bukkit = mockStatic(Bukkit.class)) {
-			plugins.when(AdvancedCorePlugin::getInstance).thenReturn(plugin);
-			Constructor<UuidLookup> constructor = UuidLookup.class.getDeclaredConstructor();
+		try (var bukkit = mockStatic(Bukkit.class)) {
+			Constructor<UuidLookup> constructor = UuidLookup.class.getDeclaredConstructor(AdvancedCorePlugin.class);
 			constructor.setAccessible(true);
-			UuidLookup lookup = constructor.newInstance();
+			UuidLookup lookup = constructor.newInstance(plugin);
 			String unknown = "Unknown" + UUID.randomUUID().toString().replace("-", "");
 
 			assertEquals("", lookup.getUUIDWithoutStorage(unknown));