From cdbbd891c43e082a36a32e49420bf87b6edd28e0 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Wed, 4 Sep 2019 22:24:39 -0400 Subject: More affix work --- .../java/darkknight/jewelrycraft/effects/AffixMods.java | 13 ------------- .../darkknight/jewelrycraft/effects/EffectBlazePowder.java | 4 +++- .../darkknight/jewelrycraft/effects/EffectEnderEye.java | 4 ++-- .../darkknight/jewelrycraft/effects/EffectEnderPearl.java | 10 +++------- .../java/darkknight/jewelrycraft/effects/EffectFeather.java | 5 ++++- .../darkknight/jewelrycraft/effects/EffectObsidian.java | 5 ++++- 6 files changed, 16 insertions(+), 25 deletions(-) delete mode 100644 src/main/java/darkknight/jewelrycraft/effects/AffixMods.java (limited to 'src/main/java/darkknight/jewelrycraft/effects') diff --git a/src/main/java/darkknight/jewelrycraft/effects/AffixMods.java b/src/main/java/darkknight/jewelrycraft/effects/AffixMods.java deleted file mode 100644 index b9ec06a..0000000 --- a/src/main/java/darkknight/jewelrycraft/effects/AffixMods.java +++ /dev/null @@ -1,13 +0,0 @@ -package darkknight.jewelrycraft.effects; - -import darkknight.jewelrycraft.api.ModifierEffect; - -public class AffixMods { - public static ModifierEffect getPrefix(String prefix) { - return null; - } - - public static ModifierEffect getSuffix(String suffix) { - return null; - } -} \ No newline at end of file diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java b/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java index ca35754..f8ffd7a 100755 --- a/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java +++ b/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java @@ -14,6 +14,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; +import net.minecraftforge.event.entity.living.LivingAttackEvent; public class EffectBlazePowder extends ModifierEffect { public EffectBlazePowder() { @@ -51,7 +52,8 @@ public class EffectBlazePowder extends ModifierEffect { @Override public boolean onEntityAttackedCancellable(ItemStack item, EntityPlayer player, Entity target, Item jewelry, - float amount) { + LivingAttackEvent event) { + // Balanced for ring if (jewelry instanceof ItemRing && !player.isInWater() && rand.nextInt(JewelryNBT.numberOfModifiers(item)) == 0) target.setFire(2); diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java b/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java index 01c045a..4e62471 100755 --- a/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java +++ b/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java @@ -29,7 +29,7 @@ public class EffectEnderEye extends ModifierEffect { } @Override - public void onJewelryEquipped(ItemStack item, Item jewelry) { + public void onJewelryEquipped(ItemStack item, Item jewelry, EntityPlayer player) { if (jewelry instanceof ItemRing) { int viewDistance; @@ -44,7 +44,7 @@ public class EffectEnderEye extends ModifierEffect { } @Override - public void onJewelryUnequipped(ItemStack item, Item jewelry) { + public void onJewelryUnequipped(ItemStack item, Item jewelry, EntityPlayer player) { if (jewelry instanceof ItemRing) Minecraft.getMinecraft().gameSettings.setOptionFloatValue(Options.RENDER_DISTANCE, getViewDistance(item)); } diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectEnderPearl.java b/src/main/java/darkknight/jewelrycraft/effects/EffectEnderPearl.java index fca9fe0..bff370b 100755 --- a/src/main/java/darkknight/jewelrycraft/effects/EffectEnderPearl.java +++ b/src/main/java/darkknight/jewelrycraft/effects/EffectEnderPearl.java @@ -20,6 +20,7 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; +import net.minecraftforge.event.entity.living.LivingAttackEvent; public class EffectEnderPearl extends ModifierEffect { public EffectEnderPearl() { @@ -77,7 +78,8 @@ public class EffectEnderPearl extends ModifierEffect { } @Override - public void onEntityAttacked(ItemStack item, EntityPlayer player, Entity target, Item jewelry, float amount) { + public void onEntityAttacked(ItemStack item, EntityPlayer player, Entity target, Item jewelry, + LivingAttackEvent event) { if (jewelry instanceof ItemRing) { // Negative ring if (target instanceof EntityEnderman) @@ -88,10 +90,4 @@ public class EffectEnderPearl extends ModifierEffect { target.posZ + rand.nextInt(16) - rand.nextInt(16)); } } - - @Override - public boolean onEntityAttackedCancellable(ItemStack item, EntityPlayer player, Entity target, Item jewelry, - float amount) { - return false; - } } diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java b/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java index 14953e6..79d2184 100755 --- a/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java +++ b/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java @@ -23,6 +23,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.*; +import net.minecraftforge.event.entity.living.LivingAttackEvent; public class EffectFeather extends ModifierEffect { public EffectFeather() { @@ -61,7 +62,9 @@ public class EffectFeather extends ModifierEffect { @Override public boolean onEntityAttackedCancellable(ItemStack item, EntityPlayer player, Entity target, Item jewelry, - float amount) { + LivingAttackEvent event) { + float amount = event.ammount; + NBTTagCompound enemyData = target.getEntityData(); if (jewelry instanceof ItemRing && !player.worldObj.isRemote) { if (enemyData.getInteger("reAttacked") == 0) { diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java b/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java index 0d561e0..d7fcef8 100755 --- a/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java +++ b/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java @@ -18,6 +18,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; +import net.minecraftforge.event.entity.living.LivingAttackEvent; public class EffectObsidian extends ModifierEffect { public EffectObsidian() { @@ -90,7 +91,9 @@ public class EffectObsidian extends ModifierEffect { @Override public boolean onEntityAttackedCancellable(ItemStack item, EntityPlayer player, Entity target, Item jewelry, - float amount) { + LivingAttackEvent event) { + float amount = event.ammount; + NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID); NBTTagCompound enemyData = target.getEntityData(); // Positive ring -- cgit v1.2.3