Changeset 230 for binary-improvements/7dtd-server-fixes

Timestamp:

Apr 18, 2015, 4:27:57 PM (10 years ago)

Author:

alloc

Message:

Binary improvements

Location:

binary-improvements/7dtd-server-fixes

Files:

• 7dtd-server-fixes.csproj (modified) (5 diffs)
• ModInfo.xml (added)
• src/API.cs (added)
• src/AllocsLogFunctions.cs (modified) (3 diffs)
• src/AssemblyInfo.cs (modified) (1 diff)
• src/CommandExtensions.cs (deleted)
• src/CommonMappingFunctions.cs (deleted)
• src/ModAPI.cs (deleted)
• src/Mods.cs (deleted)
• src/NetConnections (deleted)
• src/PersistentData/PersistentContainer.cs (modified) (1 diff)
• src/PersistentData/Player.cs (modified) (2 diffs)
• src/PlayerDataStuff.cs (modified) (1 diff)
• src/StateManager.cs (modified) (3 diffs)
• src/Version.cs (deleted)

binary-improvements/7dtd-server-fixes/7dtd-server-fixes.csproj

@@ -15 +15 @@
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\bin\7DaysToDie_Data\Managed</OutputPath>
+    <OutputPath>..\bin\Mods\Allocs_CommonFunc</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -23 +23 @@
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\bin\7DaysToDie_Data\Managed</OutputPath>
+    <OutputPath>..\bin\Mods\Allocs_CommonFunc</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -34 +34 @@
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
+    <Reference Include="Assembly-CSharp">
+      <HintPath>..\7dtd-binaries\Assembly-CSharp.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="mscorlib">
+      <HintPath>..\7dtd-binaries\mscorlib.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System">
+      <HintPath>..\7dtd-binaries\System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="UnityEngine">
       <HintPath>..\7dtd-binaries\UnityEngine.dll</HintPath>
-    </Reference>
-    <Reference Include="EasyAntiCheat.Client">
-      <HintPath>..\7dtd-binaries\EasyAntiCheat.Client.dll</HintPath>
-    </Reference>
-    <Reference Include="EasyAntiCheat.Server">
-      <HintPath>..\7dtd-binaries\EasyAntiCheat.Server.dll</HintPath>
-    </Reference>
-    <Reference Include="Assembly-CSharp-firstpass">
-      <HintPath>..\7dtd-binaries\Assembly-CSharp-firstpass.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="LogLibrary">
       <HintPath>..\7dtd-binaries\LogLibrary.dll</HintPath>
-    </Reference>
-    <Reference Include="mscorlib">
-      <HintPath>..\7dtd-binaries\mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="Assembly-CSharp">
-      <HintPath>..\7dtd-binaries\Assembly-CSharp.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
@@ -61 +59 @@
     <Compile Include="src\AllocsLogFunctions.cs" />
     <Compile Include="src\PlayerDataStuff.cs" />
-    <Compile Include="src\CommandExtensions.cs" />
-    <Compile Include="src\CommonMappingFunctions.cs" />
-    <Compile Include="src\NetConnections\ConsoleOutputSeparator.cs" />
-    <Compile Include="src\NetConnections\NetTelnetServer.cs" />
-    <Compile Include="src\NetConnections\IServer.cs" />
-    <Compile Include="src\NetConnections\IConnection.cs" />
-    <Compile Include="src\NetConnections\Servers\Telnet\Telnet.cs" />
-    <Compile Include="src\NetConnections\Servers\Telnet\TelnetConnection.cs" />
     <Compile Include="src\PersistentData\PersistentContainer.cs" />
     <Compile Include="src\StateManager.cs" />
@@ -90 +80 @@
     <Compile Include="src\FileCache\SimpleCache.cs" />
     <Compile Include="src\FileCache\MapTileCache.cs" />
-    <Compile Include="src\Mods.cs" />
-    <Compile Include="src\ModAPI.cs" />
-    <Compile Include="src\Version.cs" />
+    <Compile Include="src\API.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <Folder Include="src\" />
-    <Folder Include="src\CustomCommands\" />
-    <Folder Include="src\NetConnections\" />
-    <Folder Include="src\NetConnections\Servers\" />
-    <Folder Include="src\NetConnections\Servers\Telnet\" />
     <Folder Include="src\PersistentData\" />
     <Folder Include="src\JSON\Parser\" />
     <Folder Include="src\FileCache\" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="ModInfo.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 </Project>

binary-improvements/7dtd-server-fixes/src/AllocsLogFunctions.cs

