Ellpeck/NaturesAura
1
0
Fork 0
mirror of https://github.com/Ellpeck/NaturesAura.git synced 2024-11-26 05:08:34 +01:00
Code Issues Projects Releases Wiki Activity

made aura bar not display when the f3 screen is open so that it doesn't overlap

Browse source
This commit is contained in:
Ellpeck 2018-11-04 12:43:22 +01:00
parent 713d8c45f0
commit 3ea561ec3e
1 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/main/java/de/ellpeck/naturesaura/events/ClientEvents.java
View file

@ -32,6 +32,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandler;
import org.apache.commons.lang3.mutable.MutableInt; import org.apache.commons.lang3.mutable.MutableInt;
import vazkii.patchouli.api.PatchouliAPI;
import java.util.List; import java.util.List;
@ -153,13 +154,26 @@ public class ClientEvents {
GlStateManager.pushMatrix(); GlStateManager.pushMatrix();
mc.getTextureManager().bindTexture(OVERLAYS); mc.getTextureManager().bindTexture(OVERLAYS);
GlStateManager.color(0.8F, 0.25F, 0.25F); if (!mc.gameSettings.showDebugInfo) {
float totalPercentage = AuraChunk.getAuraInArea(mc.world, mc.player.getPosition(), 15) / (AuraChunk.DEFAULT_AURA * 2F); GlStateManager.color(0.8F, 0.25F, 0.25F);
int tHeight = MathHelper.ceil(MathHelper.clamp(totalPercentage, 0F, 1F) * 50); float totalPercentage = AuraChunk.getAuraInArea(mc.world, mc.player.getPosition(), 15) / (AuraChunk.DEFAULT_AURA * 2F);
if (tHeight < 50) int tHeight = MathHelper.ceil(MathHelper.clamp(totalPercentage, 0F, 1F) * 50);
Gui.drawModalRectWithCustomSizedTexture(3, 10, 6, 12, 6, 50 - tHeight, 256, 256); if (tHeight < 50)
if (tHeight > 0) Gui.drawModalRectWithCustomSizedTexture(3, 10, 6, 12, 6, 50 - tHeight, 256, 256);
Gui.drawModalRectWithCustomSizedTexture(3, 10 + 50 - tHeight, 0, 12 + 50 - tHeight, 6, tHeight, 256, 256); if (tHeight > 0)
Gui.drawModalRectWithCustomSizedTexture(3, 10 + 50 - tHeight, 0, 12 + 50 - tHeight, 6, tHeight, 256, 256);
if (totalPercentage > 1F)
mc.fontRenderer.drawString("+", 10F, 9.5F, 0xBB3333, true);
if (totalPercentage < 0F)
mc.fontRenderer.drawString("-", 10F, 53.5F, 0xBB3333, true);
GlStateManager.pushMatrix();
float scale = 0.75F;
GlStateManager.scale(scale, scale, scale);
mc.fontRenderer.drawString(I18n.format("info." + NaturesAura.MOD_ID + ".aura_in_area"), 3 / scale, 3 / scale, 0xBB3333, true);
GlStateManager.popMatrix();
}
if (mc.objectMouseOver != null) { if (mc.objectMouseOver != null) {
BlockPos pos = mc.objectMouseOver.getBlockPos(); BlockPos pos = mc.objectMouseOver.getBlockPos();
@ -170,28 +184,19 @@ public class ClientEvents {
IBlockState state = mc.world.getBlockState(pos); IBlockState state = mc.world.getBlockState(pos);
ItemStack blockStack = state.getBlock().getPickBlock(state, mc.objectMouseOver, mc.world, pos, mc.player); ItemStack blockStack = state.getBlock().getPickBlock(state, mc.objectMouseOver, mc.world, pos, mc.player);
this.drawContainerInfo(container, mc, res, 25, blockStack.getDisplayName()); this.drawContainerInfo(container, mc, res, 35, blockStack.getDisplayName());
if (tile instanceof TileEntityNatureAltar) { if (tile instanceof TileEntityNatureAltar) {
ItemStack tileStack = ((TileEntityNatureAltar) tile).getItemHandler(null).getStackInSlot(0); ItemStack tileStack = ((TileEntityNatureAltar) tile).getItemHandler(null).getStackInSlot(0);
if (!tileStack.isEmpty() && tileStack.hasCapability(Capabilities.auraContainer, null)) { if (!tileStack.isEmpty() && tileStack.hasCapability(Capabilities.auraContainer, null)) {
IAuraContainer stackContainer = tileStack.getCapability(Capabilities.auraContainer, null); IAuraContainer stackContainer = tileStack.getCapability(Capabilities.auraContainer, null);
this.drawContainerInfo(stackContainer, mc, res, 45, tileStack.getDisplayName()); this.drawContainerInfo(stackContainer, mc, res, 55, tileStack.getDisplayName());
} }
} }
} }
} }
} }
if (totalPercentage > 1F)
mc.fontRenderer.drawString("+", 10F, 9.5F, 0xBB3333, true);
if (totalPercentage < 0F)
mc.fontRenderer.drawString("-", 10F, 53.5F, 0xBB3333, true);
float scale = 0.75F;
GlStateManager.scale(scale, scale, scale);
mc.fontRenderer.drawString(I18n.format("info." + NaturesAura.MOD_ID + ".aura_in_area"), 3 / scale, 3 / scale, 0xBB3333, true);
GlStateManager.color(1F, 1F, 1F); GlStateManager.color(1F, 1F, 1F);
GlStateManager.popMatrix(); GlStateManager.popMatrix();
} }