diff --git a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java index 74cf7f6ed..c74f1aba0 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -81,7 +81,7 @@ public final class BaubleRenderHandler implements LayerRenderer { if(item instanceof ICosmeticAttachable) { ICosmeticAttachable attachable = (ICosmeticAttachable) item; ItemStack cosmetic = attachable.getCosmeticItem(stack); - if(cosmetic != null) { + if(!cosmetic.isEmpty()) { GlStateManager.pushMatrix(); GL11.glColor3ub((byte) 255, (byte) 255, (byte) 255); // Some of the baubles use this so we must restore it manually as well GlStateManager.color(1F, 1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java index 3f4ac9313..148edb6fe 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java @@ -56,7 +56,7 @@ public final class BlockHighlightRenderHandler { BlockPos bPos = pos.getBlockPos(); ItemStack stackHeld = PlayerHelper.getFirstHeldItem(mc.player, ModItems.twigWand); - if(stackHeld != null && ItemTwigWand.getBindMode(stackHeld)) { + if(!stackHeld.isEmpty() && ItemTwigWand.getBindMode(stackHeld)) { BlockPos coords = ItemTwigWand.getBoundTile(stackHeld); if(coords.getY() != -1) bPos = coords; diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 790865b9f..dbf578782 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -349,7 +349,7 @@ public final class HUDHandler { profiler.startSection("crystalCube"); ItemStack target = tile.getRequestTarget(); - if(target != null) { + if(!target.isEmpty()) { String s1 = target.getDisplayName(); String s2 = tile.getItemCount() + "x"; int strlen = Math.max(mc.fontRendererObj.getStringWidth(s1), mc.fontRendererObj.getStringWidth(s2)); 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 4ab2a4568..1c49d5ee0 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -269,8 +269,8 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer