From 86673c36b3974efa6915847aa3ebfa1aecf1807d Mon Sep 17 00:00:00 2001
From: Alex <alex@roese.dev>
Date: Sat, 1 Jan 2022 14:42:21 +0100
Subject: [PATCH] Formatter imported again, as this is needed for the player
 uuids

---
 .../java/net/krakatoa/proxy/ProxySystem.java  |  6 +++++-
 .../proxy/listener/PostLoginListener.java     |  3 ++-
 .../listener/SocketClientMessageListener.java |  7 +++----
 .../net/krakatoa/proxy/util/Formatter.java    | 19 +++++++++++++++++++
 4 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/net/krakatoa/proxy/util/Formatter.java

diff --git a/src/main/java/net/krakatoa/proxy/ProxySystem.java b/src/main/java/net/krakatoa/proxy/ProxySystem.java
index e0206f7..c2e9869 100644
--- a/src/main/java/net/krakatoa/proxy/ProxySystem.java
+++ b/src/main/java/net/krakatoa/proxy/ProxySystem.java
@@ -16,6 +16,7 @@ import net.krakatoa.proxy.listener.PlayerDisconnectListener;
 import net.krakatoa.proxy.listener.PostLoginListener;
 import net.krakatoa.proxy.listener.SocketClientMessageListener;
 import net.krakatoa.proxy.mongo.MongoManager;
+import net.krakatoa.proxy.util.Formatter;
 import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.api.plugin.PluginManager;
 import org.bson.Document;
@@ -27,11 +28,12 @@ public class ProxySystem extends Plugin {
   private static ProxySystem instance;
 
   private ConfigHandler configHandler;
-  private MongoManager mongoManager;
+  private Formatter formatter;
   private KraSocketClientProtocol kraSocketClientProtocol;
   private KraSocketClient kraSocketClient;
   private KraSocketClientEventInitiater kraSocketClientEventInitiater;
   private KraSocketClientEventInterface kraSocketClientEventInterface;
+  private MongoManager mongoManager;
 
   private MongoCollection<Document> players;
 
@@ -43,6 +45,8 @@ public class ProxySystem extends Plugin {
     this.configHandler = new ConfigHandler();
     this.configHandler.load();
 
+    this.formatter = new Formatter();
+
     this.kraSocketClientProtocol = new KraSocketClientProtocol();
 
     KraSocketClientConfig kraSocketClientConfig = new KraSocketClientConfig(
diff --git a/src/main/java/net/krakatoa/proxy/listener/PostLoginListener.java b/src/main/java/net/krakatoa/proxy/listener/PostLoginListener.java
index 5c7c1b5..52a4a24 100644
--- a/src/main/java/net/krakatoa/proxy/listener/PostLoginListener.java
+++ b/src/main/java/net/krakatoa/proxy/listener/PostLoginListener.java
@@ -29,7 +29,8 @@ public class PostLoginListener implements Listener {
   public void onPostLogin(PostLoginEvent event) {
     ProxiedPlayer proxiedPlayer = event.getPlayer();
 
-    String uuid = proxiedPlayer.getUniqueId().toString();
+    String uuid = ProxySystem.getInstance().getFormatter()
+        .formatUuid(proxiedPlayer.getUniqueId().toString());
 
     ProxySystem.getInstance().getPlayers()
         .find(Filters.eq("uuid", uuid))
diff --git a/src/main/java/net/krakatoa/proxy/listener/SocketClientMessageListener.java b/src/main/java/net/krakatoa/proxy/listener/SocketClientMessageListener.java
index b80f8ad..cb068ac 100644
--- a/src/main/java/net/krakatoa/proxy/listener/SocketClientMessageListener.java
+++ b/src/main/java/net/krakatoa/proxy/listener/SocketClientMessageListener.java
@@ -21,7 +21,7 @@ import org.java_websocket.handshake.ServerHandshake;
 
 public class SocketClientMessageListener implements KraSocketClientEventInterface {
 
-  private HashMap<String, Collection<ServicePlayer>> playersAutoRestartServerSystem = new HashMap<>();
+  private final HashMap<String, Collection<ServicePlayer>> playersAutoRestartServerSystem = new HashMap<>();
   private final IPlayerManager playerManager = CloudNetDriver.getInstance().getServicesRegistry()
       .getFirstService(IPlayerManager.class);
 
@@ -41,9 +41,8 @@ public class SocketClientMessageListener implements KraSocketClientEventInterfac
     ProxySystem.getInstance().getKraSocketClientProtocol().getCmdIDs()
         .removeIf(cmdID -> cmdID == kraProtocolMessage.getCmdID());
 
-    System.out.println(
-        "consumer ids " + ProxySystem.getInstance().getKraSocketClientProtocol()
-            .getConsumerHashMap().keySet());
+    System.out.println("consumer ids " + ProxySystem.getInstance().getKraSocketClientProtocol()
+        .getConsumerHashMap().keySet());
 
     switch (kraProtocolMessage.getCmdNumber()) {
       case 15:    // @Deprecated: test - mobile or voice socket connected
diff --git a/src/main/java/net/krakatoa/proxy/util/Formatter.java b/src/main/java/net/krakatoa/proxy/util/Formatter.java
new file mode 100644
index 0000000..6d77db7
--- /dev/null
+++ b/src/main/java/net/krakatoa/proxy/util/Formatter.java
@@ -0,0 +1,19 @@
+package net.krakatoa.proxy.util;
+
+import java.math.BigInteger;
+import java.util.UUID;
+
+public class Formatter {
+
+  public String formatUuid(String uuid) {
+    return uuid.replaceAll("-", "");
+  }
+
+  public UUID stringToUuid(String s) {
+    BigInteger bigInteger = new BigInteger(s.substring(0, 16), 16);
+    BigInteger bigInteger1 = new BigInteger(s.substring(16, 32), 16);
+
+    return new UUID(bigInteger.longValue(), bigInteger1.longValue());
+  }
+
+}