diff --git a/gradle.properties b/gradle.properties index 1ab3259..fa8225c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ mc_version=1.8.8 -forge_version=11.15.0.1603-1.8.8 +forge_version=11.15.0.1609-1.8.8 ccl_version=1.1.2.139 ccc_version=1.0.5.36 nei_version=1.0.5.82 diff --git a/src/main/java/mcp/mobius/waila/api/package-info.java b/src/main/java/mcp/mobius/waila/api/package-info.java index d033e55..6102327 100644 --- a/src/main/java/mcp/mobius/waila/api/package-info.java +++ b/src/main/java/mcp/mobius/waila/api/package-info.java @@ -1,3 +1,3 @@ -@API(apiVersion="1.2",owner="Waila",provides="WailaAPI") +@API(apiVersion="1.3",owner="Waila",provides="WailaAPI") package mcp.mobius.waila.api; import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/main/java/mcp/mobius/waila/handlers/VanillaTooltipHandler.java b/src/main/java/mcp/mobius/waila/handlers/VanillaTooltipHandler.java index 4f8ad6f..b5a86dc 100644 --- a/src/main/java/mcp/mobius/waila/handlers/VanillaTooltipHandler.java +++ b/src/main/java/mcp/mobius/waila/handlers/VanillaTooltipHandler.java @@ -2,6 +2,7 @@ package mcp.mobius.waila.handlers; import mcp.mobius.waila.utils.ModIdentification; import net.minecraftforge.event.entity.player.ItemTooltipEvent; +import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -11,7 +12,7 @@ public class VanillaTooltipHandler { @SideOnly(Side.CLIENT) public void tooltipEvent(ItemTooltipEvent event) { String canonicalName = ModIdentification.nameFromStack(event.itemStack); - if (canonicalName != null && !canonicalName.equals("")) + if (canonicalName != null && !canonicalName.equals("") && !Loader.isModLoaded("JEI")) event.toolTip.add("\u00a79\u00a7o" + canonicalName); } }