Move using_economy to the eco section of the config (#7265)

TownyAdvanced · Feb 19, 2024 · 03cd1c9 · 03cd1c9
1 parent 1bd0239
commit 03cd1c9
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/Towny/src/main/java/com/palmergames/bukkit/config/ConfigNodes.java b/Towny/src/main/java/com/palmergames/bukkit/config/ConfigNodes.java
@@ -1471,14 +1471,6 @@ public enum ConfigNodes {
 			"plugin.interfacing.tekkit.fake_residents",
 			"[IndustrialCraft],[BuildCraft],[Redpower],[Forestry],[Turtle]",
 			"# Add any fake players for client/server mods (aka Tekkit) here"),
-	PLUGIN_USING_ECONOMY(
-			"plugin.interfacing.using_economy",
-			"true",
-			"",
-			"# This enables/disables all the economy functions of Towny.",
-			"# This will first attempt to use Vault or Reserve to bridge your economy plugin with Towny.",
-			"# If Reserve/Vault is not present it will attempt to find a supported economy plugin.",
-			"# If neither Vault/Reserve or supported economy are present it will not be possible to create towns or do any operations that require money."),
 
 	PLUGIN_LUCKPERMS_ROOT("plugin.interfacing.luckperms","",""),
 	PLUGIN_LUCKPERMS_CONTEXTS(
@@ -2328,6 +2320,14 @@ public enum ConfigNodes {
 			"# +------------------------------------------------------+ #",
 			"############################################################",
 			""),
+	ECO_USING_ECONOMY(
+			"economy.using_economy",
+			"true",
+			"",
+			"# This enables/disables all the economy functions of Towny.",
+			"# This will first attempt to use Vault or Reserve to bridge your economy plugin with Towny.",
+			"# If Reserve/Vault is not present it will attempt to find a supported economy plugin.",
+			"# If neither Vault/Reserve or supported economy are present it will not be possible to create towns or do any operations that require money."),
 	ECO_USE_ASYNC(
 			"economy.use_async",
 			"true",

diff --git a/Towny/src/main/java/com/palmergames/bukkit/towny/TownySettings.java b/Towny/src/main/java/com/palmergames/bukkit/towny/TownySettings.java
@@ -1358,7 +1358,7 @@ public static boolean isFriendlyFireEnabled() {
 
 	public static boolean isUsingEconomy() {
 
-		return getBoolean(ConfigNodes.PLUGIN_USING_ECONOMY);
+		return getBoolean(ConfigNodes.ECO_USING_ECONOMY);
 	}
 
 	public static boolean isFakeResident(String name) {

diff --git a/Towny/src/main/resources/config-migration.json b/Towny/src/main/resources/config-migration.json
@@ -836,5 +836,15 @@
         "value": "spawning.nation_spawn.spawning_cooldowns.unaffiliated_nation_spawn_cooldown_time"
       }
     ]
+  },
+  {
+    "version": "0.100.1.15",
+    "changes": [
+      {
+        "type": "MOVE",
+        "path": "plugin.interfacing.using_economy",
+        "value": "economy.using_economy"
+      }
+    ]
   }
 ]