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 599140677..59ac6f867 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -10,11 +10,18 @@ */ package vazkii.botania.client.render.entity; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.network.datasync.DataParameter; +import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.MiscellaneousIcons; +import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.entity.EntityCorporeaSpark; public class RenderCorporeaSpark extends RenderSparkBase { @@ -48,7 +55,6 @@ public class RenderCorporeaSpark extends RenderSparkBase { @Override public void renderCallback(EntityCorporeaSpark entity, float pticks) { -/* int time = entity.getItemDisplayTicks(); if(time == 0) return; @@ -64,14 +70,12 @@ public class RenderCorporeaSpark extends RenderSparkBase { GlStateManager.color(1F, 1F, 1F, absTime / 10); GlStateManager.translate(0F, 0F, -2F + (time < 0 ? -absTime : absTime) / 6); - ItemStack stack = entity.getDisplayedItem(); + ItemStack stack = entity.getDisplayedItem().orNull(); if(stack == null) return; - Item item = stack.getItem(); - boolean block = item instanceof ItemBlock; - Minecraft.getMinecraft().renderEngine.bindTexture(block ? TextureMap.LOCATION_BLOCKS_TEXTURE : TextureMap.locationItemsTexture); - IIcon icon = block ? Block.getBlockFromItem(item).getBlockTextureFromSide(ForgeDirection.UP.ordinal()) : item.getIcon(stack, 0); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); + TextureAtlasSprite icon = Minecraft.getMinecraft().getRenderItem().getItemModelWithOverrides(stack, entity.worldObj, null).getParticleTexture(); if(icon != null) { float minU = icon.getMinU(); @@ -91,7 +95,7 @@ public class RenderCorporeaSpark extends RenderSparkBase { GlStateManager.translate(gap * i, 0F, 0F); for(int j = -shift; j < shift; j++) { GlStateManager.translate(0F, gap * j, 0F); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), 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); + IconHelper.renderIconIn3D(Tessellator.getInstance(), 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); GlStateManager.translate(0F, -gap * j, 0F); } GlStateManager.translate(-gap * i, 0F, 0F); @@ -100,7 +104,6 @@ public class RenderCorporeaSpark extends RenderSparkBase { GlStateManager.disableBlend(); GlStateManager.popMatrix(); -*/ } }