Chieri/Firmament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Port head models to 1.21.5

Browse Source
This commit is contained in:
Linnea Gräf
2025-05-01 14:18:56 +02:00
parent 6a165b702a
commit 443520c114
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/texturePacks/java/moe/nea/firmament/features/texturepack/HeadModelChooser.kt
View File

@@ -11,8 +11,8 @@ import net.minecraft.client.render.item.model.ItemModelTypes
import net.minecraft.client.render.model.ResolvableModel import net.minecraft.client.render.model.ResolvableModel
import net.minecraft.client.world.ClientWorld import net.minecraft.client.world.ClientWorld
import net.minecraft.entity.LivingEntity import net.minecraft.entity.LivingEntity
import net.minecraft.item.ItemDisplayContext
import net.minecraft.item.ItemStack import net.minecraft.item.ItemStack
import net.minecraft.item.ModelTransformationMode
import net.minecraft.util.Identifier import net.minecraft.util.Identifier
object HeadModelChooser { object HeadModelChooser {
@@ -32,7 +32,7 @@ object HeadModelChooser {
state: ItemRenderState, state: ItemRenderState,
stack: ItemStack?, stack: ItemStack?,
resolver: ItemModelManager?, resolver: ItemModelManager?,
transformationMode: ModelTransformationMode?, displayContext: ItemDisplayContext,
world: ClientWorld?, world: ClientWorld?,
user: LivingEntity?, user: LivingEntity?,
seed: Int seed: Int
@@ -44,7 +44,7 @@ object HeadModelChooser {
} else { } else {
regular regular
} }
instance.update(state, stack, resolver, transformationMode, world, user, seed) instance.update(state, stack, resolver, displayContext, world, user, seed)
} }
} }

4
src/texturePacks/java/moe/nea/firmament/mixins/custommodels/ReplaceHeadModel.java
View File

@@ -8,7 +8,7 @@ import net.minecraft.client.render.entity.state.LivingEntityRenderState;
import net.minecraft.client.render.item.ItemRenderState; import net.minecraft.client.render.item.ItemRenderState;
import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.EquipmentSlot;
import net.minecraft.entity.LivingEntity; 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.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; 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); HeadModelChooser.INSTANCE.getIS_CHOOSING_HEAD_MODEL().set(true);
tempRenderState.clear(); 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); HeadModelChooser.INSTANCE.getIS_CHOOSING_HEAD_MODEL().set(false);
if (HeadModelChooser.HasExplicitHeadModelMarker.cast(tempRenderState) if (HeadModelChooser.HasExplicitHeadModelMarker.cast(tempRenderState)