From a3c093ef5d8fe15968f785a918035c2c9c568f05 Mon Sep 17 00:00:00 2001
From: A248 <theanandbeh@gmail.com>
Date: Sun, 9 Jul 2023 21:41:27 +0600
Subject: [PATCH] Update to latest DazzleConf (see also #216)

---
 .../space/arim/libertybans/core/PillarTwoBindModule.java     | 3 +--
 .../libertybans/core/commands/usage/PluginInfoMessage.java   | 4 ++--
 .../space/arim/libertybans/core/config/ConfigHolder.java     | 5 ++---
 bans-core/src/main/resources/contributors                    | 5 ++++-
 pom.xml                                                      | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/bans-core/src/main/java/space/arim/libertybans/core/PillarTwoBindModule.java b/bans-core/src/main/java/space/arim/libertybans/core/PillarTwoBindModule.java
index 060fae3f6..9c8528405 100644
--- a/bans-core/src/main/java/space/arim/libertybans/core/PillarTwoBindModule.java
+++ b/bans-core/src/main/java/space/arim/libertybans/core/PillarTwoBindModule.java
@@ -1,6 +1,6 @@
 /*
  * LibertyBans
- * Copyright © 2022 Anand Beh
+ * Copyright © 2023 Anand Beh
  *
  * LibertyBans is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -102,7 +102,6 @@ public UsageGlossary usage(StandardUsageGlossary usage) {
 		return usage;
 	}
 
-	@Singleton
 	public PluginInfoMessage pluginInfoMessage() {
 		return PluginInfoMessage.fromResource("contributors");
 	}
diff --git a/bans-core/src/main/java/space/arim/libertybans/core/commands/usage/PluginInfoMessage.java b/bans-core/src/main/java/space/arim/libertybans/core/commands/usage/PluginInfoMessage.java
index b1c63aa68..193c3ce47 100644
--- a/bans-core/src/main/java/space/arim/libertybans/core/commands/usage/PluginInfoMessage.java
+++ b/bans-core/src/main/java/space/arim/libertybans/core/commands/usage/PluginInfoMessage.java
@@ -1,6 +1,6 @@
 /*
  * LibertyBans
- * Copyright © 2022 Anand Beh
+ * Copyright © 2023 Anand Beh
  *
  * LibertyBans is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -78,7 +78,7 @@ public void send(CmdSender sender) {
 				"&7" + PluginInfo.DESCRIPTION + "\n" +
 				"&7" + PluginInfo.URL + "\n" +
 				"&9-- Contributors --\n" +
-				"&7Maintainer(s): " + maintainers + "\n" +
+				"&7Maintainers: " + maintainers + "\n" +
 				"&7Collaborators: " + collaborators + "\n" +
 				"&7Commended Users: " + commendedUsers + "\n" +
 				"&9----------------------------------------------------------\n";
diff --git a/bans-core/src/main/java/space/arim/libertybans/core/config/ConfigHolder.java b/bans-core/src/main/java/space/arim/libertybans/core/config/ConfigHolder.java
index 0f63dfe94..3fb416376 100644
--- a/bans-core/src/main/java/space/arim/libertybans/core/config/ConfigHolder.java
+++ b/bans-core/src/main/java/space/arim/libertybans/core/config/ConfigHolder.java
@@ -1,6 +1,6 @@
 /*
  * LibertyBans
- * Copyright © 2022 Anand Beh
+ * Copyright © 2023 Anand Beh
  *
  * LibertyBans is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -21,7 +21,6 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.yaml.snakeyaml.Yaml;
 import space.arim.dazzleconf.AuxiliaryKeys;
 import space.arim.dazzleconf.ConfigurationFactory;
 import space.arim.dazzleconf.ConfigurationOptions;
@@ -56,7 +55,7 @@ public final class ConfigHolder<C> {
 		ConfigSerialisers.addTo(optionsBuilder);
 		CONFIG_OPTIONS = optionsBuilder.build();
 
-		YAML_OPTIONS = new SnakeYamlOptions.Builder().yamlSupplier(Yaml::new).commentMode(CommentMode.alternativeWriter()).build();
+		YAML_OPTIONS = new SnakeYamlOptions.Builder().commentMode(CommentMode.alternativeWriter()).build();
 	}
 	
 	public ConfigHolder(Class<C> configClass) {
diff --git a/bans-core/src/main/resources/contributors b/bans-core/src/main/resources/contributors
index f82520a0d..d5b94be1a 100644
--- a/bans-core/src/main/resources/contributors
+++ b/bans-core/src/main/resources/contributors
@@ -13,13 +13,15 @@ FreakyRed
 Gamer153
 gepron1x
 IceWaffles
-thevalleyy
+potatoru
 SnakeAmazing
+thevalleyy
 xMikux
 zendrique
 
 AGI
 Arceus
+Athar42
 Boy0000
 BumbleTree
 copyandexecute
@@ -34,6 +36,7 @@ MattVid
 Michael Sykes
 Notro
 ox
+PasteDev
 pwnker
 RhythmicSys
 SleepingTea
diff --git a/pom.xml b/pom.xml
index 0ef950e1b..c12216ca0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
 		<!-- Internal dependencies -->
 		<jakarta-inject.version>2.0.0</jakarta-inject.version>
 		<solidinjector.version>1.1.0-RC1</solidinjector.version>
-		<dazzleconf.version>1.3.0-M1</dazzleconf.version>
+		<dazzleconf.version>1.3.0-M2</dazzleconf.version>
 		<slf4j.version>1.7.30</slf4j.version>
 		<hikari.version>5.0.1</hikari.version>
 		<hsqldb.version>2.7.1</hsqldb.version>