现在支持ctrl下单的范围被拓展到整个JEI而不是只有书签

Author: Circulate233

src/main/java/com/circulation/random_complement/mixin/ae2/jei/MixinInputHandler.java

@@ -33,7 +33,6 @@
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -46,22 +45,14 @@
 @Mixin(value = InputHandler.class, remap = false)
 public abstract class MixinInputHandler {
 
-    @Shadow
-    @Final
-    private LeftAreaDispatcher leftAreaDispatcher;
-
-    @Shadow
-    @Final
-    private GhostIngredientDragManager ghostIngredientDragManager;
-
     @Shadow
     @Nullable
     protected abstract IClickedIngredient<?> getFocusUnderMouseForClick(int mouseX, int mouseY);
 
     @Inject(method = "<init>", at = @At("TAIL"))
     public void onInit(JeiRuntime runtime, IngredientRegistry ingredientRegistry, IngredientListOverlay ingredientListOverlay, GuiScreenHelper guiScreenHelper, LeftAreaDispatcher leftAreaDispatcher, BookmarkList bookmarkList, GhostIngredientDragManager ghostIngredientDragManager, CallbackInfo ci) {
         ItemTooltipHandler.regItemTooltip(GuiScreen.class, () -> {
-            val ing = leftAreaDispatcher.getIngredientUnderMouse(MouseHelper.getX(), MouseHelper.getY());
+            val ing = getFocusUnderMouseForClick(MouseHelper.getX(), MouseHelper.getY());
             if (ing == null) return ObjectLists.emptyList();
             return KeyBindings.getTooltipList();
         });
@@ -113,7 +104,7 @@ public void onInit(JeiRuntime runtime, IngredientRegistry ingredientRegistry, In
             var k = kb.getKeyBinding();
             if (k.isActiveAndMatches(eventKey)) {
                 if (kb.isNeedItem()) {
-                    var ing = leftAreaDispatcher.getIngredientUnderMouse(MouseHelper.getX(), MouseHelper.getY());
+                    var ing = getFocusUnderMouseForClick(MouseHelper.getX(), MouseHelper.getY());
                     if (ing == null) return false;
                     if (isMouse && !Mouse.isButtonDown(m)) {
                         return true;
@@ -122,7 +113,7 @@ public void onInit(JeiRuntime runtime, IngredientRegistry ingredientRegistry, In
                     if (ing.getValue() instanceof BookmarkItem<?> book) {
                         item = MEHandler.packItem(book.ingredient);
                     } else {
-                        item = MEHandler.packItem(ing);
+                        item = MEHandler.packItem(ing.getValue());
                     }
                     if (item.isEmpty()) return false;
                     final var oldGui = Minecraft.getMinecraft().currentScreen;

src/main/java/com/circulation/random_complement/mixin/ae2/miss_craft/MixinCraftingJob.java

@@ -9,8 +9,7 @@
 import com.circulation.random_complement.common.interfaces.AEIgnoredInputMachine;
 import com.circulation.random_complement.common.interfaces.RCCraftingJob;
 import com.circulation.random_complement.mixin.ae2.AccessorCraftingTreeNode;
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.llamalad7.mixinextras.sugar.Local;
 import com.llamalad7.mixinextras.sugar.Share;
 import com.llamalad7.mixinextras.sugar.ref.LocalLongRef;
 import net.minecraft.world.World;
@@ -49,16 +48,15 @@ public abstract class MixinCraftingJob implements RCCraftingJob {
     @Unique
     private boolean r$specialDeficiency;
 
-    @WrapOperation(method = "run", at = @At(value = "INVOKE", target = "Lappeng/crafting/MECraftingInventory;ignore(Lappeng/api/storage/data/IAEItemStack;)V", ordinal = 0))
-    public void record(MECraftingInventory instance, IAEItemStack what, Operation<Void> original, @Share("rcOutput") LocalLongRef stackLocalRef) {
+    @Inject(method = "run", at = @At(value = "INVOKE", target = "Lappeng/crafting/MECraftingInventory;ignore(Lappeng/api/storage/data/IAEItemStack;)V", ordinal = 0, shift = At.Shift.BEFORE))
+    public void record(CallbackInfo ci, @Share("rcOutput") LocalLongRef stackLocalRef, @Local(name = "craftingInventory") MECraftingInventory craftingInventory) {
         if (canIgnoredInput()) {
-            var stack = instance.getItemList().findPrecise(what);
+            var stack = craftingInventory.getItemList().findPrecise(this.output);
             if (stack != null) {
                 var size = stack.getStackSize();
                 stackLocalRef.set(size);
             } else stackLocalRef.set(0);
         }
-        original.call(instance, what);
     }
 
     @Intrinsic