@@ -8 +8 @@
         public class AllocsLogFunctions
         {
-                public static void RequestToSpawnPlayer (GameManager manager, int _clientId, string _name, int _chunkViewDim, PlayerProfile _playerProfile)
+                public static void RequestToSpawnPlayer (int _clientId, string _name, int _chunkViewDim, PlayerProfile _playerProfile)
                 {
                         try {
-                                ClientInfo ci = CommonMappingFunctions.GetClientInfoFromClientID (_clientId);
-                                int entityId = CommonMappingFunctions.GetEntityID (ci);
-                                EntityPlayer ep = CommonMappingFunctions.GetEntityPlayer (ci);
-                                string steamId = CommonMappingFunctions.GetSteamID (ci);
-
-                                string ip = ci.ip;
-                                string name = string.Empty;
-
-                                if (ep != null)
-                                        name = ep.EntityName;
+                                ClientInfo ci = ConnectionManager.Instance.GetClient (_clientId);
 
                                 Log.Out ("Player connected, clientid=" + _clientId +
-                                        ", entityid=" + entityId +
-                                        ", name=" + name +
-                                        ", steamid=" + steamId +
-                                        ", ip=" + ip
+                                        ", entityid=" + ci.entityId +
+                                        ", name=" + ci.playerName +
+                                        ", steamid=" + ci.playerId +
+                                        ", ip=" + ci.ip
                                 );
 
-                                PersistentContainer.Instance.Players [steamId].SetOnline (ci);
+                                PersistentContainer.Instance.Players [ci.playerId].SetOnline (ci);
                                 PersistentData.PersistentContainer.Instance.Save ();
-
-                                Mods.CallRequestToSpawnPlayer (_clientId, _name, _chunkViewDim, _playerProfile);
                         } catch (Exception e) {
                                 Log.Out ("Error in AllocsLogFunctions.RequestToSpawnPlayer: " + e);
@@ -38 +27 @@
                 }
 
-                public static void PlayerDisconnected (ConnectionManager manager, ClientInfo _cInfo, bool _bShutdown)
+                public static void PlayerDisconnected (ClientInfo _cInfo, bool _bShutdown)
                 {
                         try {
@@ -48 +37 @@
                                 }
                                 PersistentData.PersistentContainer.Instance.Save ();
-
-                                Mods.CallPlayerDisconnected (_cInfo, _bShutdown);
                         } catch (Exception e) {
                                 Log.Out ("Error in AllocsLogFunctions.PlayerDisconnected: " + e);

binary-improvements/7dtd-server-fixes/src/AssemblyInfo.cs

@@ -18 +18 @@
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion("0.112.*")]
+[assembly: AssemblyVersion("0.113.*")]
 
 // The following attributes are used to specify the signing key for the assembly, 

binary-improvements/7dtd-server-fixes/src/PersistentData/PersistentContainer.cs

@@ -54 +54 @@
                                         return true;
                                 } catch (Exception e) {
-                                        Log.Out ("Exception in PersistentContainer.Load: " + e.Message);
+                                        Log.Error ("Exception in PersistentContainer.Load");
+                                        Log.Exception (e);
                                 }
                         }

binary-improvements/7dtd-server-fixes/src/PersistentData/Player.cs

@@ -59 +59 @@
                         get {
                                 if (IsOnline) {
-                                        return CommonMappingFunctions.GetEntityPlayer (clientInfo);
+                                        return GameManager.Instance.World.Players.dict [clientInfo.entityId];
                                 } else {
                                         return null;
@@ -116 +116 @@
                         Log.Out ("Player set to online: " + steamId);
                         clientInfo = ci;
-                        entityId = CommonMappingFunctions.GetEntityID (ci);
-                        name = CommonMappingFunctions.GetPlayerName (ci);
+                        entityId = ci.entityId;
+                        name = ci.playerName;
                         ip = ci.ip;
                 }

binary-improvements/7dtd-server-fixes/src/PlayerDataStuff.cs

@@ -11 +11 @@
                 {
                         try {
-                                ClientInfo ci = CommonMappingFunctions.GetClientInfoFromClientID(_clientId);
-                                string steamId = CommonMappingFunctions.GetSteamID(ci);
-                                PersistentContainer.Instance.Players[steamId].Inventory.Update(_playerDataFile);
-                                Mods.CallSavePlayerData (_clientId, _playerDataFile);
+                                ClientInfo ci = ConnectionManager.Instance.GetClient (_clientId);
+                                PersistentContainer.Instance.Players[ci.playerId].Inventory.Update(_playerDataFile);
                         } catch (Exception e) {
                                 Log.Out ("Error in GM_SavePlayerData: " + e);

binary-improvements/7dtd-server-fixes/src/StateManager.cs

@@ -1 @@
-using AllocsFixes.NetConnections.Servers.Telnet;
 using System;
 using System.Reflection;
@@ -7 +6 @@
         public class StateManager
         {
-                public static void Awake (GameManager manager)
+                public static void Awake ()
                 {
                         try {
                                 Log.Out ("[7dtd-server-fixes by Alloc] Version: " + Assembly.GetExecutingAssembly ().GetName ().Version);
-
-                                Mods.LoadMods ();
-                                Mods.CallGameAwake ();
-                                CommandExtensions.InitCommandExtensions (manager);
-
-                                new Telnet ();
 
                                 ItemList.Instance.Init ();
@@ -26 +19 @@
                 }
 
-                public static void Shutdown (GameManager manager)
+                public static void Shutdown ()
                 {
                         try {
                                 Log.Out ("Server shutting down!");
-                                Mods.CallGameShutdown ();
                                 PersistentData.PersistentContainer.Instance.Save ();
                         } catch (Exception e) {