feat: support saving 256*256 skin (#52)

CloudburstMC · Jul 14, 2024 · 7695424 · 7695424
1 parent 2751018
commit 7695424
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/main/java/org/cloudburstmc/proxypass/network/bedrock/session/UpstreamPacketHandler.java b/src/main/java/org/cloudburstmc/proxypass/network/bedrock/session/UpstreamPacketHandler.java
@@ -13,6 +13,7 @@
 import org.cloudburstmc.protocol.common.PacketSignal;
 import org.cloudburstmc.proxypass.ProxyPass;
 import org.cloudburstmc.proxypass.network.bedrock.util.ForgeryUtils;
+import org.cloudburstmc.proxypass.network.bedrock.util.SkinUtils;
 import org.jose4j.json.JsonUtil;
 import org.jose4j.json.internal.json_simple.JSONObject;
 import org.jose4j.jws.JsonWebSignature;
@@ -125,6 +126,7 @@ private void initializeProxySession() {
                 jws.setCompactSerialization(jwt);
                 player.getLogger().saveJson("chainData", new JSONObject(JsonUtil.parseJson(jws.getUnverifiedPayload())));
                 player.getLogger().saveJson("skinData", this.skinData);
+                SkinUtils.saveSkin(proxySession, this.skinData);
             } catch (Exception e) {
                 log.error("JSON output error: " + e.getMessage(), e);
             }

diff --git a/src/main/java/org/cloudburstmc/proxypass/network/bedrock/util/SkinUtils.java b/src/main/java/org/cloudburstmc/proxypass/network/bedrock/util/SkinUtils.java
@@ -17,6 +17,7 @@ public class SkinUtils {
     public static final int DOUBLE_SKIN_SIZE = 64 * 64 * PIXEL_SIZE;
     public static final int SKIN_128_64_SIZE = 128 * 64 * PIXEL_SIZE;
     public static final int SKIN_128_128_SIZE = 128 * 128 * PIXEL_SIZE;
+    public static final int SKIN_256_256_SIZE = 256 * 256 * PIXEL_SIZE;
 
     public static void saveSkin(ProxyPlayerSession session, JSONObject skinData) {
         byte[] skin = Base64.getDecoder().decode(JsonUtils.childAsType(skinData, "SkinData", String.class));
@@ -33,13 +34,18 @@ public static void saveSkin(ProxyPlayerSession session, JSONObject skinData) {
         } else if (skin.length == SKIN_128_128_SIZE) {
             width = 128;
             height = 128;
+        } else if (skin.length == SKIN_256_256_SIZE) {
+            width = 256;
+            height = 256;
         } else {
             throw new IllegalStateException("Invalid skin");
         }
         saveImage(session, width, height, skin, "skin");
 
         byte[] cape = Base64.getDecoder().decode(JsonUtils.childAsType(skinData, "CapeData", String.class));
-        saveImage(session, 64, 32, cape, "cape");
+        if (cape.length != 0) {
+            saveImage(session, 64, 32, cape, "cape");
+        }
 
         byte[] geometry = Base64.getDecoder().decode(JsonUtils.childAsType(skinData, "SkinGeometry", String.class));
         session.getLogger().saveJson("geometry", geometry);