From 81fdaf87fa98c0c5d58a2f1cd8e42d2a920d728d Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Sat, 20 Feb 2016 17:05:34 -0500 Subject: [PATCH] Fix permanent render crashing when attempting to frame a drawer with a block that returns null IIcons --- build.gradle | 2 +- .../textures/blocks/base/base_default.png | Bin 0 -> 367 bytes .../textures/blocks/base/trim_default.png | Bin 0 -> 272 bytes .../block/BlockDrawersCustom.java | 18 ++++++++++++++++++ .../renderer/DrawersCustomRenderer.java | 7 +++++++ .../client/renderer/DrawersItemRenderer.java | 7 +++++++ 6 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 resources/assets/storagedrawers/textures/blocks/base/base_default.png create mode 100644 resources/assets/storagedrawers/textures/blocks/base/trim_default.png diff --git a/build.gradle b/build.gradle index f704878..57c7197 100644 --- a/build.gradle +++ b/build.gradle @@ -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" diff --git a/resources/assets/storagedrawers/textures/blocks/base/base_default.png b/resources/assets/storagedrawers/textures/blocks/base/base_default.png new file mode 100644 index 0000000000000000000000000000000000000000..06631a03ad5b27ac035465757abd11165dd7134a GIT binary patch literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx*Bp9q_EZ7UAbV^(!N}P*Q6H7Al^Atidb5j|D zOY;;A%@uqTD;10k3{4dbjjc@0tPCv`bPY@m4AhODhXD1lmw5WRvOi!F5w$eG{6BjM zP>8d@BeIx*f$IYZGdis?nE@1JNq6*hWMJ6X&;2Kn705s4>EaktaZ7fB;`+k|JT3b} z*NRB0oT*u|&vK_|OC6q6`kNx}EkZ0%G5LeeQXlUv2nc<}%;)#!Gk4>|YdPFa7`R zi(6maq;5ak+j&lM%Es;6nl*)X@xOoIArj}E@mWLg-jr6`xo3Ti(;mLvw_@GaeP>b} z%u_DT`TXW(Kwdp-WvY3H^>jMZgI;}C80Tg6Ocl32+VA$Bt{U?zXq$t2A#5ExyAvHBMEG(>j+Rk%8 z!5~i;$B>F!y1fS(4;XMTUF2*M*7(gY>GQi;SYTxzn~;W=v6zsxPfFh7#a6*K7X+Rx zis&eRKfQ2O^X(w(iA{5-NBqCkUF~*!{hGxl@^f?Bv()v&k8vo~F=!P4O=s|Q^>bP0 Hl+XkKputha literal 0 HcmV?d00001 diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawersCustom.java b/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawersCustom.java index 95d6987..35cc0d9 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawersCustom.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawersCustom.java @@ -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"); diff --git a/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersCustomRenderer.java b/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersCustomRenderer.java index a1698bc..732887e 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersCustomRenderer.java +++ b/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersCustomRenderer.java @@ -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) diff --git a/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersItemRenderer.java b/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersItemRenderer.java index 779f327..bfeed1e 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersItemRenderer.java +++ b/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersItemRenderer.java @@ -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); }