Initial commit for fabric

.editorconfig

@@ -0,0 +1,13 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = tab
+insert_final_newline = true
+max_line_length = 120
+
+[*.json]
+indent_style = space
+insert_final_newline = false

.gitattributes

@@ -0,0 +1,9 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# Linux start script should use lf
+/gradlew        text eol=lf
+
+# These are Windows script files and should use crlf
+*.bat           text eol=crlf
+

.github/workflows/build.yml

@@ -0,0 +1,37 @@
+# Automatically build the project and run any configured tests for every push
+# and submitted pull request. This can help catch issues that only occur on
+# certain platforms or Java versions, and provides a first line of defence
+# against bad commits.
+
+name: build
+on: [pull_request, push]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        # Use these Java versions
+        java: [
+          21,    # Current Java LTS
+        ]
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v4
+      - name: validate gradle wrapper
+        uses: gradle/wrapper-validation-action@v2
+      - name: setup jdk ${{ matrix.java }}
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: 'microsoft'
+      - name: make gradle wrapper executable
+        run: chmod +x ./gradlew
+      - name: build
+        run: ./gradlew build
+      - name: capture build artifacts
+        if: ${{ matrix.java == '21' }} # Only upload artifacts built from latest java
+        uses: actions/upload-artifact@v4
+        with:
+          name: Artifacts
+          path: build/libs/

.gitignore

@@ -0,0 +1,40 @@
+# gradle
+
+.gradle/
+build/
+out/
+classes/
+
+# eclipse
+
+*.launch
+
+# idea
+
+.idea/
+*.iml
+*.ipr
+*.iws
+
+# vscode
+
+.settings/
+.vscode/
+bin/
+.classpath
+.project
+
+# macos
+
+*.DS_Store
+
+# fabric
+
+run/
+
+# java
+
+hs_err_*.log
+replay_*.log
+*.hprof
+*.jfr

build.gradle

@@ -0,0 +1,75 @@
+plugins {
+	id 'fabric-loom' version '1.6-SNAPSHOT'
+	id 'maven-publish'
+}
+
+version = project.mod_version
+group = project.maven_group
+
+base {
+	archivesName = project.archives_base_name
+}
+
+repositories {
+	// Add repositories to retrieve artifacts from in here.
+	// You should only use this when depending on other mods because
+	// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
+	// See https://docs.gradle.org/current/userguide/declaring_repositories.html
+	// for more information about repositories.
+}
+
+dependencies {
+	// To change the versions see the gradle.properties file
+	minecraft "com.mojang:minecraft:${project.minecraft_version}"
+	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+
+	// Fabric API. This is technically optional, but you probably want it anyway.
+	//modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+}
+
+processResources {
+	inputs.property "version", project.version
+
+	filesMatching("fabric.mod.json") {
+		expand "version": project.version
+	}
+}
+
+tasks.withType(JavaCompile).configureEach {
+	it.options.release = 21
+}
+
+java {
+	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+	// if it is present.
+	// If you remove this line, sources will not be generated.
+	withSourcesJar()
+
+	sourceCompatibility = JavaVersion.VERSION_21
+	targetCompatibility = JavaVersion.VERSION_21
+}
+
+jar {
+	from("LICENSE") {
+		rename { "${it}_${project.base.archivesName.get()}"}
+	}
+}
+
+// configure the maven publication
+publishing {
+	publications {
+		create("mavenJava", MavenPublication) {
+			artifactId = project.archives_base_name
+			from components.java
+		}
+	}
+
+	// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+	repositories {
+		// Add repositories to publish to here.
+		// Notice: This block does NOT have the same function as the block in the top level.
+		// The repositories here will be used for publishing your artifact, not for
+		// retrieving dependencies.
+	}
+}

gradle.properties

