Skip to content

Commit 3032a23

Browse files
authored
Merge pull request #2935 from GreenestBeen/bump-py-and-such
Bump py version for AP workflows to 3.13
2 parents 46d3c03 + 7394f47 commit 3032a23

File tree

4 files changed

+20
-3
lines changed

4 files changed

+20
-3
lines changed

.github/workflows/release_pages_dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- name: Setup python
4141
uses: actions/[email protected]
4242
with:
43-
python-version: 3.12.0
43+
python-version: 3.13.0
4444
architecture: x64
4545

4646
- name: Install packages

.github/workflows/release_pages_main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Setup python
4040
uses: actions/[email protected]
4141
with:
42-
python-version: 3.12.0
42+
python-version: 3.13.0
4343
architecture: x64
4444

4545
- name: Install packages

archipelago.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"minimum_ap_version": "0.6.4",
3-
"world_version": "1.4.18",
3+
"world_version": "1.4.19",
44
"authors": ["2dos", "AlmostSeagull", "Ballaam", "Green Bean", "Killklli", "Lrauq", "PoryGone", "Umed"],
55
"version": 7,
66
"compatible_version": 7,

archipelago/DK64Client.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,6 +1195,23 @@ def on_package(self, cmd: str, args: dict):
11951195
self.game = self.slot_info[self.slot].game
11961196
self.slot_data = args.get("slot_data", {})
11971197
self.setup_hint_locations()
1198+
if self.slot_data.get("Version"):
1199+
ap_version = get_ap_version()
1200+
server_ver = self.slot_data.get("Version")
1201+
server_major = server_ver.split(".")[0]
1202+
server_minor = server_ver.split(".")[1]
1203+
server_patch = server_ver.split(".")[2]
1204+
# Get the current version from the ap_version.py file
1205+
ap_major = ap_version.split(".")[0]
1206+
ap_minor = ap_version.split(".")[1]
1207+
ap_patch = ap_version.split(".")[2]
1208+
if server_major != ap_major or server_minor != ap_minor:
1209+
logger.error("Your DK64 APworld does not match with the generated world.")
1210+
logger.error(f"Your version: {ap_version} | Generated version: {server_ver}")
1211+
raise Exception("Your DK64 APworld does not match with the generated world.\n" + f"Your version: {ap_version} | Generated version: {server_ver}")
1212+
if server_patch != ap_patch:
1213+
logger.warning("Your DK64 APworld does not match with the generated world, but this should not be a breaking change.")
1214+
logger.warning("While we try to maintain backwards compatibility on patch versions, be warned that something might break.")
11981215
if self.slot_data.get("death_link"):
11991216
if "DeathLink" not in self.tags:
12001217
create_task_log_exception(self.update_death_link(True))

0 commit comments

Comments
 (0)