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 e874238ad..cc55bbcd5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -58,6 +58,7 @@ import vazkii.botania.common.core.handler.ConfigHandler; 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.relic.ItemFlugelEye; import vazkii.botania.common.lib.LibObfuscation; import baubles.common.lib.PlayerHandler; @@ -73,7 +74,7 @@ public final class HUDHandler { Minecraft mc = Minecraft.getMinecraft(); Profiler profiler = mc.mcProfiler; ItemStack equippedStack = mc.thePlayer.getCurrentEquippedItem(); - + if(event.type == ElementType.ALL) { profiler.startSection("botania-hud"); MovingObjectPosition pos = mc.objectMouseOver; @@ -125,7 +126,7 @@ public final class HUDHandler { ItemFlugelEye.renderHUD(event.resolution, mc.thePlayer, equippedStack); profiler.endSection(); } - + profiler.startSection("manaBar"); EntityPlayer player = mc.thePlayer; int totalMana = 0; @@ -174,6 +175,15 @@ public final class HUDHandler { profiler.endSection(); GL11.glColor4f(1F, 1F, 1F, 1F); + } else if(event.type == ElementType.HEALTH) { + profiler.startSection("botania-hud"); + ItemStack amulet = PlayerHandler.getPlayerBaubles(mc.thePlayer).getStackInSlot(0); + if(amulet != null && amulet.getItem() == ModItems.flightTiara) { + profiler.startSection("flugelTiara"); + ItemFlightTiara.renderHUD(event.resolution, mc.thePlayer, amulet); + profiler.endSection(); + } + profiler.endSection(); } } diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index 3bb71cb8f..7616e0e50 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -44,6 +44,7 @@ public final class LibResources { public static final String GUI_NEI_BLANK = PREFIX_GUI + "neiBlank.png"; public static final String GUI_NEI_BREWERY = PREFIX_GUI + "neiBrewery.png"; public static final String GUI_FLOWER_BAG = PREFIX_GUI + "flowerBag.png"; + public static final String GUI_HUD_ICONS = PREFIX_GUI + "hudIcons.png"; public static final String ENTRY_FLOWERS = PREFIX_ENTRIES + "flowers.png"; public static final String ENTRY_APOTHECARY = PREFIX_ENTRIES + "apothecary.png"; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index 392666185..a141afbb6 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -19,12 +19,14 @@ import java.util.List; import javax.xml.bind.annotation.adapters.HexBinaryAdapter; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -34,6 +36,8 @@ import net.minecraft.stats.Achievement; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; +import net.minecraft.world.World; +import net.minecraftforge.client.GuiIngameForge; import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; @@ -44,11 +48,13 @@ import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; +import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; import baubles.common.lib.PlayerHandler; @@ -60,10 +66,16 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaubleRender, ICraftAchievement { + private static ResourceLocation textureHud = new ResourceLocation(LibResources.GUI_HUD_ICONS); private static ResourceLocation textureHalo = new ResourceLocation(LibResources.MISC_HALO); + private static final String TAG_FLYING = "flying"; + private static final String TAG_TIME_LEFT = "timeLeft"; + private static final String TAG_INFINITE_FLIGHT = "infiniteFlight"; + public static List playersWithFlight = new ArrayList(); private static final int COST = 35; + private static final int MAX_FLY_TIME = 400; public static IIcon[] wingIcons; private static final int SUBTYPES = 8; @@ -141,20 +153,44 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub return String.copyValueOf(chrs); } - + + @Override + public void onWornTick(ItemStack stack, EntityLivingBase player) { + super.onWornTick(stack, player); + + if(player instanceof EntityPlayer) { + EntityPlayer p = (EntityPlayer) player; + boolean flying = p.capabilities.isFlying; + + int time = ItemNBTHelper.getInt(stack, TAG_TIME_LEFT, MAX_FLY_TIME); + int newTime = time; + if(flying && time > 0 && !ItemNBTHelper.getBoolean(stack, TAG_INFINITE_FLIGHT, false)) + newTime--; + else if(!flying && time < MAX_FLY_TIME && player.ticksExisted % 2 == 0) + newTime++; + + ItemNBTHelper.setBoolean(stack, TAG_FLYING, flying); + if(newTime != time) + ItemNBTHelper.setInt(stack, TAG_TIME_LEFT, newTime); + } + } + @SubscribeEvent public void updatePlayerFlyStatus(LivingUpdateEvent event) { if(event.entityLiving instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.entityLiving; - ItemStack tiara = PlayerHandler.getPlayerBaubles(player).getStackInSlot(0); + int left = ItemNBTHelper.getInt(tiara, TAG_TIME_LEFT, MAX_FLY_TIME); + if(playersWithFlight.contains(playerStr(player))) { if(shouldPlayerHaveFlight(player)) { player.capabilities.allowFlying = true; if(player.capabilities.isFlying) { - if(!player.worldObj.isRemote) + if(!player.worldObj.isRemote) { ManaItemHandler.requestManaExact(tiara, player, COST, true); - else if(Math.abs(player.motionX) > 0.1 || Math.abs(player.motionZ) > 0.1) { + if(left < 3) + player.setFire(5); + } else if(Math.abs(player.motionX) > 0.1 || Math.abs(player.motionZ) > 0.1) { double x = event.entityLiving.posX - 0.5; double y = event.entityLiving.posY - 1.7; double z = event.entityLiving.posZ - 0.5; @@ -244,7 +280,13 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub private boolean shouldPlayerHaveFlight(EntityPlayer player) { ItemStack armor = PlayerHandler.getPlayerBaubles(player).getStackInSlot(0); - return armor != null && armor.getItem() == this && ManaItemHandler.requestManaExact(armor, player, COST, false); + if(armor != null && armor.getItem() == this) { + int left = ItemNBTHelper.getInt(armor, TAG_TIME_LEFT, MAX_FLY_TIME); + boolean flying = ItemNBTHelper.getBoolean(armor, TAG_FLYING, false); + return left > (flying ? 0 : MAX_FLY_TIME / 10) && ManaItemHandler.requestManaExact(armor, player, COST, false); + } + + return false; } @Override @@ -403,6 +445,42 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub GL11.glEnable(GL11.GL_LIGHTING); GL11.glShadeModel(GL11.GL_FLAT); } + + @SideOnly(Side.CLIENT) + public static void renderHUD(ScaledResolution resolution, EntityPlayer player, ItemStack stack) { + int u = Math.max(1, stack.getItemDamage()) * 9 - 9; + int v = 0; + + Minecraft mc = Minecraft.getMinecraft(); + mc.renderEngine.bindTexture(textureHud); + int x = resolution.getScaledWidth() / 2 + 10; + int y = resolution.getScaledHeight() - 49; + if(player.getAir() < 300) + y -= 10; + + int left = ItemNBTHelper.getInt(stack, TAG_TIME_LEFT, MAX_FLY_TIME); + + int segTime = MAX_FLY_TIME / 10; + int segs = (left / segTime) + 1; + int last = left % segTime; + + for(int i = 0; i < segs; i++) { + float trans = 1F; + if(i == segs - 1) { + trans = (float) last / (float) segTime; + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glDisable(GL11.GL_ALPHA_TEST); + } + + GL11.glColor4f(1F, 1F, 1F, trans); + RenderHelper.drawTexturedModalRect(x, y, 0, u, v, 9, 9); + x += 8; + } + GL11.glEnable(GL11.GL_ALPHA_TEST); + GL11.glColor4f(1F, 1F, 1F, 1F); + mc.renderEngine.bindTexture(GuiIngameForge.icons); + } @Override public Achievement getAchievementOnCraft(ItemStack stack, EntityPlayer player, IInventory matrix) { diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index f59127ff7..f1c53ac74 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -770,7 +770,7 @@ public final class LexiconData { new PageText("11"), new PageCraftingRecipe("12", ModCraftingRecipes.recipeRedStringRelay)); flightTiara = new ALexiconEntry(LibLexicon.ENDER_FLIGHT_TIARA, categoryEnder); - flightTiara.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeFlightTiara), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipesWings)); + flightTiara.setLexiconPages(new PageText("0"), new PageText("4"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeFlightTiara), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipesWings)); corporea = new ALexiconEntry(LibLexicon.ENDER_CORPOREA, categoryEnder); corporea.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PageText("4"), new PageText("5"), new PageText("6"), new PageCraftingRecipe("7", ModCraftingRecipes.recipeCorporeaSpark), new PageCraftingRecipe("8", ModCraftingRecipes.recipeMasterCorporeaSpark)); diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 04cdc781d..e531d5e5b 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -2544,6 +2544,7 @@ botania.page.redString12=The &1Red Stringed Spoofer&0. # -- FLUGEL TIARA botania.entry.flightTiara=Flügel Tiara botania.page.flightTiara0=The &4Flügel&0 were once a dominant species in the lands, now they're but a race past extinct, once created as godslayers, who possessed the ability of flight.
The usage of &1Gaia Spirits&0 allows for a small replica of their power, in the form of the &1Flügel Tiara&0, which, at the cost of &4Mana&0 allows for flight. +botania.page.flightTiara4=Not all is perfect with reproducing old technology though, the tiara has its flaws, that meaning it can't provide the power of flight constantly. If used for over ten seconds without letting it recharge it'll stop being able to provide the power of flight, it'll also set the wearer aflame.
A "flight bar" is displayed on the HUD to help monitor this. botania.page.flightTiara1=Forty thousand books from another world botania.page.flightTiara2=Combining the Tiara with a variety of Quartz species allows for it to create various different kinds of aesthetic wings, one for each style of quartz.
The recipes for the various types of quartz can be found in the &4Decorative Blocks&0 entry under &4Miscellaneous&0, &1Elven Quartz&0 is acquired by trading &1Nether Quartz&0 with the elves. botania.page.flightTiara3=Adding Wings (they can be swapped any time) diff --git a/src/main/resources/assets/botania/textures/gui/hudIcons.png b/src/main/resources/assets/botania/textures/gui/hudIcons.png index 9d7c79692..33c4e88a6 100644 Binary files a/src/main/resources/assets/botania/textures/gui/hudIcons.png and b/src/main/resources/assets/botania/textures/gui/hudIcons.png differ