@@ -0,0 +1,17 @@
+# Done to increase the memory available to gradle.
+org.gradle.jvmargs=-Xmx1G
+org.gradle.parallel=true
+
+# Fabric Properties
+# check these on https://fabricmc.net/develop
+minecraft_version=1.20.6
+yarn_mappings=1.20.6+build.1
+loader_version=0.15.11
+
+# Mod Properties
+mod_version=0.1.0-alpha2
+maven_group=icu.puqns67.skintypefix
+archives_base_name=skintypefix-fabric
+
+# Dependencies
+fabric_version=0.98.0+1.20.6

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -0,0 +1,249 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,92 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

settings.gradle

@@ -0,0 +1,10 @@
+pluginManagement {
+	repositories {
+		maven {
+			name = 'Fabric'
+			url = 'https://maven.fabricmc.net/'
+		}
+		mavenCentral()
+		gradlePluginPortal()
+	}
+}

src/main/java/icu/puqns67/skintypefix/SkinTypeFix.java

@@ -0,0 +1,21 @@
+package icu.puqns67.skintypefix;
+
+import icu.puqns67.skintypefix.config.Config;
+import icu.puqns67.skintypefix.config.ConfigLoader;
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+@Environment(EnvType.CLIENT)
+public class SkinTypeFix implements ClientModInitializer {
+	public static final Logger LOGGER = LoggerFactory.getLogger("SkinTypeFix");
+	public static final Config CONFIG = ConfigLoader.load();
+
+	@Override
+	public void onInitializeClient() {
+		LOGGER.info("Loaded!");
+	}
+}

src/main/java/icu/puqns67/skintypefix/accessor/PlayerSkinTextureAccessor.java

@@ -0,0 +1,10 @@
+package icu.puqns67.skintypefix.accessor;
+
+import net.minecraft.client.texture.NativeImage;
+
+
+public interface PlayerSkinTextureAccessor {
+	void skinTypeFix$joinLoader();
+
+	NativeImage skinTypeFix$getImage();
+}

src/main/java/icu/puqns67/skintypefix/config/Config.java

@@ -0,0 +1,6 @@
+package icu.puqns67.skintypefix.config;
+
+
+public class Config {
+	public boolean skipFixForSlimPlayers = true;
+}

src/main/java/icu/puqns67/skintypefix/config/ConfigLoader.java

@@ -0,0 +1,42 @@
+package icu.puqns67.skintypefix.config;
+
+import com.google.gson.FieldNamingPolicy;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import icu.puqns67.skintypefix.SkinTypeFix;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+
+
+public class ConfigLoader {
+	private static final Path PATH = Path.of("config", "skintypefix.json");
+	private static final Gson GSON = new GsonBuilder()
+		.setPrettyPrinting()
+		.setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
+		.create();
+
+	public static Config load() {
+		if (!Files.exists(PATH)) {
+			SkinTypeFix.LOGGER.info("[SkinTypeFix] Config file does not exist, create a new one!");
+			var result = new Config();
+			save(result);
+			return result;
+		}
+		try (var reader = Files.newBufferedReader(PATH)) {
+			return GSON.fromJson(reader, Config.class);
+		} catch (Exception e) {
+			SkinTypeFix.LOGGER.warn("[SkinTypeFix] Can't read config file, using default config!", e);
+		}
+		return new Config();
+	}
+
+	public static void save(Config config) {
+		try (var writer = Files.newBufferedWriter(PATH, StandardOpenOption.CREATE, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING)) {
+			GSON.toJson(config, writer);
+		} catch (Exception e) {
+			SkinTypeFix.LOGGER.warn("[SkinTypeFix] Can't save config file, changes may not be saved!", e);
+		}
+	}
+}

src/main/java/icu/puqns67/skintypefix/mixin/PlayerSkinProviderMixin.java

