From 403e2aad576dc59dcd6546b26fa39b388f778bfa Mon Sep 17 00:00:00 2001 From: Thomas Guimbretiere Date: Tue, 24 Dec 2013 07:48:36 +0100 Subject: [PATCH] Tooltip rendering is not dependent on NEI API no more. --- mcp/mobius/waila/overlay/OverlayRenderer.java | 3 +-- mcp/mobius/waila/overlay/WailaTickHandler.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/mcp/mobius/waila/overlay/OverlayRenderer.java b/mcp/mobius/waila/overlay/OverlayRenderer.java index 6a8d56f..fe0f629 100644 --- a/mcp/mobius/waila/overlay/OverlayRenderer.java +++ b/mcp/mobius/waila/overlay/OverlayRenderer.java @@ -8,7 +8,6 @@ import java.util.List; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import codechicken.nei.api.ItemInfo; import codechicken.nei.forge.GuiContainerManager; import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.registry.EntityRegistry; @@ -47,7 +46,7 @@ public class OverlayRenderer { if (RayTracing.instance().getTarget().typeOfHit == EnumMovingObjectType.TILE && RayTracing.instance().getTargetStack() != null) { - renderOverlay(RayTracing.instance().getTargetStack(), ItemInfo.getText(RayTracing.instance().getTargetStack(), mc.theWorld, mc.thePlayer, RayTracing.instance().getTarget()), getPositioning()); + renderOverlay(RayTracing.instance().getTargetStack(), WailaTickHandler.instance().currenttip, getPositioning()); } if (RayTracing.instance().getTarget().typeOfHit == EnumMovingObjectType.ENTITY) diff --git a/mcp/mobius/waila/overlay/WailaTickHandler.java b/mcp/mobius/waila/overlay/WailaTickHandler.java index f890648..c79abb8 100644 --- a/mcp/mobius/waila/overlay/WailaTickHandler.java +++ b/mcp/mobius/waila/overlay/WailaTickHandler.java @@ -25,7 +25,8 @@ public class WailaTickHandler implements ITickHandler { public ItemStack identifiedHighlight = new ItemStack(Block.dirt); public List currenttipHEAD = new ArrayList(); public List currenttipBODY = new ArrayList(); - public List currenttipTAIL = new ArrayList(); + public List currenttipTAIL = new ArrayList(); + public List currenttip = new ArrayList(); public HUDHandlerExternal handler = new HUDHandlerExternal(); @@ -45,7 +46,7 @@ public class WailaTickHandler implements ITickHandler { @Override public void tickEnd(EnumSet type, Object... tickData) { if(type.contains(TickType.RENDER)){ - OverlayRenderer.renderOverlay(); + OverlayRenderer.renderOverlay(); } if(type.contains(TickType.CLIENT)){ @@ -65,6 +66,11 @@ public class WailaTickHandler implements ITickHandler { this.currenttipHEAD = handler.handleTextData(targetStack, world, player, target, new ArrayList(), Layout.HEADER); this.currenttipBODY = handler.handleTextData(targetStack, world, player, target, new ArrayList(), Layout.BODY); this.currenttipTAIL = handler.handleTextData(targetStack, world, player, target, new ArrayList(), Layout.FOOTER); + + this.currenttip.clear(); + this.currenttip.addAll(this.currenttipHEAD); + this.currenttip.addAll(this.currenttipBODY); + this.currenttip.addAll(this.currenttipTAIL); } } }