13
0
geforkt von Mirrors/Paper

Adjust config headers

Dieser Commit ist enthalten in:
Jake Potrebic 2022-06-11 13:43:59 -07:00
Ursprung 26325213c7
Commit df842f3d43

Datei anzeigen

@ -85,6 +85,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ return YamlConfigurationLoader.builder() + return YamlConfigurationLoader.builder()
+ .indent(2) + .indent(2)
+ .nodeStyle(NodeStyle.BLOCK) + .nodeStyle(NodeStyle.BLOCK)
+ .headerMode(HeaderMode.PRESET)
+ .defaultOptions(options -> options.mapFactory(MapFactories.sortedNatural())); + .defaultOptions(options -> options.mapFactory(MapFactories.sortedNatural()));
+ } + }
+ +
@ -963,6 +964,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+import java.util.HashMap; +import java.util.HashMap;
+import java.util.List; +import java.util.List;
+import java.util.Map; +import java.util.Map;
+import java.util.function.Function;
+import java.util.function.Supplier; +import java.util.function.Supplier;
+ +
+import static com.google.common.base.Preconditions.checkState; +import static com.google.common.base.Preconditions.checkState;
@ -978,7 +980,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ public static final String CONFIG_DIR = "config"; + public static final String CONFIG_DIR = "config";
+ private static final String BACKUP_DIR ="legacy-backup"; + 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. + 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 + 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. + 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, + If you need help with the configuration or have any questions related to Paper,
+ join us in our Discord or check the docs page. + 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 + Discord: https://discord.gg/papermc
+ Website: https://papermc.io/ + Website: https://papermc.io/""", WORLD_CONFIG_FILE_NAME);
+ Docs: https://docs.papermc.io/""";
+ +
+ private static final String WORLD_DEFAULTS_HEADER = """ + private static final String WORLD_DEFAULTS_HEADER = """
+ This is the world defaults configuration file for Paper. + 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 + Configuration options here apply to all worlds, unless you specify overrides inside
+ the world-specific config file inside each world folder. + the world-specific config file inside each world folder.
+ +
+ Docs: https://docs.papermc.io/
+ Discord: https://discord.gg/papermc + Discord: https://discord.gg/papermc
+ Website: https://papermc.io/ + Website: https://papermc.io/""";
+ Docs: https://docs.papermc.io/""";
+ +
+ private static final String WORLD_HEADER = """ + private static final Function<ContextMap, String> WORLD_HEADER = map -> String.format("""
+ This is a world configuration file for Paper. + 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"""; + 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)) { + 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
@ -1084,7 +1094,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ protected YamlConfigurationLoader.Builder createWorldConfigLoaderBuilder(final ContextMap contextMap) { + protected YamlConfigurationLoader.Builder createWorldConfigLoaderBuilder(final ContextMap contextMap) {
+ return super.createWorldConfigLoaderBuilder(contextMap) + return super.createWorldConfigLoaderBuilder(contextMap)
+ .defaultOptions(options -> options + .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 + .serializers(serializers -> serializers
+ .register(new TypeToken<Reference2IntMap<?>>() {}, new FastutilMapSerializer.SomethingToPrimitive<Reference2IntMap<?>>(Reference2IntOpenHashMap::new, Integer.TYPE)) + .register(new TypeToken<Reference2IntMap<?>>() {}, new FastutilMapSerializer.SomethingToPrimitive<Reference2IntMap<?>>(Reference2IntOpenHashMap::new, Integer.TYPE))
+ .register(new TypeToken<Reference2LongMap<?>>() {}, new FastutilMapSerializer.SomethingToPrimitive<Reference2LongMap<?>>(Reference2LongOpenHashMap::new, Long.TYPE)) + .register(new TypeToken<Reference2LongMap<?>>() {}, new FastutilMapSerializer.SomethingToPrimitive<Reference2LongMap<?>>(Reference2LongOpenHashMap::new, Long.TYPE))