api tick 2.1

edg-l · Jun 17, 2017 · 5c715ed · 5c715ed
1 parent 6fdaeb6
commit 5c715ed
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 11 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "HelperBot/tshock-references"]
+	path = HelperBot/tshock-references
+	url = https://github.com/Ryozuki/tshock-references
diff --git a/HelperBot/HelperBot.cs b/HelperBot/HelperBot.cs
@@ -13,7 +13,7 @@
 
 namespace HelperBot
 {
-    [ApiVersion(2, 0)]
+    [ApiVersion(2, 1)]
     public class HelperBot : TerrariaPlugin
     {
         #region Info
@@ -46,8 +46,8 @@ public override void Initialize()
             ServerApi.Hooks.GamePostInitialize.Register(this, OnPostInitialize);
             ServerApi.Hooks.ServerChat.Register(this, onChat, -666);
             ServerApi.Hooks.NetGetData.Register(this, onGetData);
-            TShockAPI.Hooks.PlayerHooks.PlayerPostLogin += PlayerHooks_PlayerPostLogin;
-            TShockAPI.Hooks.PlayerHooks.PlayerLogout += PlayerHooks_PlayerLogout;
+            PlayerHooks.PlayerPostLogin += PlayerHooks_PlayerPostLogin;
+            PlayerHooks.PlayerLogout += PlayerHooks_PlayerLogout;
 
             sTimer.Elapsed += Second_Elapsed;
             sTimer.Interval = 1000;
@@ -62,8 +62,8 @@ protected override void Dispose(bool disposing)
                 ServerApi.Hooks.GamePostInitialize.Deregister(this, OnPostInitialize);
                 ServerApi.Hooks.ServerChat.Deregister(this, onChat);
                 ServerApi.Hooks.NetGetData.Deregister(this, onGetData);
-                TShockAPI.Hooks.PlayerHooks.PlayerPostLogin -= PlayerHooks_PlayerPostLogin;
-                TShockAPI.Hooks.PlayerHooks.PlayerLogout -= PlayerHooks_PlayerLogout;
+                PlayerHooks.PlayerPostLogin -= PlayerHooks_PlayerPostLogin;
+                PlayerHooks.PlayerLogout -= PlayerHooks_PlayerLogout;
             }
             base.Dispose(disposing);
         }        

diff --git a/HelperBot/HelperBot.csproj b/HelperBot/HelperBot.csproj
@@ -86,12 +86,15 @@
     <Compile Include="PTime.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="References\Mono.Data.Sqlite.dll" />
-    <Content Include="References\MySql.Data.dll" />
-    <Content Include="References\Newtonsoft.Json.dll" />
-    <Content Include="References\OTAPI.dll" />
-    <Content Include="References\TerrariaServer.exe" />
-    <Content Include="References\TShockAPI.dll" />
+    <Content Include="tshock-references\Mono.Data.Sqlite.dll" />
+    <Content Include="tshock-references\MySql.Data.dll" />
+    <Content Include="tshock-references\Newtonsoft.Json.dll" />
+    <Content Include="tshock-references\OTAPI.dll" />
+    <Content Include="tshock-references\TerrariaServer.exe" />
+    <Content Include="tshock-references\TShockAPI.dll" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="tshock-references\README.md" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/HelperBot/References/Mono.Data.Sqlite.dll b/HelperBot/References/Mono.Data.Sqlite.dll
diff --git a/HelperBot/References/MySql.Data.dll b/HelperBot/References/MySql.Data.dll
diff --git a/HelperBot/References/Newtonsoft.Json.dll b/HelperBot/References/Newtonsoft.Json.dll
diff --git a/HelperBot/References/OTAPI.dll b/HelperBot/References/OTAPI.dll
diff --git a/HelperBot/References/TShockAPI.dll b/HelperBot/References/TShockAPI.dll
diff --git a/HelperBot/References/TerrariaServer.exe b/HelperBot/References/TerrariaServer.exe
diff --git a/HelperBot/tshock-references b/HelperBot/tshock-references