mirror of
https://github.com/Sollace/Unicopia.git
synced 2025-03-17 00:40:01 +01:00
Jars will now use the correct damage and enchantment modifiers of their contained item the striking and entity
This commit is contained in:
parent
4b40325aaf
commit
171aa3b744
1 changed files with 75 additions and 2 deletions
|
@ -5,13 +5,22 @@ import com.minelittlepony.unicopia.projectile.MagicProjectileEntity;
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.Blocks;
|
import net.minecraft.block.Blocks;
|
||||||
|
import net.minecraft.enchantment.EnchantmentHelper;
|
||||||
|
import net.minecraft.enchantment.Enchantments;
|
||||||
|
import net.minecraft.entity.Entity;
|
||||||
|
import net.minecraft.entity.EntityGroup;
|
||||||
import net.minecraft.entity.EquipmentSlot;
|
import net.minecraft.entity.EquipmentSlot;
|
||||||
|
import net.minecraft.entity.LivingEntity;
|
||||||
import net.minecraft.entity.attribute.EntityAttributeInstance;
|
import net.minecraft.entity.attribute.EntityAttributeInstance;
|
||||||
import net.minecraft.entity.attribute.EntityAttributes;
|
import net.minecraft.entity.attribute.EntityAttributes;
|
||||||
|
import net.minecraft.entity.damage.DamageSource;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.particle.ParticleTypes;
|
||||||
|
import net.minecraft.server.world.ServerWorld;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
import net.minecraft.text.TranslatableText;
|
import net.minecraft.text.TranslatableText;
|
||||||
import net.minecraft.util.ActionResult;
|
import net.minecraft.util.ActionResult;
|
||||||
|
import net.minecraft.util.math.MathHelper;
|
||||||
import net.minecraft.world.WorldEvents;
|
import net.minecraft.world.WorldEvents;
|
||||||
|
|
||||||
public class FilledJarItem extends JarItem implements ChameleonItem {
|
public class FilledJarItem extends JarItem implements ChameleonItem {
|
||||||
|
@ -37,7 +46,34 @@ public class FilledJarItem extends JarItem implements ChameleonItem {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected float getProjectileDamage(ItemStack stack) {
|
protected float getProjectileDamage(ItemStack stack) {
|
||||||
stack = getAppearanceStack(stack);
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onImpact(MagicProjectileEntity projectile, Entity entity) {
|
||||||
|
super.onImpact(projectile, entity);
|
||||||
|
|
||||||
|
if (!entity.isAttackable()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
ItemStack stack = getAppearanceStack(projectile.getStack());
|
||||||
|
|
||||||
|
boolean onFire = false;
|
||||||
|
|
||||||
|
float prevHealth = 0.0F;
|
||||||
|
int fire = EnchantmentHelper.getLevel(Enchantments.FIRE_ASPECT, stack);
|
||||||
|
|
||||||
|
if (entity instanceof LivingEntity) {
|
||||||
|
prevHealth = ((LivingEntity)entity).getHealth();
|
||||||
|
|
||||||
|
if (fire > 0 && !entity.isOnFire()) {
|
||||||
|
onFire = true;
|
||||||
|
entity.setOnFireFor(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
float damage = EnchantmentHelper.getAttackDamage(stack, entity instanceof LivingEntity ? ((LivingEntity)entity).getGroup() : EntityGroup.DEFAULT);
|
||||||
|
|
||||||
EntityAttributeInstance instance = new EntityAttributeInstance(EntityAttributes.GENERIC_ATTACK_DAMAGE, i -> {});
|
EntityAttributeInstance instance = new EntityAttributeInstance(EntityAttributes.GENERIC_ATTACK_DAMAGE, i -> {});
|
||||||
|
|
||||||
|
@ -45,13 +81,50 @@ public class FilledJarItem extends JarItem implements ChameleonItem {
|
||||||
instance.addTemporaryModifier(modifier);
|
instance.addTemporaryModifier(modifier);
|
||||||
});
|
});
|
||||||
|
|
||||||
return (float)instance.getValue();
|
damage += instance.getValue();
|
||||||
|
|
||||||
|
if (entity.damage(DamageSource.thrownProjectile(projectile, projectile.getOwner()), damage)) {
|
||||||
|
|
||||||
|
int knockback = EnchantmentHelper.getLevel(Enchantments.KNOCKBACK, stack);
|
||||||
|
|
||||||
|
final float toRadians = (float)Math.PI / 180F;
|
||||||
|
|
||||||
|
if (entity instanceof LivingEntity) {
|
||||||
|
((LivingEntity)entity).takeKnockback(
|
||||||
|
knockback / 2F,
|
||||||
|
MathHelper.sin(projectile.getYaw() * toRadians),
|
||||||
|
-MathHelper.cos(projectile.getYaw() * toRadians)
|
||||||
|
);
|
||||||
|
|
||||||
|
if (fire > 0) {
|
||||||
|
entity.setOnFireFor(fire * 4);
|
||||||
|
}
|
||||||
|
|
||||||
|
float healthDiff = prevHealth - ((LivingEntity)entity).getHealth();
|
||||||
|
|
||||||
|
if (projectile.world instanceof ServerWorld && healthDiff > 2) {
|
||||||
|
((ServerWorld)projectile.world).spawnParticles(ParticleTypes.DAMAGE_INDICATOR, entity.getX(), entity.getBodyY(0.5D), entity.getZ(), (int)(healthDiff / 2F), 0.1, 0, 0.1, 0.2);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
entity.addVelocity(
|
||||||
|
-MathHelper.sin(projectile.getYaw() * toRadians) * knockback / 2F, 0.1D,
|
||||||
|
MathHelper.cos(projectile.getYaw() * toRadians) * knockback / 2F
|
||||||
|
);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (onFire) {
|
||||||
|
entity.setOnFire(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onImpact(MagicProjectileEntity projectile) {
|
protected void onImpact(MagicProjectileEntity projectile) {
|
||||||
ItemStack stack = getAppearanceStack(projectile.getStack());
|
ItemStack stack = getAppearanceStack(projectile.getStack());
|
||||||
stack.damage(1, projectile.world.random, null);
|
stack.damage(1, projectile.world.random, null);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
projectile.dropStack(stack);
|
projectile.dropStack(stack);
|
||||||
projectile.world.syncWorldEvent(WorldEvents.BLOCK_BROKEN, projectile.getBlockPos(), Block.getRawIdFromState(Blocks.GLASS.getDefaultState()));
|
projectile.world.syncWorldEvent(WorldEvents.BLOCK_BROKEN, projectile.getBlockPos(), Block.getRawIdFromState(Blocks.GLASS.getDefaultState()));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue