Use Java's base64 encoder

dmulloy2 · dmulloy2 · commit c52b4bb10cce · 2026-03-26T20:30:20.000-05:00
diff --git a/src/main/java/com/comphenix/protocol/wrappers/nbt/io/NbtTextSerializer.java b/src/main/java/com/comphenix/protocol/wrappers/nbt/io/NbtTextSerializer.java
@@ -5,8 +5,7 @@
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-
-import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
+import java.util.Base64;
 
 import com.comphenix.protocol.wrappers.nbt.NbtBase;
 import com.comphenix.protocol.wrappers.nbt.NbtCompound;
@@ -23,7 +22,7 @@ public class NbtTextSerializer {
      * A default instance of this serializer.
      */
     public static final NbtTextSerializer DEFAULT = new NbtTextSerializer();
-    
+
     private NbtBinarySerializer binarySerializer;
     
     public NbtTextSerializer() {
@@ -59,7 +58,7 @@ public <TType> String serialize(NbtBase<TType> value) {
          binarySerializer.serialize(value, dataOutput);
          
          // Serialize that array
-         return Base64Coder.encodeLines(outputStream.toByteArray());
+         return Base64.getEncoder().encodeToString(outputStream.toByteArray());
     }
     
     /**
@@ -70,7 +69,7 @@ public <TType> String serialize(NbtBase<TType> value) {
      * @throws IOException If we are unable to parse the input.
      */
     public <TType> NbtWrapper<TType> deserialize(String input) throws IOException {
-        ByteArrayInputStream inputStream = new ByteArrayInputStream(Base64Coder.decodeLines(input));
+        ByteArrayInputStream inputStream = new ByteArrayInputStream(Base64.getDecoder().decode(input));
         
         return binarySerializer.deserialize(new DataInputStream(inputStream));
     }
diff --git a/src/test/java/com/comphenix/protocol/wrappers/WrappedServerPingTest.java b/src/test/java/com/comphenix/protocol/wrappers/WrappedServerPingTest.java
@@ -1,6 +1,7 @@
 package com.comphenix.protocol.wrappers;
 
 import java.io.IOException;
+import java.util.Base64;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
@@ -20,7 +21,6 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -79,7 +79,7 @@ public void fullTest() throws IOException  {
 
         assertArrayEquals(original, roundTrip.getFavicon().getData());
 
-        CompressedImage copy = CompressedImage.fromBase64Png(Base64Coder.encodeLines(tux.getData()));
+        CompressedImage copy = CompressedImage.fromBase64Png(Base64.getEncoder().encodeToString(tux.getData()));
         assertArrayEquals(copy.getData(), roundTrip.getFavicon().getData());
     }
 
