diff --git a/src/main/java/com/minelittlepony/client/model/ModelType.java b/src/main/java/com/minelittlepony/client/model/ModelType.java index b380e6a9..0899bde9 100644 --- a/src/main/java/com/minelittlepony/client/model/ModelType.java +++ b/src/main/java/com/minelittlepony/client/model/ModelType.java @@ -2,10 +2,10 @@ package com.minelittlepony.client.model; import net.minecraft.client.model.Model; import net.minecraft.client.model.ModelPart; -import net.minecraft.client.render.entity.model.AllayEntityModel; import net.minecraft.client.render.entity.model.ArmorStandEntityModel; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.mob.VexEntity; +import net.minecraft.entity.passive.AllayEntity; import net.minecraft.util.Identifier; import com.minelittlepony.api.model.gear.IGear; @@ -71,7 +71,7 @@ public final class ModelType { public static final ModelKey ENDERMAN = register("enderman", EnderStallionModel::new); public static final ModelKey> BREEZIE = register("breezie", BreezieModel::new); public static final ModelKey PARASPRITE = register("parasprite", ParaspriteModel::new); - public static final ModelKey ALLAY = register("allay", AllayEntityModel::new); + public static final ModelKey> ALLAY = register("allay", BreezieModel::new); public static final ModelKey> ELYTRA = register("elytra", PonyElytra::new); diff --git a/src/main/java/com/minelittlepony/client/render/entity/AllayRenderer.java b/src/main/java/com/minelittlepony/client/render/entity/AllayRenderer.java index 37cf04fc..a47c511b 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/AllayRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/entity/AllayRenderer.java @@ -2,19 +2,20 @@ package com.minelittlepony.client.render.entity; import net.minecraft.client.render.entity.*; import net.minecraft.client.render.entity.feature.HeldItemFeatureRenderer; -import net.minecraft.client.render.entity.model.AllayEntityModel; +import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.passive.AllayEntity; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import com.minelittlepony.client.model.ModelType; +import com.minelittlepony.client.model.entity.BreezieModel; -public class AllayRenderer extends MobEntityRenderer { +public class AllayRenderer extends MobEntityRenderer> { private static final Identifier TEXTURE = new Identifier("minelittlepony", "textures/entity/allay/allay_pony.png"); public AllayRenderer(EntityRendererFactory.Context context) { super(context, ModelType.ALLAY.createModel(), 0.4f); - addFeature(new HeldItemFeatureRenderer(this, context.getHeldItemRenderer())); + addFeature(new HeldItemFeatureRenderer>(this, context.getHeldItemRenderer())); } @Override @@ -22,6 +23,11 @@ public class AllayRenderer extends MobEntityRenderer