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

Merge pull request #620 from MarioE/general-devel

Browse source 
Commands
This commit is contained in:
Lucas Nicodemus 2013-10-05 19:38:28 -07:00
commit 1388e9bcb3
6 changed files with 1204 additions and 1056 deletions
Download patch file Download diff file Expand all files Collapse all files

18
.editorconfig
View file

@ -1,9 +1,9 @@
root = true root = true
[*] [*]
end_of_line = crlf end_of_line = crlf
insert_final_newline = true insert_final_newline = true
[*.cs] [*.cs]
indent_style = tab indent_style = tab
trim_trailing_whitespace = true trim_trailing_whitespace = true

70
CONTRIBUTING
View file

@ -1,36 +1,36 @@
### Issue Guidelines ### Issue Guidelines
Please follow these simple requirements before posting an issue: Please follow these simple requirements before posting an issue:
1. TShock version number 1. TShock version number
2. Any stack traces that may have happened when the issue occurred 2. Any stack traces that may have happened when the issue occurred
3. How to reproduce the issue 3. How to reproduce the issue
### Pull Request Dev Guidelines ### Pull Request Dev Guidelines
These guidelines are for contributors. If you do not follow these guidelines your commits will be reverted. These guidelines are for contributors. If you do not follow these guidelines your commits will be reverted.
Required: Required:
- Follow the code style. We generally use microsofts except for m_ infront of private variables. - Follow the code style. We generally use microsofts except for m_ infront of private variables.
- Do not push unfinished features to the master branch, instead create a remote branch and push to that. - Do not push unfinished features to the master branch, instead create a remote branch and push to that.
- Do not push untested code to the master branch, instead push to the test branch. - Do not push untested code to the master branch, instead push to the test branch.
- Document all compatibility issues in the COMPATIBILITY file. (IE file formats changing) - Document all compatibility issues in the COMPATIBILITY file. (IE file formats changing)
- DO NOT MASS COMMIT. Commit changes as you go (without pushing). That way when you push we don't get a thousand changes with a 1-3 line commit message. - DO NOT MASS COMMIT. Commit changes as you go (without pushing). That way when you push we don't get a thousand changes with a 1-3 line commit message.
Optional: Optional:
- Build Version Increment (http://autobuildversion.codeplex.com/). - Build Version Increment (http://autobuildversion.codeplex.com/).
---- ----
### Dev Team Guidelines ### Dev Team Guidelines
These guidelines are to be followed by all developers with commit level access to this repository: These guidelines are to be followed by all developers with commit level access to this repository:
- Do not, for any reason, submit code to the master branch before it hits the development branch first. If the development branch is far ahead, and a new bug fix is going out, branch master, then merge with master and remove your branch. - Do not, for any reason, submit code to the master branch before it hits the development branch first. If the development branch is far ahead, and a new bug fix is going out, branch master, then merge with master and remove your branch.
- If you are found to do this, you will be the person merging and rebasing your code to fit general-devel. - If you are found to do this, you will be the person merging and rebasing your code to fit general-devel.
- Prior to posting any version on the website, you must tick the version in AssemblyInfo.cs. This is the versioning formula: - Prior to posting any version on the website, you must tick the version in AssemblyInfo.cs. This is the versioning formula:
- Major.Minor.Revision.BuildDate (tick Revision if you're fixing prior to an actual planned release) - Major.Minor.Revision.BuildDate (tick Revision if you're fixing prior to an actual planned release)
- Do not release any development builds on the forums without consulting another developer first. - Do not release any development builds on the forums without consulting another developer first.
- __Document code prior to marking it done in JIRA__ - __Document code prior to marking it done in JIRA__
- Move any un-tested code to the "Needs Validation" section on JIRA prior to marking it as done. - Move any un-tested code to the "Needs Validation" section on JIRA prior to marking it as done.
- Do not push changes to any branch without a proper issue being assigned in JIRA. If a feature isn't planned for this release, __it shouldn't be in the repo about to be released__. - Do not push changes to any branch without a proper issue being assigned in JIRA. If a feature isn't planned for this release, __it shouldn't be in the repo about to be released__.
- Submit all pull requests to the general-devel branch prior to the master branch, or you will be ignored. - Submit all pull requests to the general-devel branch prior to the master branch, or you will be ignored.

2141
TShockAPI/Commands.cs
View file

File diff suppressed because it is too large Load diff

14
TShockAPI/Log.cs
View file

@ -78,7 +78,7 @@ namespace TShockAPI
/// </summary> /// </summary>
/// <param name="format">The format of the message to be written.</param> /// <param name="format">The format of the message to be written.</param>
/// <param name="args">The format arguments.</param> /// <param name="args">The format arguments.</param>
public static void Data(String format, params String[] args) public static void Data(string format, params object[] args)
{ {
Data(String.Format(format, args)); Data(String.Format(format, args));
} }
@ -97,7 +97,7 @@ namespace TShockAPI
/// </summary> /// </summary>
/// <param name="format">The format of the message to be written.</param> /// <param name="format">The format of the message to be written.</param>
/// <param name="args">The format arguments.</param> /// <param name="args">The format arguments.</param>
public static void Error(String format, params String[] args) public static void Error(string format, params object[] args)
{ {
Error(String.Format(format, args)); Error(String.Format(format, args));
} }
@ -119,7 +119,7 @@ namespace TShockAPI
/// </summary> /// </summary>
/// <param name="format">The format of the message to be written.</param> /// <param name="format">The format of the message to be written.</param>
/// <param name="args">The format arguments.</param> /// <param name="args">The format arguments.</param>
public static void ConsoleError(String format, params String[] args) public static void ConsoleError(string format, params object[] args)
{ {
ConsoleError(String.Format(format, args)); ConsoleError(String.Format(format, args));
} }
@ -138,7 +138,7 @@ namespace TShockAPI
/// </summary> /// </summary>
/// <param name="format">The format of the message to be written.</param> /// <param name="format">The format of the message to be written.</param>
/// <param name="args">The format arguments.</param> /// <param name="args">The format arguments.</param>
public static void Warn(String format, params String[] args) public static void Warn(string format, params object[] args)
{ {
Warn(String.Format(format, args)); Warn(String.Format(format, args));
} }
@ -157,7 +157,7 @@ namespace TShockAPI
/// </summary> /// </summary>
/// <param name="format">The format of the message to be written.</param> /// <param name="format">The format of the message to be written.</param>
/// <param name="args">The format arguments.</param> /// <param name="args">The format arguments.</param>
public static void Info(String format, params String[] args) public static void Info(string format, params object[] args)
{ {
Info(String.Format(format, args)); Info(String.Format(format, args));
} }
@ -179,7 +179,7 @@ namespace TShockAPI
/// </summary> /// </summary>
/// <param name="format">The format of the message to be written.</param> /// <param name="format">The format of the message to be written.</param>
/// <param name="args">The format arguments.</param> /// <param name="args">The format arguments.</param>
public static void ConsoleInfo(String format, params String[] args) public static void ConsoleInfo(string format, params object[] args)
{ {
ConsoleInfo(String.Format(format, args)); ConsoleInfo(String.Format(format, args));
} }
@ -198,7 +198,7 @@ namespace TShockAPI
/// </summary> /// </summary>
/// <param name="format">The format of the message to be written.</param> /// <param name="format">The format of the message to be written.</param>
/// <param name="args">The format arguments.</param> /// <param name="args">The format arguments.</param>
public static void Debug(String format, params String[] args) public static void Debug(string format, params object[] args)
{ {
Debug(String.Format(format, args)); Debug(String.Format(format, args));
} }

8
TShockAPI/Permissions.cs
View file

@ -74,7 +74,7 @@ namespace TShockAPI
public static readonly string seeids = "tshock.admin.seeplayerids"; public static readonly string seeids = "tshock.admin.seeplayerids";
[Description("User can save all the players SSI state.")] [Description("User can save all the players SSI state.")]
public static readonly string savessi = "tshock.admin.savessi"; public static readonly string savessc = "tshock.admin.savessi";
[Description("User can elevate other users' groups temporarily.")] [Description("User can elevate other users' groups temporarily.")]
public static readonly string settempgroup = "tshock.admin.tempgroup"; public static readonly string settempgroup = "tshock.admin.tempgroup";
@ -156,9 +156,6 @@ namespace TShockAPI
[Description("User can spawn items.")] [Description("User can spawn items.")]
public static readonly string item = "tshock.item.spawn"; public static readonly string item = "tshock.item.spawn";
[Description("User can clear items.")]
public static readonly string clearitems = "tshock.item.clear";
[Description("Allows you to use banned items.")] [Description("Allows you to use banned items.")]
public static readonly string usebanneditem = "tshock.item.usebanned"; public static readonly string usebanneditem = "tshock.item.usebanned";
@ -256,6 +253,9 @@ namespace TShockAPI
// Non-grouped // Non-grouped
[Description("User can clear items or projectiles.")]
public static readonly string clear = "tshock.clear";
[Description("User can kill others.")] [Description("User can kill others.")]
public static readonly string kill = "tshock.kill"; public static readonly string kill = "tshock.kill";

9
TShockAPI/TShock.cs
View file

@ -1121,11 +1121,6 @@ namespace TShockAPI
} }
} }
if (player.Group.HasPermission(Permissions.causeevents) && Config.InfiniteInvasion)
{
StartInvasion();
}
player.LastNetPosition = new Vector2(Main.spawnTileX*16f, Main.spawnTileY*16f); player.LastNetPosition = new Vector2(Main.spawnTileX*16f, Main.spawnTileY*16f);
if (Config.RememberLeavePos && (RememberedPos.GetLeavePos(player.Name, player.IP) != Vector2.Zero)) if (Config.RememberLeavePos && (RememberedPos.GetLeavePos(player.Name, player.IP) != Vector2.Zero))
@ -1327,9 +1322,9 @@ namespace TShockAPI
* Useful stuff: * Useful stuff:
* */ * */
public static void StartInvasion() public static void StartInvasion(int type)
{ {
Main.invasionType = 1; Main.invasionType = type;
if (Config.InfiniteInvasion) if (Config.InfiniteInvasion)
{ {
Main.invasionSize = 20000000; Main.invasionSize = 20000000;