More affix work, and some other cleanups

3 files changed, 29 insertions, 0 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/api/Curse.java b/src/main/java/darkknight/jewelrycraft/api/Curse.java
index 6bf37ee..7f22b3e 100755
--- a/src/main/java/darkknight/jewelrycraft/api/Curse.java
+++ b/src/main/java/darkknight/jewelrycraft/api/Curse.java
@@ -15,6 +15,7 @@ import net.minecraftforge.client.event.RenderPlayerEvent;
 import net.minecraftforge.event.entity.living.LivingAttackEvent;

 import net.minecraftforge.event.entity.living.LivingDeathEvent;

 import net.minecraftforge.event.entity.living.LivingHealEvent;

+import net.minecraftforge.event.entity.living.LivingHurtEvent;

 import net.minecraftforge.event.entity.player.PlayerSleepInBedEvent;

 import net.minecraftforge.event.world.BlockEvent;

 

@@ -355,4 +356,14 @@ public abstract class Curse {
 	public void playerSleepAction(World worldObj, EntityPlayer player, PlayerSleepInBedEvent event) {

 

 	}

+

+	public void onEntityHurt(World worldObj, EntityPlayer player, LivingHurtEvent event) {

+		// TODO Auto-generated method stub

+		

+	}

+

+	public void onPlayerHurt(World worldObj, EntityPlayer player, LivingHurtEvent event) {

+		// TODO Auto-generated method stub

+		

+	}

 }

diff --git a/src/main/java/darkknight/jewelrycraft/api/IJewelryItem.java b/src/main/java/darkknight/jewelrycraft/api/IJewelryItem.java
index 34d32bf..5ee4e22 100755
--- a/src/main/java/darkknight/jewelrycraft/api/IJewelryItem.java
+++ b/src/main/java/darkknight/jewelrycraft/api/IJewelryItem.java
@@ -9,6 +9,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.DamageSource;

 import net.minecraftforge.event.entity.living.LivingAttackEvent;

 import net.minecraftforge.event.entity.living.LivingDropsEvent;

+import net.minecraftforge.event.entity.living.LivingHurtEvent;

 import net.minecraftforge.event.entity.player.PlayerEvent;

 

 /**

@@ -110,4 +111,8 @@ public interface IJewelryItem {
 	public void onJewelryUnequipped(ItemStack item);

 

 	public void onLivingDropItems(ItemStack item, EntityPlayer player, LivingDropsEvent event);

+

+	public void onPlayerHurt(ItemStack jewelryItems, EntityPlayer player, LivingHurtEvent event);

+

+	public void onEntityHurt(ItemStack jewelryItems, EntityPlayer player, LivingHurtEvent event);

 }

diff --git a/src/main/java/darkknight/jewelrycraft/api/ModifierEffect.java b/src/main/java/darkknight/jewelrycraft/api/ModifierEffect.java
index cbd740b..61358cf 100755
--- a/src/main/java/darkknight/jewelrycraft/api/ModifierEffect.java
+++ b/src/main/java/darkknight/jewelrycraft/api/ModifierEffect.java
@@ -11,6 +11,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.DamageSource;

 import net.minecraftforge.event.entity.living.LivingAttackEvent;

 import net.minecraftforge.event.entity.living.LivingDropsEvent;

+import net.minecraftforge.event.entity.living.LivingHurtEvent;

 import net.minecraftforge.event.entity.player.PlayerEvent;

 

 public class ModifierEffect {

@@ -204,4 +205,16 @@ public class ModifierEffect {
 		// TODO Auto-generated method stub

 

 	}

+

+	public void onPlayerHurt(ItemStack item, EntityPlayer player, LivingHurtEvent event,

+			ItemBaseJewelry jewelry) {

+		// TODO Auto-generated method stub

+

+	}

+

+	public void onEntityHurt(ItemStack item, EntityPlayer player, LivingHurtEvent event,

+			ItemBaseJewelry jewelry) {

+		// TODO Auto-generated method stub

+

+	}

 }