Anvilcraft/aether-legacy
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Mos.

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/main/java/com/legacy/aether/AetherEventHandler.java
View file

@ -271,33 +271,36 @@ AetherEventHandler {
@SubscribeEvent
public void onEntityAttack(AttackEntityEvent event)
{
if (event.entityPlayer.getHeldItem().getItem() == ItemsAether.flaming_sword)
if (event.entityPlayer.getHeldItem() != null)
{
if (event.target.canAttackWithItem())
if (event.entityPlayer.getHeldItem().getItem() == ItemsAether.flaming_sword)
{
if (!event.target.hitByEntity(event.entityPlayer))
if (event.target.canAttackWithItem())
{
if (event.target instanceof EntityLivingBase)
if (!event.target.hitByEntity(event.entityPlayer))
{
event.target.setFire(30);
if (event.target instanceof EntityLivingBase)
{
event.target.setFire(30);
}
}
}
}
}
else if (event.entityPlayer.getHeldItem().getItem() == ItemsAether.pig_slayer)
{
String s = EntityList.getEntityString((Entity) event.target);
else if (event.entityPlayer.getHeldItem().getItem() == ItemsAether.pig_slayer)
{
String s = EntityList.getEntityString((Entity) event.target);
if (s != null && (s.toLowerCase().contains("pig") || s.toLowerCase().contains("phyg") || s.toLowerCase().contains("taegore") || event.target.getUniqueID().toString().equals("1d680bb6-2a9a-4f25-bf2f-a1af74361d69"))) {
if (event.target.worldObj.isRemote)
{
for (int j = 0; j < 20; j++) {
Random itemRand = new Random();
double d = itemRand.nextGaussian() * 0.02D;
double d1 = itemRand.nextGaussian() * 0.02D;
double d2 = itemRand.nextGaussian() * 0.02D;
double d3 = 5D;
event.target.worldObj.spawnParticle("flame", (event.target.posX + (double) (itemRand.nextFloat() * event.target.width * 2.0F)) - (double) event.target.width - d * d3, (event.target.posY + (double) (itemRand.nextFloat() * event.target.height)) - d1 * d3, (event.target.posZ + (double) (itemRand.nextFloat() * event.target.width * 2.0F)) - (double) event.target.width - d2 * d3, d, d1, d2);
if (s != null && (s.toLowerCase().contains("pig") || s.toLowerCase().contains("phyg") || s.toLowerCase().contains("taegore") || event.target.getUniqueID().toString().equals("1d680bb6-2a9a-4f25-bf2f-a1af74361d69"))) {
if (event.target.worldObj.isRemote)
{
for (int j = 0; j < 20; j++) {
Random itemRand = new Random();
double d = itemRand.nextGaussian() * 0.02D;
double d1 = itemRand.nextGaussian() * 0.02D;
double d2 = itemRand.nextGaussian() * 0.02D;
double d3 = 5D;
event.target.worldObj.spawnParticle("flame", (event.target.posX + (double) (itemRand.nextFloat() * event.target.width * 2.0F)) - (double) event.target.width - d * d3, (event.target.posY + (double) (itemRand.nextFloat() * event.target.height)) - d1 * d3, (event.target.posZ + (double) (itemRand.nextFloat() * event.target.width * 2.0F)) - (double) event.target.width - d2 * d3, d, d1, d2);
}
}
}
}

11
src/main/java/com/legacy/aether/client/renders/entity/MoaRenderer.java
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,7 +154,14 @@ public class MoaRenderer extends RenderLiving {
}
}
return moa.getMoaType().getTexture(moa.isSaddled(), moa.riddenByEntity != null);
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) {