修复tooltips可能重复出现的问题

Author: Circulate233

dependencies.gradle

@@ -23,6 +23,7 @@ dependencies {
     compileOnly(rfg.deobf("curse.maven:modularmachinery-community-edition-817377:7306619"))
     implementation(rfg.deobf("curse.maven:extended-crafting-terminals-for-applied-1157825:6895322"))
     compileOnly(rfg.deobf("curse.maven:cofh-core-69162:2920433"))
+    implementation(rfg.deobf("curse.maven:ae2-crafting-tree-legacy-1121489:5814089"))
     compileOnly(rfg.deobf("curse.maven:cofh-world-271384:2920434"))
     compileOnly(rfg.deobf("curse.maven:thermal-foundation-222880:2926428"))
     compileOnly(rfg.deobf("curse.maven:thermal-expansion-69163:2926431"))
@@ -46,7 +47,6 @@ dependencies {
     compileOnly(rfg.deobf("curse.maven:draconic-evolution-223565:3431261"))
     compileOnly(rfg.deobf("curse.maven:packagedauto-308380:6932932"))
     compileOnly(rfg.deobf("curse.maven:ender-utilities-224320:2977010"))
-    implementation(rfg.deobf("curse.maven:ae2-crafting-tree-legacy-1121489:5814089"))
 
     compileOnly(rfg.deobf("curse.maven:botaniverse-944656:4945200"))
 }

src/main/java/com/circulation/random_complement/client/ClientProxy.java

@@ -8,13 +8,14 @@
 import com.circulation.random_complement.client.handler.RCJEIInputHandler;
 import com.circulation.random_complement.common.CommonProxy;
 import com.circulation.random_complement.common.util.Functions;
-import com.circulation.random_complement.mixin.jei.AccessorGhostIngredientDragManager;
 import com.circulation.random_complement.mixin.jei.AccessorInputHandler;
 import it.unimi.dsi.fastutil.objects.ReferenceArrayList;
 import it.unimi.dsi.fastutil.objects.ReferenceList;
 import lombok.val;
 import mezz.jei.Internal;
-import mezz.jei.gui.ghost.GhostIngredientDrag;
+import mezz.jei.bookmarks.BookmarkItem;
+import mezz.jei.input.IClickedIngredient;
+import mezz.jei.input.MouseHelper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.MinecraftForge;
@@ -41,11 +42,18 @@ public static ItemStack getMouseItem() {
 
     @Optional.Method(modid = "jei")
     public static ItemStack getJEIMouseItem() {
-        GhostIngredientDrag<?> ii = null;
+        IClickedIngredient<?> ii = null;
         if (Internal.getInputHandler() != null) {
-            ii = ((AccessorGhostIngredientDragManager) ((AccessorInputHandler) Internal.getInputHandler()).getGhostIngredientDragManager()).getGhostIngredientDrag();
+            ii = ((AccessorInputHandler) Internal.getInputHandler()).invokeGetIngredientUnderMouseForKey(MouseHelper.getX(), MouseHelper.getY());
+        }
+        if (ii != null) {
+            if (ii.getValue() instanceof ItemStack stack) {
+                return stack;
+            }
+            if (ii.getValue() instanceof BookmarkItem<?> book && book.ingredient instanceof ItemStack stack) {
+                return stack;
+            }
         }
-        if (ii != null && ii.getIngredient() instanceof ItemStack stack) return stack;
         return ItemStack.EMPTY;
     }
 
@@ -101,7 +109,6 @@ public void postInit() {
     }
 
     @Override
-    @Optional.Method(modid = "jei")
     public boolean isMouseHasItem() {
         return !getMouseItem().isEmpty();
     }

src/main/java/com/circulation/random_complement/common/CommonProxy.java

@@ -11,7 +11,6 @@
 import com.circulation.random_complement.common.network.WirelessPickBlock;
 import com.circulation.random_complement.common.util.Functions;
 import net.minecraftforge.fml.common.Loader;
-import net.minecraftforge.fml.common.Optional;
 import net.minecraftforge.fml.relauncher.Side;
 
 import static com.circulation.random_complement.RandomComplement.NET_CHANNEL;
@@ -48,7 +47,6 @@ public void postInit() {
         if (Loader.isModLoaded("appliedenergistics2")) CraftingUnitHandler.register();
     }
 
-    @Optional.Method(modid = "jei")
     public boolean isMouseHasItem() {
         return false;
     }

src/main/java/com/circulation/random_complement/mixin/jei/AccessorGhostIngredientDragManager.java

@@ -1,13 +1,13 @@
 package com.circulation.random_complement.mixin.jei;
 
-import mezz.jei.gui.ghost.GhostIngredientDragManager;
+import mezz.jei.input.IClickedIngredient;
 import mezz.jei.input.InputHandler;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
+import org.spongepowered.asm.mixin.gen.Invoker;
 
 @Mixin(value = InputHandler.class, remap = false)
 public interface AccessorInputHandler {
 
-    @Accessor
-    GhostIngredientDragManager getGhostIngredientDragManager();
+    @Invoker("getIngredientUnderMouseForKey")
+    IClickedIngredient<?> invokeGetIngredientUnderMouseForKey(int mouseX, int mouseY);
 }

src/main/java/com/circulation/random_complement/mixin/jei/AccessorInputHandler.java

@@ -10,7 +10,6 @@
     "MixinInputHandler"
   ],
   "mixins": [
-    "AccessorGhostIngredientDragManager",
     "AccessorIngredientListBatchRenderer",
     "AccessorInputHandler",
     "AccessorRecipeLayout",