themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Warps are now SQL based (sql branch)

Browse source 
Need to make warps auto copy from old structure
This commit is contained in:
Steven French 2011-07-05 21:08:11 +12:00
parent a775511694
commit b090b1fe96
3 changed files with 65 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

21
TShockAPI/Commands.cs
View file

@ -918,10 +918,9 @@ namespace TShockAPI
{ {
args.Player.SendMessage("Name reserved, use a different name", Color.Red); args.Player.SendMessage("Name reserved, use a different name", Color.Red);
} }
else if (WarpsManager.AddWarp(args.Player.TileX, args.Player.TileY, warpName, Main.worldName)) else if (TShock.Warps.AddWarp(args.Player.TileX, args.Player.TileY, warpName, Main.worldName))
{ {
args.Player.SendMessage("Set warp " + warpName, Color.Yellow); args.Player.SendMessage("Set warp " + warpName, Color.Yellow);
WarpsManager.WriteSettings();
} }
else else
{ {
@ -937,7 +936,7 @@ namespace TShockAPI
if (args.Parameters.Count > 0) if (args.Parameters.Count > 0)
{ {
string warpName = String.Join(" ", args.Parameters); string warpName = String.Join(" ", args.Parameters);
if (WarpsManager.DeleteWarp(warpName)) if (TShock.Warps.RemoveWarp(warpName))
args.Player.SendMessage("Deleted warp " + warpName, Color.Yellow); args.Player.SendMessage("Deleted warp " + warpName, Color.Yellow);
else else
args.Player.SendMessage("Could not find specified warp", Color.Red); args.Player.SendMessage("Could not find specified warp", Color.Red);
@ -957,16 +956,16 @@ namespace TShockAPI
if (args.Parameters.Count > 1) if (args.Parameters.Count > 1)
int.TryParse(args.Parameters[1], out page); int.TryParse(args.Parameters[1], out page);
var sb = new StringBuilder(); var sb = new StringBuilder();
if (WarpsManager.Warps.Count > (15 * (page - 1))) if (WarpManager.Warps.Count > (15 * (page - 1)))
{ {
for (int j = (15 * (page - 1)); j < (15 * page); j++) for (int j = (15 * (page - 1)); j < (15 * page); j++)
{ {
if (WarpsManager.Warps[j].WorldWarpName == Main.worldName) if (WarpManager.Warps[j].WorldWarpName == Main.worldName)
{ {
if (sb.Length != 0) if (sb.Length != 0)
sb.Append(", "); sb.Append(", ");
sb.Append("/").Append(WarpsManager.Warps[j].WarpName); sb.Append("/").Append(WarpManager.Warps[j].WarpName);
if (j == WarpsManager.Warps.Count - 1) if (j == WarpManager.Warps.Count - 1)
{ {
args.Player.SendMessage(sb.ToString(), Color.Yellow); args.Player.SendMessage(sb.ToString(), Color.Yellow);
break; break;
@ -979,7 +978,7 @@ namespace TShockAPI
} }
} }
} }
if (WarpsManager.Warps.Count > (15 * page)) if (WarpManager.Warps.Count > (15 * page))
{ {
args.Player.SendMessage(string.Format("Type /warp list {0} for more warps.", (page + 1)), Color.Yellow); args.Player.SendMessage(string.Format("Type /warp list {0} for more warps.", (page + 1)), Color.Yellow);
} }
@ -987,10 +986,10 @@ namespace TShockAPI
else else
{ {
string warpName = String.Join(" ", args.Parameters); string warpName = String.Join(" ", args.Parameters);
var warp = WarpsManager.FindWarp(warpName); var warp = TShock.Warps.FindWarp(warpName);
if (warp != Vector2.Zero) if (warp.WarpPos != Vector2.Zero)
{ {
if (args.Player.Teleport((int)warp.X, (int)warp.Y + 3)) if (args.Player.Teleport((int)warp.WarpPos.X, (int)warp.WarpPos.Y + 3))
args.Player.SendMessage("Warped to " + warpName, Color.Yellow); args.Player.SendMessage("Warped to " + warpName, Color.Yellow);
} }
else else

3
TShockAPI/TShock.cs
View file

@ -43,6 +43,7 @@ namespace TShockAPI
public static TSPlayer[] Players = new TSPlayer[Main.maxPlayers]; public static TSPlayer[] Players = new TSPlayer[Main.maxPlayers];
public static BanManager Bans; public static BanManager Bans;
public static WarpManager Warps;
public static BackupManager Backups; public static BackupManager Backups;
public static ConfigFile Config { get; set; } public static ConfigFile Config { get; set; }
@ -109,6 +110,7 @@ namespace TShockAPI
} }
Bans = new BanManager(DB); Bans = new BanManager(DB);
Warps = new WarpManager(DB);
Log.ConsoleInfo(string.Format("TShock Version {0} ({1}) now running.", Version, VersionCodename)); Log.ConsoleInfo(string.Format("TShock Version {0} ({1}) now running.", Version, VersionCodename));
@ -126,7 +128,6 @@ namespace TShockAPI
GetDataHandlers.InitGetDataHandler(); GetDataHandlers.InitGetDataHandler();
Commands.InitCommands(); Commands.InitCommands();
RegionManager.ReadAllSettings(); RegionManager.ReadAllSettings();
WarpsManager.ReadAllSettings();
ItemManager.LoadBans(); ItemManager.LoadBans();
Log.ConsoleInfo("AutoSave " + (TShock.Config.AutoSave ? "Enabled" : "Disabled")); Log.ConsoleInfo("AutoSave " + (TShock.Config.AutoSave ? "Enabled" : "Disabled"));

167
TShockAPI/WarpsManager.cs
View file

@ -20,162 +20,101 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Data;
using Community.CsharpSqlite.SQLiteClient;
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using System.Xml; using System.Xml;
using Terraria; using Terraria;
namespace TShockAPI namespace TShockAPI
{ {
class WarpsManager public class WarpManager
{ {
private IDbConnection database;
public static List<Warp> Warps = new List<Warp>(); public static List<Warp> Warps = new List<Warp>();
public static bool AddWarp(int x, int y, string name, string worldname) public WarpManager(IDbConnection db)
{ {
foreach (Warp nametest in Warps) database = db;
using (var com = database.CreateCommand())
{ {
if (name.ToLower() == nametest.WarpName.ToLower()) com.CommandText =
{ "CREATE TABLE IF NOT EXISTS \"Warps\" (\"X\" VARCHAR(4) NOT NULL UNIQUE, \"Y\" VARCHAR(4) NOT NULL UNIQUE , \"WarpName\" VARCHAR(32) NOT NULL , \"WorldName\" VARCHAR(255) NOT NULL );";
return false; com.ExecuteNonQuery();
}
} }
Warps.Add(new Warp(new Vector2(x, y), name, worldname));
return true;
} }
public static bool DeleteWarp(string name) static IDbDataParameter AddParameter(IDbCommand command, string name, object data)
{ {
foreach (Warp nametest in Warps) var parm = command.CreateParameter();
parm.ParameterName = name;
parm.Value = data;
command.Parameters.Add(parm);
return parm;
}
public bool AddWarp(int x, int y, string name, string worldname)
{
try
{ {
if (name.ToLower() == nametest.WarpName.ToLower() && nametest.WorldWarpName == Main.worldName) using (var com = database.CreateCommand())
{ {
Warps.Remove(nametest); com.CommandText = "INSERT INTO Warps (X, Y, WarpName, WorldName) VALUES (@x, @y, @name, @worldname)";
WriteSettings(); AddParameter(com, "@x", x);
return true; AddParameter(com, "@y", y);
AddParameter(com, "@name", name.ToLower());
AddParameter(com, "@worldname", worldname);
com.ExecuteNonQuery();
} }
return true;
}
catch (SqliteExecutionException ex)
{
} }
return false; return false;
} }
public static Vector2 FindWarp(string name) public bool RemoveWarp(string name)
{
foreach (Warp nametest in Warps)
{
if (name.ToLower() == nametest.WarpName.ToLower() && nametest.WorldWarpName == Main.worldName)
{
return nametest.WarpPos;
}
}
return Vector2.Zero;
}
public static void WriteSettings()
{ {
try try
{ {
XmlWriterSettings xmlWriterSettings = new XmlWriterSettings(); using (var com = database.CreateCommand())
xmlWriterSettings.Indent = true;
xmlWriterSettings.NewLineChars = Environment.NewLine;
using (XmlWriter settingsw = XmlWriter.Create(FileTools.WarpsPath, xmlWriterSettings))
{ {
settingsw.WriteStartDocument(); com.CommandText = "DELETE FROM Warps WHERE WarpName=@name AND WorldName=@worldname";
settingsw.WriteStartElement("Warps"); AddParameter(com, "@name", name.ToLower());
AddParameter(com, "@worldname", Main.worldName);
foreach (Warp warp in Warps) com.ExecuteNonQuery();
{ return true;
settingsw.WriteStartElement("Warp");
settingsw.WriteElementString("WarpName", warp.WarpName);
settingsw.WriteElementString("X", warp.WarpPos.X.ToString());
settingsw.WriteElementString("Y", warp.WarpPos.Y.ToString());
settingsw.WriteElementString("WorldName", warp.WorldWarpName);
settingsw.WriteEndElement();
}
settingsw.WriteEndElement();
settingsw.WriteEndDocument();
} }
Log.Info("Wrote Warps");
} }
catch catch (SqliteExecutionException ex)
{ {
Log.Info("Could not write Warps");
} }
return false;
} }
public static void ReadAllSettings() public Warp FindWarp(string name)
{ {
try try
{ {
XmlReaderSettings xmlReaderSettings = new XmlReaderSettings(); using (var com = database.CreateCommand())
xmlReaderSettings.IgnoreWhitespace = true;
using (XmlReader settingr = XmlReader.Create(FileTools.WarpsPath, xmlReaderSettings))
{ {
while (settingr.Read()) com.CommandText = "SELECT * FROM Warps WHERE WarpName=@name AND WorldName=@worldname";
AddParameter(com, "@name", name.ToLower());
AddParameter(com, "@worldname", Main.worldName);
using (var reader = com.ExecuteReader())
{ {
if (settingr.IsStartElement()) if (reader.Read())
{ return new Warp(new Vector2(Int32.Parse((string)reader["X"]),Int32.Parse((string)reader["Y"])), (string)reader["WarpName"], (string)reader["WorldName"]);
switch (settingr.Name)
{
case "Warps":
{
break;
}
case "Warp":
{
if (settingr.Read())
{
string name = string.Empty;
int x = 0;
int y = 0;
string worldname = string.Empty;
settingr.Read();
if (settingr.Value != "" || settingr.Value != null)
name = settingr.Value;
else
Log.Warn("Warp name is empty, This warp will not work");
settingr.Read();
settingr.Read();
settingr.Read();
if (settingr.Value != "" || settingr.Value != null)
Int32.TryParse(settingr.Value, out x);
else
Log.Warn("x for warp " + name + " is empty");
settingr.Read();
settingr.Read();
settingr.Read();
if (settingr.Value != "" || settingr.Value != null)
Int32.TryParse(settingr.Value, out y);
else
Log.Warn("y for warp " + name + " is empty");
settingr.Read();
settingr.Read();
settingr.Read();
if (settingr.Value != "" || settingr.Value != null)
worldname = settingr.Value;
else
Log.Warn("Worldname for warp " + name + " is empty");
AddWarp(x, y, name, worldname);
}
break;
}
}
}
} }
} }
Log.Info("Read Warps");
} }
catch catch (SqliteExecutionException ex)
{ {
Log.Info("Could not read Warps");
WriteSettings();
} }
return new Warp();
} }
} }