mirror of
https://github.com/MightyPirates/OpenComputers.git
synced 2025-09-27 15:06:41 -04:00
Merge branch 'master-MC1.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8
This commit is contained in:
commit
1c1fd6be9b
@ -1,5 +1,7 @@
|
||||
package li.cil.oc.common.item
|
||||
|
||||
import cpw.mods.fml.relauncher.Side
|
||||
import cpw.mods.fml.relauncher.SideOnly
|
||||
import li.cil.oc.Settings
|
||||
import li.cil.oc.client.renderer.item.HoverBootRenderer
|
||||
import li.cil.oc.common.item.data.HoverBootsData
|
||||
@ -48,13 +50,15 @@ class HoverBoots extends ItemArmor(ItemArmor.ArmorMaterial.DIAMOND, 0, 3) with t
|
||||
}
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
override def getArmorModel(entityLiving: EntityLivingBase, itemStack: ItemStack, armorSlot: Int): ModelBiped = {
|
||||
if (armorSlot == armorType) HoverBootRenderer
|
||||
else super.getArmorModel(entityLiving, itemStack, armorSlot)
|
||||
}
|
||||
|
||||
override def getArmorTexture(stack: ItemStack, entity: Entity, slot: Int, subType: String): String = {
|
||||
HoverBootRenderer.texture.toString
|
||||
if (entity.worldObj.isRemote) HoverBootRenderer.texture.toString
|
||||
else null
|
||||
}
|
||||
|
||||
override def getDurabilityForDisplay(stack: ItemStack): Double = {
|
||||
|
Loading…
x
Reference in New Issue
Block a user