From ee4ebde69e609c6d8e3aced09970dee37a0eb1d6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 4 Jan 2017 23:35:06 -0600 Subject: [PATCH] All entity renders and TESR's, except starfield --- .../botania/client/render/entity/LayerGaiaHead.java | 2 +- .../client/render/entity/RenderCorporeaSpark.java | 4 ++-- .../botania/client/render/tile/RenderTileAltar.java | 2 +- .../botania/client/render/tile/RenderTileAvatar.java | 2 +- .../botania/client/render/tile/RenderTileBrewery.java | 2 +- .../render/tile/RenderTileCorporeaCrystalCube.java | 6 +++--- .../client/render/tile/RenderTileEnchanter.java | 2 +- .../botania/client/render/tile/RenderTileGaiaHead.java | 10 +++++----- .../client/render/tile/RenderTileHourglass.java | 8 ++++---- .../client/render/tile/RenderTileIncensePlate.java | 2 +- .../botania/client/render/tile/RenderTilePrism.java | 2 +- .../client/render/tile/RenderTileRuneAltar.java | 4 ++-- .../client/render/tile/RenderTileSparkChanger.java | 2 +- .../botania/client/render/tile/RenderTileSpreader.java | 2 +- .../client/render/tile/RenderTileTinyPotato.java | 2 +- 15 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java b/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java index 97dbaece8..f4eb1902b 100644 --- a/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java +++ b/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java @@ -30,7 +30,7 @@ public class LayerGaiaHead implements LayerRenderer { public void doRenderLayer(@Nonnull EntityPlayer player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) { ItemStack itemstack = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD); - if (itemstack != null && itemstack.getItem() == ModItems.gaiaHead) // Botania - check for head + if (!itemstack.isEmpty() && itemstack.getItem() == ModItems.gaiaHead) // Botania - check for head { GlStateManager.pushMatrix(); 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 5fa4078f8..72c14ad6b 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -62,8 +62,8 @@ public class RenderCorporeaSpark extends RenderSparkBase { float absTime = Math.abs(time) - pticks; - ItemStack stack = entity.getDisplayedItem().orNull(); - if(stack == null) + ItemStack stack = entity.getDisplayedItem().or(ItemStack.EMPTY); + if(stack.isEmpty()) return; GlStateManager.pushMatrix(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index ea2c2c074..b9295f846 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -56,7 +56,7 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { if(water) { int petals = 0; for(int i = 0; i < altar.getSizeInventory(); i++) - if(altar.getItemHandler().getStackInSlot(i) != null) + if(!altar.getItemHandler().getStackInSlot(i).isEmpty()) petals++; else break; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java index 863c366f6..e427c4132 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -71,7 +71,7 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer { } ItemStack stack = avatar.getItemHandler().getStackInSlot(0); - if(stack != null) { + if(!stack.isEmpty()) { GlStateManager.pushMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); float s = 0.6F; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java index 4e9fe7b4d..97f5a34a9 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -50,7 +50,7 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer { } public void renderItemStack(ItemStack stack) { - if(stack != null) { + if(!stack.isEmpty()) { Minecraft mc = Minecraft.getMinecraft(); GlStateManager.pushMatrix(); mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java index 70ebe9605..bba6c391e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -51,7 +51,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { ItemStack stack = prism.getItemHandler().getStackInSlot(0); - if(stack != null) { + if(!stack.isEmpty()) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); if(stack.getItem() instanceof ILens) { GlStateManager.pushMatrix(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java index bbdedfe8f..e701fc04d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -35,7 +35,7 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer GlStateManager.scale(1F, -1F, -1F); ItemStack stack = spreader.getItemHandler().getStackInSlot(0); - if(stack != null) { + if(!stack.isEmpty()) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); stack.getItem(); GlStateManager.pushMatrix(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index 4c5516078..4ab2a4568 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -163,7 +163,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer