Skip to content

Commit 0f0abd6

Browse files
committed
Move config entries around and add migrations for new config entries
1 parent bf0b6ce commit 0f0abd6

2 files changed

Lines changed: 27 additions & 12 deletions

File tree

proxy/src/main/java/com/velocityctd/proxy/config/migration/CtdConfigMigrations.java

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,16 @@ public static List<ConfigurationMigration> createCtdMigrations() {
147147
"advanced.server-brand",
148148
"{backend-brand} ({proxy-brand})"
149149
),
150+
migration(
151+
"Replaces what is returned for both the server brand and fallback version pinger.",
152+
"advanced.custom-brand-proxy",
153+
"Velocity-CTD"
154+
),
155+
migration(
156+
"Replaces what is returned as the server brand for the user's client.",
157+
"advanced.custom-brand-backend",
158+
"Paper"
159+
),
150160
migration(
151161
"Modifies the brand and server version that displays in the multiplayer menu and status pingers.\n"
152162
+ " Supports placeholders: {protocol-min}, {protocol-max}, {protocol}, {proxy-brand},\n"
@@ -162,14 +172,19 @@ public static List<ConfigurationMigration> createCtdMigrations() {
162172
false
163173
),
164174
migration(
165-
"Replaces what is returned for both the server brand and fallback version pinger.",
166-
"advanced.custom-brand-proxy",
167-
"Velocity-CTD"
175+
"When a player disables \"Allow Server Listings\" in their client options, they are shown as\n"
176+
+ " \"Anonymous Player\" in the {players} sample of the server list ping. Set this to true to ignore\n"
177+
+ " that request and always show their real username.",
178+
"advanced.ignore-anonymous-player-request",
179+
false
168180
),
169181
migration(
170-
"Replaces what is returned as the server brand for the user's client.",
171-
"advanced.custom-brand-backend",
172-
"Paper"
182+
"Whether the {players} sample of the motd, motd-hover and fallback-version-ping should draw from a\n"
183+
+ " single shared pool. When true, a player never appears more than once across those three sections.\n"
184+
+ " When false (default), each section samples players independently and the same player may appear in\n"
185+
+ " more than one section.",
186+
"advanced.pool-players-across-sections",
187+
false
173188
),
174189

175190
// [redis]

proxy/src/main/resources/default-velocity.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,12 @@ allow-illegal-characters-in-chat = false
347347
# to of your proxy with case-sensitivity."
348348
server-brand = "{backend-brand} ({proxy-brand})"
349349

350+
# Replaces what is returned for both the server brand and fallback version pinger.
351+
custom-brand-proxy = "Velocity-CTD"
352+
353+
# Replaces what is returned as the server brand for the user's client.
354+
custom-brand-backend = "Paper"
355+
350356
# Modifies the brand and server version that displays in the multiplayer menu and status pingers.
351357
# Available options:
352358
# - "{protocol-min}": Returns the lowest compatible version from the
@@ -378,12 +384,6 @@ fallback-version-ping = "{proxy-brand} {protocol-min}-{protocol-max}"
378384
# version and can be used to customize the player count/max line freely.
379385
always-fallback-ping = false
380386

381-
# Replaces what is returned for both the server brand and fallback version pinger.
382-
custom-brand-proxy = "Velocity-CTD"
383-
384-
# Replaces what is returned as the server brand for the user's client.
385-
custom-brand-backend = "Paper"
386-
387387
# When a player disables "Allow Server Listings" in their client options, they are shown as
388388
# "Anonymous Player" in the {players} sample of the server list ping. Set this to true to ignore
389389
# that request and always show their real username.

0 commit comments

Comments
 (0)