@@ -0,0 +1,97 @@
+package icu.puqns67.skintypefix.mixin;
+
+import com.llamalad7.mixinextras.sugar.Local;
+import com.mojang.authlib.SignatureState;
+import com.mojang.authlib.minecraft.MinecraftProfileTexture;
+import com.mojang.authlib.minecraft.MinecraftProfileTextures;
+import icu.puqns67.skintypefix.SkinTypeFix;
+import icu.puqns67.skintypefix.accessor.PlayerSkinTextureAccessor;
+import icu.puqns67.skintypefix.util.Utils;
+import icu.puqns67.skintypefix.util.image.Places;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.texture.PlayerSkinProvider;
+import net.minecraft.client.util.SkinTextures;
+import net.minecraft.util.Identifier;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+
+
+@Environment(EnvType.CLIENT)
+@Mixin(PlayerSkinProvider.class)
+public class PlayerSkinProviderMixin {
+	@Inject(method = "fetchSkinTextures(Ljava/util/UUID;Lcom/mojang/authlib/minecraft/MinecraftProfileTextures;)Ljava/util/concurrent/CompletableFuture;", at = @At("TAIL"), cancellable = true)
+	private void onFetchSkinTexturesPrivate(
+		UUID uuid,
+		MinecraftProfileTextures textures,
+		CallbackInfoReturnable<CompletableFuture<SkinTextures>> cir,
+		@Local(ordinal = 0) MinecraftProfileTexture skinTextureOrigin,
+		@Local(ordinal = 0) CompletableFuture<Identifier> skinFuture,
+		@Local(ordinal = 1) CompletableFuture<Identifier> capeFuture,
+		@Local(ordinal = 2) CompletableFuture<Identifier> elytraFuture,
+		@Local SkinTextures.Model skinModelOrigin,
+		@Local String skinUrl
+	) {
+		// Skip fix if using internal skin or uuid is invalid uuid
+		if (skinTextureOrigin == null || Utils.isInvalidUUID(uuid)) {
+			return;
+		}
+
+		// If model is defaults to SLIM, and config `skipFixForSlimPlayers` is set to true,
+		// checks are skipped because some skins have bad pixels
+		if (skinModelOrigin == SkinTextures.Model.SLIM && SkinTypeFix.CONFIG.skipFixForSlimPlayers) {
+			return;
+		}
+
+		var textureManager = MinecraftClient.getInstance().getTextureManager();
+
+		CompletableFuture<SkinTextures.Model> modelFuture = skinFuture.thenApply(v -> {
+			// Get texture from TextureManager
+			var skinTexture = (PlayerSkinTextureAccessor) textureManager.getTexture(skinFuture.join());
+
+			// Wait skin loading if it needed fetch from web
+			skinTexture.skinTypeFix$joinLoader();
+
+			// Get image from PlayerSkinTexture
+			var skinImage = skinTexture.skinTypeFix$getImage();
+			if (skinImage == null) {
+				SkinTypeFix.LOGGER.warn("[SkinTypeFix] [{}] {GET_IMAGE} An error occurred while getting image!", uuid);
+				return skinModelOrigin;
+			}
+
+			// Check skin type
+			var needFix = switch (skinModelOrigin) {
+				case SLIM -> !Places.PLAYER.isAllBlack(skinImage);
+				case WIDE -> Places.PLAYER.isAllBlack(skinImage);
+			};
+
+			if (needFix) {
+				var skinModelFixed = Utils.reverseModelType(skinModelOrigin);
+				SkinTypeFix.LOGGER.info("[SkinTypeFix] [{}] Fixed skin type: {} -> {}", uuid, skinModelOrigin, skinModelFixed);
+				return skinModelFixed;
+			}
+
+			return skinModelOrigin;
+		});
+
+		// Return
+		cir.setReturnValue(
+			CompletableFuture
+				.allOf(skinFuture, capeFuture, elytraFuture, modelFuture)
+				.thenApply(v -> new SkinTextures(
+					skinFuture.join(),
+					skinUrl,
+					capeFuture.join(),
+					elytraFuture.join(),
+					modelFuture.join(),
+					textures.signatureState() == SignatureState.SIGNED
+				))
+		);
+	}
+}

src/main/java/icu/puqns67/skintypefix/mixin/PlayerSkinTextureMixin.java

