Fix firstperson arm layers in older versions. Fix #190

tr7zw · Nov 4, 2024 · 8c153a3 · 8c153a3
1 parent 0492a29
commit 8c153a3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/main/java/dev/tr7zw/skinlayers/mixin/ModelPartMixin.java b/src/main/java/dev/tr7zw/skinlayers/mixin/ModelPartMixin.java
@@ -56,7 +56,7 @@ public void render(PoseStack poseStack, VertexConsumer vertexConsumer, int light
 
     @Override
     public void setInjectedMesh(Mesh mesh, OffsetProvider offsetProvider) {
-        injectedMesh = mesh;
+        this.injectedMesh = mesh;
         this.offsetProvider = offsetProvider;
     }
 

diff --git a/src/main/java/dev/tr7zw/skinlayers/mixin/PlayerRendererMixin.java b/src/main/java/dev/tr7zw/skinlayers/mixin/PlayerRendererMixin.java
@@ -38,6 +38,7 @@
 import net.minecraft.client.renderer.entity.player.PlayerRenderer;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.entity.player.PlayerModelPart;
 import net.minecraft.world.item.ItemStack;
 
 @Mixin(PlayerRenderer.class)
@@ -50,6 +51,8 @@ public abstract class PlayerRendererMixin
 //#endif
 // spotless:on
 
+    private boolean setupFirstpersonArms = false;
+
     // spotless:off 
 	//#if MC >= 11700
     public PlayerRendererMixin(Context context, PlayerModel entityModel, float f) {
@@ -147,7 +150,8 @@ public void extractRenderState(AbstractClientPlayer abstractClientPlayer, Player
   //$$         // fall back to vanilla
   //$$         return;
   //$$     }
-  //$$     if (SkinLayersModBase.config.compatibilityMode) {
+  //$$     if (SkinLayersModBase.config.compatibilityMode || setupFirstpersonArms) {
+  //$$         setupFirstpersonArms = false;
   //$$         // Inject layers into the vanilla model
   //$$         ItemStack itemStack = abstractClientPlayer.getItemBySlot(EquipmentSlot.HEAD);
   //$$         if (SkinLayersModBase.config.enableHat && (itemStack == null
@@ -216,6 +220,7 @@ private void renderHandStart(PoseStack poseStack, MultiBufferSource multiBufferS
             // fall back to vanilla
             return;
         }
+        setupFirstpersonArms = true;
         if (arm == getModel().leftArm) {
             if (SkinLayersModBase.config.enableLeftSleeve) {
                 ((ModelPartInjector) (Object) sleeve).setInjectedMesh(settings.getLeftArmMesh(),