PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-27 15:17:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Added functionality for cuccoons

Browse source
This commit is contained in:
Sollace 2019-03-15 14:16:56 +02:00
parent 503c1c9eea
commit d34d1ddd60
2 changed files with 66 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
src/main/java/com/minelittlepony/unicopia/entity/EntityCuccoon.java
View file

@ -7,13 +7,18 @@ import javax.annotation.Nullable;
import com.google.common.collect.Lists;
import com.minelittlepony.unicopia.Predicates;
import com.minelittlepony.unicopia.Race;
import com.minelittlepony.unicopia.init.UParticles;
import com.minelittlepony.unicopia.init.USounds;
import com.minelittlepony.unicopia.power.IPower;
import com.minelittlepony.util.MagicalDamageSource;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityXPOrb;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.init.MobEffects;
import net.minecraft.init.SoundEvents;
import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.item.ItemStack;
@ -21,12 +26,16 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.datasync.DataParameter;
import net.minecraft.network.datasync.DataSerializers;
import net.minecraft.network.datasync.EntityDataManager;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumHand;
import net.minecraft.util.EnumHandSide;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.SoundEvent;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import net.minecraftforge.event.ForgeEventFactory;
@ -124,6 +133,18 @@ public class EntityCuccoon extends EntityLivingBase implements IMagicals, IInAni
}
captiveLastSneakState = sneaking;
if (passenger instanceof EntityLivingBase) {
EntityLivingBase living = (EntityLivingBase)passenger;
if (!living.isPotionActive(MobEffects.REGENERATION) && living.getHealth() < living.getMaxHealth()) {
living.addPotionEffect(new PotionEffect(MobEffects.REGENERATION, 20, 2));
}
if (!living.isPotionActive(MobEffects.SLOWNESS) && living.getHealth() < living.getMaxHealth()) {
living.addPotionEffect(new PotionEffect(MobEffects.SLOWNESS, 2000, 4));
}
}
}
if (world.isRemote) {
@ -135,6 +156,50 @@ public class EntityCuccoon extends EntityLivingBase implements IMagicals, IInAni
}
}
@Override
public EnumActionResult applyPlayerInteraction(EntityPlayer player, Vec3d vec, EnumHand hand) {
if (hand == EnumHand.MAIN_HAND && Predicates.BUGGY.test(player)) {
if (isBeingRidden()) {
Entity passenger = getPassengers().get(0);
if (player.canEat(false) || player.getHealth() < player.getMaxHealth()) {
DamageSource d = MagicalDamageSource.causePlayerDamage("feed", player);
IPower.spawnParticles(UParticles.CHANGELING_MAGIC, this, 7);
if (passenger instanceof EntityLivingBase) {
if (player.isPotionActive(MobEffects.NAUSEA)) {
((EntityLivingBase)passenger).addPotionEffect(player.removeActivePotionEffect(MobEffects.NAUSEA));
} else if (world.rand.nextInt(2300) == 0) {
((EntityLivingBase)passenger).addPotionEffect(new PotionEffect(MobEffects.WITHER, 20, 1));
}
}
if (passenger instanceof EntityPlayer) {
if (!player.isPotionActive(MobEffects.HEALTH_BOOST)) {
player.addPotionEffect(new PotionEffect(MobEffects.HEALTH_BOOST, 13000, 1));
}
}
passenger.attackEntityFrom(d, 5);
if (player.canEat(false)) {
player.getFoodStats().addStats(5, 0);
} else {
player.heal(5);
}
return EnumActionResult.SUCCESS;
}
}
}
return super.applyPlayerInteraction(player, vec, hand);
}
public float getBreatheAmount(float stutter) {
return MathHelper.sin((ticksExisted + stutter) / 40) / 2
+ hurtTime / 10F;

2
src/main/java/com/minelittlepony/unicopia/power/PowerFeed.java
View file

@ -124,7 +124,7 @@ public class PowerFeed implements IPower<Hit> {
}
}
protected float drainFrom(EntityPlayer changeling, EntityLivingBase living) {
public float drainFrom(EntityPlayer changeling, EntityLivingBase living) {
DamageSource d = MagicalDamageSource.causePlayerDamage("feed", changeling);
float damage = living.getHealth()/2;