Added tooltip event registered only if NEI is not present to show the originating mod.

This commit is contained in:
Thomas Guimbretiere committed 2015-01-03 18:59:44 +01:00
1 parent 2b5eb13f83
commit fdd401469e
3 files changed
+24 -9

No files matched your search

+2 -1
View File
@@ -82,7 +82,8 @@ public class Waila {
if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT){
MinecraftForge.EVENT_BUS.register(new DecoratorRenderer());
FMLCommonHandler.instance().bus().register(new KeyEvent());
FMLCommonHandler.instance().bus().register(WailaTickHandler.instance());
FMLCommonHandler.instance().bus().register(WailaTickHandler.instance());
}
FMLCommonHandler.instance().bus().register(new NetworkHandler());
}
@@ -1,23 +1,18 @@
package mcp.mobius.waila.client;
import java.lang.reflect.Method;
import mcp.mobius.waila.api.impl.ConfigHandler;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
import mcp.mobius.waila.gui.truetyper.FontLoader;
import mcp.mobius.waila.gui.truetyper.TrueTypeFont;
import mcp.mobius.waila.handlers.HUDHandlerBlocks;
import mcp.mobius.waila.handlers.HUDHandlerEntities;
import mcp.mobius.waila.handlers.VanillaTooltipHandler;
//import mcp.mobius.waila.handlers.SummaryProviderDefault;
import mcp.mobius.waila.server.ProxyServer;
import mcp.mobius.waila.utils.Constants;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.config.Configuration;
import org.lwjgl.input.Keyboard;
import net.minecraftforge.common.MinecraftForge;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Loader;
import mcp.mobius.waila.cbcore.LangUtil;
@@ -43,6 +38,8 @@ public class ProxyClient extends ProxyServer {
try{
Class.forName("mcp.mobius.waila.handlers.nei.NEIHandler").getDeclaredMethod("register").invoke(null);
} catch (Exception e){}
} else {
MinecraftForge.EVENT_BUS.register(new VanillaTooltipHandler());
}
ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerBlocks(), Block.class);
@@ -0,0 +1,17 @@
package mcp.mobius.waila.handlers;
import mcp.mobius.waila.utils.ModIdentification;
import net.minecraftforge.event.entity.player.ItemTooltipEvent;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class VanillaTooltipHandler {
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void tooltipEvent(ItemTooltipEvent event) {
String canonicalName = ModIdentification.nameFromStack(event.itemStack);
if (canonicalName != null && !canonicalName.equals(""))
event.toolTip.add("\u00a79\u00a7o" + canonicalName);
}
}