From 57627f6846fdb2c99716b239acfe9abe9e3171b4 Mon Sep 17 00:00:00 2001
From: Twitchy <mr.steven.french@gmail.com>
Date: Sat, 25 Jun 2011 04:37:55 +1200
Subject: [PATCH] regions.xml and warps.xml are now located in tshock dir. Will
 auto move them on first run

---
 TShockAPI/FileTools.cs     | 20 ++++++++++++++++++++
 TShockAPI/RegionManager.cs |  4 ++--
 TShockAPI/WarpsManager.cs  |  4 ++--
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/TShockAPI/FileTools.cs b/TShockAPI/FileTools.cs
index fa1938e8..d553af0c 100644
--- a/TShockAPI/FileTools.cs
+++ b/TShockAPI/FileTools.cs
@@ -32,6 +32,8 @@ namespace TShockAPI
         public static readonly string ItemBansPath = Path.Combine(TShock.SavePath, "itembans.txt");
         public static readonly string RememberedPosPath = Path.Combine(TShock.SavePath, "oldpos.xml");
         public static readonly string ConfigPath = Path.Combine(TShock.SavePath, "config.json");
+        public static readonly string RegionsPath = Path.Combine(TShock.SavePath, "regions.xml");
+        public static readonly string WarpsPath = Path.Combine(TShock.SavePath, "warps.xml");
 
         public static void CreateFile(string file)
         {
@@ -64,6 +66,24 @@ namespace TShockAPI
             CreateIfNot(UsersPath, Resources.users);
             CreateIfNot(ItemBansPath, Resources.itembans);
 
+            //Copies if using old paths (Remove in future releases, after everyone is running this version +)
+            if (File.Exists("regions.xml") && !File.Exists(RegionsPath))
+            {
+                File.Move("regions.xml", RegionsPath);                
+            }
+            else
+            {
+                CreateIfNot(RegionsPath);
+            }
+            if (File.Exists("warps.xml") && !File.Exists(WarpsPath))
+            {
+                File.Move("warps.xml", WarpsPath);
+            }
+            else
+            {
+                CreateIfNot(WarpsPath);
+            }
+
             try
             {
                 if (File.Exists(ConfigPath))
diff --git a/TShockAPI/RegionManager.cs b/TShockAPI/RegionManager.cs
index 1c92f245..8d869de6 100644
--- a/TShockAPI/RegionManager.cs
+++ b/TShockAPI/RegionManager.cs
@@ -114,7 +114,7 @@ namespace TShockAPI
                 xmlWriterSettings.Indent = true;
                 xmlWriterSettings.NewLineChars = Environment.NewLine;
 
-                using (XmlWriter settingsw = XmlWriter.Create("regions.xml", xmlWriterSettings))
+                using (XmlWriter settingsw = XmlWriter.Create(FileTools.RegionsPath, xmlWriterSettings))
                 {
                     settingsw.WriteStartDocument();
                     settingsw.WriteStartElement("Regions");
@@ -155,7 +155,7 @@ namespace TShockAPI
                 XmlReaderSettings xmlReaderSettings = new XmlReaderSettings();
                 xmlReaderSettings.IgnoreWhitespace = true;
 
-                using (XmlReader settingr = XmlReader.Create("regions.xml", xmlReaderSettings))
+                using (XmlReader settingr = XmlReader.Create(FileTools.RegionsPath, xmlReaderSettings))
                 {
                     while (settingr.Read())
                     {
diff --git a/TShockAPI/WarpsManager.cs b/TShockAPI/WarpsManager.cs
index 69ef985f..5ab2f73e 100644
--- a/TShockAPI/WarpsManager.cs
+++ b/TShockAPI/WarpsManager.cs
@@ -59,7 +59,7 @@ namespace TShockAPI
                 xmlWriterSettings.Indent = true;
                 xmlWriterSettings.NewLineChars = Environment.NewLine;
 
-                using (XmlWriter settingsw = XmlWriter.Create("warps.xml", xmlWriterSettings))
+                using (XmlWriter settingsw = XmlWriter.Create(FileTools.WarpsPath, xmlWriterSettings))
                 {
                     settingsw.WriteStartDocument();
                     settingsw.WriteStartElement("Warps");
@@ -92,7 +92,7 @@ namespace TShockAPI
                 XmlReaderSettings xmlReaderSettings = new XmlReaderSettings();
                 xmlReaderSettings.IgnoreWhitespace = true;
 
-                using (XmlReader settingr = XmlReader.Create("warps.xml", xmlReaderSettings))
+                using (XmlReader settingr = XmlReader.Create(FileTools.WarpsPath, xmlReaderSettings))
                 {
                     while (settingr.Read())
                     {