diff --git a/src/net/bdew/lib/covers/BlockCoverable.scala b/src/net/bdew/lib/covers/BlockCoverable.scala index a1bd365..d8efeac 100644 --- a/src/net/bdew/lib/covers/BlockCoverable.scala +++ b/src/net/bdew/lib/covers/BlockCoverable.scala @@ -9,14 +9,20 @@ package net.bdew.lib.covers +import cpw.mods.fml.relauncher.{Side, SideOnly} import net.bdew.lib.Misc import net.bdew.lib.block.HasTE import net.bdew.lib.items.ItemUtils import net.minecraft.block.Block import net.minecraft.entity.player.EntityPlayer +import net.minecraft.util.IIcon import net.minecraft.world.{IBlockAccess, World} +import net.minecraftforge.common.util.ForgeDirection trait BlockCoverable[T <: TileCoverable] extends HasTE[T] { + @SideOnly(Side.CLIENT) + override def getRenderType = CoverRenderer.id + override def onBlockActivated(world: World, x: Int, y: Int, z: Int, player: EntityPlayer, face: Int, xoffs: Float, yoffs: Float, zoffs: Float): Boolean = { val te = getTE(world, x, y, z) val side = Misc.forgeDirection(face) @@ -53,12 +59,12 @@ trait BlockCoverable[T <: TileCoverable] extends HasTE[T] { super.onBlockActivated(world, x, y, z, player, face, xoffs, yoffs, zoffs) } - override def getIcon(w: IBlockAccess, x: Int, y: Int, z: Int, side: Int) = - (for { - coverStack <- Option(getTE(w, x, y, z).covers(Misc.forgeDirection(side)).cval) - coverItem <- Option(coverStack.getItem) flatMap (Misc.asInstanceOpt(_, classOf[ItemCover])) + def getCoverIcon(w: IBlockAccess, x: Int, y: Int, z: Int, side: ForgeDirection): Option[IIcon] = + for { + coverStack <- Option(getTE(w, x, y, z).covers(side).cval) + coverItemMaybe <- Option(coverStack.getItem) + coverItem <- Misc.asInstanceOpt(coverItemMaybe, classOf[ItemCover]) } yield coverItem.getCoverIcon(coverStack) - ) getOrElse super.getIcon(w, x, y, z, side) override def breakBlock(world: World, x: Int, y: Int, z: Int, block: Block, meta: Int) { if (!world.isRemote) diff --git a/src/net/bdew/lib/covers/CoverRenderer.scala b/src/net/bdew/lib/covers/CoverRenderer.scala new file mode 100644 index 0000000..4b4f3c6 --- /dev/null +++ b/src/net/bdew/lib/covers/CoverRenderer.scala @@ -0,0 +1,34 @@ +/* + * Copyright (c) bdew, 2013 - 2014 + * https://github.com/bdew/bdlib + * + * This mod is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://bdew.net/minecraft-mod-public-license/ + */ + +package net.bdew.lib.covers + +import net.bdew.lib.Misc +import net.bdew.lib.render.connected.ConnectedHelper +import net.bdew.lib.render.{BaseBlockRenderHandler, RenderUtils} +import net.minecraft.block.Block +import net.minecraft.client.renderer.RenderBlocks +import net.minecraft.world.IBlockAccess +import net.minecraftforge.common.util.ForgeDirection + +object CoverRenderer extends BaseBlockRenderHandler { + override def renderInventoryBlock(block: Block, metadata: Int, modelId: Int, renderer: RenderBlocks) = + RenderUtils.renderSimpleBlockItem(block, metadata, renderer) + + override def renderWorldBlock(world: IBlockAccess, x: Int, y: Int, z: Int, block: Block, modelId: Int, renderer: RenderBlocks) = { + renderer.renderStandardBlock(block, x, y, z) + for { + blockCov <- Misc.asInstanceOpt(block, classOf[BlockCoverable[_]]) + face <- ForgeDirection.VALID_DIRECTIONS + icon <- blockCov.getCoverIcon(world, x, y, z, face) + if block.shouldSideBeRendered(world, x + face.offsetX, y + face.offsetY, z + face.offsetZ, face.ordinal()) + } ConnectedHelper.draw(face, 8).doDraw(ConnectedHelper.Vec3F(x, y, z), icon) + true + } +}