Cribs super recipe check

src/main/java/gregtech/api/logic/ProcessingLogic.java

@@ -1,6 +1,8 @@
 package gregtech.api.logic;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Stream;
 
 import javax.annotation.Nonnull;
@@ -10,6 +12,7 @@
 import net.minecraftforge.fluids.FluidStack;
 
 import gregtech.api.interfaces.tileentity.IRecipeLockable;
+import gregtech.api.objects.GTDualInputs;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
@@ -29,6 +32,8 @@ public class ProcessingLogic extends AbstractProcessingLogic<ProcessingLogic> {
     protected ItemStack[] inputItems;
     protected FluidStack[] inputFluids;
     protected boolean isRecipeLocked;
+    protected int cribsSlotHash;
+    protected Map<Integer, GTRecipe> cribsRecipeMap = new HashMap<>();
 
     public ProcessingLogic() {}
 
@@ -63,6 +68,27 @@ public ProcessingLogic setSpecialSlotItem(ItemStack specialSlotItem) {
         return getThis();
     }
 
+    public void setCribsSlotHash(int hash) {
+        this.cribsSlotHash = hash;
+    }
+
+    public boolean cribsHasRecipe(int hash) {
+        return cribsRecipeMap.containsKey(hash);
+    }
+
+    public boolean setCribsSlotRecipe(GTDualInputs inputs, int hash) {
+        GTRecipe tempRecipe = getRecipeByInputs(inputs.inputItems, inputs.inputFluid);
+        if (tempRecipe != null) {
+            cribsRecipeMap.put(hash, tempRecipe);
+            return true;
+        }
+        return false;
+    }
+
+    public void resetCribsRecipeMap() {
+        cribsRecipeMap.clear();
+    }
+
     /**
      * Enables single recipe locking mode.
      */
@@ -85,6 +111,7 @@ public ProcessingLogic clear() {
         this.calculatedEut = 0;
         this.duration = 0;
         this.calculatedParallels = 0;
+        this.cribsSlotHash = 0;
         return getThis();
     }
 
@@ -106,6 +133,14 @@ public CheckRecipeResult process() {
             inputFluids = new FluidStack[0];
         }
 
+        if (cribsSlotHash != 0 && cribsRecipeMap.containsKey(cribsSlotHash)) {
+            if (cribsRecipeMap.get(cribsSlotHash)
+                .maxParallelCalculatedByInputs(1, inputFluids, inputItems) == 1) {
+                return validateAndCalculateRecipe(cribsRecipeMap.get(cribsSlotHash)).checkRecipeResult;
+            }
+            return CheckRecipeResultRegistry.NO_RECIPE;
+        }
+
         if (isRecipeLocked && recipeLockableMachine != null && recipeLockableMachine.getSingleRecipeCheck() != null) {
             // Recipe checker is already built, we'll use it
             SingleRecipeCheck singleRecipeCheck = recipeLockableMachine.getSingleRecipeCheck();
@@ -136,6 +171,15 @@ public CheckRecipeResult process() {
         return checkRecipeResult;
     }
 
+    public GTRecipe getRecipeByInputs(ItemStack[] inItems, FluidStack[] inFluids) {
+        RecipeMap<?> map = preProcess();
+        if (map == null) return null;
+        return map.findRecipeQuery()
+            .items(inItems)
+            .fluids(inFluids)
+            .find();
+    }
+
     /**
      * Checks if supplied recipe is valid for process. This involves voltage check, output full check. If successful,
      * additionally performs input consumption, output calculation with parallel, and overclock calculation.

src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java

@@ -883,16 +883,23 @@ protected boolean supportsCraftingMEBuffer() {
     @Nonnull
     protected CheckRecipeResult doCheckRecipe() {
         CheckRecipeResult result = CheckRecipeResultRegistry.NO_RECIPE;
+
         // check crafting input hatches first
-        if (supportsCraftingMEBuffer()) {
-            for (IDualInputHatch dualInputHatch : mDualInputHatches) {
-                for (var it = dualInputHatch.inventories(); it.hasNext();) {
-                    IDualInputInventory slot = it.next();
-                    // Reverse order of input items for consistent behavior with standard input buses.
-                    ItemStack[] inputItems = slot.getItemInputs();
-                    ArrayUtils.reverse(inputItems);
-                    processingLogic.setInputItems(inputItems);
+        for (IDualInputHatch dualInputHatch : mDualInputHatches) {
+            ItemStack[] sharedItems = dualInputHatch.getSharedItems();
+            if (dualInputHatch.needClearRecipeMap()) processingLogic.resetCribsRecipeMap();
+            for (var it = dualInputHatch.inventories(); it.hasNext();) {
+                IDualInputInventory slot = it.next();
+                int slotHash = slot.hashCode();
+
+                if (!slot.isEmpty()) {
+                    if (!processingLogic.cribsHasRecipe(slotHash)
+                        && !processingLogic.setCribsSlotRecipe(slot.getPatternInputs(), slotHash)) continue;
+
+                    processingLogic.setInputItems(ArrayUtils.addAll(sharedItems, slot.getItemInputs()));
                     processingLogic.setInputFluids(slot.getFluidInputs());
+                    processingLogic.setCribsSlotHash(slotHash);
+
                     CheckRecipeResult foundResult = processingLogic.process();
                     if (foundResult.wasSuccessful()) {
                         return foundResult;
@@ -2421,6 +2428,7 @@ public UITexture getMachineModeIcon(int index) {
     @Override
     public void setMachineMode(int index) {
         machineMode = index;
+        processingLogic.resetCribsRecipeMap();
     }
 
     @Override

src/main/java/gregtech/api/objects/GTDualInputs.java

@@ -0,0 +1,10 @@
+package gregtech.api.objects;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
+public class GTDualInputs {
+
+    public ItemStack[] inputItems;
+    public FluidStack[] inputFluid;
+}

src/main/java/gregtech/common/tileentities/machines/IDualInputHatch.java

@@ -18,4 +18,8 @@ public interface IDualInputHatch {
     Optional<IDualInputInventory> getFirstNonEmptyInventory();
 
     boolean supportsFluids();
+
+    ItemStack[] getSharedItems();
+
+    boolean needClearRecipeMap();
 }

src/main/java/gregtech/common/tileentities/machines/IDualInputInventory.java

@@ -3,9 +3,16 @@
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
+import gregtech.api.objects.GTDualInputs;
+
 public interface IDualInputInventory {
 
+    boolean isEmpty();
+
     ItemStack[] getItemInputs();
 
     FluidStack[] getFluidInputs();
+
+    GTDualInputs getPatternInputs();
+
 }

src/main/java/gregtech/common/tileentities/machines/MTEHatchCraftingInputME.java

@@ -41,6 +41,7 @@
 import org.apache.commons.lang3.ArrayUtils;
 import org.jetbrains.annotations.NotNull;
 
+import com.glodblock.github.common.item.ItemFluidDrop;
 import com.glodblock.github.common.item.ItemFluidPacket;
 import com.google.common.collect.ImmutableList;
 import com.gtnewhorizons.modularui.api.math.Alignment;
@@ -93,6 +94,7 @@
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.MTEHatchInputBus;
+import gregtech.api.objects.GTDualInputs;
 import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GTUtility;
 import gregtech.api.util.extensions.ArrayExt;
@@ -198,14 +200,15 @@ public boolean isFluidEmpty() {
             return fluidInventory.isEmpty();
         }
 
+        @Override
         public boolean isEmpty() {
             return isItemEmpty() && isFluidEmpty();
         }
 
         @Override
         public ItemStack[] getItemInputs() {
-            if (isEmpty()) return new ItemStack[0];
-            return ArrayUtils.addAll(itemInventory.toArray(new ItemStack[0]), sharedItemGetter.getSharedItem());
+            if (isItemEmpty()) return new ItemStack[0];
+            return itemInventory.toArray(new ItemStack[0]);
         }
 
         @Override
@@ -218,6 +221,29 @@ public ICraftingPatternDetails getPatternDetails() {
             return patternDetails;
         }
 
+        public GTDualInputs getPatternInputs() {
+            GTDualInputs dualInputs = new GTDualInputs();
+
+            ItemStack[] inputItems = this.sharedItemGetter.getSharedItem();
+            FluidStack[] inputFluids = new FluidStack[0];
+
+            for (IAEItemStack singleInput : this.getPatternDetails()
+                .getInputs()) {
+                if (singleInput == null) continue;
+                ItemStack singleInputItemStack = singleInput.getItemStack();
+                if (singleInputItemStack.getItem() instanceof ItemFluidDrop) {
+                    FluidStack fluidStack = ItemFluidDrop.getFluidStack(singleInputItemStack);
+                    if (fluidStack != null) inputFluids = ArrayUtils.addAll(inputFluids, fluidStack);
+                } else {
+                    inputItems = ArrayUtils.addAll(inputItems, singleInputItemStack);
+                }
+            }
+
+            dualInputs.inputItems = inputItems;
+            dualInputs.inputFluid = inputFluids;
+            return dualInputs;
+        }
+
         public void refund(AENetworkProxy proxy, BaseActionSource src) throws GridAccessException {
             IMEMonitor<IAEItemStack> sg = proxy.getStorage()
                 .getItemInventory();
@@ -324,6 +350,7 @@ public NBTTagCompound writeToNBT(NBTTagCompound nbt) {
     private static final int MANUAL_SLOT_WINDOW = 10;
     private BaseActionSource requestSource = null;
     private @Nullable AENetworkProxy gridProxy = null;
+    public boolean needClearRecipeMap;
 
     // holds all internal inventories
     private final PatternSlot[] internalInventory = new PatternSlot[MAX_PATTERN_COUNT];
@@ -784,6 +811,7 @@ private void onPatternChange(int index, ItemStack newItem) {
             if (originalPattern.hasChanged(newItem, world)) {
                 try {
                     originalPattern.refund(getProxy(), getRequest());
+                    needClearRecipeMap = true;
                 } catch (GridAccessException ignored) {}
                 internalInventory[index] = null;
                 needPatternSync = true;
@@ -802,6 +830,7 @@ private void onPatternChange(int index, ItemStack newItem) {
         needPatternSync = true;
     }
 
+    @Override
     public ItemStack[] getSharedItems() {
         ItemStack[] sharedItems = new ItemStack[SLOT_MANUAL_SIZE + 1];
         sharedItems[0] = mInventory[SLOT_CIRCUIT];
@@ -1068,6 +1097,11 @@ public List<ItemStack> getItemsForHoloGlasses() {
         return list;
     }
 
+    @Override
+    public boolean needClearRecipeMap() {
+        return needClearRecipeMap;
+    }
+
     public void doublePatterns(int val) {
         boolean fast = (val & 1) != 0;
         boolean backwards = (val & 2) != 0;

src/main/java/gregtech/common/tileentities/machines/MTEHatchCraftingInputSlave.java

@@ -163,6 +163,11 @@ public boolean supportsFluids() {
         return getMaster() != null && getMaster().supportsFluids();
     }
 
+    @Override
+    public ItemStack[] getSharedItems() {
+        return getMaster() != null ? getMaster().getSharedItems() : new ItemStack[0];
+    }
+
     @Override
     public boolean justUpdated() {
         return getMaster() != null && getMaster().justUpdated();
@@ -291,4 +296,9 @@ public void getWailaNBTData(EntityPlayerMP player, TileEntity tile, NBTTagCompou
     public List<ItemStack> getItemsForHoloGlasses() {
         return getMaster() != null ? getMaster().getItemsForHoloGlasses() : null;
     }
+
+    @Override
+    public boolean needClearRecipeMap() {
+        return getMaster() != null && getMaster().needClearRecipeMap();
+    }
 }

src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiSolidifier.java

@@ -32,6 +32,7 @@
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 
+import org.apache.commons.lang3.ArrayUtils;
 import org.jetbrains.annotations.NotNull;
 
 import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
@@ -435,12 +436,21 @@ protected CheckRecipeResult doCheckRecipe() {
         CheckRecipeResult result = CheckRecipeResultRegistry.NO_RECIPE;
 
         // check crafting input hatches first
-        if (supportsCraftingMEBuffer()) {
-            for (IDualInputHatch dualInputHatch : mDualInputHatches) {
-                for (var it = dualInputHatch.inventories(); it.hasNext();) {
-                    IDualInputInventory slot = it.next();
-                    processingLogic.setInputItems(slot.getItemInputs());
+        for (IDualInputHatch dualInputHatch : mDualInputHatches) {
+            ItemStack[] sharedItems = dualInputHatch.getSharedItems();
+            if (dualInputHatch.needClearRecipeMap()) processingLogic.resetCribsRecipeMap();
+            for (var it = dualInputHatch.inventories(); it.hasNext();) {
+                IDualInputInventory slot = it.next();
+                int slotHash = slot.hashCode();
+
+                if (!slot.isEmpty()) {
+                    if (!processingLogic.cribsHasRecipe(slotHash)
+                        && !processingLogic.setCribsSlotRecipe(slot.getPatternInputs(), slotHash)) continue;
+
+                    processingLogic.setInputItems(ArrayUtils.addAll(sharedItems, slot.getItemInputs()));
                     processingLogic.setInputFluids(slot.getFluidInputs());
+                    processingLogic.setCribsSlotHash(slotHash);
+
                     CheckRecipeResult foundResult = processingLogic.process();
                     if (foundResult.wasSuccessful()) {
                         return foundResult;

src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEBlackHoleCompressor.java

@@ -534,6 +534,26 @@ protected Stream<GTRecipe> findRecipeMatches(@Nullable RecipeMap<?> map) {
                 }
             }
 
+            @Override
+            public GTRecipe getRecipeByInputs(ItemStack[] inItems, FluidStack[] inFluids) {
+                RecipeMap<?> map;
+                switch (getModeFromCircuit(inItems)) {
+                    case MACHINEMODE_COMPRESSOR -> {
+                        map = RecipeMaps.compressorRecipes;
+                    }
+                    case MACHINEMODE_BLACKHOLE -> {
+                        map = RecipeMaps.neutroniumCompressorRecipes;
+                    }
+                    default -> {
+                        return null;
+                    }
+                }
+                return map.findRecipeQuery()
+                    .items(inItems)
+                    .fluids(inFluids)
+                    .find();
+            }
+
             @NotNull
             @Override
             protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) {