From a6d532caccc43974e110f1bc74ca9a232a4159e3 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 5 Dec 2015 17:48:45 +0000 Subject: [PATCH] Petal Apothecary HUD. --- .../client/core/handler/HUDHandler.java | 12 +++- .../botania/common/block/BlockAltar.java | 4 +- .../common/block/mana/BlockRuneAltar.java | 8 +-- .../botania/common/block/tile/TileAltar.java | 60 +++++++++++++++++++ .../resources/assets/botania/lang/en_US.lang | 2 + 5 files changed, 75 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 08757960e..a3e771d31 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -52,6 +52,8 @@ import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.tile.TileAltar; +import vazkii.botania.common.block.tile.TileRuneAltar; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.block.tile.mana.TilePool; @@ -112,12 +114,16 @@ public final class HUDHandler { ((IWandHUD) block).renderHUD(mc, event.resolution, mc.theWorld, pos.blockX, pos.blockY, pos.blockZ); profiler.endSection(); } - } - else if(pos != null && equippedStack.getItem() instanceof ILexicon) + } else if(pos != null && equippedStack.getItem() instanceof ILexicon) drawLexiconHUD(mc.thePlayer.getCurrentEquippedItem(), block, pos, event.resolution); - else if(tile != null && tile instanceof TilePool) + if(tile != null && tile instanceof TilePool) renderPoolRecipeHUD(event.resolution, (TilePool) tile, equippedStack); } + if(tile != null && tile instanceof TileAltar) + ((TileAltar) tile).renderHUD(mc, event.resolution); + else if(tile != null && tile instanceof TileRuneAltar) + ((TileRuneAltar) tile).renderHUD(mc, event.resolution); + if(tile != null && tile instanceof TileCorporeaCrystalCube) renderCrystalCubeHUD(event.resolution, (TileCorporeaCrystalCube) tile); } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index fac06805a..9fcd085bd 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -33,6 +33,7 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; +import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ManaItemHandler; @@ -89,7 +90,8 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { public void onEntityCollidedWithBlock(World par1World, int par2, int par3, int par4, Entity par5Entity) { if(par5Entity instanceof EntityItem) { TileAltar tile = (TileAltar) par1World.getTileEntity(par2, par3, par4); - tile.collideEntityItem((EntityItem) par5Entity); + if(tile.collideEntityItem((EntityItem) par5Entity)) + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(tile); } } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java index a8e02c3aa..c4dd9bbd8 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -36,7 +36,7 @@ import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockRuneAltar extends BlockModContainer implements IWandable, IWandHUD, ILexiconable { +public class BlockRuneAltar extends BlockModContainer implements IWandable, ILexiconable { Random random; IIcon[] icons; @@ -166,10 +166,4 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable, IWan return LexiconData.runicAltar; } - @Override - public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z) { - ((TileRuneAltar) world.getTileEntity(x, y, z)).renderHUD(mc, res); - } - - } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java index 2f11f231b..8adfa00ff 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -15,6 +15,13 @@ import java.util.ArrayList; import java.util.List; import java.util.regex.Pattern; +import org.lwjgl.opengl.GL11; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.Gui; +import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -26,11 +33,15 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.StatCollector; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IPetalApothecary; import vazkii.botania.api.recipe.IFlowerComponent; import vazkii.botania.api.recipe.RecipePetals; +import vazkii.botania.api.recipe.RecipeRuneAltar; +import vazkii.botania.client.core.handler.HUDHandler; +import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibBlockNames; @@ -320,5 +331,54 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I public boolean hasLava() { return hasLava; } + + public void renderHUD(Minecraft mc, ScaledResolution res) { + int xc = res.getScaledWidth() / 2; + int yc = res.getScaledHeight() / 2; + + float angle = -90; + int radius = 24; + int amt = 0; + for(int i = 0; i < getSizeInventory(); i++) { + if(getStackInSlot(i) == null) + break; + amt++; + } + + if(amt > 0) { + float anglePer = 360F / amt; + + for(RecipePetals recipe : BotaniaAPI.petalRecipes) + if(recipe.matches(this)) { + mc.renderEngine.bindTexture(HUDHandler.manaBar); + RenderHelper.drawTexturedModalRect(xc + radius + 9, yc - 8, 0, 0, 8, 22, 15); + + ItemStack stack = recipe.getOutput(); + + net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); + RenderItem.getInstance().renderItemIntoGUI(mc.fontRenderer, mc.renderEngine, stack, xc + radius + 32, yc - 8); + RenderItem.getInstance().renderItemIntoGUI(mc.fontRenderer, mc.renderEngine, new ItemStack(Items.wheat_seeds), xc + radius + 16, yc + 6); + net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); + mc.fontRenderer.drawStringWithShadow("+", xc + radius + 14, yc + 10, 0xFFFFFF); + } + + net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); + for(int i = 0; i < amt; i++) { + double xPos = xc + Math.cos(angle * Math.PI / 180D) * radius - 8; + double yPos = yc + Math.sin(angle * Math.PI / 180D) * radius - 8; + GL11.glTranslated(xPos, yPos, 0); + RenderItem.getInstance().renderItemIntoGUI(mc.fontRenderer, mc.renderEngine, getStackInSlot(i), 0, 0); + GL11.glTranslated(-xPos, -yPos, 0); + + angle += anglePer; + } + net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); + } else if(recipeKeepTicks > 0 && hasWater) { + String s = StatCollector.translateToLocal("botaniamisc.altarRefill0"); + mc.fontRenderer.drawStringWithShadow(s, xc - mc.fontRenderer.getStringWidth(s) / 2, yc + 10, 0xFFFFFF); + s = StatCollector.translateToLocal("botaniamisc.altarRefill1"); + mc.fontRenderer.drawStringWithShadow(s, xc - mc.fontRenderer.getStringWidth(s) / 2, yc + 20, 0xFFFFFF); + } + } } diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 7c82d5832..6e5c7aa35 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -148,6 +148,8 @@ botaniamisc.tutorialVideo=Video botaniamisc.shiftToStopSpin=(SHIFT to stop animation) botaniamisc.noVideo=&4Video will be back soon. Sorry :( botaniamisc.adaptativeConfigChanges=Botania's Adaptative Config has changed the following config defaults for you: +botaniamisc.altarRefill0=Right click with an empty hand to +botaniamisc.altarRefill1=add back the last recipe # NEI INTEGRATION botania.nei.brewery=Botanical Brewery