From e2bcc61c522f9364e337f2cb81708b7f02ca3b06 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Mon, 28 Sep 2015 22:56:08 +0100 Subject: [PATCH] New "Redstone Helper" features for the Manaseer Monocle. --- .../client/core/handler/HUDHandler.java | 8 +++ .../item/equipment/bauble/ItemMonocle.java | 54 +++++++++++++++++++ 2 files changed, 62 insertions(+) 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 ff2c4a454..046a7b438 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -59,6 +59,7 @@ import vazkii.botania.common.item.ItemCraftingHalo; import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; +import vazkii.botania.common.item.equipment.bauble.ItemMonocle; import vazkii.botania.common.lib.LibObfuscation; import baubles.common.lib.PlayerHandler; import cpw.mods.fml.common.eventhandler.EventPriority; @@ -143,6 +144,13 @@ public final class HUDHandler { ItemFlugelEye.renderHUD(event.resolution, mc.thePlayer, equippedStack); profiler.endSection(); }*/ + + ItemStack amulet = PlayerHandler.getPlayerBaubles(mc.thePlayer).getStackInSlot(0); + if(amulet != null && amulet.getItem() == ModItems.monocle) { + profiler.startSection("monocle"); + ItemMonocle.renderHUD(event.resolution, mc.thePlayer, amulet); + profiler.endSection(); + } profiler.startSection("manaBar"); EntityPlayer player = mc.thePlayer; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java index 5030f7f36..09b0da7ba 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java @@ -10,11 +10,21 @@ */ package vazkii.botania.common.item.equipment.bauble; +import net.minecraft.block.Block; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityNote; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.client.event.RenderPlayerEvent; import org.lwjgl.opengl.GL11; @@ -23,9 +33,16 @@ import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.item.IBurstViewerBauble; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, IBaubleRender { + private static final String[] NOTES = new String[] { + "F#", "G", "G#", "A", "A#", "B", "C", "C#", "D", "D#", "E", "F", "F#", + "F#", "G", "G#", "A", "A#", "B", "C", "C#", "D", "D#", "E", "F", "F#" + }; + public ItemMonocle() { super(LibItemNames.MONOCLE); } @@ -52,5 +69,42 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, IBaub ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, itemIcon.getIconWidth(), itemIcon.getIconHeight(), 1F / 16F); } } + + @SideOnly(Side.CLIENT) + public static void renderHUD(ScaledResolution resolution, EntityPlayer player, ItemStack stack) { + Minecraft mc = Minecraft.getMinecraft(); + MovingObjectPosition pos = mc.objectMouseOver; + if(pos == null) + return; + Block block = player.worldObj.getBlock(pos.blockX, pos.blockY, pos.blockZ); + int meta = player.worldObj.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ); + TileEntity tile = player.worldObj.getTileEntity(pos.blockX, pos.blockY, pos.blockZ); + + ItemStack dispStack = null; + String text = ""; + + if(block == Blocks.redstone_wire) { + dispStack = new ItemStack(Items.redstone); + text = EnumChatFormatting.RED + "" + meta; + } else if(block == Blocks.unpowered_repeater || block == Blocks.powered_repeater) { + dispStack = new ItemStack(Items.repeater); + text = "" + (((meta & 12) >> 2) + 1); + } else if(block == Blocks.unpowered_comparator || block == Blocks.powered_comparator) { + dispStack = new ItemStack(Items.comparator); + text = ((meta & 4) == 4) ? "-" : "+"; + } + + if(dispStack == null) + return; + + int x = resolution.getScaledWidth() / 2 + 15; + int y = resolution.getScaledHeight() / 2 - 8; + + net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); + RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, dispStack, x, y); + net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); + + mc.fontRenderer.drawStringWithShadow(text, x + 20, y + 4, 0xFFFFFF); + } }