Merge pull request #2936 from GreenestBeen/bump-py-main

Add version diff handling

Author: theballaam96

ap_version.py

@@ -1,3 +1,3 @@
 """Holds the version for Archipelago."""
 
-version = "1.0.55"
+version = "1.0.56"

archipelago.json

@@ -0,0 +1,8 @@
+{
+    "minimum_ap_version": "0.6.5", 
+    "world_version": "1.0.56",
+    "authors": ["2dos", "AlmostSeagull", "Ballaam", "Green Bean", "Killklli", "Lrauq", "PoryGone", "Umed"],
+    "version": 7,
+    "compatible_version": 7,
+    "game": "Donkey Kong 64"
+}

archipelago/DK64Client.py

@@ -752,6 +752,22 @@ def on_package(self, cmd: str, args: dict):
         if cmd == "Connected":
             self.game = self.slot_info[self.slot].game
             self.slot_data = args.get("slot_data", {})
+            if self.slot_data.get("Version"):
+                server_ver = self.slot_data.get("Version")
+                server_major = server_ver.split(".")[0]
+                server_minor = server_ver.split(".")[1]
+                server_patch = server_ver.split(".")[2]
+                # Get the current version from the ap_version.py file
+                ap_major = ap_version.split(".")[0]
+                ap_minor = ap_version.split(".")[1]
+                ap_patch = ap_version.split(".")[2]
+                if server_major != ap_major or server_minor != ap_minor:
+                    logger.error("Your DK64 APworld does not match with the generated world.")
+                    logger.error(f"Your version: {ap_version} | Generated version: {server_ver}")
+                    raise Exception("Your DK64 APworld does not match with the generated world.\n" + f"Your version: {ap_version} | Generated version: {server_ver}")
+                if server_patch != ap_patch:
+                    logger.warning("Your DK64 APworld does not match with the generated world, but this should not be a breaking change.")
+                    logger.warning("While we try to maintain backwards compatibility on patch versions, be warned that something might break.")
             if self.slot_data.get("death_link"):
                 if "DeathLink" not in self.tags:
                     create_task_log_exception(self.update_death_link(True))

requirements.txt

@@ -1,2 +1,2 @@
-pyxdelta==0.2.0
-pillow==10.3.0
+pyxdelta==0.2.2
+pillow==11.3.0