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

Fixed sentient armour gem.

Browse source
This commit is contained in:
WayofTime 2016-03-19 10:24:37 -04:00
parent b86f7c24ed
commit 647046fd22
1 changed files with 18 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java
View file

@ -1,14 +1,9 @@
package WayofTime.bloodmagic.item.armour; package WayofTime.bloodmagic.item.armour;
import WayofTime.bloodmagic.BloodMagic; import java.util.Map;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler;
import WayofTime.bloodmagic.api.util.helper.NBTHelper;
import WayofTime.bloodmagic.registry.ModItems;
import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.inventory.EntityEquipmentSlot;
@ -16,13 +11,13 @@ import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.DamageSource; import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import net.minecraftforge.common.ISpecialArmor; import net.minecraftforge.common.ISpecialArmor;
import net.minecraftforge.fml.relauncher.Side; import WayofTime.bloodmagic.BloodMagic;
import net.minecraftforge.fml.relauncher.SideOnly; import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
import java.util.List; import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler;
import java.util.Map; import WayofTime.bloodmagic.api.util.helper.NBTHelper;
import WayofTime.bloodmagic.registry.ModItems;
public class ItemSentientArmour extends ItemArmor implements ISpecialArmor public class ItemSentientArmour extends ItemArmor implements ISpecialArmor
{ {
@ -203,7 +198,8 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor
public void revertArmour(EntityPlayer player, ItemStack itemStack) public void revertArmour(EntityPlayer player, ItemStack itemStack)
{ {
ItemStack stack = this.getContainedArmourStack(itemStack); ItemStack stack = this.getContainedArmourStack(itemStack);
player.inventory.armorInventory[3 - armorType.getIndex()] = stack; player.setItemStackToSlot(armorType, stack);
// player.inventory.armorInventory[3 - armorType.getIndex()] = stack;
} }
public static void revertAllArmour(EntityPlayer player) public static void revertAllArmour(EntityPlayer player)
@ -256,12 +252,10 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor
public static boolean convertPlayerArmour(EntityPlayer player, double recurringCost, double protection) public static boolean convertPlayerArmour(EntityPlayer player, double recurringCost, double protection)
{ {
ItemStack[] armours = player.inventory.armorInventory; ItemStack helmetStack = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD);
ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST);
ItemStack helmetStack = armours[3]; ItemStack leggingsStack = player.getItemStackFromSlot(EntityEquipmentSlot.LEGS);
ItemStack chestStack = armours[2]; ItemStack bootsStack = player.getItemStackFromSlot(EntityEquipmentSlot.FEET);
ItemStack leggingsStack = armours[1];
ItemStack bootsStack = armours[0];
{ {
ItemStack omegaHelmetStack = ((ItemSentientArmour) ModItems.sentientArmourHelmet).getSubstituteStack(helmetStack, recurringCost, protection); ItemStack omegaHelmetStack = ((ItemSentientArmour) ModItems.sentientArmourHelmet).getSubstituteStack(helmetStack, recurringCost, protection);
@ -269,10 +263,10 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor
ItemStack omegaLeggingsStack = ((ItemSentientArmour) ModItems.sentientArmourLegs).getSubstituteStack(leggingsStack, recurringCost, protection); ItemStack omegaLeggingsStack = ((ItemSentientArmour) ModItems.sentientArmourLegs).getSubstituteStack(leggingsStack, recurringCost, protection);
ItemStack omegaBootsStack = ((ItemSentientArmour) ModItems.sentientArmourBoots).getSubstituteStack(bootsStack, recurringCost, protection); ItemStack omegaBootsStack = ((ItemSentientArmour) ModItems.sentientArmourBoots).getSubstituteStack(bootsStack, recurringCost, protection);
armours[3] = omegaHelmetStack; player.setItemStackToSlot(EntityEquipmentSlot.HEAD, omegaHelmetStack);
armours[2] = omegaChestStack; player.setItemStackToSlot(EntityEquipmentSlot.CHEST, omegaChestStack);
armours[1] = omegaLeggingsStack; player.setItemStackToSlot(EntityEquipmentSlot.LEGS, omegaLeggingsStack);
armours[0] = omegaBootsStack; player.setItemStackToSlot(EntityEquipmentSlot.FEET, omegaBootsStack);
return true; return true;
} }