@@ -0,0 +1,75 @@
+package icu.puqns67.skintypefix.mixin;
+
+import com.mojang.blaze3d.platform.TextureUtil;
+import icu.puqns67.skintypefix.SkinTypeFix;
+import icu.puqns67.skintypefix.accessor.PlayerSkinTextureAccessor;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.texture.NativeImage;
+import net.minecraft.client.texture.PlayerSkinTexture;
+import net.minecraft.client.texture.ResourceTexture;
+import net.minecraft.util.Identifier;
+import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.*;
+
+import java.io.InputStream;
+import java.util.concurrent.CompletableFuture;
+
+
+@Environment(EnvType.CLIENT)
+@Mixin(PlayerSkinTexture.class)
+public abstract class PlayerSkinTextureMixin extends ResourceTexture implements PlayerSkinTextureAccessor {
+	@Unique
+	@Nullable
+	protected NativeImage image = null;
+	@Shadow
+	@Nullable
+	private CompletableFuture<?> loader;
+	@Shadow
+	@Final
+	private boolean convertLegacy;
+
+	public PlayerSkinTextureMixin(Identifier location) {
+		super(location);
+	}
+
+	@Shadow
+	@Nullable
+	protected abstract NativeImage remapTexture(NativeImage image);
+
+	@Unique
+	public void skinTypeFix$joinLoader() {
+		if (this.loader != null) {
+			this.loader.join();
+		}
+	}
+
+	@Unique
+	public NativeImage skinTypeFix$getImage() {
+		return this.image;
+	}
+
+	/**
+	 * @author Puqns67
+	 * @reason test
+	 */
+	@Nullable
+	@Overwrite
+	private NativeImage loadTexture(InputStream stream) {
+		try {
+			var buffer = TextureUtil.readResource(stream);
+			buffer.rewind();
+			this.image = NativeImage.read(buffer);
+			buffer.rewind();
+			var result = NativeImage.read(buffer);
+			if (this.convertLegacy) {
+				this.image = this.remapTexture(this.image);
+				result = this.remapTexture(result);
+			}
+			return result;
+		} catch (Exception exception) {
+			SkinTypeFix.LOGGER.warn("Error while loading the skin texture", exception);
+		}
+		return null;
+	}
+}

src/main/java/icu/puqns67/skintypefix/util/Utils.java

@@ -0,0 +1,22 @@
+package icu.puqns67.skintypefix.util;
+
+import net.minecraft.client.util.SkinTextures;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
+
+public class Utils {
+	private static final UUID INVALID_UUID = new UUID(0, 0);
+
+	public static @NotNull SkinTextures.Model reverseModelType(SkinTextures.Model type) {
+		return switch (type) {
+			case SLIM -> SkinTextures.Model.WIDE;
+			case WIDE -> SkinTextures.Model.SLIM;
+		};
+	}
+
+	public static boolean isInvalidUUID(UUID uuid) {
+		return INVALID_UUID.equals(uuid);
+	}
+}

src/main/java/icu/puqns67/skintypefix/util/image/Places.java

@@ -0,0 +1,41 @@
+package icu.puqns67.skintypefix.util.image;
+
+import net.minecraft.client.texture.NativeImage;
+
+import java.util.ArrayList;
+
+
+public class Places {
+	public static final Places PLAYER = Places.forPlayer();
+	private final ArrayList<Square> squares = new ArrayList<>();
+
+	public Places() {
+	}
+
+	public static Places forPlayer() {
+		var result = new Places();
+		result.add(50, 16, 51, 19);
+		result.add(50, 16, 51, 19);
+		result.add(54, 20, 55, 31);
+		result.add(42, 48, 43, 51);
+		result.add(46, 52, 47, 63);
+		return result;
+	}
+
+	public void add(Square square) {
+		this.squares.add(square);
+	}
+
+	public void add(int x1, int y1, int x2, int y2) {
+		this.add(new Square(x1, y1, x2, y2));
+	}
+
+	public boolean isAllBlack(NativeImage image) {
+		for (var square : this.squares) {
+			if (!square.isAllBlack(image)) {
+				return false;
+			}
+		}
+		return true;
+	}
+}

src/main/java/icu/puqns67/skintypefix/util/image/Point.java

