Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 23:28:35 +01:00
Code Issues Projects Releases Wiki Activity

Made the smiley cloud not crash with blocks without items

Browse source 
Closes #208
This commit is contained in:
Ellpeck 2016-08-14 23:38:32 +02:00
parent 7dc7d0f98a
commit cba12aabe0
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/SmileyCloudEasterEggs.java
View file

@ -91,7 +91,7 @@ public final class SmileyCloudEasterEggs{
@Override @Override
public void renderExtra(float f){ public void renderExtra(float f){
renderHoldingItem(true, new ItemStack(Items.MILK_BUCKET)); renderHoldingItem(true, new ItemStack(Items.MILK_BUCKET));
renderHeadBlock(Blocks.LIT_REDSTONE_LAMP, 0, 35F); renderHeadBlock(Blocks.REDSTONE_LAMP, 0, 35F);
} }
}); });
//Vazkii //Vazkii

20
src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java
View file

@ -62,15 +62,17 @@ public final class AssetUtil{
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public static void renderItemInWorld(ItemStack stack){ public static void renderItemInWorld(ItemStack stack){
GlStateManager.pushMatrix(); if(stack != null && stack.getItem() != null){
GlStateManager.disableLighting(); GlStateManager.pushMatrix();
GlStateManager.pushAttrib(); GlStateManager.disableLighting();
RenderHelper.enableStandardItemLighting(); GlStateManager.pushAttrib();
Minecraft.getMinecraft().getRenderItem().renderItem(stack, TransformType.FIXED); RenderHelper.enableStandardItemLighting();
RenderHelper.disableStandardItemLighting(); Minecraft.getMinecraft().getRenderItem().renderItem(stack, TransformType.FIXED);
GlStateManager.popAttrib(); RenderHelper.disableStandardItemLighting();
GlStateManager.enableLighting(); GlStateManager.popAttrib();
GlStateManager.popMatrix(); GlStateManager.enableLighting();
GlStateManager.popMatrix();
}
} }
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)