From 0e21d50716c7477ca9b4d70b0be0ea6359f09d4c Mon Sep 17 00:00:00 2001 From: = Date: Wed, 27 Aug 2025 15:00:51 -0400 Subject: [PATCH 1/3] Modify neoforge regex for startup command --- app/classes/shared/server.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py index 4824cc03..a50b0192 100644 --- a/app/classes/shared/server.py +++ b/app/classes/shared/server.py @@ -775,14 +775,15 @@ class ServerInstance: # We get the server command parameters from forge script server_command = re.findall( r"java @([a-zA-Z0-9_\.]+)" - r" @([a-z.\/\-]+)([0-9.\-]+)" - r"\/\b([a-z_0-9]+\.txt)\b( .{2,4})?", + r" @([a-z./\-]+)" + r"([0-9.\-]+(?:-[a-zA-Z0-9]+)?)" + r"\/\b([a-z_0-9]+\.txt)\b" + r"( .{2,4})?", run_file_text, )[0] version = server_command[2] executable_path = f"{server_command[1]}{server_command[2]}/" - # Let's set the proper server executable server_obj.executable = os.path.join( f"{executable_path}{version_info[0][0]}-{version}-server.jar" -- GitLab From 8f8aacf4a90cdf1df529aa3d33dec8be710161bd Mon Sep 17 00:00:00 2001 From: = Date: Wed, 27 Aug 2025 15:01:00 -0400 Subject: [PATCH 2/3] Cleanup update URL for modded servers --- app/classes/shared/main_controller.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/classes/shared/main_controller.py b/app/classes/shared/main_controller.py index a45b2acb..3d98072c 100644 --- a/app/classes/shared/main_controller.py +++ b/app/classes/shared/main_controller.py @@ -577,7 +577,7 @@ class Controller: if data["create_type"] == "minecraft_java": if root_create_data["create_type"] == "download_jar": # modded update urls from server jars will only update the installer - if create_data["type"] != "forge-installer": + if create_data["type"] not in MODDED_TYPES: server_obj = self.servers.get_server_obj(new_server_id) url = self.big_bucket.get_fetch_url( create_data["category"], -- GitLab From b24eef3b80d2bb8490fef6bff26a29653136a3df Mon Sep 17 00:00:00 2001 From: Zedifus Date: Sun, 31 Aug 2025 22:54:25 +0100 Subject: [PATCH 3/3] Upgrade changelog !886 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed647b1e..67e57758 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ TBD ### Bug fixes - Bedrock Builder | Utilize self call instead of static call for unzipping bedrock archives ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/884)) - Fix Human Readable Sizes on Dashboard ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/885)) +- Correct Builder to support new Neoforge versioning scheme ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/886)) ### Tweaks TBD ### Lang -- GitLab