From 443520c114ab016f5e99bcf8e91c99688ba28718 Mon Sep 17 00:00:00 2001
From: Linnea Gräf <nea@nea.moe>
Date: Thu, 1 May 2025 14:18:56 +0200
Subject: fix: Port head models to 1.21.5

---
 .../java/moe/nea/firmament/features/texturepack/HeadModelChooser.kt | 6 +++---
 .../moe/nea/firmament/mixins/custommodels/ReplaceHeadModel.java     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/texturePacks/java/moe/nea/firmament/features/texturepack/HeadModelChooser.kt b/src/texturePacks/java/moe/nea/firmament/features/texturepack/HeadModelChooser.kt
index b5f2bfe..3e8cc4e 100644
--- a/src/texturePacks/java/moe/nea/firmament/features/texturepack/HeadModelChooser.kt
+++ b/src/texturePacks/java/moe/nea/firmament/features/texturepack/HeadModelChooser.kt
@@ -11,8 +11,8 @@ import net.minecraft.client.render.item.model.ItemModelTypes
 import net.minecraft.client.render.model.ResolvableModel
 import net.minecraft.client.world.ClientWorld
 import net.minecraft.entity.LivingEntity
+import net.minecraft.item.ItemDisplayContext
 import net.minecraft.item.ItemStack
-import net.minecraft.item.ModelTransformationMode
 import net.minecraft.util.Identifier
 
 object HeadModelChooser {
@@ -32,7 +32,7 @@ object HeadModelChooser {
 			state: ItemRenderState,
 			stack: ItemStack?,
 			resolver: ItemModelManager?,
-			transformationMode: ModelTransformationMode?,
+			displayContext: ItemDisplayContext,
 			world: ClientWorld?,
 			user: LivingEntity?,
 			seed: Int
@@ -44,7 +44,7 @@ object HeadModelChooser {
 				} else {
 					regular
 				}
-			instance.update(state, stack, resolver, transformationMode, world, user, seed)
+			instance.update(state, stack, resolver, displayContext, world, user, seed)
 		}
 	}
 
diff --git a/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/ReplaceHeadModel.java b/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/ReplaceHeadModel.java
index 8381227..f445f02 100644
--- a/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/ReplaceHeadModel.java
+++ b/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/ReplaceHeadModel.java
@@ -8,7 +8,7 @@ import net.minecraft.client.render.entity.state.LivingEntityRenderState;
 import net.minecraft.client.render.item.ItemRenderState;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.LivingEntity;
-import net.minecraft.item.ModelTransformationMode;
+import net.minecraft.item.ItemDisplayContext;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -37,7 +37,7 @@ public class ReplaceHeadModel<T extends LivingEntity, S extends LivingEntityRend
 
 		HeadModelChooser.INSTANCE.getIS_CHOOSING_HEAD_MODEL().set(true);
 		tempRenderState.clear();
-		this.itemModelResolver.updateForLivingEntity(tempRenderState, headItemStack, ModelTransformationMode.HEAD, false, livingEntity);
+		this.itemModelResolver.updateForLivingEntity(tempRenderState, headItemStack, ItemDisplayContext.HEAD, livingEntity);
 		HeadModelChooser.INSTANCE.getIS_CHOOSING_HEAD_MODEL().set(false);
 
 		if (HeadModelChooser.HasExplicitHeadModelMarker.cast(tempRenderState)
-- 
cgit