This commit is contained in:
bconlon 2020-07-14 23:30:03 -07:00
parent 1c39fde6c3
commit 742edf0138
2 changed files with 32 additions and 20 deletions

View file

@ -270,6 +270,8 @@ AetherEventHandler {
@SubscribeEvent
public void onEntityAttack(AttackEntityEvent event)
{
if (event.entityPlayer.getHeldItem() != null)
{
if (event.entityPlayer.getHeldItem().getItem() == ItemsAether.flaming_sword)
{
@ -303,6 +305,7 @@ AetherEventHandler {
}
}
}
}
public boolean isGravititeTool(Item stackID) {
return stackID == ItemsAether.gravitite_shovel || stackID == ItemsAether.gravitite_axe || stackID == ItemsAether.gravitite_pickaxe;

View file

@ -36,6 +36,8 @@ public class MoaRenderer extends RenderLiving {
private static final ResourceLocation BLACK_SADDLE = Aether.locate("textures/entities/moa/black_moa_saddle.png");
private static final ResourceLocation MOS = new ResourceLocation("aether_legacy", "textures/entities/moa/mos.png");
public MoaRenderer() {
super(new MoaModel(0.0F), 1.0F);
@ -152,8 +154,15 @@ public class MoaRenderer extends RenderLiving {
}
}
if (moa.hasCustomNameTag() && "Mos".equals(moa.getCustomNameTag()) && (moa.getMoaType() == AetherMoaTypes.orange))
{
return MOS;
}
else
{
return moa.getMoaType().getTexture(moa.isSaddled(), moa.riddenByEntity != null);
}
}
private static float r(int r) {
return ((r >> 16) & 0xff) / 255F;