From f62e8b7be9d86c1635d2f60223c8b08752254526 Mon Sep 17 00:00:00 2001
From: espeon65536 <espeon65536@gmail.com>
Date: Thu, 5 Aug 2021 13:17:01 -0500
Subject: [PATCH] Minecraft: write server and port to apmc on download

---
 WebHostLib/downloads.py          | 13 ++++++++-----
 WebHostLib/templates/macros.html |  4 ++--
 worlds/minecraft/__init__.py     | 11 ++++++++---
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/WebHostLib/downloads.py b/WebHostLib/downloads.py
index 3d901bb2..2d944117 100644
--- a/WebHostLib/downloads.py
+++ b/WebHostLib/downloads.py
@@ -45,10 +45,10 @@ def download_raw_patch(seed_id, player_id: int):
         fname = f"P{patch.player_id}_{patch.player_name}_{app.jinja_env.filters['suuid'](seed_id)}.apbp"
         return send_file(patch_data, as_attachment=True, attachment_filename=fname)
 
-@app.route("/slot_file/<suuid:seed_id>/<int:player_id>")
-def download_slot_file(seed_id, player_id: int):
-    seed = Seed.get(id=seed_id)
-    slot_data: Slot = select(patch for patch in seed.slots if
+@app.route("/slot_file/<suuid:room_id>/<int:player_id>")
+def download_slot_file(room_id, player_id: int):
+    room = Room.get(id=room_id)
+    slot_data: Slot = select(patch for patch in room.seed.slots if
                    patch.player_id == player_id).first()
 
     if not slot_data:
@@ -57,7 +57,10 @@ def download_slot_file(seed_id, player_id: int):
         import io
 
         if slot_data.game == "Minecraft":
-            fname = f"AP_{app.jinja_env.filters['suuid'](seed_id)}_P{slot_data.player_id}_{slot_data.player_name}.apmc"
+            from worlds.minecraft import mc_update_output
+            fname = f"AP_{app.jinja_env.filters['suuid'](room_id)}_P{slot_data.player_id}_{slot_data.player_name}.apmc"
+            data = mc_update_output(slot_data.data, server=app.config['PATCH_TARGET'], port=room.last_port)
+            return send_file(io.BytesIO(data), as_attachment=True, attachment_filename=fname)
         elif slot_data.game == "Factorio":
             with zipfile.ZipFile(io.BytesIO(slot_data.data)) as zf:
                 for name in zf.namelist():
diff --git a/WebHostLib/templates/macros.html b/WebHostLib/templates/macros.html
index 1b5146d3..3e32b796 100644
--- a/WebHostLib/templates/macros.html
+++ b/WebHostLib/templates/macros.html
@@ -11,10 +11,10 @@
         <ul>
             {% for patch in room.seed.slots|list|sort(attribute="player_id") %}
                 {% if patch.game == "Minecraft" %}
-                <li><a href="{{ url_for("download_slot_file", seed_id=room.seed.id, player_id=patch.player_id) }}">
+                <li><a href="{{ url_for("download_slot_file", room_id=room.id, player_id=patch.player_id) }}">
                     APMC for player {{ patch.player_id }} - {{ patch.player_name }}</a></li>
                 {% elif patch.game == "Factorio" %}
-                <li><a href="{{ url_for("download_slot_file", seed_id=room.seed.id, player_id=patch.player_id) }}">
+                <li><a href="{{ url_for("download_slot_file", room_id=room.id, player_id=patch.player_id) }}">
                     Mod for player {{ patch.player_id }} - {{ patch.player_name }}</a></li>
                 {% else %}
                 <li><a href="{{ url_for("download_patch", patch_id=patch.id, room_id=room.id) }}">
diff --git a/worlds/minecraft/__init__.py b/worlds/minecraft/__init__.py
index 8a319662..05732bb2 100644
--- a/worlds/minecraft/__init__.py
+++ b/worlds/minecraft/__init__.py
@@ -1,4 +1,6 @@
 import os
+import json
+from base64 import b64encode, b64decode
 from math import ceil
 
 from .Items import MinecraftItem, item_table, required_items, junk_weights
@@ -88,9 +90,6 @@ class MinecraftWorld(World):
         link_minecraft_structures(self.world, self.player)
 
     def generate_output(self, output_directory: str):
-        import json
-        from base64 import b64encode
-
         data = self._get_mc_data()
         filename = f"AP_{self.world.seed_name}_P{self.player}_{self.world.get_player_names(self.player)}.apmc"
         with open(os.path.join(output_directory, filename), 'wb') as f:
@@ -110,3 +109,9 @@ class MinecraftWorld(World):
         if name in nonexcluded_items:  # prevent books from going on excluded locations
             item.never_exclude = True
         return item
+
+def mc_update_output(raw_data, server, port): 
+    data = json.loads(b64decode(raw_data))
+    data['server'] = server
+    data['port'] = port
+    return b64encode(bytes(json.dumps(data), 'utf-8'))