fix wireless pattern access terminal hotkey not closing the terminal when used inside the terminal (fix #351)

Author: Mari023

CHANGELOG.md

@@ -1 +1,3 @@
 - Spain Spanish Translation and updates to the Mexican Spanish Translation (#353)
+- rework pickup so it will fill to a full stack 
+- always use pickup to ME for items that are being restocked (even if it wouldn't be available / enabled)

src/main/java/de/mari_023/ae2wtlib/AE2wtlibEvents.java

@@ -53,7 +53,7 @@ public static void restock(ServerPlayer player, ItemStack item, int count, Consu
         if (cTHandler.getTargetGrid().getStorageService() == null)
             return;
 
-        int toAdd = Math.max(item.getMaxStackSize() / 2, 1) - count;
+        int toAdd = item.getMaxStackSize() - count;
         if (toAdd == 0)
             return;
 
@@ -91,24 +91,12 @@ public static void insertStackInME(ItemEntity entity, Player player) {
             return;
         if (player.level().isClientSide())
             return;
-        if (player.isShiftKeyDown())
-            return;
-        CraftingTerminalHandler cTHandler = CraftingTerminalHandler.getCraftingTerminalHandler(player);
-        ItemStack terminal = cTHandler.getCraftingTerminal();
-
-        if (!(MagnetHandler.getMagnetMode(terminal).pickupToME()))
-            return;
-        if (!cTHandler.inRange())
-            return;
 
-        MagnetHost magnetHost = cTHandler.getMagnetHost();
-        if (magnetHost == null)
+        if (!canInsert(stack, player))
             return;
 
-        // if the filter is empty, it will match anything, even in whitelist mode
-        if (magnetHost.getInsertFilter().isEmpty() && magnetHost.getInsertMode() == IncludeExclude.WHITELIST)
-            return;
-        if (!magnetHost.getInsertFilter().matchesFilter(AEItemKey.of(stack), magnetHost.getInsertMode()))
+        CraftingTerminalHandler cTHandler = CraftingTerminalHandler.getCraftingTerminalHandler(player);
+        if (!cTHandler.inRange())
             return;
 
         if (cTHandler.getTargetGrid() == null)
@@ -126,6 +114,47 @@ public static void insertStackInME(ItemEntity entity, Player player) {
         stack.setCount(leftover);
     }
 
+    private static boolean canInsert(ItemStack stack, Player player) {
+        CraftingTerminalHandler cTHandler = CraftingTerminalHandler.getCraftingTerminalHandler(player);
+        ItemStack terminal = cTHandler.getCraftingTerminal();
+
+        cTHandler.checkTerminal();
+        if (cTHandler.isRestockEnabled() && isRestocking(stack, player))
+            return true;
+
+        if (player.isShiftKeyDown())
+            return false;
+
+        if (!(MagnetHandler.getMagnetMode(terminal).pickupToME()))
+            return false;
+
+        MagnetHost magnetHost = cTHandler.getMagnetHost();
+        if (magnetHost == null)
+            return false;
+
+        // if the filter is empty, it will match anything, even in whitelist mode
+        if (magnetHost.getInsertFilter().isEmpty() && magnetHost.getInsertMode() == IncludeExclude.WHITELIST)
+            return false;
+        if (!magnetHost.getInsertFilter().matchesFilter(AEItemKey.of(stack), magnetHost.getInsertMode()))
+            return false;
+
+        return true;
+    }
+
+    private static boolean isRestocking(ItemStack stack, Player player) {
+        if (stack.is(AE2wtlibTags.NO_RESTOCK)) {
+            return false;
+        }
+        if (stack.getMaxStackSize() == 1) {
+            return false;
+        }
+        for (int i = 0; i < 9; i++) {
+            if (ItemStack.isSameItemSameComponents(stack, player.getInventory().getItem(i)))
+                return true;
+        }
+        return false;
+    }
+
     public static void pickBlock(ItemStack stack) {
         PacketDistributor.sendToServer(new PickBlockPacket(stack));
     }
@@ -152,9 +181,6 @@ public static void pickBlock(ServerPlayer player, ItemStack stack) {
         if (insert < toReplace.getCount())
             return;
         int targetAmount = stack.getMaxStackSize();
-        if (!stack.is(AE2wtlibTags.NO_RESTOCK) && targetAmount != 1) {
-            targetAmount /= 2;
-        }
         var extracted = networkInventory.extract(AEItemKey.of(stack), targetAmount, Actionable.SIMULATE, playerSource);
         if (extracted == 0)
             return;

src/main/java/de/mari_023/ae2wtlib/mixin/GuiMixin.java

@@ -31,7 +31,7 @@ public void restockOverlay(GuiGraphics guiGraphics, int x, int y, DeltaTracker d
             return;
         CraftingTerminalHandler handler = CraftingTerminalHandler
                 .getCraftingTerminalHandler(Minecraft.getInstance().player);
-        if (!handler.isRestockEnabled() || stack.getCount() == 1 || !handler.isRestockAble(stack))
+        if (!handler.isRestockEnabled() || stack.getMaxStackSize() == 1 || !handler.isRestockAble(stack))
             return;
         String number = ReadableNumberConverter.format(handler.getAccessibleAmount(stack), 3);
         if (number.startsWith(","))

src/main/resources/assets/ae2wtlib/ae2guide/ae2wtlib/restock.md

@@ -13,10 +13,10 @@ If Restock is enabled, your <ItemLink id="ae2:wireless_crafting_terminal" /> wil
 
 You can enable it in the GUI, or using a Keybind.
 
-When enabled, it will try to keep the Stack you are using at half the stack size, so 32 for most items.
+When enabled, it will try to keep the Stack you are using at the max stack size, so 64 for most items.
 It will take any missing items from your ME System,
-or put excess items into your ME System.
-This means that if you place a few items, then break them again, the item likely won't overflow into a different slot,
+or put excess items into your ME System if you pick up more.
+This means that if you place a few items, then break them again, the item won't overflow into a different slot,
 even if you don't hava an active <ItemLink id="ae2wtlib:magnet_card" />.
 
 It will **NOT** restock stacks holding a single item before being used.