diff --git a/src/main/java/org/saturnclient/modules/mods/mixins/LivingEntityRenderStateMixin.java b/src/main/java/org/saturnclient/modules/mods/mixins/LivingEntityRenderStateMixin.java index 24e842d..dacee20 100644 --- a/src/main/java/org/saturnclient/modules/mods/mixins/LivingEntityRenderStateMixin.java +++ b/src/main/java/org/saturnclient/modules/mods/mixins/LivingEntityRenderStateMixin.java @@ -1,6 +1,8 @@ package org.saturnclient.modules.mods.mixins; import net.minecraft.client.render.entity.state.LivingEntityRenderState; + +import org.saturnclient.modules.mods.utils.HealthRenderState; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; @@ -9,11 +11,16 @@ public class LivingEntityRenderStateMixin implements org.saturnclient.modules.mo @Unique private float saturn$health = 0f; @Unique private float saturn$maxHealth = 1f; + @Unique private HealthRenderState.EntityType saturn$entityType = HealthRenderState.EntityType.OTHER; - @Override public float saturn$getHealth() { return saturn$health; } - @Override public float saturn$getMaxHealth() { return saturn$maxHealth; } - @Override public void saturn$setHealth(float health, float maxHealth) { + public float saturn$getHealth() { return saturn$health; } + public float saturn$getMaxHealth() { return saturn$maxHealth; } + public void saturn$setHealth(float health, float maxHealth) { this.saturn$health = health; this.saturn$maxHealth = maxHealth; } + + public HealthRenderState.EntityType saturn$getEntityType() { return saturn$entityType; } + public void saturn$setEntityType(HealthRenderState.EntityType type) { this.saturn$entityType = type; } + } \ No newline at end of file diff --git a/src/main/java/org/saturnclient/modules/mods/mixins/LivingEntityRendererMixin.java b/src/main/java/org/saturnclient/modules/mods/mixins/LivingEntityRendererMixin.java index 9551d00..34e5d1f 100644 --- a/src/main/java/org/saturnclient/modules/mods/mixins/LivingEntityRendererMixin.java +++ b/src/main/java/org/saturnclient/modules/mods/mixins/LivingEntityRendererMixin.java @@ -2,8 +2,11 @@ package org.saturnclient.modules.mods.mixins; import net.minecraft.client.render.entity.LivingEntityRenderer; import net.minecraft.client.render.entity.state.LivingEntityRenderState; -import net.minecraft.entity.LivingEntity; import org.saturnclient.modules.mods.utils.HealthRenderState; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.mob.HostileEntity; +import net.minecraft.entity.passive.PassiveEntity; +import net.minecraft.entity.player.PlayerEntity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -14,8 +17,18 @@ public abstract class LivingEntityRendererMixin