Replace StatusManager.EMPTY_UUID with UUIDs.EMPTY

Bukkit/src/main/java/net/minecrell/serverlistplus/bukkit/handlers/ProtocolLibHandler.java

@@ -29,10 +29,10 @@
 import com.google.common.collect.Iterables;
 import net.minecrell.serverlistplus.bukkit.BukkitPlugin;
 import net.minecrell.serverlistplus.core.status.ResponseFetcher;
-import net.minecrell.serverlistplus.core.status.StatusManager;
 import net.minecrell.serverlistplus.core.status.StatusRequest;
 import net.minecrell.serverlistplus.core.status.StatusResponse;
 import net.minecrell.serverlistplus.core.util.Helper;
+import net.minecrell.serverlistplus.core.util.UUIDs;
 
 import java.net.InetSocketAddress;
 import java.util.Collections;
@@ -133,12 +133,12 @@ public int getProtocolVersion() {
  new Function<String, WrappedGameProfile>() {
  @Override
  public WrappedGameProfile apply(String input) {
- return new WrappedGameProfile(StatusManager.EMPTY_UUID, input);
+ return new WrappedGameProfile(UUIDs.EMPTY, input);
  }
  }));
  } else
  ping.setPlayers(Collections.singleton(
- new WrappedGameProfile(StatusManager.EMPTY_UUID, message)));
+ new WrappedGameProfile(UUIDs.EMPTY, message)));
  }
  }
  }

Bungee/src/main/java/net/minecrell/serverlistplus/bungee/BungeePlugin.java

@@ -65,6 +65,7 @@
 import net.minecrell.serverlistplus.core.status.StatusResponse;
 import net.minecrell.serverlistplus.core.util.Helper;
 import net.minecrell.serverlistplus.core.util.Randoms;
+import net.minecrell.serverlistplus.core.util.UUIDs;
 
 import java.awt.image.BufferedImage;
 import java.net.InetSocketAddress;
@@ -244,12 +245,12 @@ public int getProtocolVersion() {
 
  ServerPing.PlayerInfo[] sample = new ServerPing.PlayerInfo[lines.size()];
  for (int i = 0; i < sample.length; i++)
- sample[i] = new ServerPing.PlayerInfo(lines.get(i), StatusManager.EMPTY_UUID);
+ sample[i] = new ServerPing.PlayerInfo(lines.get(i), UUIDs.EMPTY);
 
  players.setSample(sample);
  } else
  players.setSample(new ServerPing.PlayerInfo[]{
- new ServerPing.PlayerInfo(message, StatusManager.EMPTY_UUID) });
+ new ServerPing.PlayerInfo(message, UUIDs.EMPTY) });
  }
  }
  }

Canary/src/main/java/net/minecrell/serverlistplus/canary/CanaryPlugin.java

@@ -57,6 +57,7 @@
 import net.minecrell.serverlistplus.core.util.Helper;
 import net.minecrell.serverlistplus.core.util.Randoms;
 import net.minecrell.serverlistplus.core.util.SnakeYAML;
+import net.minecrell.serverlistplus.core.util.UUIDs;
 import net.visualillusionsent.utils.TaskManager;
 import org.mcstats.MetricsLite;
 
@@ -240,10 +241,10 @@ public int getProtocolVersion() {
  Helper.splitLinesCached(message);
 
  for (String line : lines) {
- profiles.add(new GameProfile(StatusManager.EMPTY_UUID, line));
+ profiles.add(new GameProfile(UUIDs.EMPTY, line));
  }
  } else
- profiles.add(new GameProfile(StatusManager.EMPTY_UUID, message));
+ profiles.add(new GameProfile(UUIDs.EMPTY, message));
  }
  }
  }

Server/src/main/java/net/minecrell/serverlistplus/server/ServerListPlusServer.java

@@ -49,6 +49,7 @@
 import net.minecrell.serverlistplus.core.status.StatusResponse;
 import net.minecrell.serverlistplus.core.util.Helper;
 import net.minecrell.serverlistplus.core.util.Randoms;
+import net.minecrell.serverlistplus.core.util.UUIDs;
 import net.minecrell.serverlistplus.server.config.ServerConf;
 import net.minecrell.serverlistplus.server.network.Netty;
 import net.minecrell.serverlistplus.server.network.NetworkManager;
@@ -264,12 +265,12 @@ public int getProtocolVersion() {
 
  UserProfile[] sample = new UserProfile[lines.size()];
  for (int i = 0; i < sample.length; i++)
- sample[i] = new UserProfile(lines.get(i), StatusManager.EMPTY_UUID);
+ sample[i] = new UserProfile(lines.get(i), UUIDs.EMPTY);
 
  newPlayers.setSample(sample);
  } else
  newPlayers.setSample(new UserProfile[]{
- new UserProfile(message, StatusManager.EMPTY_UUID) });
+ new UserProfile(message, UUIDs.EMPTY) });
  }
  }
 

