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

Merge branch 'general-devel' of github.com:TShock/TShock into general-devel

Browse source
This commit is contained in:
Lucas Nicodemus 2011-07-30 16:58:54 -06:00
commit 1e2fa5cc74
15 changed files with 1488 additions and 206 deletions
Download patch file Download diff file Expand all files Collapse all files

72
TShockAPI/Commands.cs
View file

@ -140,6 +140,8 @@ namespace TShockAPI
ChatCommands.Add(new Command("managegroup", AddGroup, "addGroup"));
ChatCommands.Add(new Command("managegroup", DeleteGroup, "delGroup"));
ChatCommands.Add(new Command("managegroup", ModifyGroup, "modGroup"));
ChatCommands.Add(new Command("manageitem", AddItem, "addItem"));
ChatCommands.Add(new Command("manageitem", DeleteItem, "delItem"));
ChatCommands.Add(new Command("cfg", SetSpawn, "setspawn"));
ChatCommands.Add(new Command("cfg", Reload, "reload"));
ChatCommands.Add(new Command("cfg", ShowConfiguration, "showconfig"));
@ -1349,6 +1351,76 @@ namespace TShockAPI
#endregion Group Management
#region Item Management
private static void AddItem(CommandArgs args)
{
if (args.Parameters.Count > 0)
{
var items = Tools.GetItemByIdOrName(args.Parameters[0]);
if (items.Count == 0)
{
args.Player.SendMessage("Invalid item type!", Color.Red);
}
else if (items.Count > 1)
{
args.Player.SendMessage(string.Format("More than one ({0}) item matched!", items.Count), Color.Red);
}
else
{
var item = items[0];
if (item.type >= 1)
{
TShock.Itembans.AddNewBan(args.Parameters[0]);
args.Player.SendMessage(Tools.GetItemByIdOrName(args.Parameters[0])[0].name + " has been banned.", Color.Green);
}
else
{
args.Player.SendMessage("Invalid item type!", Color.Red);
}
}
}
else
{
args.Player.SendMessage("Invalid use: /addItem \"item name\" or /addItem ##", Color.Red);
}
}
private static void DeleteItem(CommandArgs args)
{
if (args.Parameters.Count > 0)
{
var items = Tools.GetItemByIdOrName(args.Parameters[0]);
if (items.Count == 0)
{
args.Player.SendMessage("Invalid item type!", Color.Red);
}
else if (items.Count > 1)
{
args.Player.SendMessage(string.Format("More than one ({0}) item matched!", items.Count), Color.Red);
}
else
{
var item = items[0];
if (item.type >= 1)
{
TShock.Itembans.RemoveBan(args.Parameters[0]);
args.Player.SendMessage(Tools.GetItemByIdOrName(args.Parameters[0])[0].name + " has been unbanned.", Color.Green);
}
else
{
args.Player.SendMessage("Invalid item type!", Color.Red);
}
}
}
else
{
args.Player.SendMessage("Invalid use: /delItem \"item name\" or /delItem ##", Color.Red);
}
}
#endregion Item Management
#region Server Config Commands
private static void SetSpawn(CommandArgs args)

1
TShockAPI/DB/DbExt.cs
View file

@ -64,6 +64,7 @@ namespace TShockAPI.DB
{typeof(decimal), (s, i) => s.GetDecimal(i)},
{typeof(float), (s, i) => s.GetFloat(i)},
{typeof(double), (s, i) => s.GetDouble(i)},
{typeof(object), (s, i) => s.GetValue(i)},
};
public static T Get<T>(this IDataReader reader, string column)

29
TShockAPI/DB/GroupManager.cs
View file

