fix: support clickable jei ingredients for generic entries in stock keeper screen

zznty · zznty · commit 9c336c214614 · 2025-10-27T21:24:57.000+07:00
# Conflicts:
#	forge/build.gradle
#	forge/src/main/java/ru/zznty/create_factory_logistics/mixin/logistics/stockKeeper/StockKeeperRequestScreenMixin.java
#	gradle.properties
diff --git a/forge/src/main/java/ru/zznty/create_factory_logistics/logistics/ingredient/ClickableIngredientProvider.java b/forge/src/main/java/ru/zznty/create_factory_logistics/logistics/ingredient/ClickableIngredientProvider.java
@@ -0,0 +1,9 @@
+package ru.zznty.create_factory_logistics.logistics.ingredient;
+
+import net.createmod.catnip.data.Pair;
+import net.minecraft.client.renderer.Rect2i;
+import ru.zznty.create_factory_abstractions.api.generic.key.GenericKey;
+
+public interface ClickableIngredientProvider {
+    Pair<GenericKey, Rect2i> getHoveredKey(int mouseX, int mouseY);
+}
diff --git a/forge/src/main/java/ru/zznty/create_factory_logistics/mixin/accessor/CategoryEntryAccessor.java b/forge/src/main/java/ru/zznty/create_factory_logistics/mixin/accessor/CategoryEntryAccessor.java
@@ -11,4 +11,7 @@ public interface CategoryEntryAccessor {
 
     @Accessor(remap = false)
     void setHidden(boolean hidden);
+
+    @Accessor(remap = false)
+    int getY();
 }
diff --git a/forge/src/main/java/ru/zznty/create_factory_logistics/mixin/logistics/stockKeeper/StockKeeperGuiContainerHandlerMixin.java b/forge/src/main/java/ru/zznty/create_factory_logistics/mixin/logistics/stockKeeper/StockKeeperGuiContainerHandlerMixin.java
@@ -0,0 +1,53 @@
+package ru.zznty.create_factory_logistics.mixin.logistics.stockKeeper;
+
+import com.simibubi.create.compat.jei.StockKeeperGuiContainerHandler;
+import com.simibubi.create.content.logistics.stockTicker.StockKeeperRequestScreen;
+import mezz.jei.api.ingredients.IIngredientType;
+import mezz.jei.api.runtime.IIngredientManager;
+import net.createmod.catnip.data.Pair;
+import net.minecraft.client.renderer.Rect2i;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import ru.zznty.create_factory_abstractions.api.generic.key.GenericKey;
+import ru.zznty.create_factory_abstractions.api.generic.key.GenericKeyProvider;
+import ru.zznty.create_factory_abstractions.generic.impl.GenericContentExtender;
+import ru.zznty.create_factory_logistics.logistics.ingredient.ClickableIngredientProvider;
+
+import java.util.Optional;
+
+@Mixin(StockKeeperGuiContainerHandler.class)
+public class StockKeeperGuiContainerHandlerMixin {
+    @Final
+    @Shadow(remap = false)
+    private IIngredientManager ingredientManager;
+
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    @Inject(
+            method = "getClickableIngredientUnderMouse(Lcom/simibubi/create/content/logistics/stockTicker/StockKeeperRequestScreen;DD)Ljava/util/Optional;",
+            at = @At("HEAD"),
+            remap = false,
+            cancellable = true
+    )
+    public void getClickableIngredientUnderMouse(StockKeeperRequestScreen containerScreen,
+                                                 double mouseX, double mouseY,
+                                                 CallbackInfoReturnable cir) {
+        if (containerScreen instanceof ClickableIngredientProvider provider) {
+            Pair<GenericKey, Rect2i> pair = provider.getHoveredKey((int) mouseX, (int) mouseY);
+            if (pair.getFirst() == GenericKey.EMPTY) cir.setReturnValue(Optional.empty());
+            else {
+                GenericKeyProvider<GenericKey> keyProvider = GenericContentExtender.registrationOf(
+                        pair.getFirst()).provider();
+                Optional<IIngredientType<?>> ingredientTypeForUid = ingredientManager.getIngredientTypeForUid(
+                        keyProvider.ingredientTypeUid());
+                if (ingredientTypeForUid.isEmpty()) return;
+                cir.setReturnValue(ingredientManager.createClickableIngredient(ingredientTypeForUid.get(),
+                                                                               keyProvider.unwrap(pair.getFirst()),
+                                                                               pair.getSecond(), true));
+            }
+        }
+    }
+}
diff --git a/forge/src/main/java/ru/zznty/create_factory_logistics/mixin/logistics/stockKeeper/StockKeeperRequestScreenMixin.java b/forge/src/main/java/ru/zznty/create_factory_logistics/mixin/logistics/stockKeeper/StockKeeperRequestScreenMixin.java
@@ -9,12 +9,14 @@
 import com.simibubi.create.content.logistics.stockTicker.*;
 import com.simibubi.create.foundation.gui.menu.AbstractSimiContainerScreen;
 import net.createmod.catnip.animation.LerpedFloat;
+import net.createmod.catnip.data.Couple;
 import net.createmod.catnip.data.Pair;
 import net.createmod.catnip.gui.element.GuiGameElement;
 import net.createmod.catnip.platform.services.NetworkHelper;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.EditBox;
+import net.minecraft.client.renderer.Rect2i;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.world.entity.player.Inventory;
@@ -24,14 +26,12 @@
 import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Blocks;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.*;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import ru.zznty.create_factory_abstractions.api.generic.crafting.OrderProvider;
 import ru.zznty.create_factory_abstractions.api.generic.crafting.RecipeRequestHelper;
