Fixed setting Base64 favicon for 1.19.4 or later (#2533)

Fix redundant base64 encoding of favicon

Author: lukalt

src/main/java/com/comphenix/protocol/wrappers/WrappedServerPing.java

@@ -134,16 +134,15 @@ public void setMotD(String message) {
      * @return The favicon, or NULL if no favicon will be displayed.
      */
     public CompressedImage getFavicon() {
-        String favicon = impl.getFavicon();
-        return (favicon != null) ? CompressedImage.fromEncodedText(favicon) : null;
+        return impl.getFavicon();
     }
 
     /**
      * Set the compressed PNG file that is being displayed.
      * @param image - the new compressed image or NULL if no favicon should be displayed.
      */
     public void setFavicon(CompressedImage image) {
-        impl.setFavicon((image != null) ? image.toEncodedText() : null);
+        impl.setFavicon(image);
     }
 
     /**

src/main/java/com/comphenix/protocol/wrappers/ping/LegacyServerPing.java

@@ -155,17 +155,19 @@ public void setMotD(WrappedChatComponent description) {
      * @return The favicon, or NULL if no favicon will be displayed.
      */
     @Override
-    public String getFavicon() {
-        return (String) FAVICON.get(handle);
+    public WrappedServerPing.CompressedImage getFavicon() {
+
+        String favicon = (String) FAVICON.get(handle);
+        return (favicon != null) ? WrappedServerPing.CompressedImage.fromEncodedText(favicon) : null;
     }
 
     /**
      * Set the compressed PNG file that is being displayed.
      * @param image - the new compressed image or NULL if no favicon should be displayed.
      */
     @Override
-    public void setFavicon(String image) {
-        FAVICON.set(handle, image);
+    public void setFavicon(WrappedServerPing.CompressedImage image) {
+        FAVICON.set(handle, (image != null) ? image.toEncodedText() : null);
     }
 
     /**

src/main/java/com/comphenix/protocol/wrappers/ping/ServerPingImpl.java

@@ -2,6 +2,7 @@
 
 import com.comphenix.protocol.wrappers.WrappedChatComponent;
 import com.comphenix.protocol.wrappers.WrappedGameProfile;
+import com.comphenix.protocol.wrappers.WrappedServerPing;
 import com.google.common.collect.ImmutableList;
 
 public interface ServerPingImpl extends Cloneable {
@@ -17,8 +18,8 @@ public interface ServerPingImpl extends Cloneable {
     void setVersionName(String versionName);
     int getVersionProtocol();
     void setVersionProtocol(int protocolVersion);
-    String getFavicon();
-    void setFavicon(String favicon);
+    WrappedServerPing.CompressedImage getFavicon();
+    void setFavicon(WrappedServerPing.CompressedImage favicon);
     boolean isEnforceSecureChat();
     void setEnforceSecureChat(boolean safeChat);
 

src/main/java/com/comphenix/protocol/wrappers/ping/ServerPingRecord.java

@@ -273,13 +273,13 @@ public void setVersionProtocol(int protocolVersion) {
     }
 
     @Override
-    public String getFavicon() {
-        return new String(favicon.iconBytes, StandardCharsets.UTF_8);
+    public WrappedServerPing.CompressedImage getFavicon() {
+        return new WrappedServerPing.CompressedImage("data:image/png;base64", favicon.iconBytes);
     }
 
     @Override
-    public void setFavicon(String favicon) {
-        this.favicon.iconBytes = favicon.getBytes(StandardCharsets.UTF_8);
+    public void setFavicon(WrappedServerPing.CompressedImage favicon) {
+        this.favicon.iconBytes = favicon.getDataCopy();
     }
 
     @Override