From 30ac7baa2ce637631d629289eb54cbc7711081b6 Mon Sep 17 00:00:00 2001
From: Fabian Dill <fabian.dill@web.de>
Date: Tue, 24 Aug 2021 09:52:12 +0200
Subject: [PATCH] FactorioClient: Batch-Send RCON commands when receiving
 catch-up locations and multiple items.

---
 FactorioClient.py | 15 +++++++++++----
 Fill.py           |  4 ++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/FactorioClient.py b/FactorioClient.py
index 7e3a789f..25c0b49e 100644
--- a/FactorioClient.py
+++ b/FactorioClient.py
@@ -109,9 +109,10 @@ class FactorioContext(CommonContext):
     def on_package(self, cmd: str, args: dict):
         if cmd == "Connected":
             # catch up sync anything that is already cleared.
-            for tech in args["checked_locations"]:
-                item_name = f"ap-{tech}-"
-                self.rcon_client.send_command(f'/ap-get-technology {item_name}\t-1')
+            if args["checked_locations"]:
+                self.rcon_client.send_commands({item_name: f'/ap-get-technology {item_name}\t-1' for
+                                                item_name in args["checked_locations"]})
+
 
 async def game_watcher(ctx: FactorioContext):
     bridge_logger = logging.getLogger("FactorioWatcher")
@@ -195,11 +196,15 @@ async def factorio_server_watcher(ctx: FactorioContext):
                     if ctx.mod_version < Utils.Version(0, 1, 6):
                         ctx.rcon_client.send_command("/sc game.print('Starting Archipelago Bridge')")
                         ctx.rcon_client.send_command("/sc game.print('Starting Archipelago Bridge')")
+                    if not ctx.server:
+                        logger.info("Established bridge to Factorio Server. "
+                                    "Ready to connect to Archipelago via /connect")
 
                 if not ctx.awaiting_bridge and "Archipelago Bridge Data available for game tick " in msg:
                     ctx.awaiting_bridge = True
 
             if ctx.rcon_client:
+                commands = {}
                 while ctx.send_index < len(ctx.items_received):
                     transfer_item: NetworkItem = ctx.items_received[ctx.send_index]
                     item_id = transfer_item.item
@@ -209,8 +214,10 @@ async def factorio_server_watcher(ctx: FactorioContext):
                     else:
                         item_name = Factorio.item_id_to_name[item_id]
                         factorio_server_logger.info(f"Sending {item_name} to Nauvis from {player_name}.")
-                        ctx.rcon_client.send_command(f'/ap-get-technology {item_name}\t{ctx.send_index}\t{player_name}')
+                        commands[ctx.send_index] = f'/ap-get-technology {item_name}\t{ctx.send_index}\t{player_name}'
                     ctx.send_index += 1
+                if commands:
+                    ctx.rcon_client.send_commands(commands)
             await asyncio.sleep(0.1)
 
     except Exception as e:
diff --git a/Fill.py b/Fill.py
index e9d1f2cb..20c3e54d 100644
--- a/Fill.py
+++ b/Fill.py
@@ -123,11 +123,11 @@ def distribute_items_restrictive(world: MultiWorld, fill_locations=None):
     world.random.shuffle(fill_locations)
 
     restitempool, fill_locations = fast_fill(world, restitempool, fill_locations)
-    unplaced = [item for item in progitempool + restitempool]
+    unplaced = progitempool + restitempool
     unfilled = [location.name for location in fill_locations]
 
     if unplaced or unfilled:
-        raise FillError(f'Unplaced items({len(unplaced)}): {unplaced} - Unfilled Locations({len(unfilled)}): {unfilled}')
+        logging.warning(f'Unplaced items({len(unplaced)}): {unplaced} - Unfilled Locations({len(unfilled)}): {unfilled}')
 
 
 def fast_fill(world: MultiWorld, item_pool: typing.List, fill_locations: typing.List) -> typing.Tuple[typing.List, typing.List]: