Fix permanent render crashing when attempting to frame a drawer with a block that returns null IIcons

This commit is contained in:
Justin Aquadro committed 2016-02-20 17:05:34 -05:00
1 parent 734888cba7
commit 81fdaf87fa
6 files changed
+33 -1

No files matched your search

+1 -1
View File
@@ -17,7 +17,7 @@ buildscript {
apply plugin: 'forge'
version = "1.7.10-1.9.1"
version = "1.7.10-1.9.2"
group= "com.jaquadro.minecraft.storagedrawers" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "StorageDrawers"
Binary file not shown.

After

Width:  |  Height:  |  Size: 367 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 272 B

@@ -30,6 +30,11 @@ public class BlockDrawersCustom extends BlockDrawers
@SideOnly(Side.CLIENT)
private IIcon overlayTrimFace;
@SideOnly(Side.CLIENT)
private IIcon defaultFace;
@SideOnly(Side.CLIENT)
private IIcon defaultTrim;
public BlockDrawersCustom (String blockName, int drawerCount, boolean halfDepth) {
super(blockName, drawerCount, halfDepth);
}
@@ -92,6 +97,16 @@ public class BlockDrawersCustom extends BlockDrawers
return overlayTrimShadow;
}
@SideOnly(Side.CLIENT)
public IIcon getDefaultFaceIcon () {
return defaultFace;
}
@SideOnly(Side.CLIENT)
public IIcon getDefaultTrimIcon () {
return defaultTrim;
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons (IIconRegister register) {
@@ -103,6 +118,9 @@ public class BlockDrawersCustom extends BlockDrawers
overlayTrimFace = register.registerIcon(StorageDrawers.MOD_ID + ":overlay/shading_boldtrim_" + drawerCount);
defaultFace = register.registerIcon(StorageDrawers.MOD_ID + ":base/base_default");
defaultTrim = register.registerIcon(StorageDrawers.MOD_ID + ":base/trim_default");
iconSide[0] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_raw_side");
iconSideV[0] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_raw_side");
iconSideH[0] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_raw_side");
@@ -38,6 +38,13 @@ public class DrawersCustomRenderer extends DrawersRenderer
IIcon panelIcon = Block.getBlockFromItem(materialSide.getItem()).getIcon(4, materialSide.getItemDamage());
IIcon frontIcon = Block.getBlockFromItem(materialFront.getItem()).getIcon(4, materialFront.getItemDamage());
if (trimIcon == null)
trimIcon = custom.getDefaultTrimIcon();
if (panelIcon == null)
panelIcon = custom.getDefaultFaceIcon();
if (frontIcon == null)
frontIcon = custom.getDefaultFaceIcon();
if (ClientProxy.renderPass == 0)
commonRender.renderBasePass(world, x, y, z, custom, tile.getDirection(), panelIcon, trimIcon, frontIcon);
else if (ClientProxy.renderPass == 1)
@@ -131,6 +131,13 @@ public class DrawersItemRenderer implements IItemRenderer
IIcon panelIcon = Block.getBlockFromItem(materialSide.getItem()).getIcon(4, materialSide.getItemDamage());
IIcon frontIcon = Block.getBlockFromItem(materialFront.getItem()).getIcon(4, materialFront.getItemDamage());
if (trimIcon == null)
trimIcon = custom.getDefaultTrimIcon();
if (panelIcon == null)
panelIcon = custom.getDefaultFaceIcon();
if (frontIcon == null)
frontIcon = custom.getDefaultFaceIcon();
commonRender.renderBasePass(null, 0, 0, 0, custom, RenderHelper.XNEG, panelIcon, trimIcon, frontIcon);
commonRender.renderOverlayPass(null, 0, 0, 0, custom, RenderHelper.XNEG, trimIcon, frontIcon);
}