diff --git a/build.gradle b/build.gradle index 21de19a..b48bc9e 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ apply plugin: 'java' apply plugin: 'forge' apply plugin: 'maven' -version = "1.5.8a_1.7.10" +version = "1.5.8b_dev1_1.7.10" group= "mcp.mobius.waila" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "Waila" @@ -57,7 +57,7 @@ dependencies { } minecraft { - version = "1.7.10-10.13.2.1264" + version = "1.7.10-10.13.2.1291" runDir = "eclipse" } diff --git a/src/main/java/mcp/mobius/waila/gui/truetyper/FontHelper.java b/src/main/java/mcp/mobius/waila/gui/truetyper/FontHelper.java index 6bb8078..cf32b5c 100644 --- a/src/main/java/mcp/mobius/waila/gui/truetyper/FontHelper.java +++ b/src/main/java/mcp/mobius/waila/gui/truetyper/FontHelper.java @@ -35,10 +35,12 @@ public class FontHelper { private static String formatEscape = "\u00A7"; + /* public static void drawString(String s, float x, float y, TrueTypeFont font, float scaleX, float scaleY, float... rgba){ drawString(s,x,y,font,scaleX,scaleY,0,rgba); } + */ public static void drawString(String s, float x, float y, TrueTypeFont font, float scaleX, float scaleY, float rotationZ, float... rgba){ Minecraft mc = Minecraft.getMinecraft(); diff --git a/src/main/java/mcp/mobius/waila/overlay/DisplayUtil.java b/src/main/java/mcp/mobius/waila/overlay/DisplayUtil.java index dd0b617..71386d2 100644 --- a/src/main/java/mcp/mobius/waila/overlay/DisplayUtil.java +++ b/src/main/java/mcp/mobius/waila/overlay/DisplayUtil.java @@ -13,6 +13,7 @@ import org.lwjgl.opengl.GL11; import mcp.mobius.waila.api.IWailaTooltipRenderer; import mcp.mobius.waila.api.impl.DataAccessorCommon; import mcp.mobius.waila.api.impl.ModuleRegistrar; +import mcp.mobius.waila.utils.WailaExceptionHandler; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.Gui; @@ -71,8 +72,13 @@ public class DisplayUtil { public static void renderStack(int x, int y, ItemStack stack){ enable3DRender(); - renderItem.renderItemAndEffectIntoGUI(fontRenderer, textureManager, stack, x, y); - renderItem.renderItemOverlayIntoGUI(fontRenderer, textureManager, stack, x, y); + try{ + renderItem.renderItemAndEffectIntoGUI(fontRenderer, textureManager, stack, x, y); + renderItem.renderItemOverlayIntoGUI(fontRenderer, textureManager, stack, x, y); + } catch (Exception e){ + String stackStr = stack != null ? stack.toString() : "NullStack"; + WailaExceptionHandler.handleErr(e, "renderStack | " + stackStr, null); + } enable2DRender(); } diff --git a/src/main/java/mcp/mobius/waila/overlay/Tooltip.java b/src/main/java/mcp/mobius/waila/overlay/Tooltip.java index 6d12b3f..15cbb09 100644 --- a/src/main/java/mcp/mobius/waila/overlay/Tooltip.java +++ b/src/main/java/mcp/mobius/waila/overlay/Tooltip.java @@ -20,6 +20,7 @@ import mcp.mobius.waila.api.impl.DataAccessorCommon; import mcp.mobius.waila.api.impl.ModuleRegistrar; import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderIcon; import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderString; +import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderTrueTyper; import mcp.mobius.waila.utils.Constants; import mcp.mobius.waila.utils.WailaExceptionHandler; import static mcp.mobius.waila.api.SpecialChars.*; @@ -174,6 +175,7 @@ public class Tooltip { offsetX += (columnsWidth.get(c) - DisplayUtil.getDisplayWidth(currentLine.substring(lineMatcher.start()))) / 2; renderable = new Renderable(new TTRenderString(DisplayUtil.stripWailaSymbols(cs)), new Point(offsetX, offsetY)); + //renderable = new Renderable(new TTRenderTrueTyper(DisplayUtil.stripWailaSymbols(cs)), new Point(offsetX, offsetY)); this.elements.add(renderable); } diff --git a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderString.java b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderString.java index 8eeae8f..e32a7cf 100644 --- a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderString.java +++ b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderString.java @@ -1,10 +1,13 @@ -package mcp.mobius.waila.overlay.tooltiprenderers; + package mcp.mobius.waila.overlay.tooltiprenderers; import java.awt.Dimension; +import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.IWailaCommonAccessor; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaTooltipRenderer; +import mcp.mobius.waila.gui.truetyper.FontHelper; +import mcp.mobius.waila.gui.truetyper.TrueTypeFont; import mcp.mobius.waila.overlay.DisplayUtil; import mcp.mobius.waila.overlay.OverlayConfig; @@ -25,7 +28,7 @@ public class TTRenderString implements IWailaTooltipRenderer{ @Override public void draw(String[] params, IWailaCommonAccessor accessor) { - DisplayUtil.drawString(data, 0, 0, OverlayConfig.fontcolor, true); + DisplayUtil.drawString(data, 0, 0, OverlayConfig.fontcolor, true); } } diff --git a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderTrueTyper.java b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderTrueTyper.java new file mode 100644 index 0000000..d1ca58e --- /dev/null +++ b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderTrueTyper.java @@ -0,0 +1,32 @@ +package mcp.mobius.waila.overlay.tooltiprenderers; + +import java.awt.Dimension; + +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.IWailaCommonAccessor; +import mcp.mobius.waila.api.IWailaTooltipRenderer; +import mcp.mobius.waila.gui.truetyper.FontHelper; +import mcp.mobius.waila.gui.truetyper.TrueTypeFont; +import mcp.mobius.waila.overlay.DisplayUtil; + +public class TTRenderTrueTyper implements IWailaTooltipRenderer{ + + final String data; + final Dimension size; + + public TTRenderTrueTyper(String data){ + this.data = data; + this.size = new Dimension(DisplayUtil.getDisplayWidth(data), data.equals("") ? 0 : (int)((TrueTypeFont)Waila.proxy.getFont()).getHeight()/2); + } + + @Override + public Dimension getSize(String[] params, IWailaCommonAccessor accessor) { + return size; + } + + @Override + public void draw(String[] params, IWailaCommonAccessor accessor) { + FontHelper.drawString(data, 0f, 0f, (TrueTypeFont)Waila.proxy.getFont(), 1.0f, 1.0f, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f); + } + +}