From 6e097a5056ad343271e21109f593f7cb77e4667e Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 5 Sep 2019 20:11:13 -0400 Subject: More affix work, and some other cleanups --- .../jewelrycraft/affixes/DamageAffix.java | 26 +++++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/affixes/DamageAffix.java') diff --git a/src/main/java/darkknight/jewelrycraft/affixes/DamageAffix.java b/src/main/java/darkknight/jewelrycraft/affixes/DamageAffix.java index 30c89ae..2cbfce3 100644 --- a/src/main/java/darkknight/jewelrycraft/affixes/DamageAffix.java +++ b/src/main/java/darkknight/jewelrycraft/affixes/DamageAffix.java @@ -1,16 +1,30 @@ package darkknight.jewelrycraft.affixes; import darkknight.jewelrycraft.api.ModifierEffect; -import net.minecraft.entity.Entity; +import darkknight.jewelrycraft.item.ItemBaseJewelry; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraftforge.event.entity.living.LivingAttackEvent; +import net.minecraftforge.event.entity.living.LivingHurtEvent; public class DamageAffix extends ModifierEffect { - - public DamageAffix() { + private float befFlat; + private float affFlat; + + private float mult; + + public DamageAffix(float befFlat, float affFlat, float mult) { super(null); + + this.befFlat = befFlat; + this.affFlat = affFlat; + + this.mult = mult; + } + + @Override + public void onEntityHurt(ItemStack item, EntityPlayer player, LivingHurtEvent event, ItemBaseJewelry jewelry) { + event.ammount += befFlat; + event.ammount *= mult; + event.ammount += affFlat; } - } -- cgit v1.2.3