diff --git a/proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java b/proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java index 5bfac2d26..01ffb85fa 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java @@ -414,7 +414,7 @@ public class VelocityServer implements ProxyServer, ForwardingAudience { commandManager.setAnnounceProxyCommands(configuration.isAnnounceProxyCommands()); } catch (Exception e) { - logger.error("Unable to read/load/save your velocity.yml. 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); } @@ -477,7 +477,7 @@ public class VelocityServer implements ProxyServer, ForwardingAudience { * 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.yml} + * @throws IOException if we can't read {@code velocity.yaml} */ public boolean reloadConfiguration() throws IOException { VelocityConfiguration newConfiguration = ConfigurationLoader.loadConfiguration(); diff --git a/proxy/src/main/java/com/velocitypowered/proxy/config/ConfigurationLoader.java b/proxy/src/main/java/com/velocitypowered/proxy/config/ConfigurationLoader.java index c6003b969..e58d072af 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/config/ConfigurationLoader.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/config/ConfigurationLoader.java @@ -49,15 +49,15 @@ public final class ConfigurationLoader { private static final Logger logger = LogManager.getLogger(ConfigurationLoader.class); - private static final String DEFAULT_CONFIG_RESOURCE = "default-velocity.yml"; - private static final Path DEFAULT_CONFIG_PATH = Path.of("velocity.yml"); + private static final String DEFAULT_CONFIG_RESOURCE = "default-velocity.yaml"; + private static final Path DEFAULT_CONFIG_PATH = Path.of("velocity.yaml"); private static final Path LEGACY_CONFIG_PATH = Path.of("velocity.toml"); private static final String FORWARDING_SECRET_FILE_KEY = "forwarding-secret-file"; private static final String DEFAULT_FORWARDING_SECRET_FILE = "forwarding.secret"; static final String CONFIG_VERSION_KEY = "config-version"; /** - * Current {@code velocity.yml} schema version. Files are born at this version (either freshly + * Current {@code velocity.yaml} schema version. Files are born at this version (either freshly * written from the bundled default or stamped during a {@code velocity.toml} migration). Once a * YAML-schema migration is needed, drive upgrades from here via * {@link org.spongepowered.configurate.transformation.ConfigurationTransformation#versionedBuilder()} @@ -77,7 +77,7 @@ public final class ConfigurationLoader { } /** - * Loads the Velocity configuration from {@code velocity.yml}, migrating a legacy + * Loads the Velocity configuration from {@code velocity.yaml}, migrating a legacy * {@code velocity.toml} or writing the documented default on first start as needed. * * @return the loaded configuration @@ -119,7 +119,7 @@ public final class ConfigurationLoader { } /** - * Converts a legacy {@code velocity.toml} to {@code velocity.yml}. The legacy night-config + * Converts a legacy {@code velocity.toml} to {@code velocity.yaml}. The legacy night-config * migrations are run first to normalise the file, then it is written out as YAML stamped with the * current schema version and the old file is preserved as {@code velocity.toml.migrated}. */ @@ -161,7 +161,7 @@ public final class ConfigurationLoader { * Resolves the player-info forwarding secret. Mirrors the legacy behaviour: prefer the * {@code VELOCITY_FORWARDING_SECRET} environment variable, otherwise read (creating if absent) the * file pointed at by {@code forwarding-secret-file}. The secret is deliberately kept out of - * {@code velocity.yml}. + * {@code velocity.yaml}. */ private static byte[] readForwardingSecret(final ConfigurationNode node) throws IOException { String secret = System.getenv().getOrDefault("VELOCITY_FORWARDING_SECRET", ""); diff --git a/proxy/src/main/java/com/velocitypowered/proxy/config/LegacyConfigurationLoader.java b/proxy/src/main/java/com/velocitypowered/proxy/config/LegacyConfigurationLoader.java index f455d1732..0bdacb427 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/config/LegacyConfigurationLoader.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/config/LegacyConfigurationLoader.java @@ -54,7 +54,7 @@ public class LegacyConfigurationLoader { /** * Reads the raw {@code forwarding-secret-file} value from a legacy TOML configuration, so a - * custom secret location can be preserved when migrating to {@code velocity.yml}. + * custom secret location can be preserved when migrating to {@code velocity.yaml}. * * @param path the legacy configuration path * @return the configured forwarding-secret-file, or {@code null} if unset diff --git a/proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java b/proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java index 77628a043..73d502c82 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java @@ -472,7 +472,7 @@ public class VelocityConfiguration implements ProxyConfig { static class Servers { - // Example entries live in default-velocity.yml, not here: the code default must stay empty so + // Example entries live in default-velocity.yaml, not here: the code default must stay empty so // that a user who removes the section gets an empty map rather than resurrected examples that // reference servers they no longer have. private Map servers = ImmutableMap.of(); @@ -525,7 +525,7 @@ public class VelocityConfiguration implements ProxyConfig { static class ForcedHosts { - // Example entries live in default-velocity.yml, not here: the code default must stay empty so + // Example entries live in default-velocity.yaml, not here: the code default must stay empty so // that removing the section yields no forced hosts rather than examples pointing at servers the // user does not have (which would fail validation). private Map> forcedHosts = ImmutableMap.of(); diff --git a/proxy/src/main/resources/default-velocity.yml b/proxy/src/main/resources/default-velocity.yaml similarity index 99% rename from proxy/src/main/resources/default-velocity.yml rename to proxy/src/main/resources/default-velocity.yaml index 08bcb7af4..bbcb10455 100644 --- a/proxy/src/main/resources/default-velocity.yml +++ b/proxy/src/main/resources/default-velocity.yaml @@ -53,7 +53,7 @@ kick-existing-players: false # Should Velocity pass server list ping requests to a backend server? # Available options: -# - "disabled": No pass-through will be done. The velocity.yml and server-icon.png +# - "disabled": No pass-through will be done. The velocity.yaml and server-icon.png # will determine the initial server list ping response. # - "mods": Passes only the mod list from your backend server into the response. # The first server in your try list (or forced host) with a mod list will be diff --git a/proxy/src/test/java/com/velocitypowered/proxy/config/ConfigurationLoaderTest.java b/proxy/src/test/java/com/velocitypowered/proxy/config/ConfigurationLoaderTest.java index f56ebba1b..80a766324 100644 --- a/proxy/src/test/java/com/velocitypowered/proxy/config/ConfigurationLoaderTest.java +++ b/proxy/src/test/java/com/velocitypowered/proxy/config/ConfigurationLoaderTest.java @@ -44,10 +44,10 @@ class ConfigurationLoaderTest { */ @Test void bundledDefaultLoads(@TempDir final Path dir) throws IOException { - final Path path = dir.resolve("velocity.yml"); + final Path path = dir.resolve("velocity.yaml"); try (InputStream in = ConfigurationLoaderTest.class.getClassLoader() - .getResourceAsStream("default-velocity.yml")) { - assertNotNull(in, "default-velocity.yml is missing from resources"); + .getResourceAsStream("default-velocity.yaml")) { + assertNotNull(in, "default-velocity.yaml is missing from resources"); Files.copy(in, path); } @@ -116,19 +116,19 @@ class ConfigurationLoaderTest { metrics: enabled: false """; - final Path path = dir.resolve("velocity.yml"); + final Path path = dir.resolve("velocity.yaml"); Files.writeString(path, yaml, StandardCharsets.UTF_8); assertConfig(ConfigurationLoader.load(path)); // Round trip: save the loaded config out and read it back; everything must still match. - final Path roundTripped = dir.resolve("velocity-roundtrip.yml"); + final Path roundTripped = dir.resolve("velocity-roundtrip.yaml"); ConfigurationLoader.save(ConfigurationLoader.load(path), roundTripped); assertConfig(ConfigurationLoader.load(roundTripped)); } /** - * A legacy {@code velocity.toml} must be converted to {@code velocity.yml}: values carried over, + * A legacy {@code velocity.toml} must be converted to {@code velocity.yaml}: values carried over, * the schema version stamped, a custom forwarding-secret-file preserved, and the old file * archived as {@code velocity.toml.migrated}. */ @@ -156,7 +156,7 @@ class ConfigurationLoaderTest { accepts-transfers = true """.formatted(secretLiteral)); - final Path yaml = dir.resolve("velocity.yml"); + final Path yaml = dir.resolve("velocity.yaml"); final VelocityConfiguration config = ConfigurationLoader.loadConfiguration(yaml, toml); assertTrue(Files.exists(yaml)); @@ -186,7 +186,7 @@ class ConfigurationLoaderTest { */ @Test void removedSectionsDoNotResurrectDefaults(@TempDir final Path dir) throws IOException { - final Path path = dir.resolve("velocity.yml"); + final Path path = dir.resolve("velocity.yaml"); Files.writeString(path, """ servers: only: "1.2.3.4:25565"