Add mc skin redirect to out-of-jar texture loading (#116)

Author: Raycoms

src/main/java/com/ldtteam/blockui/mod/ClientEventSubscriber.java

@@ -12,6 +12,7 @@
 import com.mojang.blaze3d.platform.InputConstants;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.resources.PlayerSkin;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.client.event.InputEvent.MouseScrollingEvent;
@@ -64,6 +65,12 @@ public static void onClientTickEvent(final ClientTickEvent event)
                 window.addChild(createTestGuiButton(0, "General All-in-one", new ResourceLocation(BlockUI.MOD_ID, "gui/test.xml"), parent -> {
                     parent.findPaneOfTypeByID("missing_out_of_jar", Image.class).setImage(OutOfJarResourceLocation.ofMinecraftFolder(BlockUI.MOD_ID, "missing_out_of_jar.png"), false);
                     parent.findPaneOfTypeByID("working_out_of_jar", Image.class).setImage(OutOfJarResourceLocation.of(BlockUI.MOD_ID, Path.of("../../src/test/resources/button.png")), false);
+                    OutOfJarResourceLocation.ofMinecraftSkin(Minecraft.getInstance(), Minecraft.getInstance().getGameProfile(), null)
+                        .thenAccept(resLoc -> parent.findPaneOfTypeByID("player_skin", Image.class).setImage(resLoc, false));
+                    OutOfJarResourceLocation.ofMinecraftSkin(Minecraft.getInstance(), Minecraft.getInstance().getGameProfile(), PlayerSkin::capeTexture)
+                        .thenAccept(resLoc -> {if (resLoc!=null){parent.findPaneOfTypeByID("player_cape", Image.class).setImage(resLoc, false);}});
+                    OutOfJarResourceLocation.ofMinecraftSkin(Minecraft.getInstance(), Minecraft.getInstance().getGameProfile(), PlayerSkin::elytraTexture)
+                        .thenAccept(resLoc -> {if (resLoc!=null){parent.findPaneOfTypeByID("player_elytra", Image.class).setImage(resLoc, false);}});
                 }));
                 window.addChild(createTestGuiButton(1, "Tooltip Positioning", new ResourceLocation(BlockUI.MOD_ID, "gui/test2.xml")));
                 window.addChild(createTestGuiButton(2, "ItemIcon To BlockState", new ResourceLocation(BlockUI.MOD_ID, "gui/test3.xml"), BlockStateTestGui::setup));

src/main/java/com/ldtteam/blockui/util/resloc/OutOfJarResourceLocation.java

@@ -1,6 +1,10 @@
 package com.ldtteam.blockui.util.resloc;
 
+import com.mojang.authlib.GameProfile;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.texture.AbstractTexture;
+import net.minecraft.client.renderer.texture.HttpTexture;
+import net.minecraft.client.resources.DefaultPlayerSkin;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.PackResources;
 import net.minecraft.server.packs.resources.FallbackResourceManager;
@@ -15,6 +19,7 @@
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.function.Function;
 import java.util.function.UnaryOperator;
 
 public class OutOfJarResourceLocation extends ResourceLocation
@@ -44,6 +49,32 @@ public static OutOfJarResourceLocation ofMinecraftFolder(final String namespace,
         return of(namespace, path);
     }
 
+    /**
+     * @param minecraft       minecraft instance
+     * @param gameProfile     player profile
+     * @param textureSelector null for {@code PlayerSkin#texture()}, or {@code PlayerSkin#capeTexture()} or
+     *                        {@code PlayerSkin#elytraTexture()} - both cape and elytry may return null future
+     */
+    public static ResourceLocation ofMinecraftSkin(
+        final Minecraft minecraft,
+        final GameProfile gameProfile,
+        @Nullable final Function<DefaultPlayerSkin, ResourceLocation> textureSelector)
+    {
+        final ResourceLocation skinResLoc = minecraft.getSkinManager().getInsecureSkinLocation(gameProfile);
+        if (skinResLoc == null)
+        {
+            return null;
+        }
+
+        final AbstractTexture texture = minecraft.getTextureManager().getTexture(skinResLoc);
+        if (!(texture instanceof final HttpTexture httpTexture))
+        {
+            return skinResLoc;
+        }
+
+        return new OutOfJarResourceLocation(skinResLoc.getNamespace(), httpTexture.file.toPath(), skinResLoc.getPath());
+    }
+
     public Path getNioPath()
     {
         return nioPath;

src/main/resources/META-INF/accesstransformer.cfg

@@ -17,3 +17,4 @@ public com.mojang.blaze3d.vertex.PoseStack f_85834_ # poseStack
 
 # blockstate rendering
 public net.minecraft.client.resources.model.ModelBakery f_244132_ # modelResources
+public net.minecraft.client.renderer.texture.HttpTexture f_117994_

src/main/resources/assets/blockui/gui/test.xml

@@ -49,5 +49,8 @@
         <itemicon item="minecraft:oak_stairs" size="64 64" pos="580 50"/>
         <itemicon item="minecraft:clock" properties="{_item:{time:0.5}}" size="32 32" pos="650 50"/>
         <itemicon item="minecraft:clock" size="32 32" pos="700 50"/>
+        <image id="player_skin" pos="300 300" size="128 128" source="blockui:veryuglymissingtexture"/>
+        <image id="player_cape" pos="428 300" size="128 64" source="blockui:veryuglymissingtexture"/>
+        <image id="player_elytra" pos="556 300" size="128 128" source="blockui:veryuglymissingtexture"/>
     </zoomdragview>
 </window>