2.0.0

samolego · Aug 17, 2022 · fbdfe9b · fbdfe9b
1 parent c12e39e
commit fbdfe9b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/main/java/org/samo_lego/fabrictailor/client/screen/tabs/SkinTabType.java b/src/main/java/org/samo_lego/fabrictailor/client/screen/tabs/SkinTabType.java
@@ -45,7 +45,7 @@ default boolean showModelBackwards() {
         return false;
     }
 
-    default Property getExtendedProperty(Player player, MinecraftProfileTexture.Type type, String textureUrl, String metadata) {
+    default Property getExtendedProperty(Player player, MinecraftProfileTexture.Type type, String textureUrl, JsonObject metadata) {
         var current = player.getGameProfile().getProperties().get(SkinManager.PROPERTY_TEXTURES).stream().findFirst();
         String json;
         if (current.isEmpty()) {
@@ -75,7 +75,7 @@ default Property getExtendedProperty(Player player, MinecraftProfileTexture.Type
         }
 
         if (metadata != null) {
-            texture.addProperty("metadata", metadata);
+            texture.add("metadata", metadata);
         }
 
         String value = new String(Base64.getEncoder().encode(jsonPayload.toString().getBytes()));

diff --git a/src/main/java/org/samo_lego/fabrictailor/client/screen/tabs/UrlSkinTab.java b/src/main/java/org/samo_lego/fabrictailor/client/screen/tabs/UrlSkinTab.java
@@ -1,5 +1,6 @@
 package org.samo_lego.fabrictailor.client.screen.tabs;
 
+import com.google.gson.JsonObject;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture;
 import com.mojang.authlib.properties.Property;
 import com.mojang.datafixers.util.Pair;
@@ -71,8 +72,11 @@ public Optional<Pair<ResourceLocation, FriendlyByteBuf>> getSkinChangePacket(Loc
                 channel = FABRICTAILOR_VANILLA_CHANGE;
             } else {
                 // HD skin (not vanilla compatible)
-                String metadata = null;
-                if (useSlim) metadata = "\"metadata\": {\"model\" : \"slim\"}";
+                JsonObject metadata = null;
+                if (useSlim) {
+                    metadata = new JsonObject();
+                    metadata.addProperty("model", "slim");
+                }
 
                 skinData = this.getExtendedProperty(player, MinecraftProfileTexture.Type.SKIN, url, metadata);
                 channel = FABRICTAILOR_HD_CHANGE;