Skip to content

config: migrate velocity.toml to velocity.yml (Configurate) #1824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
electronicboy wants to merge 7 commits into
base: dev/3.0.0
Choose a base branch
from
Draft

config: migrate velocity.toml to velocity.yml (Configurate) #1824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e250996
Seperate out night-config toml loading logic
electronicboy Nov 7, 2024
b157b30
feat(config): add documented default-velocity.yml
electronicboy Jun 17, 2026
d0e654d
feat(config): map VelocityConfiguration to YAML via Configurate Objec…
electronicboy Jun 17, 2026
64e603c
feat(config): add velocity.yml loading and velocity.toml migration
electronicboy Jun 17, 2026
cf4580f
feat(config): load velocity.yml at startup and reload
electronicboy Jun 17, 2026
0a090c8
fix(config): keep server/forced-host defaults empty in code
electronicboy Jun 17, 2026
3755083
fix(config): use .yaml extension instead of .yml
electronicboy Jun 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import com.velocitypowered.proxy.command.builtin.ServerCommand;
import com.velocitypowered.proxy.command.builtin.ShutdownCommand;
import com.velocitypowered.proxy.command.builtin.VelocityCommand;
import com.velocitypowered.proxy.config.ConfigurationLoader;
import com.velocitypowered.proxy.config.VelocityConfiguration;
import com.velocitypowered.proxy.connection.client.ConnectedPlayer;
import com.velocitypowered.proxy.connection.player.resourcepack.VelocityResourcePackInfo;
Expand Down Expand Up @@ -402,8 +403,7 @@ private void registerTranslations() {
@SuppressFBWarnings("DM_EXIT")
private void doStartupConfigLoad() {
try {
Path configPath = Path.of("velocity.toml");
configuration = VelocityConfiguration.read(configPath);
configuration = ConfigurationLoader.loadConfiguration();

if (!configuration.validate()) {
logger.error("Your configuration is invalid. Velocity will not start up until the errors "
Expand All @@ -414,7 +414,7 @@ private void doStartupConfigLoad() {

commandManager.setAnnounceProxyCommands(configuration.isAnnounceProxyCommands());
} catch (Exception e) {
logger.error("Unable to read/load/save your velocity.toml. The server will shut down.", e);
logger.error("Unable to read/load/save your velocity.yaml. The server will shut down.", e);
LogManager.shutdown();
System.exit(1);
}
Expand Down Expand Up @@ -477,11 +477,10 @@ public boolean isShutdown() {
* Reloads the proxy's configuration.
*
* @return {@code true} if successful, {@code false} if we can't read the configuration
* @throws IOException if we can't read {@code velocity.toml}
* @throws IOException if we can't read {@code velocity.yaml}
*/
public boolean reloadConfiguration() throws IOException {
Path configPath = Path.of("velocity.toml");
VelocityConfiguration newConfiguration = VelocityConfiguration.read(configPath);
VelocityConfiguration newConfiguration = ConfigurationLoader.loadConfiguration();

if (!newConfiguration.validate()) {
return false;
Expand Down
Loading