diff --git a/src/main/java/mcp/mobius/waila/api/IWailaRegistrar.java b/src/main/java/mcp/mobius/waila/api/IWailaRegistrar.java index 8d77db9..66f43ad 100644 --- a/src/main/java/mcp/mobius/waila/api/IWailaRegistrar.java +++ b/src/main/java/mcp/mobius/waila/api/IWailaRegistrar.java @@ -69,6 +69,8 @@ public interface IWailaRegistrar { @Deprecated public void registerSyncedNBTKey(String key, Class target); + public void registerTooltipRenderer(String name, IWailaTooltipRenderer renderer); + /* UNUSED FOR NOW (Will be used for the ingame wiki */ //public void registerDocTextFile (String filename); //public void registerShortDataProvider (IWailaSummaryProvider dataProvider, Class item); diff --git a/src/main/java/mcp/mobius/waila/api/IWailaTooltipRenderer.java b/src/main/java/mcp/mobius/waila/api/IWailaTooltipRenderer.java new file mode 100644 index 0000000..f247c28 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/api/IWailaTooltipRenderer.java @@ -0,0 +1,9 @@ +package mcp.mobius.waila.api; + +import java.awt.Point; + + +public interface IWailaTooltipRenderer { + Point getSize(IWailaDataAccessor accessor); + void draw (IWailaDataAccessor accessor); +} diff --git a/src/main/java/mcp/mobius/waila/api/SpecialChars.java b/src/main/java/mcp/mobius/waila/api/SpecialChars.java index 5bd92a8..14aa0c1 100644 --- a/src/main/java/mcp/mobius/waila/api/SpecialChars.java +++ b/src/main/java/mcp/mobius/waila/api/SpecialChars.java @@ -30,11 +30,13 @@ public class SpecialChars { public static String WailaStyle = "\u00A4"; public static String WailaIcon = "\u00A5"; + public static String WailaRenderer = "\u00A6"; public static String TAB = WailaStyle + WailaStyle +"a"; public static String ALIGNRIGHT = WailaStyle + WailaStyle +"b"; public static String ALIGNCENTER = WailaStyle + WailaStyle +"c"; public static String HEART = WailaStyle + WailaIcon +"a"; public static String HHEART = WailaStyle + WailaIcon +"b"; public static String EHEART = WailaStyle + WailaIcon +"c"; + public static String RENDER = WailaStyle + WailaRenderer +"a"; } diff --git a/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java b/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java index dec35ca..01e2245 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java +++ b/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java @@ -21,6 +21,7 @@ import mcp.mobius.waila.api.IWailaFMPDecorator; import mcp.mobius.waila.api.IWailaFMPProvider; import mcp.mobius.waila.api.IWailaRegistrar; import mcp.mobius.waila.api.IWailaSummaryProvider; +import mcp.mobius.waila.api.IWailaTooltipRenderer; import mcp.mobius.waila.cbcore.LangUtil; import mcp.mobius.waila.utils.Constants; @@ -55,6 +56,8 @@ public class ModuleRegistrar implements IWailaRegistrar { public LinkedHashMap IMCRequests = new LinkedHashMap(); + public LinkedHashMap tooltipRenderers = new LinkedHashMap(); + private ModuleRegistrar() { instance = this; } @@ -214,6 +217,14 @@ public class ModuleRegistrar implements IWailaRegistrar { this.syncedNBTKeys.get(target).add(key); } + @Override + public void registerTooltipRenderer(String name, IWailaTooltipRenderer renderer){ + if (!this.tooltipRenderers.containsKey(name)) + this.tooltipRenderers.put(name, renderer); + else + Waila.log.warn(String.format("A renderer named %s already exists (Class : %s). Skipping new renderer.", name, renderer.getClass().getName())); + } + /* PROVIDER GETTERS */ public ArrayList getHeadProviders(Object block) { @@ -280,6 +291,10 @@ public class ModuleRegistrar implements IWailaRegistrar { return getProviders(name, this.FMPClassDecorators); } + public IWailaTooltipRenderer getTooltipRenderer(String name){ + return this.tooltipRenderers.get(name); + } + private ArrayList getProviders(Object obj, LinkedHashMap> target){ ArrayList returnList = new ArrayList(); for (Class clazz : target.keySet()) diff --git a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java index 936f672..4c74b20 100644 --- a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java +++ b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java @@ -77,6 +77,8 @@ public class HUDHandlerBlocks implements IWailaDataProvider { @Override public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + currenttip.add(RENDER + "{Plop}"); + String modName = ModIdentification.nameFromStack(itemStack); if (modName != null && !modName.equals("")){ currenttip.add(BLUE + ITALIC + modName); diff --git a/src/main/java/mcp/mobius/waila/overlay/Tooltip.java b/src/main/java/mcp/mobius/waila/overlay/Tooltip.java index aef1be8..093281b 100644 --- a/src/main/java/mcp/mobius/waila/overlay/Tooltip.java +++ b/src/main/java/mcp/mobius/waila/overlay/Tooltip.java @@ -10,7 +10,10 @@ import java.awt.Point; import codechicken.lib.gui.GuiDraw; import net.minecraft.item.ItemStack; import net.minecraftforge.common.config.Configuration; +import mcp.mobius.waila.api.IWailaTooltipRenderer; import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.api.impl.DataAccessorBlock; +import mcp.mobius.waila.api.impl.ModuleRegistrar; import mcp.mobius.waila.utils.Constants; import static mcp.mobius.waila.api.SpecialChars.*; @@ -53,6 +56,11 @@ public class Tooltip { columnsWidth[i] += IconSize; else if (s.startsWith(WailaStyle + WailaStyle)) columnsWidth[i] += 0; + else if (s.startsWith(RENDER)){ + IWailaTooltipRenderer renderer = ModuleRegistrar.instance().getTooltipRenderer(s.substring(3)); + if (renderer != null) + columnsWidth[i] += renderer.getSize(DataAccessorBlock.instance).x; + } else columnsWidth[i] += GuiDraw.getStringWidth(s); } @@ -68,12 +76,25 @@ public class Tooltip { int prevIndex = 0; while (matcher.find()){ String substring = s.substring(prevIndex, matcher.start()); + if (!substring.equals("")) retList.add(substring); - retList.add(s.substring(matcher.start(), matcher.end())); - prevIndex = matcher.end(); + + String controlStr = s.substring(matcher.start(), matcher.end()); + + // If we don't have a render type block + if (controlStr.startsWith(RENDER)){ + int endOfBlock = s.substring(prevIndex).indexOf("}"); + String renderStr = controlStr + s.substring(matcher.end() + 1, endOfBlock); + retList.add(renderStr); + prevIndex += renderStr.length() + 2; + } else { + retList.add(controlStr); + prevIndex = matcher.end(); + } } retList.add(s.substring(prevIndex)); + return retList; } } @@ -163,6 +184,10 @@ public class Tooltip { if (s.startsWith(WailaStyle + WailaIcon)){ OverlayRenderer.renderIcon(x + offsetX + columnsPos[c] + c*TabSpacing + offX, y + ty + 10*i, IconSize, IconSize, IconUI.bySymbol(s)); offX += IconSize; + } else if (s.startsWith(RENDER)){ + IWailaTooltipRenderer renderer = ModuleRegistrar.instance().getTooltipRenderer(s.substring(3)); + if (renderer != null) + renderer.draw(DataAccessorBlock.instance); }else{ offX += GuiDraw.getStringWidth(s); }