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

Merge or some shit

Browse source
This commit is contained in:
Maverick Motherfucker 2011-05-30 01:57:56 -07:00
commit 0dee1092ee
4 changed files with 267 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -46,3 +46,7 @@ Thumbs.db
*.csproj.user
*.cache
*.txt
<<<<<<< HEAD
=======
*.pdb
>>>>>>> ef60c83b40be0a7948d3cb0381cc6e4526a9b2d6

265
TShockAPI/TShock.cs
View file

@ -7,6 +7,7 @@ using Terraria;
using TerrariaAPI;
using TerrariaAPI.Hooks;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
namespace TShockAPI
{
@ -16,6 +17,23 @@ namespace TShockAPI
public static string saveDir = "./tshock/";
public static bool killGuide = true;
public static int invasionMultiplier = 1;
public static int defaultMaxSpawns = 4;
public static int defaultSpawnRate = 700;
public static bool kickCheater = true;
public static bool banCheater = true;
public static int serverPort = 7777;
public static bool enableWhitelist = false;
public static bool infinateInvasion = false;
public static bool permaPvp = false;
public static int killCount = 0;
public static bool shownOneTimeInvasionMinder = false;
public static string tileWhitelist = "";
private static bool banTnt = false;
private static bool kickTnt = false;
public override Version Version
{
get { return new Version(0, 1); }
@ -44,6 +62,8 @@ namespace TShockAPI
GameHooks.OnLoadContent += new Action<Microsoft.Xna.Framework.Content.ContentManager>(OnLoadContent);
ServerHooks.OnChat += new Action<int, string, HandledEventArgs>(OnChat);
NetHooks.OnPreGetData += GetData;
ServerHooks.OnJoin += new Action<int, AllowEventArgs>(OnJoin);
//NetHooks.OnGreetPlayer += new NetHooks.GreetPlayerD(OnGreetPlayer);
}
/*
@ -66,6 +86,22 @@ namespace TShockAPI
return;
}
void OnGreetPlayer(int who, HandledEventArgs e)
{
int plr = who; //legacy support
e.Handled = true;
ShowMOTD(who);
if (Main.player[plr].statLifeMax > 400 || Main.player[plr].statManaMax > 200 || Main.player[plr].statLife > 400 || Main.player[plr].statMana > 200)
{
HandleCheater(plr);
}
if (permaPvp)
{
Main.player[who].hostile = true;
NetMessage.SendData(30, -1, -1, "", who);
}
}
void OnChat(int ply, string msg, HandledEventArgs handler)
{
if (IsAdmin(ply))
@ -73,7 +109,7 @@ namespace TShockAPI
if (msg.Length > 5 && msg.Substring(0, 5) == "/kick")
{
string plStr = msg.Remove(0, 5).Trim();
if (FindPlayer(plStr) == -1 || plStr == "")
if (!(FindPlayer(plStr) == -1 || plStr == ""))
{
Kick(FindPlayer(plStr), "You were kicked.");
Broadcast(plStr + " was kicked by " + FindPlayer(ply));
@ -94,6 +130,20 @@ namespace TShockAPI
}
}
void OnJoin(int ply, AllowEventArgs handler)
{
string ip = GetRealIP((Convert.ToString(Netplay.serverSock[ply].tcpClient.Client.RemoteEndPoint)));
if (CheckBanned(ip) || CheckCheat(ip) || CheckGreif(ip))
{
Kick(ply, "Your account has been disabled.");
}
if (!OnWhitelist(ip))
{
Kick(ply, "Not on whitelist.");
}
}
void OnLoadContent(Microsoft.Xna.Framework.Content.ContentManager obj)
{
@ -101,12 +151,12 @@ namespace TShockAPI
void OnPreInit()
{
SetupConfig();
}
void OnPostInit()
{
}
void OnUpdate(GameTime time)
@ -133,6 +183,134 @@ namespace TShockAPI
* Useful stuff:
* */
public static bool OnWhitelist(string ip)
{
if (!enableWhitelist) { return true; }
if (!System.IO.File.Exists(saveDir + "whitelist.txt")) { CreateFile(saveDir + "whitelist.txt"); TextWriter tw = new StreamWriter(saveDir + "whitelist.txt"); tw.WriteLine("127.0.0.1"); tw.Close(); }
TextReader tr = new StreamReader(saveDir + "whitelist.txt");
string whitelist = tr.ReadToEnd();
ip = GetRealIP(ip);
if (whitelist.Contains(ip)) { return true; } else { return false; }
}
public static bool CheckGreif(String ip)
{
ip = GetRealIP(ip);
if (!banTnt) { return false; }
TextReader tr = new StreamReader(saveDir + "grief.txt");
string list = tr.ReadToEnd();
tr.Close();
return list.Contains(ip);
}
public static bool CheckCheat(String ip)
{
ip = GetRealIP(ip);
if (!banCheater) { return false; }
TextReader tr = new StreamReader(saveDir + "cheaters.txt");
string trr = tr.ReadToEnd();
tr.Close();
if (trr.Contains(ip))
{
return true;
}
return false;
}
public static bool CheckBanned(String p)
{
String ip = p.Split(':')[0];
TextReader tr = new StreamReader(saveDir + "bans.txt");
string banlist = tr.ReadToEnd();
tr.Close();
banlist = banlist.Trim();
if (banlist.Contains(ip))
return true;
return false;
}
private static void KeepTilesUpToDate()
{
TextReader tr = new StreamReader(saveDir + "tiles.txt");
string file = tr.ReadToEnd();
tr.Close();
if (!file.Contains("0x3d"))
{
System.IO.File.Delete(saveDir + "tiles.txt");
CreateFile(saveDir + "tiles.txt");
TextWriter tw = new StreamWriter(saveDir + "tiles.txt");
tw.Write("0x03, 0x05, 0x14, 0x25, 0x18, 0x18, 0x20, 0x1b, 0x34, 0x48, 0x33, 0x3d, 0x47, 0x49, 0x4a, 0x35, 0x3d, 0x3e, 0x45, 0x47, 0x49, 0x4a,");
tw.Close();
}
}
public static void SetupConfig()
{
if (!System.IO.Directory.Exists(saveDir)) { System.IO.Directory.CreateDirectory(saveDir); }
if (!System.IO.File.Exists(saveDir + "tiles.txt"))
{
CreateFile(saveDir + "tiles.txt");
TextWriter tw = new StreamWriter(saveDir + "tiles.txt");
tw.Write("0x03, 0x05, 0x14, 0x25, 0x18, 0x18, 0x20, 0x1b, 0x34, 0x48, 0x33, 0x3d, 0x47, 0x49, 0x4a, 0x35, 0x3d, 0x3e, 0x45, 0x47, 0x49, 0x4a,");
tw.Close();
}
if (!System.IO.File.Exists(saveDir + "motd.txt"))
{
CreateFile(saveDir + "motd.txt");
TextWriter tw = new StreamWriter(saveDir + "motd.txt");
tw.WriteLine("This server is running TShock. Type /help for a list of commands.");
tw.WriteLine("%255,000,000%Current map: %map%");
tw.WriteLine("Current players: %players%");
tw.Close();
}
if (!System.IO.File.Exists(saveDir + "bans.txt")) { CreateFile(saveDir + "bans.txt"); }
if (!System.IO.File.Exists(saveDir + "cheaters.txt")) { CreateFile(saveDir + "cheaters.txt"); }
if (!System.IO.File.Exists(saveDir + "admins.txt")) { CreateFile(saveDir + "admins.txt"); }
if (!System.IO.File.Exists(saveDir + "grief.txt")) { CreateFile(saveDir + "grief.txt"); }
if (!System.IO.File.Exists(saveDir + "whitelist.txt")) { CreateFile(saveDir + "whitelist.txt"); }
if (!System.IO.File.Exists(saveDir + "config.txt"))
{
CreateFile(saveDir + "config.txt");
TextWriter tw = new StreamWriter(saveDir + "config.txt");
tw.WriteLine("true,50,4,700,true,true,7777,false,false,false,false,false");
tw.Close();
}
KeepTilesUpToDate();
TextReader tr = new StreamReader(saveDir + "config.txt");
string config = tr.ReadToEnd();
config = config.Replace("\n", "");
config = config.Replace("\r", "");
config = config.Replace(" ", "");
tr.Close();
string[] configuration = config.Split(',');
try
{
killGuide = Convert.ToBoolean(configuration[0]);
invasionMultiplier = Convert.ToInt32(configuration[1]);
defaultMaxSpawns = Convert.ToInt32(configuration[2]);
defaultSpawnRate = Convert.ToInt32(configuration[3]);
kickCheater = Convert.ToBoolean(configuration[4]);
banCheater = Convert.ToBoolean(configuration[5]);
serverPort = Convert.ToInt32(configuration[6]);
enableWhitelist = Convert.ToBoolean(configuration[7]);
infinateInvasion = Convert.ToBoolean(configuration[8]);
permaPvp = Convert.ToBoolean(configuration[9]);
kickTnt = Convert.ToBoolean(configuration[10]);
banTnt = Convert.ToBoolean(configuration[11]);
if (infinateInvasion)
{
//Main.startInv();
}
}
catch (Exception e)
{
WriteError(e.Message);
}
Netplay.serverPort = serverPort;
}
public static void Kick(int ply, string reason)
{
NetMessage.SendData(0x2, ply, -1, reason, 0x0, 0f, 0f, 0f);
@ -182,6 +360,20 @@ namespace TShockAPI
return pl;
}
public static void HandleCheater(int ply)
{
string cheater = FindPlayer(ply);
string ip = GetRealIP(Convert.ToString(Netplay.serverSock[ply].tcpClient.Client.RemoteEndPoint));
WriteGrief(ply);
if (!kickCheater) { return; }
Netplay.serverSock[ply].kill = true;
Netplay.serverSock[ply].Reset();
NetMessage.syncPlayers();
Broadcast(cheater + " was " + (banCheater ? "banned " : "kicked ") + "for cheating.");
}
public static string FindPlayer(int ply)
{
for (int i = 0; i < Main.player.Length; i++)
@ -253,5 +445,72 @@ namespace TShockAPI
{
using (FileStream fs = File.Create(file)) { }
}
public static void ShowMOTD(int ply)
{
string foo = "";
TextReader tr = new StreamReader(saveDir + "motd.txt");
while ((foo = tr.ReadLine()) != null)
{
foo = foo.Replace("%map%", Main.worldName);
foo = foo.Replace("%players%", GetPlayers());
if (foo.Substring(0, 1) == "%" && foo.Substring(12, 1) == "%") //Look for a beginning color code.
{
string possibleColor = foo.Substring(0, 13);
foo = foo.Remove(0, 13);
float[] pC = { 0, 0, 0 };
possibleColor = possibleColor.Replace("%", "");
string[] pCc = possibleColor.Split(',');
if (pCc.Length == 3)
{
try
{
pC[0] = Clamp(Convert.ToInt32(pCc[0]), 255, 0);
pC[1] = Clamp(Convert.ToInt32(pCc[1]), 255, 0);
pC[2] = Clamp(Convert.ToInt32(pCc[2]), 255, 0);
SendMessage(ply, foo, pC);
continue;
}
catch (Exception e)
{
WriteError(e.Message);
}
}
}
SendMessage(ply, foo);
}
tr.Close();
}
public static T Clamp<T>(T value, T max, T min)
where T : System.IComparable<T>
{
T result = value;
if (value.CompareTo(max) > 0)
result = max;
if (value.CompareTo(min) < 0)
result = min;
return result;
}
private static string GetPlayers()
{
string str = "";
for (int i = 0; i < Main.maxPlayers; i++)
{
if (Main.player[i].active)
{
if (str == "")
{
str = str + Main.player[i].name;
}
else
{
str = str + ", " + Main.player[i].name;
}
}
}
return str;
}
}
}

1
TShockAPI/TShockAPI.csproj
View file

@ -33,6 +33,7 @@
<ItemGroup>
<Reference Include="Microsoft.Xna.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" />
<Reference Include="Microsoft.Xna.Framework.Game, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" />
<Reference Include="Microsoft.Xna.Framework.Graphics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />

BIN
TShockAPI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View file

Binary file not shown.