process legacy (64x32) skins

moehreag · moehreag · commit a1c561c5eb24 · 2025-09-07T15:10:35.000+02:00
diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/mixin/skins/PlayerSkinTextureAccessor.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/mixin/skins/PlayerSkinTextureAccessor.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2025 moehreag <moehreag@gmail.com> & Contributors
+ *
+ * This file is part of AxolotlClient.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * For more information, see the LICENSE file.
+ */
+
+package io.github.axolotlclient.mixin.skins;
+
+import net.minecraft.client.texture.NativeImage;
+import net.minecraft.client.texture.PlayerSkinTexture;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+@Mixin(PlayerSkinTexture.class)
+public interface PlayerSkinTextureAccessor {
+
+	@Invoker("remapTexture")
+	static NativeImage invokeRemapTexture(NativeImage img) {
+		throw new UnsupportedOperationException();
+	}
+}
diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/auth/skin/SkinManager.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/auth/skin/SkinManager.java
@@ -37,6 +37,7 @@
 import io.github.axolotlclient.api.util.UUIDHelper;
 import io.github.axolotlclient.bridge.AxoMinecraftClient;
 import io.github.axolotlclient.bridge.util.AxoIdentifier;
+import io.github.axolotlclient.mixin.skins.PlayerSkinTextureAccessor;
 import io.github.axolotlclient.modules.auth.Account;
 import io.github.axolotlclient.util.ClientColors;
 import net.minecraft.client.MinecraftClient;
@@ -62,18 +63,27 @@ public Skin read(Path p) {
 				byteBuffer.put(in);
 				byteBuffer.rewind();
 				try (var img = NativeImage.read(byteBuffer)) {
-					if (img.getWidth() != 64 || img.getHeight() != 64) return null;
-					slim = (ClientColors.ARGB.alpha(img.getPixelColor(47, 63)) == 0);
+					int width = img.getWidth();
+					int height = img.getHeight();
+					if (width != 64) return null;
+					if (height == 32) {
+						var img2 = PlayerSkinTextureAccessor.invokeRemapTexture(img);
+						img2.writeFile(p);
+						slim = ClientColors.ARGB.alpha(img2.getPixelColor(47, 63)) == 0;
+					} else if (height != 64) {
+						return null;
+					} else {
+						slim = ClientColors.ARGB.alpha(img.getPixelColor(47, 63)) == 0;
+					}
 				}
 			}
-			return new Skin.Local(!slim, Hashing.sha512().hashUnencodedChars(p.toString()).toString(), p, sha256);
+			return new Skin.Local(!slim, p, sha256);
 		} catch (Exception e) {
 			AxolotlClientCommon.getInstance().getLogger().warn("Failed to probe skin: ", e);
 		}
 		return null;
 	}
 