+import ru.zznty.create_factory_abstractions.api.generic.key.GenericKey;
 import ru.zznty.create_factory_abstractions.api.generic.search.CategoriesProvider;
 import ru.zznty.create_factory_abstractions.api.generic.search.GenericSearch;
 import ru.zznty.create_factory_abstractions.api.generic.stack.GenericStack;
@@ -40,14 +40,15 @@
 import ru.zznty.create_factory_abstractions.generic.support.CraftableGenericStack;
 import ru.zznty.create_factory_abstractions.generic.support.GenericInventorySummary;
 import ru.zznty.create_factory_abstractions.generic.support.GenericOrder;
+import ru.zznty.create_factory_logistics.logistics.ingredient.ClickableIngredientProvider;
 import ru.zznty.create_factory_logistics.mixin.accessor.CategoryEntryAccessor;
 import ru.zznty.create_factory_logistics.mixin.accessor.StockTickerBlockEntityAccessor;
 
 import java.util.*;
 import java.util.function.Function;
 
 @Mixin(StockKeeperRequestScreen.class)
-public abstract class StockKeeperRequestScreenMixin extends AbstractSimiContainerScreen<StockKeeperRequestMenu> implements OrderProvider, CategoriesProvider {
+public abstract class StockKeeperRequestScreenMixin extends AbstractSimiContainerScreen<StockKeeperRequestMenu> implements OrderProvider, CategoriesProvider, ClickableIngredientProvider {
     public StockKeeperRequestScreenMixin(StockKeeperRequestMenu container, Inventory inv, Component title) {
         super(container, inv, title);
     }
@@ -82,12 +83,15 @@ public StockKeeperRequestScreenMixin(StockKeeperRequestMenu container, Inventory
     @Shadow
     public EditBox searchBox;
 
+    @Final
     @Shadow
-    final int cols = 9;
+    int cols, orderY;
 
+    @Final
     @Shadow
-    final int rowHeight = 20;
+    int rowHeight, colWidth;
 
+    @Final
     @Shadow
     private Set<Integer> hiddenCategories;
 
@@ -114,6 +118,21 @@ public void requestSchematicList() {
     @Shadow
     public List<StockKeeperRequestScreen.CategoryEntry> categories;
 
+    @Final
+    @Shadow(remap = false)
+    Couple<Integer> noneHovered;
+
+    @Shadow(remap = false)
+    int itemsX, itemsY;
+
+    @Shadow(remap = false)
+    int windowWidth;
+
+    @Shadow(remap = false)
+    private Couple<Integer> getHoveredSlot(int x, int y) {
+        return noneHovered;
+    }
+
     @Redirect(
             method = "containerTick",
             at = @At(
@@ -509,4 +528,49 @@ public Set<Integer> hiddenCategories() {
     public List<List<BigGenericStack>> currentItemSource() {
         return currentItemSource;
     }
+
+    @Override
+    public Pair<GenericKey, Rect2i> getHoveredKey(int mouseX, int mouseY) {
+        Couple<Integer> hoveredSlot = getHoveredSlot(mouseX, mouseY);
+
+        if (hoveredSlot != noneHovered) {
+            int index = hoveredSlot.getSecond();
+            boolean recipeHovered = hoveredSlot.getFirst() == -2;
+            boolean orderHovered = hoveredSlot.getFirst() == -1;
+
+            int x, y;
+            BigGenericStack entry;
+            if (recipeHovered) {
+                int jeiX = getGuiLeft() + (windowWidth - colWidth * recipesToOrder.size()) / 2 + 1;
+                int jeiY = orderY - 31;
+
+                x = jeiX + (index * colWidth);
+                y = jeiY;
+
+                entry = recipesToOrder.get(index);
+            } else {
+                if (orderHovered) {
+                    x = itemsX + index * colWidth;
+                    y = orderY;
+
+                    entry = itemsToOrder.get(index);
+                } else {
+                    int categoryIndex = hoveredSlot.getFirst();
+                    int categoryY = categories.isEmpty() ?
+                                    0 :
+                                    ((CategoryEntryAccessor) categories.get(categoryIndex)).getY();
+
+                    x = itemsX + (index % cols) * colWidth;
+                    y = itemsY + categoryY + (categories.isEmpty() ? 4 : rowHeight) + (index / cols) * rowHeight;
+
+                    entry = displayedItems.get(categoryIndex).get(index);
+                }
+            }
+
+            Rect2i bounds = new Rect2i(x, y, x + 18, y + 18);
+            return Pair.of(entry.get().key(), bounds);
+        }
+
+        return Pair.of(GenericKey.EMPTY, new Rect2i(0, 0, 0, 0));
+    }
 }
diff --git a/forge/src/main/resources/mixins.create_factory_logistics.json b/forge/src/main/resources/mixins.create_factory_logistics.json
@@ -41,6 +41,7 @@
     "accessor.CategoryEntryAccessor",
     "logistics.panel.FactoryPanelScreenMixin",
     "logistics.redstoneRequester.RedstoneRequesterScreenMixin",
+    "logistics.stockKeeper.StockKeeperGuiContainerHandlerMixin",
     "logistics.stockKeeper.StockKeeperRequestScreenMixin",
     "logistics.stockKeeper.StockKeeperTransferHandlerMixin",
     "render.ChainConveyorRendererMixin",

Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,7 @@ public interface CategoryEntryAccessor {`
`11`	`11`
`12`	`12`	`@Accessor(remap = false)`
`13`	`13`	`void setHidden(boolean hidden);`
	`14`	`+`
	`15`	`+ @Accessor(remap = false)`
	`16`	`+ int getY();`
`14`	`17`	`}`