mirror of
https://github.com/GTNewHorizons/waila.git
synced 2026-11-21 20:52:40 +00:00
Added skeleton support for custom renderers in the tooltip.
Still need to fix the offset and check all the signatures.
This commit is contained in:
1 parent
b686bb431c
commit
adcc7783a8
6 files changed
+57
-2
No files matched your search
@@ -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);
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
package mcp.mobius.waila.api;
|
||||
|
||||
import java.awt.Point;
|
||||
|
||||
|
||||
public interface IWailaTooltipRenderer {
|
||||
Point getSize(IWailaDataAccessor accessor);
|
||||
void draw (IWailaDataAccessor accessor);
|
||||
}
|
||||
@@ -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";
|
||||
|
||||
}
|
||||
@@ -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<String, String> IMCRequests = new LinkedHashMap<String, String>();
|
||||
|
||||
public LinkedHashMap<String, IWailaTooltipRenderer> tooltipRenderers = new LinkedHashMap<String, IWailaTooltipRenderer>();
|
||||
|
||||
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<IWailaDataProvider> 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 <T> ArrayList<T> getProviders(Object obj, LinkedHashMap<Class, ArrayList<T>> target){
|
||||
ArrayList<T> returnList = new ArrayList<T>();
|
||||
for (Class clazz : target.keySet())
|
||||
|
||||
@@ -77,6 +77,8 @@ public class HUDHandlerBlocks implements IWailaDataProvider {
|
||||
|
||||
@Override
|
||||
public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
|
||||
currenttip.add(RENDER + "{Plop}");
|
||||
|
||||
String modName = ModIdentification.nameFromStack(itemStack);
|
||||
if (modName != null && !modName.equals("")){
|
||||
currenttip.add(BLUE + ITALIC + modName);
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user