Merge pull request #431 from TownyAdvanced/v0.7.2

Use Towny's internal CommentedConfiguration.
TownyAdvanced · Dec 30, 2021 · 9ed4c04 · 9ed4c04
2 parents 2b253bb + 0587fcf
commit 9ed4c04
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 238 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.gmail.goosius</groupId>
   <artifactId>SiegeWar</artifactId>
-  <version>0.7.1</version>
+  <version>0.7.2</version>
   <name>siegewar</name> <!-- Leave lower-cased -->
 
   <properties>

diff --git a/src/main/java/com/gmail/goosius/siegewar/settings/CommentedConfiguration.java b/src/main/java/com/gmail/goosius/siegewar/settings/CommentedConfiguration.java
diff --git a/src/main/java/com/gmail/goosius/siegewar/settings/Settings.java b/src/main/java/com/gmail/goosius/siegewar/settings/Settings.java
@@ -7,6 +7,7 @@
 
 import com.gmail.goosius.siegewar.utils.FileMgmt;
 import com.gmail.goosius.siegewar.utils.SiegeWarBattleSessionUtil;
+import com.palmergames.bukkit.config.CommentedConfiguration;
 import com.palmergames.util.TimeTools;
 
 public class Settings {
@@ -61,7 +62,7 @@ public static void loadConfig(String filepath, String version) throws Exception
 			File file = new File(filepath);
 
 			// read the config.yml into memory
-			config = new CommentedConfiguration(file);
+			config = new CommentedConfiguration(file.toPath());
 			if (!config.load())
 				throw new IOException("Failed to load Config!");
 
@@ -98,7 +99,7 @@ public static String getLastRunVersion(String currentVersion) {
 	 */
 	private static void setDefaults(String version, File file) {
 
-		newConfig = new CommentedConfiguration(file);
+		newConfig = new CommentedConfiguration(file.toPath());
 		newConfig.load();
 
 		for (ConfigNodes root : ConfigNodes.values()) {

diff --git a/src/main/java/com/gmail/goosius/siegewar/settings/Translation.java b/src/main/java/com/gmail/goosius/siegewar/settings/Translation.java
@@ -1,6 +1,7 @@
 package com.gmail.goosius.siegewar.settings;
 
 import com.gmail.goosius.siegewar.SiegeWar;
+import com.palmergames.bukkit.config.CommentedConfiguration;
 import com.palmergames.bukkit.towny.command.HelpMenu;
 import com.palmergames.bukkit.util.Colors;
 import com.palmergames.util.StringMgmt;
@@ -29,10 +30,10 @@ public static void loadLanguage(String filepath, String defaultRes) throws Excep
 		File file = FileMgmt.unpackResourceFile(fullPath, res, defaultRes);
 
 		// read the (language).yml into memory
-		language = new CommentedConfiguration(file);
+		language = new CommentedConfiguration(file.toPath());
 		language.load();
 		HelpMenu.loadMenus();
-		CommentedConfiguration newLanguage = new CommentedConfiguration(file);
+		CommentedConfiguration newLanguage = new CommentedConfiguration(file.toPath());
 
 		try {
 			newLanguage.loadFromString(FileMgmt.convertStreamToString("/" + res));