PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-02-13 16:24:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed crash when ancountering a guardian wearing armour

Browse source
This commit is contained in:
Sollace 2019-11-30 17:19:16 +02:00
parent 2aafc214ac
commit 7f0163d47d
4 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/com/minelittlepony/client/model/ClientPonyModel.java
View file

@ -39,6 +39,11 @@ public abstract class ClientPonyModel<T extends LivingEntity> extends MsonPlayer
attributes.updateLivingState(entity, pony, mode); attributes.updateLivingState(entity, pony, mode);
} }
@Override
public void copyAttributes(BipedEntityModel<T> other) {
setAttributes(other);
}
@Override @Override
public ModelAttributes<?> getAttributes() { public ModelAttributes<?> getAttributes() {
return attributes; return attributes;

6
src/main/java/com/minelittlepony/client/model/IPonyMixinModel.java
View file

@ -1,6 +1,7 @@
package com.minelittlepony.client.model; package com.minelittlepony.client.model;
import net.minecraft.client.model.ModelPart; import net.minecraft.client.model.ModelPart;
import net.minecraft.client.render.entity.model.BipedEntityModel;
import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.entity.LivingEntity; import net.minecraft.entity.LivingEntity;
import net.minecraft.util.Arm; import net.minecraft.util.Arm;
@ -33,6 +34,11 @@ public interface IPonyMixinModel<T extends LivingEntity, M extends IPonyModel<T>
mixin().updateLivingState(entity, pony, mode); mixin().updateLivingState(entity, pony, mode);
} }
@Override
default void copyAttributes(BipedEntityModel<T> other) {
mixin().copyAttributes(other);
}
@Override @Override
default void transform(BodyPart part, MatrixStack stack) { default void transform(BodyPart part, MatrixStack stack) {
mixin().transform(part, stack); mixin().transform(part, stack);

3
src/main/java/com/minelittlepony/client/model/IPonyModel.java
View file

@ -1,6 +1,7 @@
package com.minelittlepony.client.model; package com.minelittlepony.client.model;
import net.minecraft.client.model.ModelPart; import net.minecraft.client.model.ModelPart;
import net.minecraft.client.render.entity.model.BipedEntityModel;
import net.minecraft.entity.LivingEntity; import net.minecraft.entity.LivingEntity;
import com.minelittlepony.client.render.EquineRenderManager; import com.minelittlepony.client.render.EquineRenderManager;
@ -13,6 +14,8 @@ import com.minelittlepony.pony.IPony;
public interface IPonyModel<T extends LivingEntity> extends PonyModelConstants, IModel, ICapitated<ModelPart>, ICompartmented<ModelPart>, MsonModel { public interface IPonyModel<T extends LivingEntity> extends PonyModelConstants, IModel, ICapitated<ModelPart>, ICompartmented<ModelPart>, MsonModel {
void copyAttributes(BipedEntityModel<T> other);
void updateLivingState(T entity, IPony pony, EquineRenderManager.Mode mode); void updateLivingState(T entity, IPony pony, EquineRenderManager.Mode mode);
@Override @Override

2
src/main/java/com/minelittlepony/client/render/entity/feature/ArmourFeature.java
View file

@ -58,7 +58,7 @@ public class ArmourFeature<T extends LivingEntity, M extends EntityModel<T> & IP
V armour = ArmourFeature.getArmorModel(entity, itemstack, armorSlot, layer, pony.<V>getArmor().getArmorForLayer(layer)); V armour = ArmourFeature.getArmorModel(entity, itemstack, armorSlot, layer, pony.<V>getArmor().getArmorForLayer(layer));
if (armour.prepareToRender(armorSlot, layer)) { if (armour.prepareToRender(armorSlot, layer)) {
((BipedEntityModel<T>)pony.getBody()).setAttributes(armour); pony.getBody().copyAttributes(armour);
armour.setAngles(entity, limbAngle, limbDistance, age, headYaw, headPitch); armour.setAngles(entity, limbAngle, limbDistance, age, headYaw, headPitch);
armour.synchroniseLegs(pony.getBody()); armour.synchroniseLegs(pony.getBody());