From be31795ddf036964fd5bd319e74205162c01bafe Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Fri, 17 Apr 2015 11:55:07 +0100 Subject: [PATCH] Null check if an item has an icon before rendering it above a corporea spark. Closes #761 --- .../render/entity/RenderCorporeaSpark.java | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java index f0a659193..db639df51 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -71,27 +71,29 @@ public class RenderCorporeaSpark extends RenderSparkBase { Minecraft.getMinecraft().renderEngine.bindTexture(block ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture); IIcon icon = block ? Block.getBlockFromItem(item).getBlockTextureFromSide(ForgeDirection.UP.ordinal()) : item.getIcon(stack, 0); - float minU = icon.getMinU(); - float maxU = icon.getMaxU(); - float minV = icon.getMinV(); - float maxV = icon.getMaxV(); + if(icon != null) { + float minU = icon.getMinU(); + float maxU = icon.getMaxU(); + float minV = icon.getMinV(); + float maxV = icon.getMaxV(); - int pieces = 8; - float stepU = (maxU - minU) / pieces; - float stepV = (maxV - minV) / pieces; - float gap = 1F + (time > 0 ? 10F - absTime : absTime) * 0.2F; - int shift = pieces / 2; + int pieces = 8; + float stepU = (maxU - minU) / pieces; + float stepV = (maxV - minV) / pieces; + float gap = 1F + (time > 0 ? 10F - absTime : absTime) * 0.2F; + int shift = pieces / 2; - float scale = 1F / pieces * 3F; - GL11.glScalef(scale, scale, 1F); - for(int i = -shift; i < shift; i++) { - GL11.glTranslated(gap * i, 0F, 0F); - for(int j = -shift; j < shift; j++) { - GL11.glTranslated(0F, gap * j, 0F); - ItemRenderer.renderItemIn2D(Tessellator.instance, minU + stepU * (i + shift), minV + stepV * (j + shift + 1), minU + stepU * (i + shift + 1), minV + stepV * (j + shift), icon.getIconWidth() / pieces, icon.getIconHeight() / pieces, 1F / 8F); - GL11.glTranslated(0F, -gap * j, 0F); + float scale = 1F / pieces * 3F; + GL11.glScalef(scale, scale, 1F); + for(int i = -shift; i < shift; i++) { + GL11.glTranslated(gap * i, 0F, 0F); + for(int j = -shift; j < shift; j++) { + GL11.glTranslated(0F, gap * j, 0F); + ItemRenderer.renderItemIn2D(Tessellator.instance, minU + stepU * (i + shift), minV + stepV * (j + shift + 1), minU + stepU * (i + shift + 1), minV + stepV * (j + shift), icon.getIconWidth() / pieces, icon.getIconHeight() / pieces, 1F / 8F); + GL11.glTranslated(0F, -gap * j, 0F); + } + GL11.glTranslated(-gap * i, 0F, 0F); } - GL11.glTranslated(-gap * i, 0F, 0F); } GL11.glDisable(GL11.GL_BLEND);