mirror of
https://github.com/GTNewHorizons/waila.git
synced 2026-11-20 12:19:44 +00:00
Bumped API version
Fixed double showing of mod name on item tooltip when JEI is present
This commit is contained in:
1 parent
d4a5ac7367
commit
4cb138b088
3 files changed
+4
-3
No files matched your search
+1
-1
@@ -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
|
||||
|
||||
@@ -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;
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user