Post-merge fixups

In particular, act as if a spellbook has been discovered during tooltip
generation if player is null. This allows JEI to index all the spell
names.
This commit is contained in:
Philipp Rustemeier
2018-03-16 17:40:50 +01:00
parent 873b5a4f4d
commit ea11910af2
9 changed files with 25 additions and 26 deletions
@@ -82,9 +82,9 @@ public class ItemSpectralArmour extends ItemArmor implements IConjuredItem {
@Override
public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type){
if(slot == EntityEquipmentSlot.LEGS) return "wizardry:textures/armour/spectral_armour_legs.png";
if(slot == EntityEquipmentSlot.LEGS) return "ebwizardry:textures/armour/spectral_armour_legs.png";
return "wizardry:textures/armour/spectral_armour.png";
return "ebwizardry:textures/armour/spectral_armour.png";
}
@Override