OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 15:49:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Leave a paper.yml.txt stub pointing to new location (#8090)

Browse source
This commit is contained in:
Jake Potrebic 2022-08-02 13:24:57 -07:00
parent 08e93ca29f
commit 15ce56cb40
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
patches/server/Paper-config-files.patch
View file

@ -1023,6 +1023,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ map.require(WORLD_KEY) + map.require(WORLD_KEY)
+ ); + );
+ +
+ private static final String MOVED_NOTICE = """
+ The global and world default configuration files have moved to %s
+ and the world-specific configuration file has been moved inside
+ the respective world folder.
+
+ See https://docs.papermc.io/paper/configuration for more information.
+ """;
+
+ private static final Supplier<SpigotWorldConfig> SPIGOT_WORLD_DEFAULTS = Suppliers.memoize(() -> new SpigotWorldConfig(RandomStringUtils.randomAlphabetic(255)) { + private static final Supplier<SpigotWorldConfig> SPIGOT_WORLD_DEFAULTS = Suppliers.memoize(() -> new SpigotWorldConfig(RandomStringUtils.randomAlphabetic(255)) {
+ @Override // override to ensure "verbose" is false + @Override // override to ensure "verbose" is false
+ public void init() { + public void init() {
@ -1200,6 +1208,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
+ +
+ public static PaperConfigurations setup(final Path legacyConfig, final Path configDir, final Path worldFolder, final File spigotConfig) throws Exception { + public static PaperConfigurations setup(final Path legacyConfig, final Path configDir, final Path worldFolder, final File spigotConfig) throws Exception {
+ final Path legacy = Files.isSymbolicLink(legacyConfig) ? Files.readSymbolicLink(legacyConfig) : legacyConfig;
+ final Path replacementFile = legacy.resolveSibling(legacyConfig.getFileName() + "-README.txt");
+ if (Files.notExists(replacementFile)) {
+ Files.createFile(replacementFile);
+ Files.writeString(replacementFile, String.format(MOVED_NOTICE, configDir.toAbsolutePath()));
+ }
+ if (needsConverting(legacyConfig)) { + if (needsConverting(legacyConfig)) {
+ try { + try {
+ if (Files.exists(configDir) && !Files.isDirectory(configDir)) { + if (Files.exists(configDir) && !Files.isDirectory(configDir)) {
@ -1215,7 +1229,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ if (Files.exists(legacyConfigBackup) && !Files.isRegularFile(legacyConfigBackup)) { + if (Files.exists(legacyConfigBackup) && !Files.isRegularFile(legacyConfigBackup)) {
+ throw new RuntimeException("Paper needs to create a '" + backupFileName + "' file in the '" + BACKUP_DIR + "' folder. You already have a non-file named '" + backupFileName + "'. Please remove it and restart the server."); + throw new RuntimeException("Paper needs to create a '" + backupFileName + "' file in the '" + BACKUP_DIR + "' folder. You already have a non-file named '" + backupFileName + "'. Please remove it and restart the server.");
+ } + }
+ Files.move(legacyConfig, legacyConfigBackup, StandardCopyOption.REPLACE_EXISTING); // make backup + Files.move(legacyConfig.toRealPath(), legacyConfigBackup, StandardCopyOption.REPLACE_EXISTING); // make backup
+ if (Files.isSymbolicLink(legacyConfig)) {
+ Files.delete(legacyConfig);
+ }
+ convert(legacyConfigBackup, configDir, worldFolder, spigotConfig); + convert(legacyConfigBackup, configDir, worldFolder, spigotConfig);
+ } catch (final IOException ex) { + } catch (final IOException ex) {
+ throw new RuntimeException("Could not convert '" + legacyConfig.getFileName().toString() + "' to the new configuration format", ex); + throw new RuntimeException("Could not convert '" + legacyConfig.getFileName().toString() + "' to the new configuration format", ex);
@ -1309,7 +1326,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ return BasicConfigurationNode.root(options); + return BasicConfigurationNode.root(options);
+ } + }
+ +
+ // Sym links are not correctly checked in createDirectories + // Symlinks are not correctly checked in createDirectories
+ static void createDirectoriesSymlinkAware(Path path) throws IOException { + static void createDirectoriesSymlinkAware(Path path) throws IOException {
+ if (!Files.isDirectory(path)) { + if (!Files.isDirectory(path)) {
+ Files.createDirectories(path); + Files.createDirectories(path);