Support 26.1 (#368)

Author: ZekerZhayard

Common/src/main/java/customskinloader/fake/FakeSkinBuffer.java

@@ -7,6 +7,7 @@
 import java.util.function.Predicate;
 
 import customskinloader.CustomSkinLoader;
+import customskinloader.fake.itf.FakeInterfaceManager;
 import customskinloader.fake.texture.FakeBufferedImage;
 import customskinloader.fake.texture.FakeImage;
 import customskinloader.fake.texture.FakeNativeImage;
@@ -28,7 +29,9 @@ public static NativeImage processLegacySkin(NativeImage image, String url) {
 
         FakeImage img = parseUserSkin0(new FakeNativeImage(image));
         if (img instanceof FakeNativeImage) {
-            return FakeNativeImage.Extended.create((FakeNativeImage) img);
+            image = ((FakeNativeImage) img).getImage();
+            FakeInterfaceManager.NativeImage_setFakeImage(image, img);
+            return image;
         }
 
         CustomSkinLoader.logger.warning("Failed to parseUserSkin(downloadAndRegisterSkin).");

Common/src/main/java/customskinloader/fake/itf/FakeInterfaceManager.java

@@ -4,6 +4,7 @@
 import java.util.Optional;
 
 import customskinloader.fake.FakeMinecraftProfileTexture;
+import customskinloader.fake.texture.FakeNativeImage;
 import net.minecraft.client.resources.IResource;
 import net.minecraft.client.resources.IResourceManager;
 import net.minecraft.util.ResourceLocation;
@@ -32,6 +33,14 @@ public static void NativeImage_setPixel(Object nativeImage, int x, int y, int co
         ((IFakeNativeImage) nativeImage).setPixel(x, y, color);
     }
 
+    public static FakeNativeImage NativeImage_getFakeImage(Object nativeImage) {
+        return ((IFakeNativeImage) nativeImage).getFakeImage();
+    }
+
+    public static void NativeImage_setFakeImage(Object nativeImage, Object fakeImage) {
+        ((IFakeNativeImage) nativeImage).setFakeImage((FakeNativeImage) fakeImage);
+    }
+
     public static FakeMinecraftProfileTexture ResourceLocation_getTexture(Object location) {
         return ((IFakeResourceLocation) location).getTexture();
     }

Common/src/main/java/customskinloader/fake/itf/IFakeNativeImage.java

@@ -1,5 +1,6 @@
 package customskinloader.fake.itf;
 
+import customskinloader.fake.texture.FakeNativeImage;
 import net.minecraft.client.renderer.texture.NativeImage;
 
 public interface IFakeNativeImage {
@@ -10,4 +11,8 @@ default int getPixel(int x, int y) {
     default void setPixel(int x, int y, int color) {
         ((NativeImage) this).func_195700_a(x, y, color);
     }
+
+    FakeNativeImage getFakeImage();
+
+    void setFakeImage(FakeNativeImage fakeImage);
 }

Common/src/main/java/customskinloader/fake/texture/FakeNativeImage.java

@@ -71,22 +71,4 @@ public void copyArea(int x0, int y0, int dx, int dy, int width, int height, bool
     public void close() {
         image.close();
     }
-
-    public static class Extended extends NativeImage {
-        public static NativeImage create(FakeNativeImage fakeImage) {
-            return new FakeNativeImage.Extended(fakeImage);
-        }
-
-        private final FakeNativeImage fakeImage;
-
-        public Extended(FakeNativeImage fakeImage) {
-            super(fakeImage.getWidth(), fakeImage.getHeight(), true);
-            this.func_195703_a(fakeImage.getImage());
-            this.fakeImage = fakeImage;
-        }
-
-        public FakeNativeImage getFakeImage() {
-            return this.fakeImage;
-        }
-    }
 }

Common/src/main/java/customskinloader/fake/texture/FakeThreadDownloadImageData.java

@@ -4,6 +4,7 @@
 import java.util.function.Function;
 
 import customskinloader.fake.FakeCapeBuffer;
+import customskinloader.fake.FakeMinecraftProfileTexture;
 import customskinloader.fake.FakeSkinBuffer;
 import customskinloader.fake.FakeSkinManager;
 import customskinloader.fake.itf.FakeInterfaceManager;
@@ -36,8 +37,10 @@ public static Function<NativeImage, CompletableFuture<?>> createTextureV2(Functi
 
     public static Function<NativeImage, CompletableFuture<?>> createTexture(Function<NativeImage, CompletableFuture<?>> function, Function<NativeImage, Function<Object, Object>> cape, Object location, boolean bl) {
         return bl ? _image -> {
-            if (FakeInterfaceManager.ResourceLocation_getTexture(location) != null && _image instanceof FakeNativeImage.Extended) {
-                FakeSkinManager.BaseBuffer.judgeType(FakeInterfaceManager.ResourceLocation_getTexture(location), () -> FakeSkinBuffer.judgeType0(((FakeNativeImage.Extended) _image).getFakeImage()));
+            FakeMinecraftProfileTexture texture = FakeInterfaceManager.ResourceLocation_getTexture(location);
+            FakeNativeImage image = FakeInterfaceManager.NativeImage_getFakeImage(_image);
+            if (texture != null && image != null) {
+                FakeSkinManager.BaseBuffer.judgeType(texture, () -> FakeSkinBuffer.judgeType0(image));
             }
             return function.apply(_image);
         } : _image -> function.apply(_image).thenApply(cape.apply(_image));

Fabric/mixin.tsrg

@@ -3,10 +3,12 @@ net/minecraft/client/Minecraft net/minecraft/class_310
 	isIntegratedServerRunning ()Z method_1542
 net/minecraft/client/entity/AbstractClientPlayer net/minecraft/class_742
 net/minecraft/client/gui/Gui net/minecraft/class_332
+net/minecraft/client/gui/GuiGraphicsExtractor net/minecraft/client/gui/GuiGraphicsExtractor
 net/minecraft/client/gui/GuiPlayerTabOverlay net/minecraft/class_355
 	renderPlayerlist (ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V method_1919
 	renderPlayerlist (Lcom/mojang/blaze3d/matrix/MatrixStack;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V method_1919
 	renderPlayerlist (Lnet/minecraft/client/gui/Gui;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V method_1919
+	renderPlayerlist (Lnet/minecraft/client/gui/GuiGraphicsExtractor;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V extractRenderState
 net/minecraft/client/model/ModelRenderer net/minecraft/class_630
 net/minecraft/client/renderer/IImageBuffer net/minecraft/class_760
 net/minecraft/client/renderer/IRenderTypeBuffer net/minecraft/class_4597

Fabric/src/main/resources/customskinloader.accesswidener

@@ -1,6 +1,5 @@
 accessWidener v2 intermediary
 extendable class net/minecraft/class_1011 # 24w46a+
 extendable class net/minecraft/class_1071$class_8686 # 23w31a+
-extendable class net/minecraft/class_2960 # 24w46a+
 accessible method net/minecraft/class_1071$class_8686 <init> (Ljava/util/UUID;Lcom/mojang/authlib/properties/Property;)V # 23w42a+
 accessible method net/minecraft/class_2960 <init> (Ljava/lang/String;Ljava/lang/String;)V # 24w18a+

Fabric/src/main/resources/fabric.mod.json

@@ -17,5 +17,9 @@
   "mixins": [
     "mixins.customskinloader.json"
   ],
-  "accessWidener": "customskinloader.accesswidener"
+  "accessWidener": "customskinloader.accesswidener",
+
+  "depends": {
+    "minecraft": "<=1.21.11"
+  }
 }