Tooltip rendering is not dependent on NEI API no more.

This commit is contained in:
Thomas Guimbretiere committed 2013-12-24 07:48:36 +01:00
1 parent c171d33e8c
commit 403e2aad57
2 files changed
+9 -4

No files matched your search

@@ -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)
@@ -25,7 +25,8 @@ public class WailaTickHandler implements ITickHandler {
public ItemStack identifiedHighlight = new ItemStack(Block.dirt);
public List<String> currenttipHEAD = new ArrayList<String>();
public List<String> currenttipBODY = new ArrayList<String>();
public List<String> currenttipTAIL = new ArrayList<String>();
public List<String> currenttipTAIL = new ArrayList<String>();
public List<String> currenttip = new ArrayList<String>();
public HUDHandlerExternal handler = new HUDHandlerExternal();
@@ -45,7 +46,7 @@ public class WailaTickHandler implements ITickHandler {
@Override
public void tickEnd(EnumSet<TickType> 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<String>(), Layout.HEADER);
this.currenttipBODY = handler.handleTextData(targetStack, world, player, target, new ArrayList<String>(), Layout.BODY);
this.currenttipTAIL = handler.handleTextData(targetStack, world, player, target, new ArrayList<String>(), Layout.FOOTER);
this.currenttip.clear();
this.currenttip.addAll(this.currenttipHEAD);
this.currenttip.addAll(this.currenttipBODY);
this.currenttip.addAll(this.currenttipTAIL);
}
}
}