Sponge/src/main/java/net/minecrell/serverlistplus/sponge/SpongePlugin.java

@@ -45,6 +45,7 @@
 import net.minecrell.serverlistplus.core.status.StatusResponse;
 import net.minecrell.serverlistplus.core.util.Helper;
 import net.minecrell.serverlistplus.core.util.Randoms;
+import net.minecrell.serverlistplus.core.util.UUIDs;
 import net.minecrell.serverlistplus.sponge.protocol.DummyStatusProtocolHandler;
 import net.minecrell.serverlistplus.sponge.protocol.StatusProtocolHandler;
 import net.minecrell.serverlistplus.sponge.protocol.StatusProtocolHandlerImpl;
@@ -277,10 +278,10 @@ public int getProtocolVersion() {
  Helper.splitLinesCached(message);
 
  for (String line : lines) {
- profiles.add(GameProfile.of(StatusManager.EMPTY_UUID, line));
+ profiles.add(GameProfile.of(UUIDs.EMPTY, line));
  }
  } else
- profiles.add(GameProfile.of(StatusManager.EMPTY_UUID, message));
+ profiles.add(GameProfile.of(UUIDs.EMPTY, message));
  }
  }
  }

Velocity/src/main/java/net/minecrell/serverlistplus/velocity/VelocityPlugin.java

@@ -61,6 +61,7 @@
 import net.minecrell.serverlistplus.core.util.Helper;
 import net.minecrell.serverlistplus.core.util.Randoms;
 import net.minecrell.serverlistplus.core.util.SnakeYAML;
+import net.minecrell.serverlistplus.core.util.UUIDs;
 import org.slf4j.Logger;
 
 import javax.annotation.Nonnull;
@@ -251,11 +252,11 @@ public int getProtocolVersion() {
 
  ServerPing.SamplePlayer[] sample = new ServerPing.SamplePlayer[lines.size()];
  for (int i = 0; i < sample.length; i++)
- sample[i] = new ServerPing.SamplePlayer(lines.get(i), StatusManager.EMPTY_UUID);
+ sample[i] = new ServerPing.SamplePlayer(lines.get(i), UUIDs.EMPTY);
 
  builder.samplePlayers(sample);
  } else
- builder.samplePlayers(new ServerPing.SamplePlayer(message, StatusManager.EMPTY_UUID));
+ builder.samplePlayers(new ServerPing.SamplePlayer(message, UUIDs.EMPTY));
  }
  }
  }

src/main/java/net/minecrell/serverlistplus/core/replacement/DefaultLiteralPlaceholder.java

@@ -24,7 +24,6 @@
 import net.minecrell.serverlistplus.core.player.PlayerIdentity;
 import net.minecrell.serverlistplus.core.player.ban.BanProvider;
 import net.minecrell.serverlistplus.core.replacement.util.Literals;
-import net.minecrell.serverlistplus.core.status.StatusManager;
 import net.minecrell.serverlistplus.core.status.StatusResponse;
 import net.minecrell.serverlistplus.core.util.UUIDs;
 
@@ -55,7 +54,7 @@ public String replace(StatusResponse response, String s) {
  @Override
  public String replace(ServerListPlusCore core, String s) {
  // Use unknown UUID
- return replace(s, UUIDs.STANDARD.toString(StatusManager.EMPTY_UUID));
+ return replace(s, UUIDs.STANDARD.toString(UUIDs.EMPTY));
  }
  },
  DASHLESS_UUID ("%_uuid_%") {
@@ -69,7 +68,7 @@ public String replace(StatusResponse response, String s) {
  @Override
  public String replace(ServerListPlusCore core, String s) {
  // Use unknown UUID
- return replace(s, UUIDs.NO_DASHES.toString(StatusManager.EMPTY_UUID));
+ return replace(s, UUIDs.NO_DASHES.toString(UUIDs.EMPTY));
  }
  },
  ONLINE_PLAYERS ("%online%") {

src/main/java/net/minecrell/serverlistplus/core/status/StatusManager.java

@@ -50,9 +50,6 @@
 import java.util.UUID;
 
 public class StatusManager extends AbstractManager {
- public static final String EMPTY_ID = "0-0-0-0-0"; // Easiest format
- public static final UUID EMPTY_UUID = UUID.fromString(EMPTY_ID);
-
  private @Getter PersonalizedStatusPatch patch;
  private @Getter Map<VirtualHost, PersonalizedStatusPatch> hosts;
  private Multimap<String, DynamicReplacer> replacers; // For the used placeholders of the messages.