From 3e001c4cdf84949b530cb0cf6f6ab00648ad22ff Mon Sep 17 00:00:00 2001 From: ZekerZhayard Date: Fri, 7 May 2021 17:15:45 +0800 Subject: [PATCH] Fix elytra can not be rendered when the cape doesn't contain elytra. (#160) * Fix elytra can not be rendered when the cape doesn't contain elytra. * Fix typo. * Streamline IFakeThreadDownloadImageData. * Fix wrong arguments. * Add compatible with other custom player model mods, such as tr7zw/FirstPersonModel --- .../customskinloader/fake/FakeCapeBuffer.java | 206 ++++++++++++++++++ .../customskinloader/fake/FakeSkinBuffer.java | 13 +- .../fake/FakeSkinManager.java | 7 +- .../fake/FakeThreadDownloadImageData.java | 2 +- .../fake/itf/IFakeMinecraft.java | 9 + .../itf/IFakeThreadDownloadImageData.java | 12 + .../fake/texture/FakeNativeImage.java | 7 +- .../customskinloader/utils/MinecraftUtil.java | 8 + Fabric/Fabric.tsrg | 5 + Fabric/mixin.tsrg | 2 + Fabric/resource/mixins.customskinloader.json | 2 +- .../fabric/MixinConfigPlugin.java | 2 +- Forge/resource/transformers.js | 26 ++- .../forge/TransformerManager.java | 4 + .../forge/loader/LaunchWrapper.java | 3 +- .../FakeInterfacesTransformer.java | 28 ++- Vanilla/1.12.2/1.12.2.tsrg | 5 + Vanilla/1.12.2/mixin.tsrg | 2 + .../resource/mixins.customskinloader.json | 1 + Vanilla/1.15.2/1.15.2.tsrg | 5 + Vanilla/1.15.2/mixin.tsrg | 2 + .../resource/mixins.customskinloader.json | 2 +- Vanilla/1.16.5/1.16.5.tsrg | 5 + Vanilla/1.16.5/mixin.tsrg | 2 + .../resource/mixins.customskinloader.json | 2 +- Vanilla/1.8.9/1.8.9.tsrg | 5 + Vanilla/1.8.9/mixin.tsrg | 2 + .../resource/mixins.customskinloader.json | 1 + .../mixin/MixinThreadDownloadImageDataV1.java | 23 ++ ...va => MixinThreadDownloadImageDataV2.java} | 9 +- 30 files changed, 381 insertions(+), 21 deletions(-) create mode 100644 Common/source/customskinloader/fake/FakeCapeBuffer.java create mode 100644 Common/source/customskinloader/fake/itf/IFakeThreadDownloadImageData.java create mode 100644 Vanilla/source/customskinloader/mixin/MixinThreadDownloadImageDataV1.java rename Vanilla/source/customskinloader/mixin/{MixinThreadDownloadImageData.java => MixinThreadDownloadImageDataV2.java} (82%) diff --git a/Common/source/customskinloader/fake/FakeCapeBuffer.java b/Common/source/customskinloader/fake/FakeCapeBuffer.java new file mode 100644 index 0000000..04723ec --- /dev/null +++ b/Common/source/customskinloader/fake/FakeCapeBuffer.java @@ -0,0 +1,206 @@ +package customskinloader.fake; + +import java.io.IOException; +import java.io.InputStream; +import java.util.function.BiPredicate; +import java.util.function.Predicate; +import javax.imageio.ImageIO; + +import customskinloader.fake.itf.IFakeThreadDownloadImageData; +import customskinloader.fake.texture.FakeBufferedImage; +import customskinloader.fake.texture.FakeImage; +import customskinloader.utils.MinecraftUtil; +import net.minecraft.util.ResourceLocation; + +public class FakeCapeBuffer extends FakeSkinBuffer { + private static final ResourceLocation TEXTURE_ELYTRA = new ResourceLocation("textures/entity/elytra.png"); + private static int loadedGlobal = 0; + private static FakeImage elytraImage = loadElytra(); + + public static FakeImage loadElytra() { + loadedGlobal++; + try { + InputStream is = MinecraftUtil.getResourceFromResourceLocation(TEXTURE_ELYTRA); + if (is != null) { + FakeImage image = new FakeBufferedImage(ImageIO.read(is)); + if (image.getWidth() % 64 != 0 || image.getHeight() % 32 != 0) { // wtf? + return elytraImage; + } + image = resetImageFormat(image, 22, 0, 46, 22); + return image; + } + } catch (IOException ignored) { } + return null; + } + + private int loaded = 0; + private double ratioX = -1; + private double ratioY = -1; + private ResourceLocation location; + private String type = null; + + public FakeCapeBuffer(ResourceLocation location) { + this.location = location; + } + + @Override + public FakeImage parseUserSkin(FakeImage image) { + if (image == null) return null; + this.image = image; + + // When resource packs were changed, the elytra image needs to be reloaded, and here will be entered again + if (this.loaded == loadedGlobal) { + elytraImage = loadElytra(); + } + this.loaded = loadedGlobal; + if (elytraImage != null) { + if (this.ratioX < 0) + this.ratioX = this.image.getWidth() / 64.0D; + if (this.ratioY < 0) + this.ratioY = this.image.getHeight() / 32.0D; + if (this.type == null) + this.type = this.judgeType(); + + if ("cape".equals(this.type)) { + this.image = resetImageFormat(this.image, 0, 0, 22, 17); + this.attachElytra(elytraImage); + if (this.image instanceof FakeBufferedImage) { // before 1.12.2 + this.refreshTexture((FakeBufferedImage) this.image); + } + } + } + return this.image; + } + + /** + * Judge the cape type + * + * @return "elytra" if the cape contains elytra texture, otherwise "cape" + */ + @Override + public String judgeType() { + if (this.image != null && elytraImage != null) { + // If all the pixels in ((22, 0), (45, 21)) is same as background, it means the cape doesn't contain elytra + Predicate predicate = EQU_BG.apply(this.image.getRGBA(this.image.getWidth() - 1, this.image.getHeight() - 1)); + return withElytraPixels((x, y) -> !predicate.test(this.image.getRGBA(x, y)), "elytra", "cape"); + } + return "cape"; + } + + private void attachElytra(FakeImage elytraImage) { + if (this.image != null) { + int capeW = this.image.getWidth(), capeH = this.image.getHeight(); + int elytraW = elytraImage.getWidth(), elytraH = elytraImage.getHeight(); + + // scale cape and elytra to the same size + // cape part ((0, 0), (21, 16)) -> (22 * 17) + if (capeW < elytraW) { + this.image = scaleImage(this.image, true, elytraW / (double) capeW, 1, capeW / 64.0D, capeH / 32.0D, elytraW, capeH, 0, 0, 22, 17); + capeW = elytraW; + this.ratioX = capeW / 64.0D; + } + if (capeH < elytraH) { + this.image = scaleImage(this.image, true, 1, elytraH / (double) capeH, capeW / 64.0D, capeH / 32.0D, capeW, elytraH, 0, 0, 22, 17); + capeH = elytraH; + this.ratioY = capeH / 32.0D; + } + // elytra part ((22, 0), (45, 21)) -> (24 * 22) + if (elytraW < capeW) { + elytraImage = scaleImage(elytraImage, false, capeW / (double) elytraW, 1, elytraW / 64.0D, elytraH / 32.0D, capeW, elytraH, 22, 0, 46, 22); + elytraW = capeW; + } + if (elytraH < capeH) { + elytraImage = scaleImage(elytraImage, false, 1, capeH / (double) elytraH, elytraW / 64.0D, elytraH / 32.0D, elytraW, capeH, 22, 0, 46, 22); + elytraH = capeH; + } + + // Overwrite pixels from elytra to cape + FakeImage finalElytraImage = elytraImage; + withElytraPixels((x, y) -> { + this.image.setRGBA(x, y, finalElytraImage.getRGBA(x, y)); + return false; + }, null, null); + } + } + + /** + * Traverse every elytra pixel + * @param predicate the predicate with x and y + * @param returnValue if the condition flag equals the condition, then return this value + * @param defaultReturnValue otherwise return this value + */ + private R withElytraPixels(BiPredicate predicate, R returnValue, R defaultReturnValue) { + int startX = (int) Math.ceil(22 * ratioX), endX = (int) Math.ceil(46 * ratioX); + int startY = (int) Math.ceil(0 * ratioY), endY = (int) Math.ceil(22 * ratioY); + int excludeX0 = (int) Math.ceil(24 * ratioX), excludeX1 = (int) Math.ceil(44 * ratioX); + int excludeY = (int) Math.ceil(2 * ratioY); + for (int x = startX; x < endX; ++x) { + for (int y = startY; y < endY; ++y) { + if (y < excludeY && (x < excludeX0 || x >= excludeX1)) continue; + if (predicate.test(x, y)) { + return returnValue; + } + } + } + return defaultReturnValue; + } + + // TextureID won't be regenerated when changing resource packs before 1.12.2 + private void refreshTexture(FakeBufferedImage image) { + Object textureObj = MinecraftUtil.getTextureManager().getTexture(this.location); + if (textureObj instanceof IFakeThreadDownloadImageData) { + // NOTICE: OptiFine modified the upload process of the texture from ThreadDownloadImageData + // Therefore, it may not be correct to simply copy the vanilla behavior + ((IFakeThreadDownloadImageData) textureObj).resetNewBufferedImage(image.getImage()); + } + } + + // Some cape image doesn't support alpha channel, so reset image format to ARGB + private static FakeImage resetImageFormat(FakeImage image, int startX, int startY, int endX, int endY) { + if (image != null) { + int width = image.getWidth(), height = image.getHeight(); + image = scaleImage(image, true, 1, 1, width / 64.0D, height / 32.0D, width, height, startX, startY, endX, endY); + } + return image; + } + + /** + * Scale image + * @param image the image to scale. + * @param closeOldImage whether close old image + * @param scaleWidth width enlargement ratio + * @param scaleHeight height enlargement ratio + * @param ratioX the ratio of 64 of the old image width + * @param ratioY the ratio of 32 of the old image height + * @param width the width after scaling. + * @param height the height after scaling. + * @param startX the x where start to copy. + * @param startY the y where start to copy. + * @param endX the x where end to copy. + * @param endY the y where end to copy. + * @return the image after scaling. + */ + private static FakeImage scaleImage(FakeImage image, boolean closeOldImage, double scaleWidth, double scaleHeight, double ratioX, double ratioY, int width, int height, int startX, int startY, int endX, int endY) { + FakeImage newImage = image.createImage(width, height); + startX = (int) (startX * ratioX); endX = (int) (endX * ratioX); + startY = (int) (startY * ratioY); endY = (int) (endY * ratioY); + + int x0 = (int) (startX * scaleWidth), x1 = (int) ((startX + 1) * scaleWidth), dx0 = x1 - x0; + for (int x = startX; x < endX; ++x) { + int y0 = (int) (startY * scaleHeight), y1 = (int) ((startY + 1) * scaleHeight), dy0 = y1 - y0; + for (int y = startY; y < endY; ++y) { + int rgba = image.getRGBA(x, y); + for (int dx = 0; dx < dx0; dx++) { + for (int dy = 0; dy < dy0; dy++) { + newImage.setRGBA(x0 + dx, y0 + dy, rgba); + } + } + y0 = y1; y1 = (int) ((y + 2) * scaleHeight); dy0 = y1 - y0; + } + x0 = x1; x1 = (int) ((x + 2) * scaleWidth); dx0 = x1 - x0; + } + if (closeOldImage) + image.close(); + return newImage; + } +} diff --git a/Common/source/customskinloader/fake/FakeSkinBuffer.java b/Common/source/customskinloader/fake/FakeSkinBuffer.java index 4e0f41d..d3f04f5 100644 --- a/Common/source/customskinloader/fake/FakeSkinBuffer.java +++ b/Common/source/customskinloader/fake/FakeSkinBuffer.java @@ -1,6 +1,7 @@ package customskinloader.fake; import java.awt.image.BufferedImage; +import java.util.function.Function; import java.util.function.Predicate; import customskinloader.CustomSkinLoader; @@ -12,14 +13,14 @@ import net.minecraft.client.renderer.texture.NativeImage; public class FakeSkinBuffer implements IImageBuffer { private int ratio = 1; - private FakeImage image = null; + FakeImage image = null; //parseUserSkin for 1.15+ - public static NativeImage processLegacySkin(NativeImage image, Runnable processTask) { + public static NativeImage processLegacySkin(NativeImage image, Runnable processTask, Function processLegacySkin) { if (processTask instanceof IImageBuffer) { return ((IImageBuffer) processTask).func_195786_a(image); } - return new FakeSkinBuffer().func_195786_a(image); + return processLegacySkin.apply(image); } //parseUserSkin for 1.13+ @@ -94,6 +95,9 @@ public class FakeSkinBuffer implements IImageBuffer { return image; } + /** Judge if the color is transparent or same with background */ + static final Function> EQU_BG = bgColor -> getA(bgColor) == 0 ? (c) -> getA(c) == 0 : (c) -> c.equals(bgColor); + /** * Judge the type of skin * Must be called after parseUserSkin @@ -112,8 +116,7 @@ public class FakeSkinBuffer implements IImageBuffer { * which means it is Alex model. * Otherwise, it is Steve model. * */ - Predicate predicate = - getA(bgColor) == 0 ? (c) -> getA(c) == 0 : (c) -> c == bgColor; + Predicate predicate = EQU_BG.apply(bgColor); for (int x = 54 * ratio; x <= 55 * ratio; ++x) { for (int y = 20 * ratio; y <= 31 * ratio; ++y) { int color = image.getRGBA(x, y); diff --git a/Common/source/customskinloader/fake/FakeSkinManager.java b/Common/source/customskinloader/fake/FakeSkinManager.java index e8c3e2f..e1d89f2 100644 --- a/Common/source/customskinloader/fake/FakeSkinManager.java +++ b/Common/source/customskinloader/fake/FakeSkinManager.java @@ -105,7 +105,10 @@ public class FakeSkinManager { private MinecraftProfileTexture texture; public BaseBuffer(SkinAvailableCallback callback, Type type, ResourceLocation location, MinecraftProfileTexture texture) { - this.buffer = (type == Type.SKIN ? new FakeSkinBuffer() : null); + switch (type) { + case SKIN: this.buffer = new FakeSkinBuffer(); break; + case CAPE: this.buffer = new FakeCapeBuffer(location); break; + } this.callback = callback; this.type = type; @@ -118,7 +121,7 @@ public class FakeSkinManager { } public BufferedImage parseUserSkin(BufferedImage image) { - return buffer == null ? image : buffer.parseUserSkin(image); + return buffer instanceof FakeSkinBuffer ? ((FakeSkinBuffer) buffer).parseUserSkin(image) : image; } public void skinAvailable() { diff --git a/Common/source/customskinloader/fake/FakeThreadDownloadImageData.java b/Common/source/customskinloader/fake/FakeThreadDownloadImageData.java index 087ff1e..6b6c3e8 100644 --- a/Common/source/customskinloader/fake/FakeThreadDownloadImageData.java +++ b/Common/source/customskinloader/fake/FakeThreadDownloadImageData.java @@ -84,7 +84,7 @@ public class FakeThreadDownloadImageData { V4(() -> new IThreadDownloadImageDataBuilder() { // Forge 1.15.x~1.16.x @Override public SimpleTexture build(File cacheFile, String imageUrl, ResourceLocation textureResourceLocation, IImageBuffer imageBuffer, MinecraftProfileTexture.Type textureType) { - return new DownloadingTexture(cacheFile, imageUrl, textureResourceLocation, textureType == MinecraftProfileTexture.Type.SKIN, imageBuffer); + return new DownloadingTexture(cacheFile, imageUrl, textureResourceLocation, true, imageBuffer); } }); diff --git a/Common/source/customskinloader/fake/itf/IFakeMinecraft.java b/Common/source/customskinloader/fake/itf/IFakeMinecraft.java index 6af2313..ca9258d 100644 --- a/Common/source/customskinloader/fake/itf/IFakeMinecraft.java +++ b/Common/source/customskinloader/fake/itf/IFakeMinecraft.java @@ -1,8 +1,17 @@ package customskinloader.fake.itf; +import java.io.IOException; +import java.io.InputStream; + import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; public interface IFakeMinecraft { + default InputStream getResourceFromResourceLocation(ResourceLocation location) throws IOException { + return ((Minecraft) this).getResourceManager().getResource(location).getInputStream(); + } + + // 1.14+ default void execute(Runnable runnable) { ((Minecraft) this).addScheduledTask(runnable); } diff --git a/Common/source/customskinloader/fake/itf/IFakeThreadDownloadImageData.java b/Common/source/customskinloader/fake/itf/IFakeThreadDownloadImageData.java new file mode 100644 index 0000000..a5685e7 --- /dev/null +++ b/Common/source/customskinloader/fake/itf/IFakeThreadDownloadImageData.java @@ -0,0 +1,12 @@ +package customskinloader.fake.itf; + +import java.awt.image.BufferedImage; + +// This interface is only available before 1.12.2 +public interface IFakeThreadDownloadImageData { + /** + * Reset {@link net.minecraft.client.renderer.ThreadDownloadImageData#bufferedImage} and + * {@link net.minecraft.client.renderer.ThreadDownloadImageData#textureUploaded} to false to refresh texture. + */ + void resetNewBufferedImage(BufferedImage image); +} diff --git a/Common/source/customskinloader/fake/texture/FakeNativeImage.java b/Common/source/customskinloader/fake/texture/FakeNativeImage.java index cce80a5..3d9fd64 100644 --- a/Common/source/customskinloader/fake/texture/FakeNativeImage.java +++ b/Common/source/customskinloader/fake/texture/FakeNativeImage.java @@ -30,11 +30,14 @@ public class FakeNativeImage implements FakeImage { } public int getRGBA(int x, int y) { - return image.func_195709_a(x, y); + int abgr = image.func_195709_a(x, y); + int b = abgr >>> 16 & 0xFF, r = abgr >>> 0 & 0xFF; + return abgr & 0xFF00FF00 | (r << 16 | b); } public void setRGBA(int x, int y, int rgba) { - image.func_195700_a(x, y, rgba); + int b = rgba >>> 0 & 0xFF, r = rgba >>> 16 & 0xFF; + image.func_195700_a(x, y, rgba & 0xFF00FF00 | (b << 16 | r)); } public void copyImageData(FakeImage image) { diff --git a/Common/source/customskinloader/utils/MinecraftUtil.java b/Common/source/customskinloader/utils/MinecraftUtil.java index b499d79..b5bacc9 100644 --- a/Common/source/customskinloader/utils/MinecraftUtil.java +++ b/Common/source/customskinloader/utils/MinecraftUtil.java @@ -1,6 +1,8 @@ package customskinloader.utils; import java.io.File; +import java.io.IOException; +import java.io.InputStream; import java.net.URL; import java.net.URLDecoder; import java.util.ArrayList; @@ -8,9 +10,11 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import com.mojang.authlib.GameProfile; +import customskinloader.fake.itf.IFakeMinecraft; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.resources.SkinManager; +import net.minecraft.util.ResourceLocation; import org.apache.commons.lang3.StringUtils; /** @@ -30,6 +34,10 @@ public class MinecraftUtil { return Minecraft.getMinecraft().getSkinManager(); } + public static InputStream getResourceFromResourceLocation(ResourceLocation location) throws IOException { + return ((IFakeMinecraft) Minecraft.getMinecraft()).getResourceFromResourceLocation(location); + } + private static ArrayList minecraftVersion = new ArrayList(); private static String minecraftMainVersion = null; diff --git a/Fabric/Fabric.tsrg b/Fabric/Fabric.tsrg index 263d4cf..6a1deff 100644 --- a/Fabric/Fabric.tsrg +++ b/Fabric/Fabric.tsrg @@ -9,6 +9,7 @@ net/minecraft/client/Minecraft net/minecraft/class_310 addScheduledTask (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; func_152344_a getCurrentServerData ()Lnet/minecraft/client/multiplayer/ServerData; method_1558 getMinecraft ()Lnet/minecraft/client/Minecraft; method_1551 + getResourceManager ()Lnet/minecraft/client/resources/IResourceManager; method_1478 getSession ()Lnet/minecraft/util/Session; method_1548 getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; method_1495 getSkinManager ()Lnet/minecraft/client/resources/SkinManager; method_1582 @@ -45,6 +46,10 @@ net/minecraft/client/renderer/texture/ThreadDownloadImageData net/minecraft/clas net/minecraft/client/resources/DefaultPlayerSkin net/minecraft/class_1068 getDefaultSkin (Ljava/util/UUID;)Lnet/minecraft/util/ResourceLocation; method_4648 getDefaultSkinLegacy ()Lnet/minecraft/util/ResourceLocation; method_4649 +net/minecraft/client/resources/IResource net/minecraft/class_3298 + getInputStream ()Ljava/io/InputStream; method_14482 +net/minecraft/client/resources/IResourceManager net/minecraft/class_3300 + getResource (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/resources/IResource; method_14486 net/minecraft/client/resources/SkinManager net/minecraft/class_1071 loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V method_4652 net/minecraft/client/resources/SkinManager$SkinAvailableCallback net/minecraft/class_1071$class_1072 diff --git a/Fabric/mixin.tsrg b/Fabric/mixin.tsrg index b009562..01b42c8 100644 --- a/Fabric/mixin.tsrg +++ b/Fabric/mixin.tsrg @@ -12,6 +12,8 @@ net/minecraft/client/renderer/IRenderTypeBuffer net/minecraft/class_4597 net/minecraft/client/renderer/RenderType net/minecraft/class_1921 getEntitySolid (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; method_23572 net/minecraft/client/renderer/ThreadDownloadImageData net/minecraft/class_1046 + bufferedImage field_110560_d + textureUploaded field_5215 processTask field_20843 loadTexture (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; method_22795 processLegacySkin (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; method_22798 diff --git a/Fabric/resource/mixins.customskinloader.json b/Fabric/resource/mixins.customskinloader.json index b96738f..fe673be 100644 --- a/Fabric/resource/mixins.customskinloader.json +++ b/Fabric/resource/mixins.customskinloader.json @@ -9,7 +9,7 @@ "MixinRenderPlayer", "MixinSkinManager", "MixinTextureManager", - "MixinThreadDownloadImageData", + "MixinThreadDownloadImageDataV2", "MixinTileEntitySkull" ], "refmap": "mixins.customskinloader.refmap.json", diff --git a/Fabric/source/customskinloader/fabric/MixinConfigPlugin.java b/Fabric/source/customskinloader/fabric/MixinConfigPlugin.java index 127ff78..eb2aaa1 100644 --- a/Fabric/source/customskinloader/fabric/MixinConfigPlugin.java +++ b/Fabric/source/customskinloader/fabric/MixinConfigPlugin.java @@ -54,7 +54,7 @@ public class MixinConfigPlugin implements IMixinConfigPlugin { @Override public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { boolean result = true; - if (mixinClassName.endsWith(".MixinThreadDownloadImageData")) { + if (mixinClassName.endsWith(".MixinThreadDownloadImageDataV2")) { result = this.world_version >= 2205 && this.protocol_version >= 554; // 19w38a+ } else if (mixinClassName.endsWith(".MixinLayerCape") || mixinClassName.endsWith(".MixinRenderPlayer")) { result = this.world_version >= 2210 && this.protocol_version >= 558; // 19w41a+ diff --git a/Forge/resource/transformers.js b/Forge/resource/transformers.js index dceb6f9..08d3ca4 100644 --- a/Forge/resource/transformers.js +++ b/Forge/resource/transformers.js @@ -1,7 +1,10 @@ +var Handle = Java.type('org.objectweb.asm.Handle'); var Opcodes = Java.type('org.objectweb.asm.Opcodes'); +var Type = Java.type('org.objectweb.asm.Type'); var FieldInsnNode = Java.type('org.objectweb.asm.tree.FieldInsnNode'); var FieldNode = Java.type('org.objectweb.asm.tree.FieldNode'); var InsnNode = Java.type('org.objectweb.asm.tree.InsnNode'); +var InvokeDynamicInsnNode = Java.type('org.objectweb.asm.tree.InvokeDynamicInsnNode'); var JumpInsnNode = Java.type('org.objectweb.asm.tree.JumpInsnNode'); var LabelNode = Java.type('org.objectweb.asm.tree.LabelNode'); var MethodInsnNode = Java.type('org.objectweb.asm.tree.MethodInsnNode'); @@ -17,8 +20,9 @@ function checkName(name, srgName) { // De-obfuscate method and field names. function mapName(srgName) { try { - if (srgName.startsWith("field_")) return net.minecraftforge.coremod.api.ASMAPI.mapField(srgName); - if (srgName.startsWith("func_")) return net.minecraftforge.coremod.api.ASMAPI.mapMethod(srgName); + var ASMAPI = Java.type('net.minecraftforge.coremod.api.ASMAPI'); + if (srgName.startsWith("field_")) return ASMAPI.mapField(srgName); + if (srgName.startsWith("func_")) return ASMAPI.mapMethod(srgName); } catch (ignored) { // Before forge-1.13.2-25.0.194 } @@ -166,6 +170,16 @@ function initializeCoreMod() { }, 'transformer': function (cn) { cn.interfaces.add("customskinloader/fake/itf/IFakeMinecraft"); + + var mn = new MethodNode(Opcodes.ACC_PUBLIC, "getResourceFromResourceLocation", "(Lnet/minecraft/util/ResourceLocation;)Ljava/io/InputStream;", null, null); + mn.instructions.add(new VarInsnNode(Opcodes.ALOAD, 0)); + mn.instructions.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "net/minecraft/client/Minecraft", mapName("func_195551_G"), "()Lnet/minecraft/resources/IResourceManager;", false)); + mn.instructions.add(new VarInsnNode(Opcodes.ALOAD, 1)); + mn.instructions.add(new MethodInsnNode(Opcodes.INVOKEINTERFACE, "net/minecraft/resources/IResourceManager", mapName("func_199002_a"), "(Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/resources/IResource;", true)); + mn.instructions.add(new MethodInsnNode(Opcodes.INVOKEINTERFACE, "net/minecraft/resources/IResource", mapName("func_199027_b"), "()Ljava/io/InputStream;", true)); + mn.instructions.add(new InsnNode(Opcodes.ARETURN)); + cn.methods.add(mn); + return cn; } }, @@ -203,9 +217,15 @@ function initializeCoreMod() { for (var iterator = mn.instructions.iterator(); iterator.hasNext();) { var node = iterator.next(); if (node.getOpcode() === Opcodes.INVOKESTATIC && node.owner.equals("net/minecraft/client/renderer/texture/DownloadingTexture") && checkName(node.name, "func_229163_c_") && node.desc.equals("(Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage;")) { + // FakeSkinBuffer.processLegacySkin(image, this.processTask, DownloadingTexture::processLegacySkin); mn.instructions.insertBefore(node, new VarInsnNode(Opcodes.ALOAD, 0)); mn.instructions.insertBefore(node, new FieldInsnNode(Opcodes.GETFIELD, "net/minecraft/client/renderer/texture/DownloadingTexture", mapName("field_229155_i_"), "Ljava/lang/Runnable;")); - iterator.set(new MethodInsnNode(Opcodes.INVOKESTATIC, "customskinloader/fake/FakeSkinBuffer", "processLegacySkin", "(Lnet/minecraft/client/renderer/texture/NativeImage;Ljava/lang/Runnable;)Lnet/minecraft/client/renderer/texture/NativeImage;", false)); + mn.instructions.insertBefore(node, new InvokeDynamicInsnNode("apply", "()Ljava/util/function/Function;", + /* bsm */ new Handle(Opcodes.H_INVOKESTATIC, "java/lang/invoke/LambdaMetafactory", "metafactory", "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;", false), + /* bsmArgs */ Type.getType("(Ljava/lang/Object;)Ljava/lang/Object;"), + /* bsmArgs */ new Handle(Opcodes.H_INVOKESTATIC, "net/minecraft/client/renderer/texture/DownloadingTexture", mapName("func_229163_c_"), "(Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage;", false), + /* bsmArgs */ Type.getType("(Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage;"))); + iterator.set(new MethodInsnNode(Opcodes.INVOKESTATIC, "customskinloader/fake/FakeSkinBuffer", "processLegacySkin", "(Lnet/minecraft/client/renderer/texture/NativeImage;Ljava/lang/Runnable;Ljava/util/function/Function;)Lnet/minecraft/client/renderer/texture/NativeImage;", false)); } } } diff --git a/Forge/source/customskinloader/forge/TransformerManager.java b/Forge/source/customskinloader/forge/TransformerManager.java index f0fc05b..b1d5d2c 100644 --- a/Forge/source/customskinloader/forge/TransformerManager.java +++ b/Forge/source/customskinloader/forge/TransformerManager.java @@ -44,6 +44,10 @@ public class TransformerManager { return remapper.mapType(name); } + public static String mapFieldName(String owner, String name, String desc) { + return remapper.mapFieldName(owner, name, desc); + } + public static String mapMethodName(String owner, String name, String desc) { return remapper.mapMethodName(owner, name, desc); } diff --git a/Forge/source/customskinloader/forge/loader/LaunchWrapper.java b/Forge/source/customskinloader/forge/loader/LaunchWrapper.java index 0572967..4ebd0e1 100644 --- a/Forge/source/customskinloader/forge/loader/LaunchWrapper.java +++ b/Forge/source/customskinloader/forge/loader/LaunchWrapper.java @@ -19,7 +19,8 @@ import org.objectweb.asm.tree.MethodNode; public class LaunchWrapper implements IClassTransformer { private static final TransformerManager.IClassTransformer[] CLASS_TRANSFORMERS = { new FakeInterfacesTransformer.MinecraftTransformer(), - new FakeInterfacesTransformer.AbstractTextureTransfomer(), + new FakeInterfacesTransformer.ThreadDownloadImageDataTransformer(), + new FakeInterfacesTransformer.AbstractTextureTransformer(), new FakeInterfacesTransformer.TextureTransformer(), new FakeInterfacesTransformer.TextureManagerTransformer() }; diff --git a/Forge/source/customskinloader/forge/transformer/FakeInterfacesTransformer.java b/Forge/source/customskinloader/forge/transformer/FakeInterfacesTransformer.java index 51769ad..e851966 100644 --- a/Forge/source/customskinloader/forge/transformer/FakeInterfacesTransformer.java +++ b/Forge/source/customskinloader/forge/transformer/FakeInterfacesTransformer.java @@ -3,6 +3,10 @@ package customskinloader.forge.transformer; import customskinloader.forge.TransformerManager; import org.objectweb.asm.Opcodes; import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.FieldInsnNode; +import org.objectweb.asm.tree.InsnNode; +import org.objectweb.asm.tree.MethodNode; +import org.objectweb.asm.tree.VarInsnNode; public class FakeInterfacesTransformer { @TransformerManager.TransformTarget( @@ -16,10 +20,32 @@ public class FakeInterfacesTransformer { } } + @TransformerManager.TransformTarget( + className = "net.minecraft.client.renderer.ThreadDownloadImageData" + ) + public static class ThreadDownloadImageDataTransformer implements TransformerManager.IClassTransformer { + @Override + public ClassNode transform(ClassNode cn) { + cn.interfaces.add("customskinloader/fake/itf/IFakeThreadDownloadImageData"); + + MethodNode mn = new MethodNode(Opcodes.ACC_PUBLIC, "resetNewBufferedImage", "(Ljava/awt/image/BufferedImage;)V", null, null); + mn.instructions.add(new VarInsnNode(Opcodes.ALOAD, 0)); + mn.instructions.add(new InsnNode(Opcodes.ICONST_0)); + mn.instructions.add(new FieldInsnNode(Opcodes.PUTFIELD, cn.name, TransformerManager.mapFieldName(cn.name, "field_110559_g", "Z"), "Z")); + mn.instructions.add(new VarInsnNode(Opcodes.ALOAD, 0)); + mn.instructions.add(new VarInsnNode(Opcodes.ALOAD, 1)); + mn.instructions.add(new FieldInsnNode(Opcodes.PUTFIELD, cn.name, TransformerManager.mapFieldName(cn.name, "field_110560_d", "Ljava/awt/image/BufferedImage;"), "Ljava/awt/image/BufferedImage;")); + mn.instructions.add(new InsnNode(Opcodes.RETURN)); + cn.methods.add(mn); + + return cn; + } + } + @TransformerManager.TransformTarget( className = "net.minecraft.client.renderer.texture.AbstractTexture" ) - public static class AbstractTextureTransfomer implements TransformerManager.IClassTransformer { + public static class AbstractTextureTransformer implements TransformerManager.IClassTransformer { @Override public ClassNode transform(ClassNode cn) { cn.interfaces.add("net/minecraft/client/renderer/texture/Texture"); diff --git a/Vanilla/1.12.2/1.12.2.tsrg b/Vanilla/1.12.2/1.12.2.tsrg index 6988ab5..6d48a88 100644 --- a/Vanilla/1.12.2/1.12.2.tsrg +++ b/Vanilla/1.12.2/1.12.2.tsrg @@ -9,6 +9,7 @@ net/minecraft/client/Minecraft bib addScheduledTask (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; a getCurrentServerData ()Lnet/minecraft/client/multiplayer/ServerData; C getMinecraft ()Lnet/minecraft/client/Minecraft; z + getResourceManager ()Lnet/minecraft/client/resources/IResourceManager; O getSession ()Lnet/minecraft/util/Session; K getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; X getSkinManager ()Lnet/minecraft/client/resources/SkinManager; Y @@ -45,6 +46,10 @@ net/minecraft/client/renderer/texture/ThreadDownloadImageData cdh net/minecraft/client/resources/DefaultPlayerSkin cef getDefaultSkin (Ljava/util/UUID;)Lnet/minecraft/util/ResourceLocation; a getDefaultSkinLegacy ()Lnet/minecraft/util/ResourceLocation; a +net/minecraft/client/resources/IResource ceo + getInputStream ()Ljava/io/InputStream; b +net/minecraft/client/resources/IResourceManager cep + getResource (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/resources/IResource; a net/minecraft/client/resources/SkinManager cex loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V a net/minecraft/client/resources/SkinManager$SkinAvailableCallback cex$a diff --git a/Vanilla/1.12.2/mixin.tsrg b/Vanilla/1.12.2/mixin.tsrg index d6a99d2..322fc81 100644 --- a/Vanilla/1.12.2/mixin.tsrg +++ b/Vanilla/1.12.2/mixin.tsrg @@ -12,6 +12,8 @@ net/minecraft/client/model/ModelRenderer brs net/minecraft/client/renderer/RenderType net/minecraft/client/renderer/RenderType getEntitySolid (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; func_228634_a_ net/minecraft/client/renderer/ThreadDownloadImageData cdh + bufferedImage l + textureUploaded n processTask field_229155_i_ loadTexture (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; func_229159_a_ processLegacySkin (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; func_229163_c_ diff --git a/Vanilla/1.12.2/resource/mixins.customskinloader.json b/Vanilla/1.12.2/resource/mixins.customskinloader.json index fe2ad8e..3c2ff4d 100644 --- a/Vanilla/1.12.2/resource/mixins.customskinloader.json +++ b/Vanilla/1.12.2/resource/mixins.customskinloader.json @@ -8,6 +8,7 @@ "MixinPlayerMenuObject", "MixinSkinManager", "MixinTextureManager", + "MixinThreadDownloadImageDataV1", "MixinTileEntitySkull" ], "refmap": "mixins.customskinloader.refmap.json", diff --git a/Vanilla/1.15.2/1.15.2.tsrg b/Vanilla/1.15.2/1.15.2.tsrg index ffebbc4..4fa3263 100644 --- a/Vanilla/1.15.2/1.15.2.tsrg +++ b/Vanilla/1.15.2/1.15.2.tsrg @@ -9,6 +9,7 @@ net/minecraft/client/Minecraft dbn addScheduledTask (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; func_152344_a getCurrentServerData ()Lnet/minecraft/client/multiplayer/ServerData; z getMinecraft ()Lnet/minecraft/client/Minecraft; x + getResourceManager ()Lnet/minecraft/client/resources/IResourceManager; I getSession ()Lnet/minecraft/util/Session; E getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; R getSkinManager ()Lnet/minecraft/client/resources/SkinManager; S @@ -45,6 +46,10 @@ net/minecraft/client/renderer/texture/ThreadDownloadImageData dzz net/minecraft/client/resources/DefaultPlayerSkin eaq getDefaultSkin (Ljava/util/UUID;)Lnet/minecraft/util/ResourceLocation; a getDefaultSkinLegacy ()Lnet/minecraft/util/ResourceLocation; a +net/minecraft/client/resources/IResource za + getInputStream ()Ljava/io/InputStream; b +net/minecraft/client/resources/IResourceManager zb + getResource (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/resources/IResource; a net/minecraft/client/resources/SkinManager eaz loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V a net/minecraft/client/resources/SkinManager$SkinAvailableCallback eaz$a diff --git a/Vanilla/1.15.2/mixin.tsrg b/Vanilla/1.15.2/mixin.tsrg index 3cae25b..0f171f2 100644 --- a/Vanilla/1.15.2/mixin.tsrg +++ b/Vanilla/1.15.2/mixin.tsrg @@ -12,6 +12,8 @@ net/minecraft/client/renderer/IRenderTypeBuffer dqt net/minecraft/client/renderer/RenderType drb getEntitySolid (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; a net/minecraft/client/renderer/ThreadDownloadImageData dzz + bufferedImage field_110560_d + textureUploaded k processTask i loadTexture (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; a processLegacySkin (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; c diff --git a/Vanilla/1.15.2/resource/mixins.customskinloader.json b/Vanilla/1.15.2/resource/mixins.customskinloader.json index 40e8658..0b1fad1 100644 --- a/Vanilla/1.15.2/resource/mixins.customskinloader.json +++ b/Vanilla/1.15.2/resource/mixins.customskinloader.json @@ -9,7 +9,7 @@ "MixinRenderPlayer", "MixinSkinManager", "MixinTextureManager", - "MixinThreadDownloadImageData", + "MixinThreadDownloadImageDataV2", "MixinTileEntitySkull" ], "refmap": "mixins.customskinloader.refmap.json", diff --git a/Vanilla/1.16.5/1.16.5.tsrg b/Vanilla/1.16.5/1.16.5.tsrg index 81b0480..9a6356d 100644 --- a/Vanilla/1.16.5/1.16.5.tsrg +++ b/Vanilla/1.16.5/1.16.5.tsrg @@ -9,6 +9,7 @@ net/minecraft/client/Minecraft djz addScheduledTask (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; func_152344_a getCurrentServerData ()Lnet/minecraft/client/multiplayer/ServerData; E getMinecraft ()Lnet/minecraft/client/Minecraft; C + getResourceManager ()Lnet/minecraft/client/resources/IResourceManager; N getSession ()Lnet/minecraft/util/Session; J getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; Y getSkinManager ()Lnet/minecraft/client/resources/SkinManager; Z @@ -45,6 +46,10 @@ net/minecraft/client/renderer/texture/ThreadDownloadImageData ejt net/minecraft/client/resources/DefaultPlayerSkin ekj getDefaultSkin (Ljava/util/UUID;)Lnet/minecraft/util/ResourceLocation; a getDefaultSkinLegacy ()Lnet/minecraft/util/ResourceLocation; a +net/minecraft/client/resources/IResource acg + getInputStream ()Ljava/io/InputStream; b +net/minecraft/client/resources/IResourceManager ach + getResource (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/resources/IResource; a net/minecraft/client/resources/SkinManager eks loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V a net/minecraft/client/resources/SkinManager$SkinAvailableCallback eks$a diff --git a/Vanilla/1.16.5/mixin.tsrg b/Vanilla/1.16.5/mixin.tsrg index a6e6c1e..510c4d1 100644 --- a/Vanilla/1.16.5/mixin.tsrg +++ b/Vanilla/1.16.5/mixin.tsrg @@ -12,6 +12,8 @@ net/minecraft/client/renderer/IRenderTypeBuffer eag net/minecraft/client/renderer/RenderType eao getEntitySolid (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; b net/minecraft/client/renderer/ThreadDownloadImageData ejt + bufferedImage field_110560_d + textureUploaded k processTask i loadTexture (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; a processLegacySkin (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; c diff --git a/Vanilla/1.16.5/resource/mixins.customskinloader.json b/Vanilla/1.16.5/resource/mixins.customskinloader.json index 40e8658..0b1fad1 100644 --- a/Vanilla/1.16.5/resource/mixins.customskinloader.json +++ b/Vanilla/1.16.5/resource/mixins.customskinloader.json @@ -9,7 +9,7 @@ "MixinRenderPlayer", "MixinSkinManager", "MixinTextureManager", - "MixinThreadDownloadImageData", + "MixinThreadDownloadImageDataV2", "MixinTileEntitySkull" ], "refmap": "mixins.customskinloader.refmap.json", diff --git a/Vanilla/1.8.9/1.8.9.tsrg b/Vanilla/1.8.9/1.8.9.tsrg index 223ecc8..5f7c41c 100644 --- a/Vanilla/1.8.9/1.8.9.tsrg +++ b/Vanilla/1.8.9/1.8.9.tsrg @@ -9,6 +9,7 @@ net/minecraft/client/Minecraft ave addScheduledTask (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; a getCurrentServerData ()Lnet/minecraft/client/multiplayer/ServerData; D getMinecraft ()Lnet/minecraft/client/Minecraft; A + getResourceManager ()Lnet/minecraft/client/resources/IResourceManager; Q getSession ()Lnet/minecraft/util/Session; L getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; aa getSkinManager ()Lnet/minecraft/client/resources/SkinManager; ab @@ -45,6 +46,10 @@ net/minecraft/client/renderer/texture/ThreadDownloadImageData bma net/minecraft/client/resources/DefaultPlayerSkin bmz getDefaultSkin (Ljava/util/UUID;)Lnet/minecraft/util/ResourceLocation; a getDefaultSkinLegacy ()Lnet/minecraft/util/ResourceLocation; a +net/minecraft/client/resources/IResource bnh + getInputStream ()Ljava/io/InputStream; b +net/minecraft/client/resources/IResourceManager bni + getResource (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/resources/IResource; a net/minecraft/client/resources/SkinManager bnp loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V a net/minecraft/client/resources/SkinManager$SkinAvailableCallback bnp$a diff --git a/Vanilla/1.8.9/mixin.tsrg b/Vanilla/1.8.9/mixin.tsrg index fa2658a..8831a46 100644 --- a/Vanilla/1.8.9/mixin.tsrg +++ b/Vanilla/1.8.9/mixin.tsrg @@ -12,6 +12,8 @@ net/minecraft/client/model/ModelRenderer bct net/minecraft/client/renderer/RenderType net/minecraft/client/renderer/RenderType getEntitySolid (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; func_228634_a_ net/minecraft/client/renderer/ThreadDownloadImageData bma + bufferedImage l + textureUploaded n processTask field_229155_i_ loadTexture (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; func_229159_a_ processLegacySkin (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; func_229163_c_ diff --git a/Vanilla/1.8.9/resource/mixins.customskinloader.json b/Vanilla/1.8.9/resource/mixins.customskinloader.json index fe2ad8e..3c2ff4d 100644 --- a/Vanilla/1.8.9/resource/mixins.customskinloader.json +++ b/Vanilla/1.8.9/resource/mixins.customskinloader.json @@ -8,6 +8,7 @@ "MixinPlayerMenuObject", "MixinSkinManager", "MixinTextureManager", + "MixinThreadDownloadImageDataV1", "MixinTileEntitySkull" ], "refmap": "mixins.customskinloader.refmap.json", diff --git a/Vanilla/source/customskinloader/mixin/MixinThreadDownloadImageDataV1.java b/Vanilla/source/customskinloader/mixin/MixinThreadDownloadImageDataV1.java new file mode 100644 index 0000000..0e64db5 --- /dev/null +++ b/Vanilla/source/customskinloader/mixin/MixinThreadDownloadImageDataV1.java @@ -0,0 +1,23 @@ +package customskinloader.mixin; + +import java.awt.image.BufferedImage; + +import customskinloader.fake.itf.IFakeThreadDownloadImageData; +import net.minecraft.client.renderer.ThreadDownloadImageData; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; + +@Mixin(ThreadDownloadImageData.class) // This mixin is only for 1.12.2- +public abstract class MixinThreadDownloadImageDataV1 implements IFakeThreadDownloadImageData { + @Shadow + private BufferedImage bufferedImage; + + @Shadow + private boolean textureUploaded; + + @Override + public void resetNewBufferedImage(BufferedImage image) { + this.textureUploaded = false; + this.bufferedImage = image; + } +} diff --git a/Vanilla/source/customskinloader/mixin/MixinThreadDownloadImageData.java b/Vanilla/source/customskinloader/mixin/MixinThreadDownloadImageDataV2.java similarity index 82% rename from Vanilla/source/customskinloader/mixin/MixinThreadDownloadImageData.java rename to Vanilla/source/customskinloader/mixin/MixinThreadDownloadImageDataV2.java index e5975a6..8a303e9 100644 --- a/Vanilla/source/customskinloader/mixin/MixinThreadDownloadImageData.java +++ b/Vanilla/source/customskinloader/mixin/MixinThreadDownloadImageDataV2.java @@ -11,11 +11,16 @@ import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(ThreadDownloadImageData.class) @SuppressWarnings("target") -public abstract class MixinThreadDownloadImageData { +public abstract class MixinThreadDownloadImageDataV2 { @Final @Shadow private Runnable processTask; + @Shadow + private static NativeImage processLegacySkin(NativeImage nativeImageIn) { + return null; + } + @Redirect( method = "Lnet/minecraft/client/renderer/ThreadDownloadImageData;loadTexture(Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage;", at = @At( @@ -24,6 +29,6 @@ public abstract class MixinThreadDownloadImageData { ) ) private NativeImage redirect_loadTexture(NativeImage image) { - return FakeSkinBuffer.processLegacySkin(image, this.processTask); + return FakeSkinBuffer.processLegacySkin(image, this.processTask, MixinThreadDownloadImageDataV2::processLegacySkin); } }