Fix 1.16 slim skin capes. Fix #70

tr7zw · Sep 26, 2024 · 7f70b10 · 7f70b10
1 parent 5c01d89
commit 7f70b10
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,7 +28,7 @@ jobs:
       - name: build
         run: ./gradlecw build
       - name: capture build artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Artifacts
           path: 'versions/**/build/libs/*.jar'

diff --git a/src/main/java/dev/tr7zw/waveycapes/mixin/PlayerRendererMixin.java b/src/main/java/dev/tr7zw/waveycapes/mixin/PlayerRendererMixin.java
@@ -5,14 +5,19 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+
+
 import dev.tr7zw.waveycapes.renderlayers.CustomCapeRenderLayer;
 import net.minecraft.client.model.PlayerModel;
 import net.minecraft.client.player.AbstractClientPlayer;
 import net.minecraft.client.renderer.entity.LivingEntityRenderer;
 import net.minecraft.client.renderer.entity.player.PlayerRenderer;
+
 // spotless:off
 //#if MC < 11700
 //$$import net.minecraft.client.renderer.entity.EntityRenderDispatcher;
+//$$ import com.mojang.blaze3d.vertex.PoseStack;
+//$$ import net.minecraft.client.renderer.MultiBufferSource;
 //#else
 import net.minecraft.client.renderer.entity.EntityRendererProvider.Context;
 //#endif
@@ -22,21 +27,43 @@
 public abstract class PlayerRendererMixin
         extends LivingEntityRenderer<AbstractClientPlayer, PlayerModel<AbstractClientPlayer>> {
 
+    private boolean injectedCape = false;
+
     // spotless:off
     //#if MC >= 11700
     public PlayerRendererMixin(Context context, PlayerModel<AbstractClientPlayer> entityModel, float f) {
         super(context, entityModel, f);
     }
     //#else
-    //$$public PlayerRendererMixin(EntityRenderDispatcher entityRenderDispatcher) {
-    //$$    super(entityRenderDispatcher, null, 0);
+    //$$public PlayerRendererMixin(EntityRenderDispatcher entityRenderDispatcher,
+    //$$        PlayerModel<AbstractClientPlayer> entityModel, float f) {
+    //$$    super(entityRenderDispatcher, entityModel, f);
     //$$}
     //#endif
     //spotless:on
 
     @Inject(method = "<init>*", at = @At("RETURN"))
     public void onCreate(CallbackInfo info) {
+        injectedCape = true;
+        System.out.println("Adding renderlayer " + getModel());
         addLayer(new CustomCapeRenderLayer(this));
+        System.out.println("Layers: " + layers);
     }
+
+    // Dirty 1.16 workaround for slim skins for whatever reason not working right
+    // spotless:off
+    //#if MC < 11700
+    //$$@Inject(method = "render", at = @At("HEAD"))
+    //$$public void renderLegacyWorkaround(AbstractClientPlayer abstractClientPlayer, float f, float g, PoseStack poseStack,
+    //$$        MultiBufferSource multiBufferSource, int i, CallbackInfo ci) {
+    //$$    if(!injectedCape) {
+    //$$        System.out.println("Adding renderlayer " + getModel());
+    //$$        addLayer(new CustomCapeRenderLayer(this));
+    //$$        System.out.println("Layers: " + layers);
+    //$$        injectedCape = true;
+    //$$    }
+    //$$}
+    //#endif
+    //spotless:on
 
 }