Cribs super recipe check

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

@@ -43,6 +43,7 @@ public abstract class AbstractProcessingLogic<P extends AbstractProcessingLogic<
     protected double speedBoost = 1.0;
     protected boolean amperageOC = true;
     protected boolean isCleanroom;
+    protected boolean needWipeCraftingPatternRecipeCache;
 
     // #region Setters
 
@@ -213,6 +214,7 @@ protected RecipeMap<?> preProcess() {
             recipeMap = recipeMapSupplier.get();
         }
         if (lastRecipeMap != recipeMap) {
+            if (lastRecipeMap != null) needWipeCraftingPatternRecipeCache = true;
             lastRecipe = null;
             lastRecipeMap = recipeMap;
         }

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

@@ -1,5 +1,8 @@
 package gregtech.api.logic;
 
+import static java.util.stream.Collectors.toList;
+
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -20,6 +23,7 @@
 import gregtech.api.util.GTRecipe;
 import gregtech.api.util.OverclockCalculator;
 import gregtech.api.util.ParallelHelper;
+import gregtech.common.tileentities.machines.IDualInputInventory;
 
 /**
  * Logic class to calculate result of recipe check from inputs, based on recipemap.
@@ -32,8 +36,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<>();
+    protected int craftingPatternHash;
+    protected Map<Integer, List<GTRecipe>> craftingPatternRecipeCache = new HashMap<>();
 
     public ProcessingLogic() {}
 
@@ -68,25 +72,35 @@ 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;
+    public boolean craftingPatternHandler(IDualInputInventory slot) {
+        int hash = slot.hashCode();
+        if (needWipeCraftingPatternRecipeCache) {
+            craftingPatternRecipeCache.clear();
+            needWipeCraftingPatternRecipeCache = false;
         }
-        return false;
+        if (!craftingPatternRecipeCache.containsKey(hash)) {
+            GTDualInputs inputs = slot.getPatternInputs();
+            setInputItems(inputs.inputItems);
+            setInputFluids(inputs.inputFluid);
+            List<GTRecipe> recipes = new ArrayList<>();
+            for (GTRecipe recipe : findRecipeMatches(preProcess()).collect(toList())) {
+                if (!recipes.contains(recipe)) {
+                    recipes.add(recipe);
+                }
+            }
+            if (!recipes.isEmpty()) {
+                craftingPatternRecipeCache.put(hash, recipes);
+                craftingPatternHash = hash;
+                return true;
+            }
+            return false;
+        }
+        craftingPatternHash = hash;
+        return true;
     }
 
-    public void resetCribsRecipeMap() {
-        cribsRecipeMap.clear();
+    public void removeEntryCraftingPatternRecipeCache(int hash) {
+        craftingPatternRecipeCache.remove(hash);
     }
 
     /**
@@ -111,7 +125,7 @@ public ProcessingLogic clear() {
         this.calculatedEut = 0;
         this.duration = 0;
         this.calculatedParallels = 0;
-        this.cribsSlotHash = 0;
+        this.craftingPatternHash = 0;
         return getThis();
     }
 
@@ -133,11 +147,15 @@ 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;
+        if (craftingPatternHash != 0) {
+            List<GTRecipe> matchedRecipes = craftingPatternRecipeCache.get(craftingPatternHash);
+            for (GTRecipe matchedRecipe : matchedRecipes) {
+                if (matchedRecipe.maxParallelCalculatedByInputs(1, inputFluids, inputItems) == 1) {
+                    CalculationResult foundResult = validateAndCalculateRecipe(matchedRecipe);
+                    return foundResult.checkRecipeResult;
+                }
             }
+            craftingPatternHash = 0;
             return CheckRecipeResultRegistry.NO_RECIPE;
         }
 
@@ -171,15 +189,6 @@ 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

@@ -887,18 +887,13 @@ protected CheckRecipeResult doCheckRecipe() {
         // check crafting input hatches first
         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;
+                if (!slot.isEmpty() && processingLogic.craftingPatternHandler(slot)) {
 
                     processingLogic.setInputItems(ArrayUtils.addAll(sharedItems, slot.getItemInputs()));
                     processingLogic.setInputFluids(slot.getFluidInputs());
-                    processingLogic.setCribsSlotHash(slotHash);
 
                     CheckRecipeResult foundResult = processingLogic.process();
                     if (foundResult.wasSuccessful()) {
@@ -1727,6 +1722,7 @@ public boolean addToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasing
         }
         if (aMetaTileEntity instanceof IDualInputHatch hatch) {
             hatch.updateCraftingIcon(this.getMachineCraftingIcon());
+            hatch.setProcessingLogic(processingLogic);
             return mDualInputHatches.add(hatch);
         }
         if (aMetaTileEntity instanceof ISmartInputHatch hatch) {
@@ -2056,12 +2052,8 @@ public void getWailaBody(ItemStack itemStack, List<String> currentTip, IWailaDat
                 }
             }
         }
-        currentTip.add(
-            GTWaila.getMachineProgressString(
-                isActive,
-                tag.getBoolean("isAllowedToWork"),
-                tag.getInteger("maxProgress"),
-                tag.getInteger("progress")));
+        currentTip
+            .add(GTWaila.getMachineProgressString(isActive, tag.getInteger("maxProgress"), tag.getInteger("progress")));
         // Show ns on the tooltip
         if (GTMod.gregtechproxy.wailaAverageNS && tag.hasKey("averageNS")) {
             int tAverageTime = tag.getInteger("averageNS");
@@ -2110,7 +2102,6 @@ public void getWailaNBTData(EntityPlayerMP player, TileEntity tile, NBTTagCompou
         final IGregTechTileEntity tileEntity = getBaseMetaTileEntity();
         if (tileEntity != null) {
             tag.setBoolean("isActive", tileEntity.isActive());
-            tag.setBoolean("isAllowedToWork", tileEntity.isAllowedToWork());
             if (tileEntity.isActive()) {
                 if (mEUt < 0) tag.setLong("energyUsage", getActualEnergyUsage());
                 else tag.setLong("energyUsage", (long) -mEUt * mEfficiency / 10000);
@@ -2433,7 +2424,6 @@ public UITexture getMachineModeIcon(int index) {
     @Override
     public void setMachineMode(int index) {
         machineMode = index;
-        processingLogic.resetCribsRecipeMap();
     }
 
     @Override

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

@@ -5,6 +5,8 @@
 
 import net.minecraft.item.ItemStack;
 
+import gregtech.api.logic.ProcessingLogic;
+
 public interface IDualInputHatch {
 
     boolean justUpdated();
@@ -21,5 +23,5 @@ public interface IDualInputHatch {
 
     ItemStack[] getSharedItems();
 
-    boolean needClearRecipeMap();
+    void setProcessingLogic(ProcessingLogic pl);
 }

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

@@ -92,6 +92,7 @@
 import gregtech.api.interfaces.modularui.IAddGregtechLogo;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.MTEHatchInputBus;
 import gregtech.api.objects.GTDualInputs;
@@ -221,6 +222,11 @@ public ICraftingPatternDetails getPatternDetails() {
             return patternDetails;
         }
 
+        @Override
+        public int hashCode() {
+            return Objects.hashCode(patternDetails);
+        }
+
         public GTDualInputs getPatternInputs() {
             GTDualInputs dualInputs = new GTDualInputs();
 
@@ -350,7 +356,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;
+    public ArrayList<ProcessingLogic> processingLogics = new ArrayList<>();
 
     // holds all internal inventories
     private final PatternSlot[] internalInventory = new PatternSlot[MAX_PATTERN_COUNT];
@@ -812,7 +818,6 @@ 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;
@@ -839,6 +844,23 @@ public ItemStack[] getSharedItems() {
         return ArrayExt.withoutNulls(sharedItems, ItemStack[]::new);
     }
 
+    @Override
+    public void setProcessingLogic(ProcessingLogic pl) {
+        if (!processingLogics.contains(pl)) {
+            processingLogics.add(pl);
+        }
+    }
+
+    private void resetCraftingInputRecipeMap() {
+        for (ProcessingLogic pl : processingLogics) {
+            if (pl == null) continue;
+            for (PatternSlot slot : internalInventory) {
+                if (slot == null) continue;
+                pl.removeEntryCraftingPatternRecipeCache(slot.hashCode());
+            }
+        }
+    }
+
     @Override
     public void getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
         IWailaConfigHandler config) {
@@ -1011,6 +1033,12 @@ public ItemStack getCrafterIcon() {
         return getMachineCraftingIcon();
     }
 
+    @Override
+    public void markDirty() {
+        super.markDirty();
+        resetCraftingInputRecipeMap();
+    }
+
     private boolean postMEPatternChange() {
         // don't post until it's active
         if (!getProxy().isActive()) return false;
@@ -1044,6 +1072,7 @@ protected ModularWindow createSlotManualWindow(final EntityPlayer player) {
                 .endAtSlot(SLOT_MANUAL_START + SLOT_MANUAL_SIZE - 1)
                 .phantom(false)
                 .background(getGUITextureSet().getItemSlot())
+                .widgetCreator(slot -> new SlotWidget(slot).setChangeListener(this::resetCraftingInputRecipeMap))
                 .build()
                 .setPos(7, 7));
         return builder.build();
@@ -1098,11 +1127,6 @@ 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

@@ -23,6 +23,7 @@
 import gregtech.api.interfaces.IDataCopyable;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.MTEHatchInputBus;
 import gregtech.api.render.TextureFactory;
@@ -298,7 +299,7 @@ public List<ItemStack> getItemsForHoloGlasses() {
     }
 
     @Override
-    public boolean needClearRecipeMap() {
-        return getMaster() != null && getMaster().needClearRecipeMap();
+    public void setProcessingLogic(ProcessingLogic pl) {
+        if (getMaster() != null) getMaster().setProcessingLogic(pl);
     }
 }

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

@@ -438,18 +438,13 @@ protected CheckRecipeResult doCheckRecipe() {
         // check crafting input hatches first
         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;
+                if (!slot.isEmpty() && processingLogic.craftingPatternHandler(slot)) {
 
                     processingLogic.setInputItems(ArrayUtils.addAll(sharedItems, slot.getItemInputs()));
                     processingLogic.setInputFluids(slot.getFluidInputs());
-                    processingLogic.setCribsSlotHash(slotHash);
 
                     CheckRecipeResult foundResult = processingLogic.process();
                     if (foundResult.wasSuccessful()) {

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

@@ -534,26 +534,6 @@ 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) {