src/main/kotlin/net/shadowfacts/phycon/network/block/terminal/TerminalBlockEntity.kt

@@ -50,6 +50,7 @@ class TerminalBlockEntity: DeviceBlockEntity(PhyBlockEntities.TERMINAL),
 	private val inventoryCache = mutableMapOf<IPAddress, GroupedItemInvView>()
 	val internalBuffer = TerminalBufferInventory(18)
 
+	private val locateRequestQueue = LinkedList<StackLocateRequest>()
 	private val pendingRequests = LinkedList<StackLocateRequest>()
 	override val pendingInsertions = mutableListOf<PendingInsertion>()
 	override val dispatchStackTimeout = INSERTION_TIMEOUT
@@ -102,7 +103,7 @@ class TerminalBlockEntity: DeviceBlockEntity(PhyBlockEntities.TERMINAL),
 		}
 		if (request != null) {
 			request.results.add(packet.amount to packet.stackProvider)
-			if (request.isFinishable(counter)) {
+			if (request.totalResultAmount >= request.amount || counter - request.timestamp >= LOCATE_REQUEST_TIMEOUT || request.results.size >= inventoryCache.size) {
 				stackLocateRequestCompleted(request)
 			}
 		}
@@ -148,6 +149,16 @@ class TerminalBlockEntity: DeviceBlockEntity(PhyBlockEntities.TERMINAL),
 		}
 	}
 
+	private fun sendEnqueuedLocateRequests() {
+		if (world!!.isClient) return
+
+		for (request in locateRequestQueue) {
+			pendingRequests.add(request)
+			sendPacket(LocateStackPacket(request.stack, ipAddress))
+		}
+		locateRequestQueue.clear()
+	}
+
 	private fun finishPendingRequests() {
 		if (world!!.isClient) return
 		if (pendingRequests.isEmpty()) return
@@ -170,6 +181,7 @@ class TerminalBlockEntity: DeviceBlockEntity(PhyBlockEntities.TERMINAL),
 
 		if (counter % 20 == 0L) {
 			if (!world!!.isClient) {
+				sendEnqueuedLocateRequests()
 				finishPendingRequests()
 				beginInsertions()
 				finishTimedOutPendingInsertions()
@@ -210,11 +222,7 @@ class TerminalBlockEntity: DeviceBlockEntity(PhyBlockEntities.TERMINAL),
 	}
 
 	fun requestItem(stack: ItemStack, amount: Int = stack.count) {
-		val request = StackLocateRequest(stack, amount, counter)
-		pendingRequests.add(request)
-		// locate packets are sent immediately instead of being added to a queue
-		// otherwise the terminal UI feels sluggish and unresponsive
-		sendPacket(LocateStackPacket(stack, ipAddress))
+		locateRequestQueue.add(StackLocateRequest(stack, amount, counter))
 	}
 
 	private fun stackLocateRequestCompleted(request: StackLocateRequest) {

src/main/kotlin/net/shadowfacts/phycon/network/block/terminal/TerminalScreen.kt

@@ -7,7 +7,6 @@ import net.minecraft.client.gui.widget.TextFieldWidget
 import net.minecraft.client.util.math.MatrixStack
 import net.minecraft.entity.player.PlayerInventory
 import net.minecraft.screen.slot.Slot
-import net.minecraft.screen.slot.SlotActionType
 import net.minecraft.text.LiteralText
 import net.minecraft.text.Text
 import net.minecraft.util.Identifier
@@ -90,13 +89,6 @@ class TerminalScreen(handler: TerminalScreenHandler, playerInv: PlayerInventory,
 		DrawableHelper.fill(matrixStack, slot.x, slot.y, slot.x + 16, slot.y + 16, color.toInt())
 	}
 
-	override fun onMouseClick(slot: Slot?, i: Int, j: Int, slotActionType: SlotActionType?) {
-		super.onMouseClick(slot, i, j, slotActionType)
-
-		// don't unfocus the search box on mouse click
-		searchBox.setSelected(true)
-	}
-
 	override fun charTyped(c: Char, i: Int): Boolean {
 		val oldText = searchBox.text
 		if (searchBox.charTyped(c, i)) {

src/main/kotlin/net/shadowfacts/phycon/networking/C2STerminalRequestItem.kt

@@ -26,14 +26,7 @@ object C2STerminalRequestItem: ServerReceiver {
 		val buf = PacketByteBufs.create()
 		buf.writeIdentifier(terminal.world!!.registryKey.value)
 		buf.writeBlockPos(terminal.pos)
-
-		// Force the count of the stack to be 1 before serializing for the network because
-		// PacketByteBuf serializes the stack count as a byte. Otherwise counts > 127 will result in
-		// an overflow and be negative on the receiving side.
-		val stackCopy = stack.copy()
-		stackCopy.count = 1
-		buf.writeItemStack(stackCopy)
-
+		buf.writeItemStack(stack)
 		buf.writeVarInt(amount)
 		return ClientPlayNetworking.createC2SPacket(CHANNEL, buf)
 	}