Merge branch 'main' into rtg

src/main/java/appeng/client/gui/me/patternaccess/PatternAccessTermScreen.java

@@ -247,7 +247,7 @@ private void renderLinkStatus(GuiGraphics guiGraphics, ILinkStatus linkStatus) {
                     GUI_PADDING_X - 1,
                     GUI_HEADER_HEIGHT,
                     COLUMNS * 18,
-                    this.imageHeight - GUI_FOOTER_HEIGHT);
+                    visibleRows * ROW_HEIGHT);
 
             renderContext.fillRect(rect, new ConstantColor(0x3f000000));
 

src/main/java/appeng/menu/me/common/MEStorageMenu.java

@@ -39,6 +39,7 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 
+import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import it.unimi.dsi.fastutil.shorts.ShortSet;
 
 import appeng.api.behaviors.ContainerItemStrategies;
@@ -698,21 +699,22 @@ protected ItemStack transferStackToMenu(ItemStack input) {
     }
 
     /**
-     * Checks if the terminal has a given amount of the requested item. Used to determine for REI/JEI if a recipe is
-     * potentially craftable based on the available items.
+     * Checks if the terminal has a given reservedAmounts of the requested item. Used to determine for REI/JEI if a
+     * recipe is potentially craftable based on the available items.
      * <p/>
      * This method is <strong>slow</strong>, but it is client-only and thus doesn't scale with the player count.
      */
-    public boolean hasIngredient(Predicate<ItemStack> ingredient, int amount) {
+    public boolean hasIngredient(Predicate<ItemStack> predicate, Object2IntOpenHashMap<Object> reservedAmounts) {
         var clientRepo = getClientRepo();
 
         if (clientRepo != null) {
             for (var stack : clientRepo.getAllEntries()) {
-                if (stack.getWhat() instanceof AEItemKey itemKey && ingredient.test(itemKey.toStack())) {
-                    if (stack.getStoredAmount() >= amount) {
+                if (stack.getWhat() instanceof AEItemKey itemKey && predicate.test(itemKey.toStack())) {
+                    var reservedAmount = reservedAmounts.getOrDefault(stack.getWhat(), 0);
+                    if (stack.getStoredAmount() - reservedAmount >= 1) {
+                        reservedAmounts.merge(itemKey, 1, Integer::sum);
                         return true;
                     }
-                    amount -= stack.getStoredAmount();
                 }
             }
         }

src/main/java/appeng/menu/me/items/CraftingTermMenu.java

@@ -169,21 +169,22 @@ public void clearCraftingGrid() {
     }
 
     @Override
-    public boolean hasIngredient(Predicate<ItemStack> predicate, int amount) {
+    public boolean hasIngredient(Predicate<ItemStack> predicate, Object2IntOpenHashMap<Object> reservedAmounts) {
         // In addition to the base item repo, also check the crafting grid if it
         // already contains some of the needed items
         for (var slot : getSlots(SlotSemantics.CRAFTING_GRID)) {
             var stackInSlot = slot.getItem();
             if (!stackInSlot.isEmpty() && predicate.test(stackInSlot)) {
-                if (stackInSlot.getCount() >= amount) {
+                var reservedAmount = reservedAmounts.getOrDefault(slot, 0);
+                if (stackInSlot.getCount() > reservedAmount) {
+                    reservedAmounts.merge(slot, 1, Integer::sum);
                     return true;
                 }
-                amount -= stackInSlot.getCount();
             }
 
         }
 
-        return super.hasIngredient(predicate, amount);
+        return super.hasIngredient(predicate, reservedAmounts);
     }
 
     /**
@@ -229,9 +230,8 @@ public MissingIngredientSlots findMissingIngredients(Map<Integer, Ingredient> in
             // Then check the terminal screen's repository of network items
             if (!found) {
                 // We use AE stacks to get an easily comparable item type key that ignores stack size
-                int neededAmount = reservedGridAmounts.getOrDefault(ingredient, 0) + 1;
-                if (hasIngredient(ingredient, neededAmount)) {
-                    reservedGridAmounts.put(ingredient, neededAmount);
+                if (hasIngredient(ingredient, reservedGridAmounts)) {
+                    reservedGridAmounts.merge(ingredient, 1, Integer::sum);
                     found = true;
                 }
             }