@@ -0,0 +1,16 @@
+package icu.puqns67.skintypefix.util.image;
+
+import net.minecraft.client.texture.NativeImage;
+
+
+public record Point(int x, int y) {
+	public Point {
+		if (x < 0 || y < 0) {
+			throw new IllegalArgumentException(String.format("Invalid position: %d, %d", x, y));
+		}
+	}
+
+	public boolean isBlack(NativeImage image) {
+		return image.getColor(x, y) == 0xff000000;
+	}
+}

src/main/java/icu/puqns67/skintypefix/util/image/Square.java

@@ -0,0 +1,40 @@
+package icu.puqns67.skintypefix.util.image;
+
+import net.minecraft.client.texture.NativeImage;
+
+import java.util.ArrayList;
+
+
+public record Square(Point p1, Point p2) {
+	public Square {
+		// The point close to (0,0) is p1
+		if (p2.x() < p1.x() || p1.x() == p2.x() && p2.y() < p1.y()) {
+			var tmp = p1;
+			p1 = p2;
+			p2 = tmp;
+		}
+	}
+
+	public Square(int x1, int y1, int x2, int y2) {
+		this(new Point(x1, y1), new Point(x2, y2));
+	}
+
+	public ArrayList<Point> points() {
+		var result = new ArrayList<Point>();
+		for (var Y = this.p1.y(); Y <= this.p2.y(); Y++) {
+			for (var X = this.p1.x(); X <= this.p2.x(); X++) {
+				result.add(new Point(X, Y));
+			}
+		}
+		return result;
+	}
+
+	public boolean isAllBlack(NativeImage image) {
+		for (var point : this.points()) {
+			if (!point.isBlack(image)) {
+				return false;
+			}
+		}
+		return true;
+	}
+}

src/main/resources/assets/skintypefix/lang/en_us.json

@@ -0,0 +1,5 @@
+{
+    "modmenu.nameTranslation.skintypefix": "Skin type fix",
+    "modmenu.summaryTranslation.skintypefix": "Fix wrong skin type for some players.",
+    "modmenu.descriptionTranslation.skintypefix": "Fix an issue where the skin type of some players did not match the skin type of the actual skin file."
+}

src/main/resources/assets/skintypefix/lang/zh_cn.json

@@ -0,0 +1,5 @@
+{
+    "modmenu.nameTranslation.skintypefix": "皮肤类型修复",
+    "modmenu.summaryTranslation.skintypefix": "为部分玩家修复错误的皮肤类型。",
+    "modmenu.descriptionTranslation.skintypefix": "修复部分玩家的皮肤类型与实际皮肤文件的皮肤类型不匹配的问题。"
+}

src/main/resources/fabric.mod.json

@@ -0,0 +1,36 @@
+{
+    "schemaVersion": 1,
+    "id": "skintypefix",
+    "version": "${version}",
+    "name": "Skin Type Fix",
+    "description": "Fix wrong skin type for some players.",
+    "authors": [
+        "Puqns67"
+    ],
+    "contact": {
+        "homepage": "https://modrinth.com/project/skintypefix",
+        "sources": "https://github.com/Puqns67/SkinTypeFix"
+    },
+    "license": "GPL-3.0-or-later",
+    "icon": "assets/skintypefix/icon.png",
+    "environment": "client",
+    "entrypoints": {
+        "client": [
+            "icu.puqns67.skintypefix.SkinTypeFix"
+        ]
+    },
+    "mixins": [
+        {
+            "config": "skintypefix.mixins.json",
+            "environment": "client"
+        }
+    ],
+    "depends": {
+        "fabricloader": ">=0.15.11",
+        "minecraft": "~1.20.6",
+        "java": ">=21"
+    },
+    "suggests": {
+        "another-mod": "*"
+    }
+}

src/main/resources/skintypefix.mixins.json

@@ -0,0 +1,12 @@
+{
+  "required": true,
+  "package": "icu.puqns67.skintypefix.mixin",
+  "compatibilityLevel": "JAVA_21",
+  "injectors": {
+    "defaultRequire": 1
+  },
+  "client": [
+    "PlayerSkinProviderMixin",
+    "PlayerSkinTextureMixin"
+  ]
+}