mirror of
https://github.com/GTNewHorizons/waila.git
synced 2026-11-22 05:02:23 +00:00
Added argument to pass along the param array
This commit is contained in:
1 parent
6bba5f1e7e
commit
a63dc221ba
4 files changed
+18
-16
No files matched your search
@@ -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);
|
||||
}
|
||||
@@ -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));
|
||||
|
||||
@@ -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 !
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user