diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index 51067ef68..6d4429869 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -63,6 +63,8 @@ public final class ConfigHandler { public static boolean useShiftForQuickLookup = false; public static boolean enableArmorModels = true; public static int manaBarHeight = 29; + public static int flightBarHeight = 49; + public static int flightBarBreathHeight = 59; public static int glSecondaryTextureUnit = 7; public static boolean altFlowerTextures = false; @@ -177,6 +179,12 @@ public final class ConfigHandler { desc = "The height of the mana display bar in above the XP bar. You can change this if you have a mod that changes where the XP bar is."; manaBarHeight = loadPropInt("manaBar.height", desc, manaBarHeight); + desc = "The height of the Flugel Tiara flight bar. You can change this if you have a mod that adds a bar in that spot."; + flightBarHeight = loadPropInt("flightBar.height", desc, flightBarHeight); + + desc = "The height of the Flugel Tiara flight bar if your breath bar is shown. You can change this if you have a mod that adds a bar in that spot."; + flightBarBreathHeight = loadPropInt("flightBarBreath.height", desc, flightBarBreathHeight); + desc = "The GL Texture Unit to use for the secondary sampler passed in to the Lexica Botania's category button shader. DO NOT TOUCH THIS IF YOU DON'T KNOW WHAT YOU'RE DOING"; glSecondaryTextureUnit = loadPropInt("shaders.secondaryUnit", desc, glSecondaryTextureUnit); 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 46a887b48..af3b711b4 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 @@ -54,6 +54,7 @@ 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.handler.ConfigHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; @@ -506,9 +507,9 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub mc.renderEngine.bindTexture(textureHud); int xo = resolution.getScaledWidth() / 2 + 10; int x = xo; - int y = resolution.getScaledHeight() - 49; + int y = resolution.getScaledHeight() - ConfigHandler.flightBarHeight; if(player.getAir() < 300) - y -= 10; + y = resolution.getScaledHeight() - ConfigHandler.flightBarBreathHeight; int left = ItemNBTHelper.getInt(stack, TAG_TIME_LEFT, MAX_FLY_TIME);