From 9b53b2057dbba2758350855861d8546c893361a5 Mon Sep 17 00:00:00 2001 From: Wapriaily Date: Fri, 3 Feb 2023 13:02:29 +0800 Subject: [PATCH 1/4] Update Rust and frozen flame --- .../frozen_flame/egg-frozen-flame.json | 2 +- .../rust/rust_autowipe/egg-rust-autowipe.json | 60 ++++++++++++------- 2 files changed, 41 insertions(+), 21 deletions(-) diff --git a/game_eggs/steamcmd_servers/frozen_flame/egg-frozen-flame.json b/game_eggs/steamcmd_servers/frozen_flame/egg-frozen-flame.json index 6ed35e80..fccb2201 100644 --- a/game_eggs/steamcmd_servers/frozen_flame/egg-frozen-flame.json +++ b/game_eggs/steamcmd_servers/frozen_flame/egg-frozen-flame.json @@ -50,7 +50,7 @@ }, { "name": "Server Name", - "description": "The server nane", + "description": "The server name", "env_variable": "SERVER_NAME", "default_value": "My Frozen Flame Server", "user_viewable": true, diff --git a/game_eggs/steamcmd_servers/rust/rust_autowipe/egg-rust-autowipe.json b/game_eggs/steamcmd_servers/rust/rust_autowipe/egg-rust-autowipe.json index cb002c52..1534f0f2 100644 --- a/game_eggs/steamcmd_servers/rust/rust_autowipe/egg-rust-autowipe.json +++ b/game_eggs/steamcmd_servers/rust/rust_autowipe/egg-rust-autowipe.json @@ -4,9 +4,9 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-11-26T11:35:12+01:00", + "exported_at": "2023-02-03T13:00:17+08:00", "name": "Rust Autowipe", - "author": "support@pterodactyl.io", + "author": "kano@wapriaily.com", "description": "The only aim in Rust is to survive. To do this you will need to overcome struggles such as hunger, thirst and cold. Build a fire. Build a shelter. Kill animals for meat. Protect yourself from other players, and kill them for meat. Create alliances with other players and form a town. Do whatever it takes to survive.", "features": [ "steam_disk_space" @@ -15,7 +15,7 @@ "ghcr.io\/pterodactyl\/games:rust": "ghcr.io\/pterodactyl\/games:rust" }, "file_denylist": [], - "startup": "\".\/RustDedicated -batchmode +server.port {{SERVER_PORT}} +server.identity \"rust\" +rcon.ip 0.0.0.0 +rcon.port {{RCON_PORT}} +rcon.web true +server.hostname \\\"{{HOSTNAME}}\\\" +server.level \\\"{{LEVEL}}\\\" +server.description \\\"{{DESCRIPTION}}\\\" +server.url \\\"{{SERVER_URL}}\\\" +server.headerimage \\\"{{SERVER_IMG}}\\\" +server.worldsize \\\"{{WORLD_SIZE}}\\\" +server.seed \\\"$( if [ -f seed.txt ] && [[ ${WORLD_SEED} == \"0\" ]]; then printf %s $(cat seed.txt); else printf %s '${WORLD_SEED}'; fi )\\\" +server.maxplayers {{MAX_PLAYERS}} +rcon.password \\\"{{RCON_PASS}}\\\" +server.saveinterval {{SAVEINTERVAL}} {{ADDITIONAL_ARGS}}\"", + "startup": "\".\/RustDedicated -batchmode +server.port {{SERVER_PORT}} +server.queryport {{QUERY_PORT}} +server.identity \"rust\" +rcon.ip 0.0.0.0 +rcon.port {{RCON_PORT}} +rcon.web true +server.hostname \\\"{{HOSTNAME}}\\\" +server.level \\\"{{LEVEL}}\\\" +server.description \\\"{{DESCRIPTION}}\\\" +server.url \\\"{{SERVER_URL}}\\\" +server.headerimage \\\"{{SERVER_IMG}}\\\" +server.worldsize \\\"{{WORLD_SIZE}}\\\" +server.seed \\\"$( if [ -f seed.txt ] && [[ ${WORLD_SEED} == \"0\" ]]; then printf %s $(cat seed.txt); else printf %s '${WORLD_SEED}'; fi )\\\" +server.maxplayers {{MAX_PLAYERS}} +rcon.password \\\"{{RCON_PASS}}\\\" +app.port {{APP_PORT}} +server.saveinterval {{SAVEINTERVAL}} {{ADDITIONAL_ARGS}}\"", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Server startup complete\"\r\n}", @@ -30,6 +30,26 @@ } }, "variables": [ + { + "name": "SRCDS_APPID", + "description": "", + "env_variable": "SRCDS_APPID", + "default_value": "258550", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|max:20", + "field_type": "text" + }, + { + "name": "Max Players", + "description": "The maximum amount of players allowed in the server at once.", + "env_variable": "MAX_PLAYERS", + "default_value": "40", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer", + "field_type": "text" + }, { "name": "Server Name", "description": "The name of your server in the public server list.", @@ -100,16 +120,6 @@ "rules": "nullable|string", "field_type": "text" }, - { - "name": "Max Players", - "description": "The maximum amount of players allowed in the server at once.", - "env_variable": "MAX_PLAYERS", - "default_value": "40", - "user_viewable": true, - "user_editable": true, - "rules": "required|integer", - "field_type": "text" - }, { "name": "Server Image", "description": "The header image for the top of your server listing.", @@ -181,13 +191,23 @@ "field_type": "text" }, { - "name": "SRCDS_APPID", - "description": "", - "env_variable": "SRCDS_APPID", - "default_value": "258550", - "user_viewable": false, - "user_editable": false, - "rules": "required|string|max:20", + "name": "QUERY PORT", + "description": "Port for QUERY connections.", + "env_variable": "QUERY_PORT", + "default_value": "28017", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer", + "field_type": "text" + }, + { + "name": "APP PORT", + "description": "Port for Rust+ applications. -1 to disable.", + "env_variable": "APP_PORT", + "default_value": "28082", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer", "field_type": "text" } ] From 4f77e5a7fdb1c9dc13ec32c47b10b5b1ba7fb740 Mon Sep 17 00:00:00 2001 From: Wapriaily Date: Fri, 3 Feb 2023 14:34:50 +0800 Subject: [PATCH 2/4] Update --- .../frozen_flame/egg-frozen-flame.json | 44 +++++++++---------- .../rust/rust_autowipe/egg-rust-autowipe.json | 2 +- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/game_eggs/steamcmd_servers/frozen_flame/egg-frozen-flame.json b/game_eggs/steamcmd_servers/frozen_flame/egg-frozen-flame.json index fccb2201..cb229f4d 100644 --- a/game_eggs/steamcmd_servers/frozen_flame/egg-frozen-flame.json +++ b/game_eggs/steamcmd_servers/frozen_flame/egg-frozen-flame.json @@ -4,9 +4,9 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-11-19T18:35:39+01:00", + "exported_at": "2023-02-03T14:32:26+08:00", "name": "Frozen Flame", - "author": "theblitzbat@gmail.com", + "author": "parker@parkervcp.com", "description": "Frozen Flame Dedicated Server", "features": null, "docker_images": { @@ -38,6 +38,26 @@ "rules": "nullable|numeric", "field_type": "text" }, + { + "name": "Max Players", + "description": "Maximum player count", + "env_variable": "MAX_PLAYERS", + "default_value": "10", + "user_viewable": true, + "user_editable": true, + "rules": "required|numeric", + "field_type": "text" + }, + { + "name": "Query Port", + "description": "The query port.", + "env_variable": "QUERY_PORT", + "default_value": "27015", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer|between:1024,65536", + "field_type": "text" + }, { "name": "Additional Arguments", "description": "Specify additional launch parameters such as -crossplay. You must include a dash - and separate each parameter with space: -crossplay -exclusivejoin", @@ -68,16 +88,6 @@ "rules": "required|string|max:128", "field_type": "text" }, - { - "name": "Max Players", - "description": "Maximum player count", - "env_variable": "MAX_PLAYERS", - "default_value": "10", - "user_viewable": true, - "user_editable": true, - "rules": "required|numeric", - "field_type": "text" - }, { "name": "Auto Update", "description": "Auto update server software", @@ -87,16 +97,6 @@ "user_editable": true, "rules": "boolean", "field_type": "text" - }, - { - "name": "Query Port", - "description": "The query port.", - "env_variable": "QUERY_PORT", - "default_value": "27015", - "user_viewable": true, - "user_editable": true, - "rules": "required|integer|between:1024,65536", - "field_type": "text" } ] } \ No newline at end of file diff --git a/game_eggs/steamcmd_servers/rust/rust_autowipe/egg-rust-autowipe.json b/game_eggs/steamcmd_servers/rust/rust_autowipe/egg-rust-autowipe.json index 1534f0f2..84e4032f 100644 --- a/game_eggs/steamcmd_servers/rust/rust_autowipe/egg-rust-autowipe.json +++ b/game_eggs/steamcmd_servers/rust/rust_autowipe/egg-rust-autowipe.json @@ -6,7 +6,7 @@ }, "exported_at": "2023-02-03T13:00:17+08:00", "name": "Rust Autowipe", - "author": "kano@wapriaily.com", + "author": "parker@parkervcp.com", "description": "The only aim in Rust is to survive. To do this you will need to overcome struggles such as hunger, thirst and cold. Build a fire. Build a shelter. Kill animals for meat. Protect yourself from other players, and kill them for meat. Create alliances with other players and form a town. Do whatever it takes to survive.", "features": [ "steam_disk_space" From 1930eb72dc265375e697d0133fb2e0d311ed7e95 Mon Sep 17 00:00:00 2001 From: Wapriaily Date: Fri, 3 Feb 2023 14:37:50 +0800 Subject: [PATCH 3/4] Restore the author --- .../steamcmd_servers/rust/rust_autowipe/egg-rust-autowipe.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/rust/rust_autowipe/egg-rust-autowipe.json b/game_eggs/steamcmd_servers/rust/rust_autowipe/egg-rust-autowipe.json index 84e4032f..eaa55f52 100644 --- a/game_eggs/steamcmd_servers/rust/rust_autowipe/egg-rust-autowipe.json +++ b/game_eggs/steamcmd_servers/rust/rust_autowipe/egg-rust-autowipe.json @@ -6,7 +6,7 @@ }, "exported_at": "2023-02-03T13:00:17+08:00", "name": "Rust Autowipe", - "author": "parker@parkervcp.com", + "author": "support@pterodactyl.io", "description": "The only aim in Rust is to survive. To do this you will need to overcome struggles such as hunger, thirst and cold. Build a fire. Build a shelter. Kill animals for meat. Protect yourself from other players, and kill them for meat. Create alliances with other players and form a town. Do whatever it takes to survive.", "features": [ "steam_disk_space" From 9f42e907ce34af601a02d3c1a2db1dd646a24402 Mon Sep 17 00:00:00 2001 From: Wapriaily Date: Fri, 3 Feb 2023 22:23:07 +0800 Subject: [PATCH 4/4] Restore the author --- game_eggs/steamcmd_servers/frozen_flame/egg-frozen-flame.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/frozen_flame/egg-frozen-flame.json b/game_eggs/steamcmd_servers/frozen_flame/egg-frozen-flame.json index cb229f4d..f76ca3ff 100644 --- a/game_eggs/steamcmd_servers/frozen_flame/egg-frozen-flame.json +++ b/game_eggs/steamcmd_servers/frozen_flame/egg-frozen-flame.json @@ -6,7 +6,7 @@ }, "exported_at": "2023-02-03T14:32:26+08:00", "name": "Frozen Flame", - "author": "parker@parkervcp.com", + "author": "theblitzbat@gmail.com", "description": "Frozen Flame Dedicated Server", "features": null, "docker_images": {