More affix work, and some other cleanups

2 files changed, 22 insertions, 8 deletions

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;
 	}
-	
 }
diff --git a/src/main/java/darkknight/jewelrycraft/affixes/HealthAffix.java b/src/main/java/darkknight/jewelrycraft/affixes/HealthAffix.java
index 56ec244..90fc1a4 100644
--- a/src/main/java/darkknight/jewelrycraft/affixes/HealthAffix.java
+++ b/src/main/java/darkknight/jewelrycraft/affixes/HealthAffix.java
@@ -23,7 +23,7 @@ public class HealthAffix extends ModifierEffect {
 
 	@Override
 	public void onJewelryUnequipped(ItemStack item, Item jewelry, EntityPlayer player) {
-		player.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(player.getMaxHealth() + health);
-		player.setHealth(player.getHealth() + health);
+		player.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(player.getMaxHealth() - health);
+		player.setHealth(player.getHealth() - health);
 	}
 }