mirror of
https://github.com/GTNewHorizons/ForgeMultipart.git
synced 2026-11-22 05:02:32 +00:00
Handle blocks with null icons with missingno texture. Support for mods that replace block instances.
This commit is contained in:
1 parent
bb55c8a5c6
commit
bc993a5643
2 files changed
+14
-2
No files matched your search
@@ -22,6 +22,8 @@ import codechicken.lib.render.CCRenderState
|
||||
import codechicken.lib.vec.Rotation
|
||||
import net.minecraft.tileentity.TileEntity
|
||||
import net.minecraftforge.common.MinecraftForge
|
||||
import net.minecraft.client.renderer.RenderBlocks
|
||||
import codechicken.microblock.handler.MicroblockProxy
|
||||
|
||||
class BlockMicroMaterial(val block:Block, val meta:Int = 0) extends IMicroMaterial
|
||||
{
|
||||
@@ -31,9 +33,16 @@ class BlockMicroMaterial(val block:Block, val meta:Int = 0) extends IMicroMateri
|
||||
@SideOnly(Side.CLIENT)
|
||||
override def loadIcons()
|
||||
{
|
||||
var iblock = Block.blocksList(block.blockID)//Reacquire the block instance incase a mod replaced it.
|
||||
val icons = new Array[Icon](6)
|
||||
for(i <- 0 until 6)
|
||||
icons(i) = block.getIcon(i, meta)
|
||||
|
||||
if(iblock == null)
|
||||
for(i <- 0 until 6)
|
||||
icons(i) = MicroblockProxy.renderBlocks.getBlockIcon(null)
|
||||
else
|
||||
for(i <- 0 until 6)
|
||||
icons(i) = MicroblockProxy.renderBlocks.getIconSafe(iblock.getIcon(i, meta))
|
||||
|
||||
icont = new MultiIconTransformation(icons)
|
||||
}
|
||||
|
||||
|
||||
@@ -30,6 +30,7 @@ import codechicken.lib.lang.LangUtil
|
||||
import net.minecraft.util.ResourceLocation
|
||||
import codechicken.lib.packet.PacketCustom
|
||||
import cpw.mods.fml.common.network.NetworkRegistry
|
||||
import net.minecraft.client.renderer.RenderBlocks
|
||||
|
||||
class MicroblockProxy_serverImpl
|
||||
{
|
||||
@@ -89,6 +90,8 @@ class MicroblockProxy_serverImpl
|
||||
|
||||
class MicroblockProxy_clientImpl extends MicroblockProxy_serverImpl
|
||||
{
|
||||
val renderBlocks = new RenderBlocks
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
override def preInit()
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user