From fdd401469eee86fa23247920fe65edc462cdfd1d Mon Sep 17 00:00:00 2001 From: Thomas Guimbretiere Date: Sat, 3 Jan 2015 18:59:44 +0100 Subject: [PATCH] Added tooltip event registered only if NEI is not present to show the originating mod. --- src/main/java/mcp/mobius/waila/Waila.java | 3 ++- .../mcp/mobius/waila/client/ProxyClient.java | 13 +++++-------- .../waila/handlers/VanillaTooltipHandler.java | 17 +++++++++++++++++ 3 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 src/main/java/mcp/mobius/waila/handlers/VanillaTooltipHandler.java diff --git a/src/main/java/mcp/mobius/waila/Waila.java b/src/main/java/mcp/mobius/waila/Waila.java index d4b8202..7c1d794 100644 --- a/src/main/java/mcp/mobius/waila/Waila.java +++ b/src/main/java/mcp/mobius/waila/Waila.java @@ -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()); } diff --git a/src/main/java/mcp/mobius/waila/client/ProxyClient.java b/src/main/java/mcp/mobius/waila/client/ProxyClient.java index 3377323..80676bb 100644 --- a/src/main/java/mcp/mobius/waila/client/ProxyClient.java +++ b/src/main/java/mcp/mobius/waila/client/ProxyClient.java @@ -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); diff --git a/src/main/java/mcp/mobius/waila/handlers/VanillaTooltipHandler.java b/src/main/java/mcp/mobius/waila/handlers/VanillaTooltipHandler.java new file mode 100644 index 0000000..fc427ff --- /dev/null +++ b/src/main/java/mcp/mobius/waila/handlers/VanillaTooltipHandler.java @@ -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); + } +}