Plexus/Plex
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex.git synced 2025-07-05 09:06:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

A bit more work on the API

Browse Source
This commit is contained in:
Focusvity
2022-05-18 20:31:15 +10:00
parent 7fe28ae8cb
commit 7efa151157
19 changed files with 89 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/main/java/dev/plex/cache/DataUtils.java vendored
View File

@ -55,9 +55,9 @@ public class DataUtils
public static PlexPlayer getPlayer(UUID uuid, boolean loadExtraData)
{
if (PlayerCache.getPlexPlayerMap().containsKey(uuid))
if (Plex.get().getPlayerCache().getPlexPlayerMap().containsKey(uuid))
{
return PlayerCache.getPlexPlayerMap().get(uuid);
return Plex.get().getPlayerCache().getPlexPlayerMap().get(uuid);
}
if (Plex.get().getStorageType() == StorageType.MONGODB)
@ -77,7 +77,7 @@ public class DataUtils
public static PlexPlayer getPlayer(String username, boolean loadExtraData)
{
Optional<PlexPlayer> plexPlayer = PlayerCache.getPlexPlayerMap().values().stream().filter(player -> player.getName().equalsIgnoreCase(username)).findFirst();
Optional<PlexPlayer> plexPlayer = Plex.get().getPlayerCache().getPlexPlayerMap().values().stream().filter(player -> player.getName().equalsIgnoreCase(username)).findFirst();
if (plexPlayer.isPresent())
{
return plexPlayer.get();
@ -102,7 +102,7 @@ public class DataUtils
*/
public static PlexPlayer getPlayerByIP(String ip)
{
PlexPlayer player = PlayerCache.getPlexPlayerMap().values().stream().filter(plexPlayer -> plexPlayer.getIps().contains(ip)).findFirst().orElse(null);
PlexPlayer player = Plex.get().getPlayerCache().getPlexPlayerMap().values().stream().filter(plexPlayer -> plexPlayer.getIps().contains(ip)).findFirst().orElse(null);
if (player != null)
{
return player;

7
server/src/main/java/dev/plex/cache/PlayerCache.java vendored
View File

@ -1,6 +1,7 @@
package dev.plex.cache;
import com.google.common.collect.Maps;
import dev.plex.api.IPlayerCache;
import dev.plex.player.PlexPlayer;
import java.util.Map;
import java.util.UUID;
@ -9,7 +10,7 @@ import java.util.UUID;
* Cache storage
*/
public class PlayerCache
public class PlayerCache implements IPlayerCache<PlexPlayer>
{
/**
* A key/value pair where the key is the unique ID of the Plex Player
@ -25,7 +26,7 @@ public class PlayerCache
// {
// return punishedPlayerMap;
// }
public static Map<UUID, PlexPlayer> getPlexPlayerMap()
public Map<UUID, PlexPlayer> getPlexPlayerMap()
{
return plexPlayerMap;
}
@ -39,7 +40,7 @@ public class PlayerCache
return getPunishedPlayerMap().get(uuid);
}
*/
public static PlexPlayer getPlexPlayer(UUID uuid)
public PlexPlayer getPlexPlayer(UUID uuid)
{
return getPlexPlayerMap().get(uuid);
}