From f2c43710c3a5a8a600fb4880cc554128eec798c9 Mon Sep 17 00:00:00 2001 From: MarcoCoreDuo <90222533+MarcoCoreDuo@users.noreply.github.com> Date: Fri, 15 Dec 2023 18:27:00 +0100 Subject: [PATCH 1/3] Add ARM support and update variables --- game_eggs/yuzu-emu/yuzu-emu.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/game_eggs/yuzu-emu/yuzu-emu.json b/game_eggs/yuzu-emu/yuzu-emu.json index aa571676..601160ea 100644 --- a/game_eggs/yuzu-emu/yuzu-emu.json +++ b/game_eggs/yuzu-emu/yuzu-emu.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2023-02-26T13:57:20+01:00", + "exported_at": "2023-12-15T18:17:15+01:00", "name": "YuzuEmu", "author": "me@basvandenboom.dev", "description": "Egg for hosting dedicated Yuzu multiplayer rooms.", @@ -13,7 +13,7 @@ "ghcr.io\/parkervcp\/yolks:debian": "ghcr.io\/parkervcp\/yolks:debian" }, "file_denylist": [], - "startup": ".\/yuzu-room --room-name \"{{ROOM_NAME}}\" --room-description \"{{ROOM_DESCRIPTION}}\" --preferred-game \"{{PREFERRED_GAME}}\" --preferred-game-id {{PREFERRED_GAME_ID}} --port {{SERVER_PORT}} --max_members {{MAX_MEMBERS}} --password \"{{PASSWORD}}\" --token \"{{YUZU_TOKEN}}\" --web-api-url \"https:\/\/api.yuzu-emu.org\/\"", + "startup": ".\/yuzu-room --room-name \"{{ROOM_NAME}}\" --room-description \"{{ROOM_DESCRIPTION}}\" --preferred-game \"{{PREFERRED_GAME}}\" --preferred-game-id {{PREFERRED_GAME_ID}} --port {{SERVER_PORT}} --max_members {{MAX_MEMBERS}} --password \"{{PASSWORD}}\" --token \"{{YUZU_TOKEN}}\" --web-api-url \"https:\/\/api.yuzu-emu.org\"", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Room is open\"\r\n}", @@ -23,7 +23,7 @@ "scripts": { "installation": { "script": "#!\/bin\/bash\r\n\r\n# Install build tools\r\necho \"deb http:\/\/deb.debian.org\/debian bullseye-backports main\" >> \/etc\/apt\/sources.list && \\\r\napt-get update && apt-get -y full-upgrade && \\\r\n apt-get install -y build-essential wget git ccache ninja-build libssl-dev pkg-config libarchive-tools \\\r\n cmake\/bullseye-backports cmake-data\/bullseye-backports\r\n\r\n\r\n# Shallow clone yuzu repository, since we delete the local copy afterwards\r\ngit clone --depth 1 -j4 --recursive --shallow-submodules https:\/\/github.com\/yuzu-emu\/yuzu-mainline.git \/mnt\/server\/yuzu-mainline\r\n\r\n# Download build tools and build\r\ngit clone --depth 1 https:\/\/github.com\/yuzu-emu\/yuzu-multiplayer-dedicated.git \/mnt\/server\/build-files\r\ncd \/mnt\/server\/yuzu-mainline && \/mnt\/server\/build-files\/.ci\/build.sh\r\n\r\n# Copy server binary to container root\r\ncp \/mnt\/server\/yuzu-mainline\/build\/bin\/yuzu-room \/mnt\/server\/yuzu-room\r\n\r\n# Delete git repo's to save disk space.\r\nrm -rf \/mnt\/server\/yuzu-mainline && rm -rf \/mnt\/server\/build-files", - "container": "ghcr.io\/pterodactyl\/installers:debian", + "container": "debian:bullseye-slim", "entrypoint": "bash" } }, @@ -35,7 +35,7 @@ "default_value": "My Yuzu Room", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20", + "rules": "required|string|max:60", "field_type": "text" }, { @@ -75,7 +75,7 @@ "default_value": "4", "user_viewable": true, "user_editable": true, - "rules": "required|int|max:12|min:1", + "rules": "required|int|max:16|min:1", "field_type": "text" }, { @@ -95,7 +95,7 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string|max:60", + "rules": "nullable|string", "field_type": "text" } ] From f11f9bc084b51dfec615922b2d7533b1cf6839b9 Mon Sep 17 00:00:00 2001 From: MarcoCoreDuo <90222533+MarcoCoreDuo@users.noreply.github.com> Date: Fri, 15 Dec 2023 18:28:17 +0100 Subject: [PATCH 2/3] Rename yuzu-emu.json to egg-yuzu-emu.json --- game_eggs/yuzu-emu/{yuzu-emu.json => egg-yuzu-emu.json} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename game_eggs/yuzu-emu/{yuzu-emu.json => egg-yuzu-emu.json} (99%) diff --git a/game_eggs/yuzu-emu/yuzu-emu.json b/game_eggs/yuzu-emu/egg-yuzu-emu.json similarity index 99% rename from game_eggs/yuzu-emu/yuzu-emu.json rename to game_eggs/yuzu-emu/egg-yuzu-emu.json index 601160ea..9cf46c59 100644 --- a/game_eggs/yuzu-emu/yuzu-emu.json +++ b/game_eggs/yuzu-emu/egg-yuzu-emu.json @@ -99,4 +99,4 @@ "field_type": "text" } ] -} \ No newline at end of file +} From b21123b7cae534d02eb6ffcf4f3d2ae96fdfdc9e Mon Sep 17 00:00:00 2001 From: MarcoCoreDuo <90222533+MarcoCoreDuo@users.noreply.github.com> Date: Fri, 15 Dec 2023 21:45:25 +0100 Subject: [PATCH 3/3] Change container image to ghcr.io/parkervcp/installers:debian --- game_eggs/yuzu-emu/egg-yuzu-emu.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game_eggs/yuzu-emu/egg-yuzu-emu.json b/game_eggs/yuzu-emu/egg-yuzu-emu.json index 9cf46c59..784709d7 100644 --- a/game_eggs/yuzu-emu/egg-yuzu-emu.json +++ b/game_eggs/yuzu-emu/egg-yuzu-emu.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2023-12-15T18:17:15+01:00", + "exported_at": "2023-12-15T21:41:29+01:00", "name": "YuzuEmu", "author": "me@basvandenboom.dev", "description": "Egg for hosting dedicated Yuzu multiplayer rooms.", @@ -23,7 +23,7 @@ "scripts": { "installation": { "script": "#!\/bin\/bash\r\n\r\n# Install build tools\r\necho \"deb http:\/\/deb.debian.org\/debian bullseye-backports main\" >> \/etc\/apt\/sources.list && \\\r\napt-get update && apt-get -y full-upgrade && \\\r\n apt-get install -y build-essential wget git ccache ninja-build libssl-dev pkg-config libarchive-tools \\\r\n cmake\/bullseye-backports cmake-data\/bullseye-backports\r\n\r\n\r\n# Shallow clone yuzu repository, since we delete the local copy afterwards\r\ngit clone --depth 1 -j4 --recursive --shallow-submodules https:\/\/github.com\/yuzu-emu\/yuzu-mainline.git \/mnt\/server\/yuzu-mainline\r\n\r\n# Download build tools and build\r\ngit clone --depth 1 https:\/\/github.com\/yuzu-emu\/yuzu-multiplayer-dedicated.git \/mnt\/server\/build-files\r\ncd \/mnt\/server\/yuzu-mainline && \/mnt\/server\/build-files\/.ci\/build.sh\r\n\r\n# Copy server binary to container root\r\ncp \/mnt\/server\/yuzu-mainline\/build\/bin\/yuzu-room \/mnt\/server\/yuzu-room\r\n\r\n# Delete git repo's to save disk space.\r\nrm -rf \/mnt\/server\/yuzu-mainline && rm -rf \/mnt\/server\/build-files", - "container": "debian:bullseye-slim", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, @@ -99,4 +99,4 @@ "field_type": "text" } ] -} +} \ No newline at end of file