@ -18,11 +18,16 @@ namespace TShockAPI.DB
string query;
if (TShock.Config.StorageType.ToLower() == "sqlite")
query =
"CREATE TABLE IF NOT EXISTS 'GroupList' ('GroupName' TEXT PRIMARY KEY, 'Commands' TEXT, 'OrderBy' TEXT);";
{
db.Query("CREATE TABLE IF NOT EXISTS 'GroupList' (GroupName TEXT PRIMARY KEY, Commands TEXT, 'OrderBy' TEXT);");
query = "CREATE TEMPORARY TABLE GroupList_backup('GroupName' TEXT PRIMARY KEY, 'Commands' TEXT); INSERT INTO GroupList_backup SELECT 'GroupName','Commands' FROM GroupList; DROP TABLE GroupList; CREATE TABLE IF NOT EXISTS GroupList('GroupName' TEXT PRIMARY KEY, 'Commands' TEXT); INSERT INTO 'GroupList' SELECT 'GroupName','Commands' FROM GroupList_backup; DROP TABLE GroupList_backup;";
}
else
{
query =
"CREATE TABLE IF NOT EXISTS GroupList (GroupName VARCHAR(255) PRIMARY, Commands VARCHAR(255), OrderBy VARCHAR(255));";
"CREATE TABLE IF NOT EXISTS GroupList (GroupName VARCHAR(255) PRIMARY, Commands VARCHAR(255));";
db.Query("ALTER TABLE GroupList DROP COLUMN OrderBy");
}
db.Query(query);
@ -46,10 +51,6 @@ namespace TShockAPI.DB
String[] info = line.Split(' ');
String comms = "";
int size = info.Length;
int test = 0;
bool hasOrder = int.TryParse(info[info.Length - 1], out test);
if (hasOrder)
size = info.Length - 1;
for (int i = 1; i < size; i++)
{
if (!comms.Equals(""))
@ -58,11 +59,11 @@ namespace TShockAPI.DB
}
if (TShock.Config.StorageType.ToLower() == "sqlite")
query = "INSERT OR IGNORE INTO GroupList (GroupName, Commands, OrderBy) VALUES (@0, @1, @2);";
query = "INSERT OR IGNORE INTO GroupList (GroupName, Commands) VALUES (@0, @1);";
else if (TShock.Config.StorageType.ToLower() == "mysql")
query = "INSERT IGNORE INTO GroupList SET GroupName=@0, Commands=@1, OrderBy=@2;";
query = "INSERT IGNORE INTO GroupList SET GroupName=@0, Commands=@1;";
db.Query(query, info[0].Trim(), comms, hasOrder ? info[info.Length - 1] : "0");
db.Query(query, info[0].Trim(), comms);
}
}
@ -105,12 +106,10 @@ namespace TShockAPI.DB
if (GroupExists(name))
return "Error: Group already exists. Use /modGroup to change permissions.";
string query = (TShock.Config.StorageType.ToLower() == "sqlite") ?
"INSERT OR IGNORE INTO GroupList (GroupName, Commands, OrderBy) VALUES (@0, @1, @2);" :
"INSERT IGNORE INTO GroupList SET GroupName=@0, Commands=@1, OrderBy=@2;";
if (database.Query(query, name, permissions, "0") == 1)
"INSERT OR IGNORE INTO GroupList (GroupName, Commands) VALUES (@0, @1);" :
"INSERT IGNORE INTO GroupList SET GroupName=@0, Commands=@1";
if (database.Query(query, name, permissions) == 1)
message = "Group " + name + " has been created successfully.";
Group g = new Group(name);
g.permissions.Add(permissions);

6
TShockAPI/DB/SqlTable.cs
View file

@ -1,6 +0,0 @@
namespace TShockAPI.DB
{
class SqlTable
{
}
}

317
TShockAPI/DBTools.cs Normal file
View file

