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

Added sentient armour gem recipe. Added ability for Tartaric gems to fill other gems.

Browse source
This commit is contained in:
WayofTime 2016-01-26 07:56:17 -05:00
parent e2a007d932
commit 1242fefc30
8 changed files with 67 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java
View file

@ -189,12 +189,12 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor
{
if (this == ModItems.livingArmourChest || this == ModItems.livingArmourHelmet || this == ModItems.livingArmourBoots)
{
return "bloodmagic:models/armor/boundArmour_layer_1.png";
return "bloodmagic:models/armor/livingArmour_layer_1.png";
}
if (this == ModItems.livingArmourLegs)
{
return "bloodmagic:models/armor/boundArmour_layer_2.png";
return "bloodmagic:models/armor/livingArmour_layer_2.png";
} else
{
return null;

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

@ -1,7 +1,9 @@
package WayofTime.bloodmagic.item.armour;
import java.util.List;
import java.util.Map;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
@ -260,6 +262,8 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor
}
omegaTag.setTag("armour", tag);
Map<Integer, Integer> enchantmentMap = EnchantmentHelper.getEnchantments(previousArmour);
EnchantmentHelper.setEnchantments(enchantmentMap, newArmour);
}
public ItemStack getContainedArmourStack(ItemStack newArmour)