add item mod name tooltip back

badasintended · Apr 12, 2021 · 2a880d8 · 2a880d8
1 parent 17a6456
commit 2a880d8
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 3 deletions.
diff --git a/common/src/main/java/mcp/mobius/waila/WailaClient.java b/common/src/main/java/mcp/mobius/waila/WailaClient.java
@@ -1,5 +1,6 @@
 package mcp.mobius.waila;
 
+import java.util.List;
 import java.util.function.BiFunction;
 
 import mcp.mobius.waila.api.impl.config.PluginConfig;
@@ -8,8 +9,13 @@
 import mcp.mobius.waila.gui.GuiConfigHome;
 import mcp.mobius.waila.overlay.TickHandler;
 import mcp.mobius.waila.plugin.core.WailaCore;
+import mcp.mobius.waila.util.ModIdentification;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.item.TooltipContext;
 import net.minecraft.client.options.KeyBinding;
+import net.minecraft.item.ItemStack;
+import net.minecraft.text.LiteralText;
+import net.minecraft.text.Text;
 import org.lwjgl.glfw.GLFW;
 
 public abstract class WailaClient {
@@ -63,4 +69,13 @@ protected static void onCientTick() {
         }
     }
 
+    protected static void onItemTooltip(ItemStack stack, TooltipContext context, List<Text> tooltip) {
+        if (PluginConfig.INSTANCE.get(WailaCore.CONFIG_SHOW_MOD_NAME)) {
+            tooltip.add(new LiteralText(String.format(
+                Waila.CONFIG.get().getFormatting().getModName(),
+                ModIdentification.getModInfo(stack.getItem()).getName()
+            )));
+        }
+    }
+
 }
diff --git a/common/src/main/java/mcp/mobius/waila/plugin/core/WailaCore.java b/common/src/main/java/mcp/mobius/waila/plugin/core/WailaCore.java
@@ -23,8 +23,8 @@ public class WailaCore implements IWailaPlugin {
     public static final Identifier CONFIG_SHOW_FLUID = Waila.id("show_fluids");
     public static final Identifier CONFIG_SHOW_ENTITY = Waila.id("show_entities");
     public static final Identifier CONFIG_SHOW_ITEM = Waila.id("show_item");
+    public static final Identifier CONFIG_SHOW_MOD_NAME = Waila.id("show_mod_name");
 
-    static final Identifier CONFIG_SHOW_MOD_NAME = Waila.id("show_mod_name");
     static final Identifier CONFIG_SHOW_REGISTRY = Waila.id("show_registry");
     static final Identifier CONFIG_SHOW_ENTITY_HEALTH = Waila.id("show_entity_hp");
     static final Identifier CONFIG_SHOW_STATES = Waila.id("show_states");

diff --git a/fabric/src/main/java/mcp/mobius/waila/fabric/FabricWailaClient.java b/fabric/src/main/java/mcp/mobius/waila/fabric/FabricWailaClient.java
@@ -8,6 +8,7 @@
 import mcp.mobius.waila.overlay.Tooltip;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
+import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
 import net.minecraft.client.options.KeyBinding;
@@ -28,6 +29,8 @@ public void onInitializeClient() {
 
         ClientTickEvents.END_CLIENT_TICK.register(client -> onCientTick());
 
+        ItemTooltipCallback.EVENT.register(WailaClient::onItemTooltip);
+
         Tooltip.onCreate = texts ->
             WailaTooltipEvent.WAILA_HANDLE_TOOLTIP.invoker().onTooltip(new WailaTooltipEvent(texts, DataAccessor.INSTANCE));
 

diff --git a/forge/src/main/java/mcp/mobius/waila/forge/ForgeWailaClient.java b/forge/src/main/java/mcp/mobius/waila/forge/ForgeWailaClient.java
@@ -12,6 +12,7 @@
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.TickEvent;
+import net.minecraftforge.event.entity.player.ItemTooltipEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.ExtensionPoint;
 import net.minecraftforge.fml.ModLoadingContext;
@@ -63,17 +64,22 @@ static void registerConfigScreen() {
     static class Subscriber {
 
         @SubscribeEvent
-        static void onRenderGameOverlay(RenderGameOverlayEvent.Post event) {
+        static void renderGameOverlay(RenderGameOverlayEvent.Post event) {
             if (event.getType() == RenderGameOverlayEvent.ElementType.ALL)
                 Tooltip.render(event.getMatrixStack(), event.getPartialTicks());
         }
 
         @SubscribeEvent
-        static void onClientTick(TickEvent.ClientTickEvent event) {
+        static void clientTick(TickEvent.ClientTickEvent event) {
             if (event.phase == TickEvent.Phase.END)
                 onCientTick();
         }
 
+        @SubscribeEvent
+        static void itemTooltip(ItemTooltipEvent event) {
+            onItemTooltip(event.getItemStack(), event.getFlags(), event.getToolTip());
+        }
+
     }
 
     @Mod(Waila.WTHIT)