lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Migrated tool enchantment checks to the EnchantmentHelper as opposed to crawling the NBT compound

Browse source
This commit is contained in:
MSourceCoded 2014-10-09 04:15:07 +08:00
parent 297567a417
commit ed7850e13d
3 changed files with 9 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java
View file

@ -27,6 +27,7 @@ import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.enchantment.EnchantmentHelper;
public class BoundAxe extends ItemAxe implements IBindable
{
@ -144,33 +145,8 @@ public class BoundAxe extends ItemAxe implements IBindable
int posX = (int)(blockVec.xCoord);
int posY = (int)(blockVec.yCoord);
int posZ = (int)(blockVec.zCoord);
boolean silkTouch = false;
int so = Enchantment.silkTouch.effectId;
int fortune = Enchantment.fortune.effectId;
int fortuneLvl = 0;
NBTTagList enchants = par1ItemStack.getEnchantmentTagList();
if (enchants != null)
{
for (int i = 0; i < enchants.tagCount(); i++)
{
if (enchants.getCompoundTagAt(i) instanceof NBTTagCompound)
{
NBTTagCompound nbt = (NBTTagCompound) enchants.getCompoundTagAt(i);
int id = nbt.getShort("id");
if (id == so)
{
silkTouch = true;
}
if (id == fortune)
{
fortuneLvl = nbt.getShort("lvl");
}
}
}
}
boolean silkTouch = EnchantmentHelper.getSilkTouchModifier(par3EntityPlayer);
int fortuneLvl = EnchantmentHelper.getFortuneModifier(par3EntityPlayer);
for (int i = -5; i <= 5; i++)
{

30
1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java
View file

@ -23,6 +23,7 @@ import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.enchantment.EnchantmentHelper;
public class BoundPickaxe extends ItemPickaxe implements IBindable
{
@ -141,33 +142,8 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable
int posX = (int)(blockVec.xCoord);
int posY = (int)(blockVec.yCoord);
int posZ = (int)(blockVec.zCoord);
boolean silkTouch = false;
int so = Enchantment.silkTouch.effectId;
int fortune = Enchantment.fortune.effectId;
int fortuneLvl = 0;
NBTTagList enchants = par1ItemStack.getEnchantmentTagList();
if (enchants != null)
{
for (int i = 0; i < enchants.tagCount(); i++)
{
if (enchants.getCompoundTagAt(i) instanceof NBTTagCompound)
{
NBTTagCompound nbt = (NBTTagCompound) enchants.getCompoundTagAt(i);
int id = nbt.getShort("id");
if (id == so)
{
silkTouch = true;
}
if (id == fortune)
{
fortuneLvl = nbt.getShort("lvl");
}
}
}
}
boolean silkTouch = EnchantmentHelper.getSilkTouchModifier(par3EntityPlayer);
int fortuneLvl = EnchantmentHelper.getFortuneModifier(par3EntityPlayer);
for (int i = -5; i <= 5; i++)
{

30
1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java
View file

@ -23,6 +23,7 @@ import net.minecraftforge.common.ForgeHooks;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
import net.minecraft.enchantment.EnchantmentHelper;
import com.google.common.collect.Multimap;
@ -145,33 +146,8 @@ public class BoundShovel extends ItemSpade implements IBindable
int posX = (int)(blockVec.xCoord);
int posY = (int)(blockVec.yCoord);
int posZ = (int)(blockVec.zCoord);
boolean silkTouch = false;
int so = Enchantment.silkTouch.effectId;
int fortune = Enchantment.fortune.effectId;
int fortuneLvl = 0;
NBTTagList enchants = par1ItemStack.getEnchantmentTagList();
if (enchants != null)
{
for (int i = 0; i < enchants.tagCount(); i++)
{
if (enchants.getCompoundTagAt(i) instanceof NBTTagCompound)
{
NBTTagCompound nbt = (NBTTagCompound) enchants.getCompoundTagAt(i);
int id = nbt.getShort("id");
if (id == so)
{
silkTouch = true;
}
if (id == fortune)
{
fortuneLvl = nbt.getShort("lvl");
}
}
}
}
boolean silkTouch = EnchantmentHelper.getSilkTouchModifier(par3EntityPlayer);
int fortuneLvl = EnchantmentHelper.getFortuneModifier(par3EntityPlayer);
for (int i = -5; i <= 5; i++)
{