Fix building UUID

voruti · Dec 1, 2023 · 8423586 · 8423586
1 parent c0f0b0c
commit 8423586
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/main/java/one/oktw/Util.java b/src/main/java/one/oktw/Util.java
@@ -0,0 +1,13 @@
+package one.oktw;
+
+import java.util.UUID;
+
+public final class Util {
+    private Util() {
+    }
+
+
+    public static UUID fromString(final String input) {
+        return UUID.fromString(input.replaceFirst("(\\w{8})(\\w{4})(\\w{4})(\\w{4})(\\w{12})", "$1-$2-$3-$4-$5"));
+    }
+}
diff --git a/src/main/java/one/oktw/mixin/bungee/ServerHandshakeNetworkHandlerMixin.java b/src/main/java/one/oktw/mixin/bungee/ServerHandshakeNetworkHandlerMixin.java
@@ -2,7 +2,6 @@
 
 import com.google.gson.Gson;
 import com.mojang.authlib.properties.Property;
-import com.mojang.util.UUIDTypeAdapter;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.network.NetworkState;
 import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket;
@@ -11,6 +10,7 @@
 import net.minecraft.text.LiteralTextContent;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
+import one.oktw.Util;
 import one.oktw.interfaces.BungeeClientConnection;
 import one.oktw.mixin.ClientConnectionAccessor;
 import org.spongepowered.asm.mixin.Final;
@@ -47,7 +47,7 @@ private void onProcessHandshakeStart(HandshakeC2SPacket packet, CallbackInfo ci)
 
 
                 // extract forwarded profile information and save them:
-                ((BungeeClientConnection) connection).setSpoofedUUID(UUIDTypeAdapter.fromString(split[2]));
+                ((BungeeClientConnection) connection).setSpoofedUUID(Util.fromString(split[2]));
 
                 if (split.length == 4) {
                     ((BungeeClientConnection) connection).setSpoofedProfile(gson.fromJson(split[3], Property[].class));