Limework/RedisBungee
2
0
Fork 0
mirror of https://github.com/proxiodev/RedisBungee.git synced 2025-04-20 01:27:07 +00:00
Code Releases Activity

Ran inspections on code. Fixed compile errors.

Browse Source
This commit is contained in:
Tux 2014-05-30 23:57:42 -04:00
parent 8bf80450ca
commit 527f76ac6b
9 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java
View File

@ -512,7 +512,7 @@ public final class RedisBungee extends Plugin {
} }
class JedisPubSubHandler extends JedisPubSub { class JedisPubSubHandler extends JedisPubSub {
private ExecutorService executor = Executors.newCachedThreadPool(new ThreadFactoryBuilder().setDaemon(true).setNameFormat("RedisBungee PubSub Handler - #%d").build()); private final ExecutorService executor = Executors.newCachedThreadPool(new ThreadFactoryBuilder().setDaemon(true).setNameFormat("RedisBungee PubSub Handler - #%d").build());
@Override @Override
public void onMessage(final String s, final String s2) { public void onMessage(final String s, final String s2) {

2
src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeCommandSender.java
View File

@ -23,7 +23,7 @@ import java.util.Collections;
* @since 0.2.3 * @since 0.2.3
*/ */
@NoArgsConstructor(access = AccessLevel.PRIVATE) @NoArgsConstructor(access = AccessLevel.PRIVATE)
public class RedisBungeeCommandSender implements CommandSender { class RedisBungeeCommandSender implements CommandSender {
static final RedisBungeeCommandSender instance = new RedisBungeeCommandSender(); static final RedisBungeeCommandSender instance = new RedisBungeeCommandSender();
@Override @Override

8
src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeCommands.java
View File

@ -60,7 +60,7 @@ class RedisBungeeCommands {
Multimap<String, UUID> serverToPlayers = RedisBungee.getApi().getServerToPlayers(); Multimap<String, UUID> serverToPlayers = RedisBungee.getApi().getServerToPlayers();
Multimap<String, String> human = HashMultimap.create(); Multimap<String, String> human = HashMultimap.create();
for (Map.Entry<String, UUID> entry : serverToPlayers.entries()) { for (Map.Entry<String, UUID> entry : serverToPlayers.entries()) {
human.put(entry.getKey(), plugin.getUuidTranslator().getNameFromUuid(entry.getValue())); human.put(entry.getKey(), plugin.getUuidTranslator().getNameFromUuid(entry.getValue(), false));
} }
for (String server : new TreeSet<>(serverToPlayers.keySet())) { for (String server : new TreeSet<>(serverToPlayers.keySet())) {
TextComponent serverName = new TextComponent(); TextComponent serverName = new TextComponent();
@ -102,7 +102,7 @@ class RedisBungeeCommands {
@Override @Override
public void run() { public void run() {
if (args.length > 0) { if (args.length > 0) {
UUID uuid = plugin.getUuidTranslator().getTranslatedUuid(args[0]); UUID uuid = plugin.getUuidTranslator().getTranslatedUuid(args[0], true);
if (uuid == null) { if (uuid == null) {
sender.sendMessage(PLAYER_NOT_FOUND); sender.sendMessage(PLAYER_NOT_FOUND);
return; return;
@ -138,7 +138,7 @@ class RedisBungeeCommands {
@Override @Override
public void run() { public void run() {
if (args.length > 0) { if (args.length > 0) {
UUID uuid = plugin.getUuidTranslator().getTranslatedUuid(args[0]); UUID uuid = plugin.getUuidTranslator().getTranslatedUuid(args[0], true);
if (uuid == null) { if (uuid == null) {
sender.sendMessage(PLAYER_NOT_FOUND); sender.sendMessage(PLAYER_NOT_FOUND);
return; return;
@ -178,7 +178,7 @@ class RedisBungeeCommands {
@Override @Override
public void run() { public void run() {
if (args.length > 0) { if (args.length > 0) {
UUID uuid = plugin.getUuidTranslator().getTranslatedUuid(args[0]); UUID uuid = plugin.getUuidTranslator().getTranslatedUuid(args[0], true);
if (uuid == null) { if (uuid == null) {
sender.sendMessage(PLAYER_NOT_FOUND); sender.sendMessage(PLAYER_NOT_FOUND);
return; return;

2
src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeConsumer.java
View File

@ -19,7 +19,7 @@ import java.util.concurrent.LinkedBlockingQueue;
@RequiredArgsConstructor @RequiredArgsConstructor
public class RedisBungeeConsumer implements Runnable { public class RedisBungeeConsumer implements Runnable {
private final RedisBungee plugin; private final RedisBungee plugin;
private BlockingQueue<ConsumerEvent> consumerQueue = new LinkedBlockingQueue<>(); private final BlockingQueue<ConsumerEvent> consumerQueue = new LinkedBlockingQueue<>();
private boolean stopped = false; private boolean stopped = false;
@Override @Override

6
src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeListener.java
View File

@ -68,7 +68,7 @@ public class RedisBungeeListener implements Listener {
ServerPing.PlayerInfo[] info = new ServerPing.PlayerInfo[players.size()]; ServerPing.PlayerInfo[] info = new ServerPing.PlayerInfo[players.size()];
int idx = 0; int idx = 0;
for (UUID player : players) { for (UUID player : players) {
info[idx] = new ServerPing.PlayerInfo(plugin.getUuidTranslator().getNameFromUuid(player), ""); info[idx] = new ServerPing.PlayerInfo(plugin.getUuidTranslator().getNameFromUuid(player, false), "");
idx++; idx++;
} }
reply.setPlayers(new ServerPing.Players(old.getPlayers().getMax(), players.size(), info)); reply.setPlayers(new ServerPing.Players(old.getPlayers().getMax(), players.size(), info));
@ -110,7 +110,7 @@ public class RedisBungeeListener implements Listener {
} }
Set<String> players = new HashSet<>(); Set<String> players = new HashSet<>();
for (UUID uuid : original) for (UUID uuid : original)
players.add(plugin.getUuidTranslator().getNameFromUuid(uuid)); players.add(plugin.getUuidTranslator().getNameFromUuid(uuid, false));
out.writeUTF(Joiner.on(',').join(players)); out.writeUTF(Joiner.on(',').join(players));
break; break;
case "PlayerCount": case "PlayerCount":
@ -133,7 +133,7 @@ public class RedisBungeeListener implements Listener {
String user = in.readUTF(); String user = in.readUTF();
out.writeUTF("LastOnline"); out.writeUTF("LastOnline");
out.writeUTF(user); out.writeUTF(user);
out.writeLong(plugin.getLastOnline(plugin.getUuidTranslator().getTranslatedUuid(user))); out.writeLong(plugin.getLastOnline(plugin.getUuidTranslator().getTranslatedUuid(user, true)));
break; break;
default: default:
break; break;

2
src/main/java/com/imaginarycode/minecraft/redisbungee/RedisUtil.java
View File

@ -8,7 +8,7 @@ package com.imaginarycode.minecraft.redisbungee;
import redis.clients.jedis.Jedis; import redis.clients.jedis.Jedis;
public class RedisUtil { class RedisUtil {
public static void cleanUpPlayer(String player, Jedis rsc) { public static void cleanUpPlayer(String player, Jedis rsc) {
rsc.srem("server:" + RedisBungee.getApi().getServerId() + ":usersOnline", player); rsc.srem("server:" + RedisBungee.getApi().getServerId() + ":usersOnline", player);
rsc.hdel("player:" + player, "server"); rsc.hdel("player:" + player, "server");

2
src/main/java/com/imaginarycode/minecraft/redisbungee/util/NameFetcher.java
View File

@ -20,7 +20,7 @@ import java.util.UUID;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
/* Credits to evilmidget38 for this class. I modified it to use Gson. */ /* Credits to evilmidget38 for this class. I modified it to use Gson. */
public class NameFetcher implements Callable<Map<UUID, String>> { class NameFetcher implements Callable<Map<UUID, String>> {
private static final String PROFILE_URL = "https://sessionserver.mojang.com/session/minecraft/profile/"; private static final String PROFILE_URL = "https://sessionserver.mojang.com/session/minecraft/profile/";
private final List<UUID> uuids; private final List<UUID> uuids;

2
src/main/java/com/imaginarycode/minecraft/redisbungee/util/UUIDFetcher.java
View File

@ -18,7 +18,7 @@ import java.util.*;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
/* Credits to evilmidget38 for this class. I modified it to use Gson. */ /* Credits to evilmidget38 for this class. I modified it to use Gson. */
public class UUIDFetcher implements Callable<Map<String, UUID>> { class UUIDFetcher implements Callable<Map<String, UUID>> {
private static final double PROFILES_PER_REQUEST = 100; private static final double PROFILES_PER_REQUEST = 100;
private static final String PROFILE_URL = "https://api.mojang.com/profiles/minecraft"; private static final String PROFILE_URL = "https://api.mojang.com/profiles/minecraft";
private final List<String> names; private final List<String> names;

5
src/main/java/com/imaginarycode/minecraft/redisbungee/util/UUIDTranslator.java
View File

@ -9,7 +9,6 @@ package com.imaginarycode.minecraft.redisbungee.util;
import com.google.common.base.Charsets; import com.google.common.base.Charsets;
import com.google.common.collect.BiMap; import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap; import com.google.common.collect.HashBiMap;
import com.google.common.collect.Maps;
import com.imaginarycode.minecraft.redisbungee.RedisBungee; import com.imaginarycode.minecraft.redisbungee.RedisBungee;
import lombok.NonNull; import lombok.NonNull;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -30,8 +29,8 @@ public class UUIDTranslator {
private final RedisBungee plugin; private final RedisBungee plugin;
private final BiMap<String, UUID> uuidMap = HashBiMap.create(); private final BiMap<String, UUID> uuidMap = HashBiMap.create();
private final ReadWriteLock lock = new ReentrantReadWriteLock(); private final ReadWriteLock lock = new ReentrantReadWriteLock();
public static final Pattern UUID_PATTERN = Pattern.compile("[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}"); private static final Pattern UUID_PATTERN = Pattern.compile("[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}");
public static final Pattern MOJANGIAN_UUID_PATTERN = Pattern.compile("[a-fA-F0-9]{32}"); private static final Pattern MOJANGIAN_UUID_PATTERN = Pattern.compile("[a-fA-F0-9]{32}");
public UUID getTranslatedUuid(@NonNull String player, boolean expensiveLookups) { public UUID getTranslatedUuid(@NonNull String player, boolean expensiveLookups) {
if (ProxyServer.getInstance().getPlayer(player) != null) if (ProxyServer.getInstance().getPlayer(player) != null)