From b3182b5420cce485db167eecfeb5aa8a0f3d1f29 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Mon, 8 Jun 2015 23:51:35 +0100 Subject: [PATCH] Fixed the Terra Shatterer's mana display overlapping tooltips when they would go off screen. Closes #1036 --- .../core/handler/TerraPickRankDisplayHandler.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/TerraPickRankDisplayHandler.java b/src/main/java/vazkii/botania/client/core/handler/TerraPickRankDisplayHandler.java index d824b9af2..2f7294f80 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TerraPickRankDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TerraPickRankDisplayHandler.java @@ -51,10 +51,19 @@ public final class TerraPickRankDisplayHandler { int width = 0; for(String s : tooltip) width = Math.max(width, font.getStringWidth(s)); - + int tooltipHeight = (tooltip.size() - 1) * 10 + 5; + + int height = 3; int offx = 11; int offy = 17; - int height = 3; + + boolean offscreen = mouseX + width + 19 >= res.getScaledWidth(); + + int fixY = res.getScaledHeight() - (mouseY + tooltipHeight); + if(fixY < 0) + offy -= fixY; + if(offscreen) + offx = -13 - width; int level = ItemTerraPick.getLevel(stack); int max = ItemTerraPick.LEVELS[Math.min(ItemTerraPick.LEVELS.length - 1, level + 1)];