.github/workflows/tag.yml

@@ -399,7 +399,7 @@ jobs:
           loaders: forge
           name: ${{github.ref_name}}-1.20.6 - Forge
           version-type: beta
-          files: 'versions/1.20.6-forge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
+          files: 'versions/1.20.6-forge/build/libs/!(*-@(dev|sources|javadoc)).jar'
           game-versions: 1.20.6
       - name: Publish-1.20.6-forge-Modrinth
         uses: Kir-Antipov/mc-publish@v3.3.0
@@ -408,7 +408,7 @@ jobs:
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
           loaders: forge
           name: ${{github.ref_name}}-1.20.6 - Forge
-          files: 'versions/1.20.6-forge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
+          files: 'versions/1.20.6-forge/build/libs/!(*-@(dev|sources|javadoc)).jar'
           game-versions: 1.20.6
       - name: Publish-1.20.6-neoforge-Curseforge
         uses: Kir-Antipov/mc-publish@v3.3.0

gradle-compose.yml

@@ -3,7 +3,7 @@ source: "https://github.com/tr7zw/ProcessedModTemplate/tree/master"
 replacements:
   name: "3d-Skin-Layers"
   id: "skinlayers3d"
-  version: "1.6.4"
+  version: "1.6.5"
   description: "Renders the player skin layer in 3d"
   homepageUrl: "https://modrinth.com/mod/3dskinlayers"
   sourcesUrl: "https://github.com/tr7zw/3d-skin-layers"

src/main/java/dev/tr7zw/skinlayers/mixin/CustomHeadLayerMixin.java

@@ -39,7 +39,7 @@ public void render(PoseStack poseStack, MultiBufferSource multiBufferSource, int
         if (!SkinLayersModBase.config.enableSkulls)
             return;
         if (Minecraft.getInstance().player != null && livingEntity
-                .distanceToSqr(Minecraft.getInstance().player) > SkinLayersModBase.config.renderDistanceLOD
+                .distanceToSqr(Minecraft.getInstance().gameRenderer.getMainCamera().getPosition()) > SkinLayersModBase.config.renderDistanceLOD
                         * SkinLayersModBase.config.renderDistanceLOD) {
             return; // too far away
         }

src/main/java/dev/tr7zw/skinlayers/mixin/PlayerRendererMixin.java

@@ -66,8 +66,8 @@ public void setModelProperties(AbstractClientPlayer abstractClientPlayer, Callba
             this.addLayer(new CustomLayerFeatureRenderer(this));
             loaded = true;
         }
-        if (Minecraft.getInstance().player == null || Minecraft.getInstance().player
-                .distanceToSqr(abstractClientPlayer) > SkinLayersModBase.config.renderDistanceLOD
+        if (Minecraft.getInstance().player == null || abstractClientPlayer
+                .distanceToSqr(Minecraft.getInstance().gameRenderer.getMainCamera().getPosition()) > SkinLayersModBase.config.renderDistanceLOD
                         * SkinLayersModBase.config.renderDistanceLOD) {
             return;
         }

src/main/java/dev/tr7zw/skinlayers/mixin/SkullBlockEntityRendererMixin.java

@@ -27,7 +27,9 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.block.entity.SkullBlockEntity;
+import net.minecraft.world.phys.Vec3;
 // spotless:off 
 //#if MC >= 11700
 import net.minecraft.client.model.SkullModelBase;
@@ -55,11 +57,11 @@ public class SkullBlockEntityRendererMixin {
     @Inject(method = "render", at = @At("HEAD"))
     public void render(SkullBlockEntity skullBlockEntity, float f, PoseStack poseStack,
             MultiBufferSource multiBufferSource, int i, int j, CallbackInfo info) {
-        LocalPlayer player = Minecraft.getInstance().player;
+        Vec3 camera = Minecraft.getInstance().gameRenderer.getMainCamera().getPosition();
         if (!SkinLayersModBase.config.enableSkulls)
             return;
-        if (internalDistToCenterSqr(skullBlockEntity.getBlockPos(), (int) player.getX(), (int) player.getY(),
-                (int) player.getZ()) < SkinLayersModBase.config.renderDistanceLOD
+        if (internalDistToCenterSqr(skullBlockEntity.getBlockPos(), (int) camera.x(), (int) camera.y(),
+                (int) camera.z()) < SkinLayersModBase.config.renderDistanceLOD
                         * SkinLayersModBase.config.renderDistanceLOD) {
             lastSkull = (SkullSettings) skullBlockEntity;
             GameProfile gameProfile = null;
@@ -110,7 +112,7 @@ private static void renderSkull(Direction direction, float f, float g, PoseStack
     	// spotless:on
         if (skullModelBase instanceof SkullModelAccessor) {
             SkullModelAccessor accessor = (SkullModelAccessor) skullModelBase;
-            if (!renderNext) {
+            if (!renderNext || lastSkull == null) {
                 accessor.showHat(true);
                 lastSkull = null;
                 return;

src/main/java/dev/tr7zw/skinlayers/renderlayers/CustomLayerFeatureRenderer.java

@@ -75,7 +75,7 @@ public void render(PoseStack poseStack, MultiBufferSource multiBufferSource, int
         if (mc.level == null) {
             return; // in a menu or something and the model gets rendered
         }
-        if (mc.player.distanceToSqr(player) > SkinLayersModBase.config.renderDistanceLOD
+        if (player.distanceToSqr(mc.gameRenderer.getMainCamera().getPosition()) > SkinLayersModBase.config.renderDistanceLOD
                 * SkinLayersModBase.config.renderDistanceLOD)
             return;