From 78caaa0dd9d439b21cadf28aea421b59c57825b8 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Wed, 24 Sep 2014 19:07:15 +0100 Subject: [PATCH] Added a HUD element to display if a mana infusion recipe is ready or not. --- .../client/core/handler/HUDHandler.java | 55 ++++++++++++++---- .../assets/botania/textures/gui/manaHud.png | Bin 5466 -> 6597 bytes 2 files changed, 45 insertions(+), 10 deletions(-) diff --git a/MODSRC/vazkii/botania/client/core/handler/HUDHandler.java b/MODSRC/vazkii/botania/client/core/handler/HUDHandler.java index 0f41fad31..7d9ce6b61 100644 --- a/MODSRC/vazkii/botania/client/core/handler/HUDHandler.java +++ b/MODSRC/vazkii/botania/client/core/handler/HUDHandler.java @@ -22,6 +22,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; @@ -31,17 +32,20 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; import org.lwjgl.opengl.GL11; +import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ICreativeManaProvider; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaUsingItem; +import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wiki.IWikiProvider; import vazkii.botania.api.wiki.WikiHooks; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.item.ModItems; import baubles.common.lib.PlayerHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -55,15 +59,19 @@ public final class HUDHandler { if(event.type == ElementType.ALL) { Minecraft mc = Minecraft.getMinecraft(); MovingObjectPosition pos = mc.objectMouseOver; - if(pos != null && mc.thePlayer.getCurrentEquippedItem() != null && mc.thePlayer.getCurrentEquippedItem().getItem() == ModItems.twigWand) { - Block block = mc.theWorld.getBlock(pos.blockX, pos.blockY, pos.blockZ); - if(block instanceof IWandHUD) - ((IWandHUD) block).renderHUD(mc, event.resolution, mc.theWorld, pos.blockX, pos.blockY, pos.blockZ); - } - - else if(pos != null && mc.thePlayer.getCurrentEquippedItem() != null && mc.thePlayer.getCurrentEquippedItem().getItem() instanceof ILexicon) { - Block block = mc.theWorld.getBlock(pos.blockX, pos.blockY, pos.blockZ); - drawLexiconGUI(mc.thePlayer.getCurrentEquippedItem(), block, pos, event.resolution); + Block block = mc.theWorld.getBlock(pos.blockX, pos.blockY, pos.blockZ); + TileEntity tile = mc.theWorld.getTileEntity(pos.blockX, pos.blockY, pos.blockZ); + ItemStack stack = mc.thePlayer.getCurrentEquippedItem(); + + if(stack != null) { + if(pos != null && stack.getItem() == ModItems.twigWand) { + if(block instanceof IWandHUD) + ((IWandHUD) block).renderHUD(mc, event.resolution, mc.theWorld, pos.blockX, pos.blockY, pos.blockZ); + } + else if(pos != null && stack.getItem() instanceof ILexicon) + drawLexiconHUD(mc.thePlayer.getCurrentEquippedItem(), block, pos, event.resolution); + else if(tile != null && tile instanceof TilePool) + renderPoolRecipeHUD(event.resolution, (TilePool) tile, stack); } } else if(event.type == ElementType.EXPERIENCE) { EntityPlayer player = Minecraft.getMinecraft().thePlayer; @@ -135,8 +143,35 @@ public final class HUDHandler { RenderHelper.drawTexturedModalRect(x, y, 0, 0, 251, width, 5); GL11.glDisable(GL11.GL_BLEND); } + + private void renderPoolRecipeHUD(ScaledResolution res, TilePool tile, ItemStack stack) { + for(RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) { + if(recipe.matches(stack)) { + Minecraft mc = Minecraft.getMinecraft(); + mc.renderEngine.bindTexture(manaBar); + int x = res.getScaledWidth() / 2 - 11; + int y = res.getScaledHeight() / 2 + 10; + + int u = tile.getCurrentMana() >= recipe.getManaToConsume() ? 0 : 22; + int v = mc.thePlayer.getCommandSenderName().equals("haighyorkie") && mc.thePlayer.isSneaking() ? 23 : 8; + + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + RenderHelper.drawTexturedModalRect(x, y, 0, u, v, 22, 15); + GL11.glDisable(GL11.GL_BLEND); + net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); + RenderItem.getInstance().renderItemIntoGUI(mc.fontRenderer, mc.renderEngine, stack, x - 20, y); + RenderItem.getInstance().renderItemIntoGUI(mc.fontRenderer, mc.renderEngine, recipe.getOutput(), x + 26, y); + net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); - private void drawLexiconGUI(ItemStack stack, Block block, MovingObjectPosition pos, ScaledResolution res) { + GL11.glDisable(GL11.GL_LIGHTING); + + break; + } + } + } + + private void drawLexiconHUD(ItemStack stack, Block block, MovingObjectPosition pos, ScaledResolution res) { Minecraft mc = Minecraft.getMinecraft(); FontRenderer font = mc.fontRenderer; boolean draw = false; diff --git a/resources/assets/botania/textures/gui/manaHud.png b/resources/assets/botania/textures/gui/manaHud.png index b16d2797d89663c9ecddac44c2a147f0def6071a..57305b79ba0f74829c2227cb4f6e0275bb6558e8 100644 GIT binary patch delta 3884 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 Q0|Fm};SGbz>+Zk&C)}n8%m4rY delta 2744 zcmb_eeLT}^8y^ZOR7d0`r8BQ5FUc86t9Df0A`(X&t3+bWOAL$s)`@Zwt05s)3iU|K znSH#hO@$VVwLElK8io;L-oiFK_xU{kob&md&-2vtoZny9?|!+i`?|i@{r%p}yLv31 zHmE^rX|B!(d=q=dyWOJj$Qyy>GjuZ)yl@`Xpa-61qhj zEPr~)4CS&-)doIQ#mDu$61xkmtst6%(C_u?w=SjuZ)A^4sIAA*DaYsPA3H-bKJ;#P zgDO4nxZ2vaa#>N$!X$d@F1^f=JLtZJNL`4uyga{xlKN*@TjBfnO?=Eu&kncS>?~7J z;l(>4?XfX zs)tqxX1Q*5dg|Ajw~KLwEoWY~w5;Lt`Cx<~pE?{y)9o0|DJt6XY0mLn!SupZh;#`_ z>%NX>deTpXIvBhY<66$xu2WWeXIIJ#w<+=jf2r#o_U!q#u+3+Ow(dIRe~!hYRIjr` zP^w@Ro@qD~n-6#0Ok$6ZL*qBv!jdF?3i%#a%&rad%R9^)`)^cKd}ooXRu`l}9F22B z6b=mzrkY)=O_3o;TlWnw%?m^$Bk4k62*TbzNhYqTtF1k0rxz0+fAHSX+vxWL1KaQO z(%ni?4FZ*IM~>aPb!#NfF(^2ABkFFD)rFXt14v5w`!OB{5fB_)2E8Avs;Oajc5a%( z7lDMx@LBxcEE4ILlJvB+)mIvgj8-9+7edekrfv7>DitZlxHAqj-+o1P{|&|AB@ zw6j}M!Bjz6Q_P$Gej{47Cusr%%^Ry^7yP(7~}#_x4wGZqEwo>gsao$T?B@>Wr;X>hn0q(r%0*sNyJ&0nN%% z2r{w#fP)E0sNvAd@i zoxtRJ#pcs7%cm(6%F0B=1HPCHUlYZg)8=qE0QWPt3MWHDn@xSFpS_6dpzaIXYQKfAyFc(`Gc^wh{^(OSC`@ZHxU$GYYb6x(AOujS` z5aJJzK!33RX7h_6f&LfJ{*>x}Xs-W?!x9GyjarULOx&!ktzBDRUjoPq#$YgvC|nwg zWw>|g2Qh9>5E`9bW)4UWP(`Uvzg&JtHa|JjVoH%?SNtkAft!16J4zLU!8m(GDgD;d zgP%By&6;oDGkKKyzV3p^b9Od48-9-${)SDEj+Q^Iu68EFfln?~D3RDeO)(w?Wf&~> z5EOcfwJ?w&;T_(}3%9GS^8?JuW=yj5m(V)TIwR8HuCS4LnMe6C7?6g1kKsBxA)nf? z>?oHsY9>owr~n^|(ed$fS7!imu8lDO7yt4L;+}*F=SsitoV}YyN6iJvGwSmby~598 z{)2OFK*2OLAPvR+stQD2c#}UmrTOYsf=i{}MJ!9x&`CAdEiEHs?S!C#+sjA@_~|EO z*NuMu{wtE69x?9qQ0#TKP*j|Kc8j6mmGz27s|Fm3(JL=rD4+?8#uS3|+~C-fsDz7@ z?fAe*AOYrUZB;AsR3Z92ayH5C?{B;ci*wxaF;NJq0|w1?8=_D&V>}Qt?iGVATQ;Ej z`ud2Km6ov9AzPq}$w)6mq4AMpfSW|@z~Ep|?}?90chyTkW+=b$cpDn~qgiMm#gUO2 z!BqQwQ3YiN1_m~TZNsu$PAE7t;8`uT)&Hi+aj`gtKxhZm0ICD?g(^B1~d98tJV`SRlTz80G_G&OaBc275RP28-<{S~ zbXqVN5Cb4l-f=24G!0OIpcx#acab1~R+tJ46$+|Gl0^~aYN0+vd+s$B=Xj^Mco{n$ z2KCjQx93M?<#I((&3W5=3CFtOndC<(?v0LE_G=Pz#IYDDqFs2lM!?BhJj=ewLqgS9 z>p)StNKz7?)NPP}!!6IUnByO;3q=JX j##wUP1$iq}8ASoca!68#KWjS<1E1?bPv