@ -0,0 +1,317 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Text;
using TShockAPI.DB;
namespace TShockAPI
{
public class DBTools
{
internal static IDbConnection database;
/// <summary>
/// Creates a Table, within the current open DB
/// </summary>
/// <param name="name">Name of the Table</param>
/// <param name="columns">The list of columns that the Table will have</param>
/// <param name="IfNotExists">Only try create Table if it does not exist</param>
public static void CreateTable(string name, List<Column> columns, bool IfNotExists =true)
{
//Build up Creation string :)
StringBuilder sb = new StringBuilder();
sb.Append("CREATE TABLE ");
if (IfNotExists)
sb.Append("IF NOT EXISTS ");
if (TShock.Config.StorageType.ToLower() == "sqlite")
sb.Append("'" + name + "' (");
else if (TShock.Config.StorageType.ToLower() == "mysql")
sb.Append(name + " (");
int count = 0;
foreach (Column column in columns)
{
count++;
if (column.Type.ToLower() == "int")
{
if (TShock.Config.StorageType.ToLower() == "sqlite")
sb.Append(column.Name + " NUMERIC ");
else if (TShock.Config.StorageType.ToLower() == "mysql")
sb.Append(column.Name + " INT(255) ");
}
else if (column.Type.ToLower() == "string")
{
if (TShock.Config.StorageType.ToLower() == "sqlite")
sb.Append(column.Name + " TEXT ");
else if (TShock.Config.StorageType.ToLower() == "mysql")
sb.Append(column.Name + " VARCHAR(255) ");
}
if (column.Unique)
sb.Append("UNIQUE");
if (columns.Count == count)
sb.Append(")");
else
sb.Append(", ");
}
database.Query(sb.ToString());
}
/// <summary>
/// Inserts a list of values into a Table, if conditions are met
/// </summary>
/// <param name="tablename">Name of the Table</param>
/// <param name="Ignore">Ignore insert if feild is unique and there is already a exact entry</param>
/// <param name="Values">The list of values to enter into the table</param>
/// <param name="WhereStatements">The list of where statements that must be met, can be an empty list</param>
public static int InsertTable(string tablename, bool Ignore, List<ColumnData> Values, List<ColumnData> WhereStatements)
{
StringBuilder sb = new StringBuilder();
sb.Append("INSERT ");
if (Ignore)
{
if (TShock.Config.StorageType.ToLower() == "sqlite")
sb.Append("OR IGNORE ");
else if (TShock.Config.StorageType.ToLower() == "mysql")
sb.Append("IGNORE ");
}
if (TShock.Config.StorageType.ToLower() == "sqlite")
sb.Append("INTO '" + tablename + "' (");
else if (TShock.Config.StorageType.ToLower() == "mysql")
sb.Append("INTO " + tablename + " ");
using (var com = database.CreateCommand())
{
//Values
if (TShock.Config.StorageType.ToLower() == "sqlite")
{
int count = 0;
foreach (ColumnData columnname in Values)
{
count++;
if (Values.Count != count)
sb.Append(columnname.Name + ", ");
else
sb.Append(columnname.Name + ") ");
}
sb.Append("VALUES (");
count = 0;
foreach (ColumnData columnname in Values)
{
count++;
if (Values.Count != count)
{
sb.Append("@" + columnname.Name.ToLower() + ", ");
com.AddParameter("@" + columnname.Name.ToLower(), columnname.Value);
}
else
{
sb.Append("@" + columnname.Name.ToLower() + ") ");
com.AddParameter("@" + columnname.Name.ToLower(), columnname.Value);
}
}
}
else if (TShock.Config.StorageType.ToLower() == "mysql")
{
sb.Append("SET ");
int count = 0;
foreach (ColumnData columnname in Values)
{
count++;
if (Values.Count != count)
{
sb.Append("@" + columnname.Name.ToLower() + "=" + columnname.Value + ", ");
com.AddParameter("@" + columnname.Name.ToLower(), columnname.Value);
}
else
{
sb.Append("@" + columnname.Name.ToLower() + "=" + columnname.Value + ") ");
com.AddParameter("@" + columnname.Name.ToLower(), columnname.Value);
}
}
}
//Where Statement (if any)
if (WhereStatements.Count > 0)
{
sb.Append("WHERE ");
int count = 0;
foreach (ColumnData columnname in WhereStatements)
{
count++;
if (Values.Count != count)
{
sb.Append("@" + columnname.Name.ToLower() + "-where" + "=" + columnname.Value + " AND ");
com.AddParameter("@" + columnname.Name.ToLower() + "-where", columnname.Value);
}
else
{
sb.Append("@" + columnname.Name.ToLower() + "-where" + "=" + columnname.Value + ";");
com.AddParameter("@" + columnname.Name.ToLower() + "-where", columnname.Value);
}
}
}
com.CommandText = sb.ToString();
using (var reader = com.ExecuteReader())
return reader.RecordsAffected;
}
}
/// <summary>
/// Returns a list of values from a given Table, where conditions are met
/// </summary>
/// <param name="tablename">Name of the Table</param>
/// <param name="getcolumn">The name of the column you are getting the values from</param>
/// <param name="WhereStatements">The list of where statements that must be met, can be an empty list</param>
public static List<object> ReadTable(string tablename, string getcolumn, List<ColumnData> WhereStatements)
{
StringBuilder sb = new StringBuilder();
List<object> ReturnedValues = new List<object>();
sb.Append("SELECT * FROM " + tablename + " ");
using (var com = database.CreateCommand())
{
//Where Statement (if any)
if (WhereStatements.Count > 0)
{
sb.Append("WHERE ");
int count = 0;
foreach (ColumnData columnname in WhereStatements)
{
count++;
if (WhereStatements.Count != count)
{
sb.Append(columnname.Name + " =" + columnname.Value + " AND ");
}
else
{
sb.Append(columnname.Name + " =" + columnname.Value);
}
}
}
com.CommandText = sb.ToString();
using (var reader = com.ExecuteReader())
{
while (reader.Read())
ReturnedValues.Add(reader.Get<object>(getcolumn));
}
}
return ReturnedValues;
}
/// <summary>
/// Sets values in a Table, where statements are met
/// </summary>
/// <param name="tablename">Name of the Table</param>
/// <param name="setcolumn">The column data you are setting</param>
/// <param name="WhereStatements">The list of where statements that must be met, can be an empty list</param>
public static int SetTable(string tablename, ColumnData setcolumn, List<ColumnData> WhereStatements)
{
StringBuilder sb = new StringBuilder();
sb.Append("UPDATE " + tablename + " SET " + setcolumn.Name + "=@setcolumn ");
using (var com = database.CreateCommand())
{
//Where Statement (if any)
if (WhereStatements.Count > 0)
{
sb.Append("WHERE ");
int count = 0;
foreach (ColumnData columnname in WhereStatements)
{
count++;
if (WhereStatements.Count != count)
{
sb.Append(columnname.Name + " =" + columnname.Value + " AND ");
}
else
{
sb.Append(columnname.Name + " =" + columnname.Value);
}
}
}
com.CommandText = sb.ToString();
com.AddParameter("@setcolumn", setcolumn.Value);
using (var reader = com.ExecuteReader())
return reader.RecordsAffected;
}
}
}
public class Column
{
public string Name { get; set; }
public string Type { get; set; }
public bool Unique { get; set; }
public string Parameters { get; set; }
/// <summary>
/// The class for creating a new column type
/// </summary>
/// <param name="name">Name of the column</param>
/// <param name="unique">Whether there can be more than one exact value in the column</param>
/// <param name="type">The type of column, currently the api only supports "string" or "int"</param>
/// <param name="parameters">Extra SQL parameters given, can cause errors cross different SQL (SQLite and MySql)</param>
public Column(string name, bool unique, string type, string parameters = "")
{
Name = name;
Type = type;
Unique = unique;
Parameters = parameters;
}
public Column()
{
Name = string.Empty;
Type = string.Empty;
Unique = false;
Parameters = string.Empty;
}
}
public class ColumnData
{
public string Name { get; set; }
public object Value { get; set; }
/// <summary>
/// The class for testing, inserting or setting column data
/// </summary>
/// <param name="name">Column Name</param>
/// <param name="value">Column Value</param>
public ColumnData(string name, object value)
{
Name = name;
Value = value;
}
public ColumnData()
{
Name = string.Empty;
Value = string.Empty;
}
}
}

