From a63dc221ba1dc36768e90c92effe12077f943877 Mon Sep 17 00:00:00 2001 From: Thomas Guimbretiere Date: Mon, 29 Dec 2014 16:17:41 +0100 Subject: [PATCH] Added argument to pass along the param array --- .../waila/api/IWailaTooltipRenderer.java | 4 ++-- .../mcp/mobius/waila/overlay/DisplayUtil.java | 2 +- .../mcp/mobius/waila/overlay/Tooltip.java | 24 ++++++++++--------- .../waila/overlay/TooltipRendererString.java | 4 ++-- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/main/java/mcp/mobius/waila/api/IWailaTooltipRenderer.java b/src/main/java/mcp/mobius/waila/api/IWailaTooltipRenderer.java index 5a5c963..c55fbb2 100644 --- a/src/main/java/mcp/mobius/waila/api/IWailaTooltipRenderer.java +++ b/src/main/java/mcp/mobius/waila/api/IWailaTooltipRenderer.java @@ -5,6 +5,6 @@ import java.awt.Point; public interface IWailaTooltipRenderer { - Dimension getSize(IWailaDataAccessor accessor); - void draw (IWailaDataAccessor accessor, int x, int y); + Dimension getSize(String[] params, IWailaDataAccessor accessor); + void draw (String[] params, IWailaDataAccessor accessor, int x, int y); } diff --git a/src/main/java/mcp/mobius/waila/overlay/DisplayUtil.java b/src/main/java/mcp/mobius/waila/overlay/DisplayUtil.java index 453bc4f..259b723 100644 --- a/src/main/java/mcp/mobius/waila/overlay/DisplayUtil.java +++ b/src/main/java/mcp/mobius/waila/overlay/DisplayUtil.java @@ -32,7 +32,7 @@ public class DisplayUtil { while (renderMatcher.find()){ IWailaTooltipRenderer renderer = ModuleRegistrar.instance().getTooltipRenderer(renderMatcher.group("name")); if (renderer != null) - width += renderer.getSize(DataAccessorBlock.instance).width; + width += renderer.getSize(renderMatcher.group("args").split(","), DataAccessorBlock.instance).width; } width += fontRenderer.getStringWidth(stripSymbols(s)); diff --git a/src/main/java/mcp/mobius/waila/overlay/Tooltip.java b/src/main/java/mcp/mobius/waila/overlay/Tooltip.java index 5341bde..fd7e43b 100644 --- a/src/main/java/mcp/mobius/waila/overlay/Tooltip.java +++ b/src/main/java/mcp/mobius/waila/overlay/Tooltip.java @@ -38,14 +38,20 @@ public class Tooltip { IWailaDataAccessor accessor = DataAccessorBlock.instance; /////////////////////////////////////Renderable/////////////////////////////////////// - private class Renderable implements IWailaTooltipRenderer{ + private class Renderable{ final IWailaTooltipRenderer renderer; final Point pos; + final String[] params; - public Renderable(IWailaTooltipRenderer renderer, Point pos){ + public Renderable(IWailaTooltipRenderer renderer, Point pos, String[] params){ this.renderer = renderer; this.pos = pos; + this.params = params; } + + public Renderable(IWailaTooltipRenderer renderer, Point pos){ + this(renderer, pos, new String[]{}); + } //public void setPos(int x, int y){ // this.pos = new Point(x, y); @@ -55,14 +61,12 @@ public class Tooltip { return this.pos; } - @Override public Dimension getSize(IWailaDataAccessor accessor) { - return this.renderer.getSize(accessor); + return this.renderer.getSize(this.params, accessor); } - @Override public void draw(IWailaDataAccessor accessor, int x, int y) { - this.renderer.draw(accessor, x + this.pos.x, y + this.pos.y); + this.renderer.draw(this.params, accessor, x + this.pos.x, y + this.pos.y); } @Override @@ -134,13 +138,11 @@ public class Tooltip { if (renderMatcher.find()){ String renderName = renderMatcher.group("name"); - String renderArgs = renderMatcher.group("args"); - - System.out.printf("%s [ %s ]\n", renderName, renderArgs); IWailaTooltipRenderer renderer = ModuleRegistrar.instance().getTooltipRenderer(renderName); - if (renderer != null) - renderable = new Renderable(renderer, new Point(offsetX, offsetY)); + if (renderer != null){ + renderable = new Renderable(renderer, new Point(offsetX, offsetY), renderMatcher.group("args").split(",")); + } } else { // Todo : The added offset should be based on the remaining of the column, not just the current string ! diff --git a/src/main/java/mcp/mobius/waila/overlay/TooltipRendererString.java b/src/main/java/mcp/mobius/waila/overlay/TooltipRendererString.java index dbb2506..7c8830d 100644 --- a/src/main/java/mcp/mobius/waila/overlay/TooltipRendererString.java +++ b/src/main/java/mcp/mobius/waila/overlay/TooltipRendererString.java @@ -17,12 +17,12 @@ public class TooltipRendererString implements IWailaTooltipRenderer{ } @Override - public Dimension getSize(IWailaDataAccessor accessor) { + public Dimension getSize(String[] params, IWailaDataAccessor accessor) { return size; } @Override - public void draw(IWailaDataAccessor accessor, int x, int y) { + public void draw(String[] params, IWailaDataAccessor accessor, int x, int y) { GuiDraw.drawString(data, x, y, OverlayConfig.fontcolor, true); }