From df842f3d433d95dba7fd033fa07e356412018c3d Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Sat, 11 Jun 2022 13:43:59 -0700
Subject: [PATCH] Adjust config headers

---
 patches/server/Paper-config-files.patch | 30 ++++++++++++++++---------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/patches/server/Paper-config-files.patch b/patches/server/Paper-config-files.patch
index 507e4e028f..e79354a944 100644
--- a/patches/server/Paper-config-files.patch
+++ b/patches/server/Paper-config-files.patch
@@ -85,6 +85,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        return YamlConfigurationLoader.builder()
 +            .indent(2)
 +            .nodeStyle(NodeStyle.BLOCK)
++            .headerMode(HeaderMode.PRESET)
 +            .defaultOptions(options -> options.mapFactory(MapFactories.sortedNatural()));
 +    }
 +
@@ -963,6 +964,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import java.util.HashMap;
 +import java.util.List;
 +import java.util.Map;
++import java.util.function.Function;
 +import java.util.function.Supplier;
 +
 +import static com.google.common.base.Preconditions.checkState;
@@ -978,7 +980,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    public static final String CONFIG_DIR = "config";
 +    private static final String BACKUP_DIR ="legacy-backup";
 +
-+    private static final String GLOBAL_HEADER = """
++    private static final String GLOBAL_HEADER = String.format("""
 +            This is the global configuration file for Paper.
 +            As you can see, there's a lot to configure. Some options may impact gameplay, so use
 +            with caution, and make sure you know what each option does before configuring.
@@ -986,11 +988,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            If you need help with the configuration or have any questions related to Paper,
 +            join us in our Discord or check the docs page.
 +
-+            The world configuration options have been moved to their own files.
++            The world configuration options have been moved inside
++            their respective world folder. The files are named %s
 +
++            Docs: https://docs.papermc.io/
 +            Discord: https://discord.gg/papermc
-+            Website: https://papermc.io/
-+            Docs: https://docs.papermc.io/""";
++            Website: https://papermc.io/""", WORLD_CONFIG_FILE_NAME);
 +
 +    private static final String WORLD_DEFAULTS_HEADER = """
 +            This is the world defaults configuration file for Paper.
@@ -1003,13 +1006,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            Configuration options here apply to all worlds, unless you specify overrides inside
 +            the world-specific config file inside each world folder.
 +
++            Docs: https://docs.papermc.io/
 +            Discord: https://discord.gg/papermc
-+            Website: https://papermc.io/
-+            Docs: https://docs.papermc.io/""";
++            Website: https://papermc.io/""";
 +
-+    private static final String WORLD_HEADER = """
-+            This is a world configuration file for Paper.
-+            This file may start empty but can be filled with settings to override ones in the config/world-defaults.yml""";
++    private static final Function<ContextMap, String> WORLD_HEADER = map -> String.format("""
++        This is a world configuration file for Paper.
++        This file may start empty but can be filled with settings to override ones in the %s/%s
++        
++        World: %s (%s)""",
++        PaperConfigurations.CONFIG_DIR,
++        PaperConfigurations.WORLD_DEFAULTS_CONFIG_FILE_NAME,
++        map.require(WORLD_NAME),
++        map.require(WORLD_KEY)
++    );
 +
 +    private static final Supplier<SpigotWorldConfig> SPIGOT_WORLD_DEFAULTS = Suppliers.memoize(() -> new SpigotWorldConfig(RandomStringUtils.randomAlphabetic(255)) {
 +        @Override // override to ensure "verbose" is false
@@ -1084,7 +1094,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    protected YamlConfigurationLoader.Builder createWorldConfigLoaderBuilder(final ContextMap contextMap) {
 +        return super.createWorldConfigLoaderBuilder(contextMap)
 +            .defaultOptions(options -> options
-+                .header(contextMap.require(WORLD_NAME).equals(WORLD_DEFAULTS) ? WORLD_DEFAULTS_HEADER : WORLD_HEADER)
++                .header(contextMap.require(WORLD_NAME).equals(WORLD_DEFAULTS) ? WORLD_DEFAULTS_HEADER : WORLD_HEADER.apply(contextMap))
 +                .serializers(serializers -> serializers
 +                    .register(new TypeToken<Reference2IntMap<?>>() {}, new FastutilMapSerializer.SomethingToPrimitive<Reference2IntMap<?>>(Reference2IntOpenHashMap::new, Integer.TYPE))
 +                    .register(new TypeToken<Reference2LongMap<?>>() {}, new FastutilMapSerializer.SomethingToPrimitive<Reference2LongMap<?>>(Reference2LongOpenHashMap::new, Long.TYPE))