12
TShockAPI/FileTools.cs
View file

@ -20,13 +20,13 @@ using System.IO;
namespace TShockAPI
{
internal class FileTools
public class FileTools
{
public static string RulesPath { get { return Path.Combine(TShock.SavePath, "rules.txt"); } }
public static string MotdPath { get { return Path.Combine(TShock.SavePath, "motd.txt"); } }
public static string WhitelistPath { get { return Path.Combine(TShock.SavePath, "whitelist.txt"); } }
public static string RememberedPosPath { get { return Path.Combine(TShock.SavePath, "oldpos.xml"); } }
public static string ConfigPath { get { return Path.Combine(TShock.SavePath, "config.json"); } }
internal static string RulesPath { get { return Path.Combine(TShock.SavePath, "rules.txt"); } }
internal static string MotdPath { get { return Path.Combine(TShock.SavePath, "motd.txt"); } }
internal static string WhitelistPath { get { return Path.Combine(TShock.SavePath, "whitelist.txt"); } }
internal static string RememberedPosPath { get { return Path.Combine(TShock.SavePath, "oldpos.xml"); } }
internal static string ConfigPath { get { return Path.Combine(TShock.SavePath, "config.json"); } }
public static void CreateFile(string file)
{

6
TShockAPI/TSPlayer.cs
View file

@ -296,6 +296,12 @@ namespace TShockAPI
NetMessage.SendData((int)PacketTypes.TogglePVP, -1, -1, "", Index);
}
public virtual void SetTeam(int team)
{
Main.player[Index].team = team;
SendData(PacketTypes.PlayerTeam, "", Index);
}
public virtual void Whoopie(object time)
{
var time2 = (int)time;

4
TShockAPI/TShock.cs
View file

@ -155,6 +155,8 @@ namespace TShockAPI
throw new Exception("Invalid storage type");
}
DBTools.database = DB;
Backups = new BackupManager(Path.Combine(SavePath, "backups"));
Backups.KeepFor = Config.BackupKeepFor;
Backups.Interval = Config.BackupInterval;
@ -613,6 +615,8 @@ namespace TShockAPI
return;
}
player.SendData(PacketTypes.WorldInfo);
Log.Info(string.Format("{0} ({1}) from '{2}' group joined.", player.Name, player.IP, player.Group.Name));
Tools.ShowFileToUser(player, "motd.txt");

2
TShockAPI/TShockAPI.csproj
View file

@ -93,10 +93,10 @@
<ItemGroup>
<Compile Include="BackupManager.cs" />
<Compile Include="DB\BanManager.cs" />
<Compile Include="DBTools.cs" />
<Compile Include="DB\ItemManager.cs" />
<Compile Include="DB\DbExt.cs" />
<Compile Include="DB\GroupManager.cs" />
<Compile Include="DB\SqlTable.cs" />
<Compile Include="DB\UserManager.cs" />
<Compile Include="IPackable.cs" />
<Compile Include="Commands.cs" />

2
TShockAPI/Tools.cs
View file

@ -28,7 +28,7 @@ using Terraria;
namespace TShockAPI
{
internal class Tools
public class Tools
{
public static Random Random = new Random();
//private static List<Group> groups = new List<Group>();

1
TShockAPI/config/groups.txt
View file

@ -25,6 +25,7 @@
#tphere - allow a player to teleport players to their position
#managewarp - allow player to add/delete warp locations
#managegroup - allow player to add/delete/modify groups
#manageitem - allow a player to add/delete item bans
#editspawn - allow player to enable/disable build protection
#cfg - allow player to view/change tshock configuration
#time - allow player to change time