From 786f83ebdf0b5190a7e6271a0a17d3477df9e0b9 Mon Sep 17 00:00:00 2001 From: Alex Wang Date: Mon, 14 Jan 2019 15:07:08 -0600 Subject: [PATCH] API 2.1 update to TShock 4.3.25 --- .gitignore | 2 ++ .vs/Wolfje.Plugins.EnglishPlox/v15/.suo | Bin 0 -> 28160 bytes Wolfje.Plugins.EnglishPlox/EnglishPloxPlugin.cs | 11 +++++------ .../Wolfje.Plugins.EnglishPlox.csproj | 5 ++++- 4 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 .vs/Wolfje.Plugins.EnglishPlox/v15/.suo diff --git a/.gitignore b/.gitignore index a189e1f..0137e57 100755 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ Wolfje.Plugins.EnglishPlox/bin/ Wolfje.Plugins.EnglishPlox/obj/ +.vs/Wolfje.Plugins.EnglishPlox/v15/Server/sqlite3/db.lock +.vs/Wolfje.Plugins.EnglishPlox/v15/Server/sqlite3/storage.ide diff --git a/.vs/Wolfje.Plugins.EnglishPlox/v15/.suo b/.vs/Wolfje.Plugins.EnglishPlox/v15/.suo new file mode 100644 index 0000000000000000000000000000000000000000..a990efade1bc2cb6938a04ddb523203e22340ddd GIT binary patch literal 28160 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 literal 0 HcmV?d00001 diff --git a/Wolfje.Plugins.EnglishPlox/EnglishPloxPlugin.cs b/Wolfje.Plugins.EnglishPlox/EnglishPloxPlugin.cs index 2fe8b2f..4f194ec 100755 --- a/Wolfje.Plugins.EnglishPlox/EnglishPloxPlugin.cs +++ b/Wolfje.Plugins.EnglishPlox/EnglishPloxPlugin.cs @@ -1,15 +1,14 @@ using System; -using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Text; using System.Text.RegularExpressions; -using System.Threading.Tasks; using Terraria; -using TerrariaApi; +using Terraria.Localization; -namespace Wolfje.Plugins.EnglishPlox { - [TerrariaApi.Server.ApiVersion(1, 20)] +namespace Wolfje.Plugins.EnglishPlox +{ + [TerrariaApi.Server.ApiVersion(2, 1)] public class EnglishPloxPlugin : TerrariaApi.Server.TerrariaPlugin { public static readonly Regex invalidCharactersRegex = new Regex(@"[^\da-z!@#\$%\^\&\*\(\)\-\+~ ;{}|\[\]:\.,_`]", RegexOptions.IgnoreCase); @@ -57,7 +56,7 @@ private void Server_Join(TerrariaApi.Server.JoinEventArgs args) { foreach (Match m in invalidCharactersRegex.Matches(player.name)) { sb.Append(m.Value); } - Terraria.NetMessage.SendData((int)PacketTypes.Disconnect, player.whoAmI, text: "Your name cannot contain these characters: " + sb.ToString()); + NetMessage.SendData((int)PacketTypes.Disconnect, player.whoAmI, text: NetworkText.FromLiteral("Your name cannot contain these characters: " + sb.ToString())); } } diff --git a/Wolfje.Plugins.EnglishPlox/Wolfje.Plugins.EnglishPlox.csproj b/Wolfje.Plugins.EnglishPlox/Wolfje.Plugins.EnglishPlox.csproj index 76ed725..055b0b7 100755 --- a/Wolfje.Plugins.EnglishPlox/Wolfje.Plugins.EnglishPlox.csproj +++ b/Wolfje.Plugins.EnglishPlox/Wolfje.Plugins.EnglishPlox.csproj @@ -30,6 +30,9 @@ 4 + + ..\..\Tshock-refs\OTAPI.dll + @@ -39,7 +42,7 @@ False - ..\..\ServerInstance4.3\TerrariaServer.exe + ..\..\Tshock-refs\TerrariaServer.exe