-
 	public CompletableFuture<AxoIdentifier> loadSkin(Skin skin) {
 		var rl = AxoIdentifier.of(AxolotlClientCommon.MODID, "skins/" + skin.textureKey());
 		if (loadedTextures.contains(rl)) {
diff --git a/1.16_combat-6/src/main/resources/axolotlclient.mixins.json b/1.16_combat-6/src/main/resources/axolotlclient.mixins.json
@@ -62,6 +62,7 @@
 		"WorldRendererAccessor",
 		"WorldRendererMixin",
 		"api.JoinMulitplayerScreenMixin",
+		"skins.PlayerSkinTextureAccessor",
 		"translation.LanguageMixin"
 	],
 	"injectors": {
diff --git a/1.20/src/main/java/io/github/axolotlclient/mixin/skins/PlayerSkinTextureAccessor.java b/1.20/src/main/java/io/github/axolotlclient/mixin/skins/PlayerSkinTextureAccessor.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2025 moehreag <moehreag@gmail.com> & Contributors
+ *
+ * This file is part of AxolotlClient.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * For more information, see the LICENSE file.
+ */
+
+package io.github.axolotlclient.mixin.skins;
+
+import com.mojang.blaze3d.texture.NativeImage;
+import net.minecraft.client.texture.PlayerSkinTexture;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+@Mixin(PlayerSkinTexture.class)
+public interface PlayerSkinTextureAccessor {
+
+	@Invoker("remapTexture")
+	static NativeImage invokeRemapTexture(NativeImage img) {
+		throw new UnsupportedOperationException();
+	}
+}
diff --git a/1.20/src/main/java/io/github/axolotlclient/modules/auth/skin/SkinManager.java b/1.20/src/main/java/io/github/axolotlclient/modules/auth/skin/SkinManager.java
@@ -37,6 +37,7 @@
 import io.github.axolotlclient.api.util.UUIDHelper;
 import io.github.axolotlclient.bridge.AxoMinecraftClient;
 import io.github.axolotlclient.bridge.util.AxoIdentifier;
+import io.github.axolotlclient.mixin.skins.PlayerSkinTextureAccessor;
 import io.github.axolotlclient.modules.auth.Account;
 import io.github.axolotlclient.util.ClientColors;
 import net.minecraft.client.MinecraftClient;
@@ -55,10 +56,20 @@ public Skin read(Path p) {
 			var in = Files.readAllBytes(p);
 			sha256 = Hashing.sha256().hashBytes(in).toString();
 			try (var img = NativeImage.read(in)) {
-				if (img.getWidth() != 64 || img.getHeight() != 64) return null;
-				slim = (ClientColors.ARGB.alpha(img.getPixelColor(47, 63)) == 0);
+				int width = img.getWidth();
+				int height = img.getHeight();
+				if (width != 64) return null;
+				if (height == 32) {
+					var img2 = PlayerSkinTextureAccessor.invokeRemapTexture(img);
+					img2.writeFile(p);
+					slim = ClientColors.ARGB.alpha(img2.getPixelColor(47, 63)) == 0;
+				} else if (height != 64) {
+					return null;
+				} else {
+					slim = ClientColors.ARGB.alpha(img.getPixelColor(47, 63)) == 0;
+				}
 			}
-			return new Skin.Local(!slim, Hashing.sha512().hashUnencodedChars(p.toString()).toString(), p, sha256);
+			return new Skin.Local(!slim, p, sha256);
 		} catch (Exception e) {
 			AxolotlClientCommon.getInstance().getLogger().warn("Failed to probe skin: ", e);
 		}
diff --git a/1.20/src/main/resources/axolotlclient.mixins.json b/1.20/src/main/resources/axolotlclient.mixins.json
@@ -61,6 +61,7 @@
 		"WorldRendererAccessor",
 		"WorldRendererMixin",
 		"api.JoinMulitplayerScreenMixin",
+		"skins.PlayerSkinTextureAccessor",
 		"translation.TranslationStorageMixin"
 	],
 	"injectors": {
diff --git a/1.21.7/src/main/java/io/github/axolotlclient/mixin/skins/SkinTextureDownloaderAccessor.java b/1.21.7/src/main/java/io/github/axolotlclient/mixin/skins/SkinTextureDownloaderAccessor.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2025 moehreag <moehreag@gmail.com> & Contributors
+ *
+ * This file is part of AxolotlClient.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * For more information, see the LICENSE file.
+ */
+
+package io.github.axolotlclient.mixin.skins;
+
+import com.mojang.blaze3d.platform.NativeImage;
+import net.minecraft.client.renderer.texture.SkinTextureDownloader;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+@Mixin(SkinTextureDownloader.class)
+public interface SkinTextureDownloaderAccessor {
+	@Invoker("processLegacySkin")
+	static NativeImage invokeProcessLegacySkin(NativeImage img, String url) {
+		throw new UnsupportedOperationException();
+	}
+}
diff --git a/1.21.7/src/main/java/io/github/axolotlclient/modules/auth/skin/SkinManager.java b/1.21.7/src/main/java/io/github/axolotlclient/modules/auth/skin/SkinManager.java
@@ -37,6 +37,7 @@
 import io.github.axolotlclient.api.util.UUIDHelper;
 import io.github.axolotlclient.bridge.AxoMinecraftClient;
 import io.github.axolotlclient.bridge.util.AxoIdentifier;
+import io.github.axolotlclient.mixin.skins.SkinTextureDownloaderAccessor;
 import io.github.axolotlclient.modules.auth.Account;
 import io.github.axolotlclient.util.ClientColors;
 import net.minecraft.client.Minecraft;
@@ -55,10 +56,20 @@ public Skin read(Path p) {
 			var in = Files.readAllBytes(p);
 			sha256 = Hashing.sha256().hashBytes(in).toString();
 			try (var img = NativeImage.read(in)) {
-				if (img.getWidth() != 64 || img.getHeight() != 64) return null;
-				slim = ClientColors.ARGB.alpha(img.getPixel(47, 63)) == 0;
+				int width = img.getWidth();
+				int height = img.getHeight();
+				if (width != 64) return null;
+				if (height == 32) {
+					var img2 = SkinTextureDownloaderAccessor.invokeProcessLegacySkin(img, "local");
+					img2.writeToFile(p);
+					slim = ClientColors.ARGB.alpha(img2.getPixel(47, 63)) == 0;
+				} else if (height != 64) {
+					return null;
+				} else {
+					slim = ClientColors.ARGB.alpha(img.getPixel(47, 63)) == 0;
+				}
 			}
-			return new Skin.Local(!slim, Hashing.sha512().hashUnencodedChars(p.toString()).toString(), p, sha256);
+			return new Skin.Local(!slim, p, sha256);
 		} catch (Exception e) {
 			AxolotlClientCommon.getInstance().getLogger().warn("Failed to probe skin: ", e);
 		}
diff --git a/1.21.7/src/main/resources/axolotlclient.mixins.json b/1.21.7/src/main/resources/axolotlclient.mixins.json
@@ -65,6 +65,7 @@
 		"WorldListWidgetEntryMixin",
 		"WorldRendererMixin",
 		"api.JoinMulitplayerScreenMixin",
+		"skins.SkinTextureDownloaderAccessor",
 		"translation.TranslationStorageMixin"
 	],
 	"injectors": {
diff --git a/1.21/src/main/java/io/github/axolotlclient/mixin/skins/PlayerSkinTextureAccessor.java b/1.21/src/main/java/io/github/axolotlclient/mixin/skins/PlayerSkinTextureAccessor.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2025 moehreag <moehreag@gmail.com> & Contributors
+ *
+ * This file is part of AxolotlClient.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * For more information, see the LICENSE file.
+ */
+
+package io.github.axolotlclient.mixin.skins;
+
+import com.mojang.blaze3d.texture.NativeImage;
+import net.minecraft.client.texture.PlayerSkinTexture;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+@Mixin(PlayerSkinTexture.class)
+public interface PlayerSkinTextureAccessor {
+
+	@Invoker("remapTexture")
+	static NativeImage invokeRemapTexture(NativeImage img) {
+		throw new UnsupportedOperationException();
+	}
+}
diff --git a/1.21/src/main/java/io/github/axolotlclient/modules/auth/skin/SkinManager.java b/1.21/src/main/java/io/github/axolotlclient/modules/auth/skin/SkinManager.java
@@ -37,6 +37,7 @@
 import io.github.axolotlclient.api.util.UUIDHelper;
 import io.github.axolotlclient.bridge.AxoMinecraftClient;
 import io.github.axolotlclient.bridge.util.AxoIdentifier;
+import io.github.axolotlclient.mixin.skins.PlayerSkinTextureAccessor;
 import io.github.axolotlclient.modules.auth.Account;
 import io.github.axolotlclient.util.ClientColors;
 import net.minecraft.client.MinecraftClient;
@@ -55,10 +56,20 @@ public Skin read(Path p) {
 			var in = Files.readAllBytes(p);
 			sha256 = Hashing.sha256().hashBytes(in).toString();
 			try (var img = NativeImage.read(in)) {
-				if (img.getWidth() != 64 || img.getHeight() != 64) return null;
-				slim = ClientColors.ARGB.alpha(img.getPixelColor(47, 63)) == 0;
+				int width = img.getWidth();
+				int height = img.getHeight();
+				if (width != 64) return null;
+				if (height == 32) {
+					var img2 = PlayerSkinTextureAccessor.invokeRemapTexture(img);
+					img2.writeFile(p);
+					slim = ClientColors.ARGB.alpha(img2.getPixelColor(47, 63)) == 0;
+				} else if (height != 64) {
+					return null;
+				} else {
+					slim = ClientColors.ARGB.alpha(img.getPixelColor(47, 63)) == 0;
+				}
 			}
-			return new Skin.Local(!slim, Hashing.sha512().hashUnencodedChars(p.toString()).toString(), p, sha256);
+			return new Skin.Local(!slim, p, sha256);
 		} catch (Exception e) {
 			AxolotlClientCommon.getInstance().getLogger().warn("Failed to probe skin: ", e);
 		}
diff --git a/1.21/src/main/resources/axolotlclient.mixins.json b/1.21/src/main/resources/axolotlclient.mixins.json
@@ -60,6 +60,7 @@
 		"WorldRendererAccessor",
 		"WorldRendererMixin",
 		"api.JoinMulitplayerScreenMixin",
+		"skins.PlayerSkinTextureAccessor",
 		"translation.TranslationStorageMixin"
 	],
 	"injectors": {
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/modules/auth/skin/SkinManager.java b/1.8.9/src/main/java/io/github/axolotlclient/modules/auth/skin/SkinManager.java
@@ -42,6 +42,7 @@
 import io.github.axolotlclient.util.ClientColors;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.render.texture.DynamicTexture;
+import net.minecraft.client.render.texture.SkinImageProcessor;
 import net.minecraft.client.resource.skin.DefaultSkinUtils;
 import net.minecraft.resource.Identifier;
 
@@ -58,17 +59,24 @@ public Skin read(Path p) {
 			sha256 = Hashing.sha256().hashBytes(in).toString();
 			try (var bs = new ByteArrayInputStream(in)) {
 				var img = ImageIO.read(bs);
-				if (img.getWidth() != 64 || img.getHeight() != 64) return null;
-				slim = (ClientColors.ARGB.alpha(img.getRGB(47, 63)) == 0);
+				int height = img.getHeight();
+				int width = img.getWidth();
+				if (width != 64) return null;
+				if (height == 32) {
+					img = new SkinImageProcessor().process(img);
+					try (var out = Files.newOutputStream(p)) {
+						ImageIO.write(img, "png", out);
+					}
+				} else if (height != 64) return null;
+				slim = ClientColors.ARGB.alpha(img.getRGB(47, 63)) == 0;
 			}
-			return new Skin.Local(!slim, Hashing.sha512().hashUnencodedChars(p.toString()).toString(), p, sha256);
+			return new Skin.Local(!slim, p, sha256);
 		} catch (Exception e) {
 			AxolotlClientCommon.getInstance().getLogger().warn("Failed to probe skin: ", e);
 		}
 		return null;
 	}
 
-
 	public CompletableFuture<AxoIdentifier> loadSkin(Skin skin) {
 		var rl = AxoIdentifier.of(AxolotlClientCommon.MODID, "skins/" + skin.textureKey());
 		if (loadedTextures.contains(rl)) {
diff --git a/common/src/main/java/io/github/axolotlclient/modules/auth/skin/Asset.java b/common/src/main/java/io/github/axolotlclient/modules/auth/skin/Asset.java
@@ -29,7 +29,6 @@
 import io.github.axolotlclient.modules.auth.MSApi;
 
 public interface Asset {
-	String id();
 
 	default boolean isOnline() {
 		return false;
diff --git a/common/src/main/java/io/github/axolotlclient/modules/auth/skin/Skin.java b/common/src/main/java/io/github/axolotlclient/modules/auth/skin/Skin.java
@@ -34,7 +34,7 @@
 public interface Skin extends Asset {
 	boolean isClassicVariant();
 
-	record Local(boolean classic, String id, Path file, String textureKey) implements Skin {
+	record Local(boolean classic, Path file, String textureKey) implements Skin {
 
 		@Override
 		public boolean isClassicVariant() {
@@ -75,11 +75,6 @@ public boolean isClassicVariant() {
 			return online.isClassicVariant();
 		}
 
-		@Override
-		public String id() {
-			return online.id();
-		}
-
 		@Override
 		public CompletableFuture<byte[]> image() {
 			return local.image();
diff --git a/common/src/main/java/io/github/axolotlclient/util/Watcher.java b/common/src/main/java/io/github/axolotlclient/util/Watcher.java
@@ -98,7 +98,7 @@ public boolean pollForChanges() throws IOException {
 		while ((watchKey = this.watcher.poll()) != null) {
 			for (WatchEvent<?> watchEvent : watchKey.pollEvents()) {
 				bl = true;
-				if (watchKey.watchable() == this.path && watchEvent.kind() == StandardWatchEventKinds.ENTRY_CREATE) {
+				if (watchKey.watchable() == this.path && watchEvent.context() != null) {
 					Path path = this.path.resolve((Path) watchEvent.context());
 					if (Files.isDirectory(path, LinkOption.NOFOLLOW_LINKS)) {
 						this.watchDir(path);
