AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-27 23:14:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-MC1.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8

Browse Source
This commit is contained in:
Florian Nücke 2015-05-22 21:09:31 +02:00
commit 1c1fd6be9b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/li/cil/oc/common/item/HoverBoots.scala
View File

@ -1,5 +1,7 @@
package li.cil.oc.common.item 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.Settings
import li.cil.oc.client.renderer.item.HoverBootRenderer import li.cil.oc.client.renderer.item.HoverBootRenderer
import li.cil.oc.common.item.data.HoverBootsData 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 = { override def getArmorModel(entityLiving: EntityLivingBase, itemStack: ItemStack, armorSlot: Int): ModelBiped = {
if (armorSlot == armorType) HoverBootRenderer if (armorSlot == armorType) HoverBootRenderer
else super.getArmorModel(entityLiving, itemStack, armorSlot) else super.getArmorModel(entityLiving, itemStack, armorSlot)
} }
override def getArmorTexture(stack: ItemStack, entity: Entity, slot: Int, subType: String): String = { 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 = { override def getDurabilityForDisplay(stack: ItemStack): Double = {