Protected rendering from crashes.

Tried to use TrueTyper without success
Update to latest Gradle
This commit is contained in:
Thomas Guimbretiere committed 2015-02-10 17:32:43 +01:00
1 parent 6d6e7616e4
commit 01546d40e9
6 files changed
+51 -6

No files matched your search

@@ -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();
@@ -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();
}
@@ -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);
}
@@ -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);
}
}
@@ -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);
}
}