From 95bd4689d6b3bf80df75f62e2174fbe1a8b0e83a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 1 Jun 2016 20:39:49 -0500 Subject: [PATCH] Fix halo crashing, also tweak visuals slightly. Closes #314 --- .../botania/client/core/handler/HUDHandler.java | 6 +++++- .../botania/common/item/ItemCraftingHalo.java | 13 +++---------- 2 files changed, 8 insertions(+), 11 deletions(-) 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 0117408bb..cc0ca7e53 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -142,9 +142,13 @@ public final class HUDHandler { } if(main != null && main.getItem() instanceof ItemCraftingHalo) { - profiler.startSection("craftingHalo"); + profiler.startSection("craftingHalo_main"); ItemCraftingHalo.renderHUD(event.getResolution(), mc.thePlayer, main); profiler.endSection(); + } else if(offhand != null && offhand.getItem() instanceof ItemCraftingHalo) { + profiler.startSection("craftingHalo_off"); + ItemCraftingHalo.renderHUD(event.getResolution(), mc.thePlayer, offhand); + profiler.endSection(); } if(main != null && main.getItem() instanceof ItemSextant) { diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 9d72ddba8..7cd743826 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -460,20 +460,13 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { ItemStack slotStack = getItemForSlot(stack, seg); if(slotStack != null) { mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); - float scale = seg == 0 ? 0.75F : 0.6F; + float scale = seg == 0 ? 0.9F : 0.8F; GlStateManager.scale(scale, scale, scale); GlStateManager.rotate(180F, 0F, 1F, 0F); GlStateManager.translate(seg == 0 ? 0.5F : 0F, seg == 0 ? -0.1F : 0.6F, 0F); - if(slotStack.getItem() instanceof ItemBlock) { - GlStateManager.translate(0, -0.5, 0.5F); - IBlockState state = ((ItemBlock) slotStack.getItem()).block.getStateFromMeta(slotStack.getItem().getMetadata(slotStack.getMetadata())); - Minecraft.getMinecraft().getBlockRendererDispatcher().renderBlockBrightness(state, 1.0F); - } else { - - GlStateManager.rotate(90.0F, 0.0F, 1.0F, 0.0F); - Minecraft.getMinecraft().getRenderItem().renderItem(slotStack, ItemCameraTransforms.TransformType.GUI); - } + GlStateManager.rotate(90.0F, 0.0F, 1.0F, 0.0F); + Minecraft.getMinecraft().getRenderItem().renderItem(slotStack, ItemCameraTransforms.TransformType.GUI); } GlStateManager.popMatrix();