Changeset 224 for binary-improvements/7dtd-server-fixes/src

Timestamp:

Apr 2, 2015, 9:16:34 PM (10 years ago)

Author:

alloc

Message:

A11 preps

Location:

binary-improvements/7dtd-server-fixes/src

Files:

• AdminToolsStuff.cs (deleted)
• AllocsLogFunctions.cs (modified) (3 diffs)
• AssemblyInfo.cs (modified) (1 diff)
• CommandExtensions.cs (modified) (1 diff)
• CommonMappingFunctions.cs (modified) (2 diffs)
• CustomCommands (deleted)
• ItemList.cs (modified) (3 diffs)
• MapRendering (deleted)
• ModAPI.cs (added)
• Mods.cs (added)
• NetConnections/ConsoleOutputSeparator.cs (modified) (3 diffs)
• NetConnections/Servers/Telnet/TelnetConnection.cs (modified) (5 diffs)
• NetConnections/Servers/Web (deleted)
• PersistentData/Inventory.cs (modified) (2 diffs)
• PlayerDataStuff.cs (modified) (1 diff)
• StateManager.cs (modified) (3 diffs)
• Version.cs (added)

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

@@ -31 +31 @@
                                 PersistentContainer.Instance.Players [steamId].SetOnline (ci);
                                 PersistentData.PersistentContainer.Instance.Save ();
+
+                                Mods.CallRequestToSpawnPlayer (_clientId, _name, _chunkViewDim, _playerProfile);
                         } catch (Exception e) {
                                 Log.Out ("Error in AllocsLogFunctions.RequestToSpawnPlayer: " + e);
@@ -36 +38 @@
                 }
 
-                public static void PlayerDisconnected (ConnectionManager manager, int _clientId, bool _bShutdown)
+                public static void PlayerDisconnected (ConnectionManager manager, ClientInfo _cInfo, bool _bShutdown)
                 {
                         try {
-                                Player p = PersistentContainer.Instance.Players.GetPlayerByClientId (_clientId);
+                                Player p = PersistentContainer.Instance.Players [_cInfo.playerId];
                                 if (p != null) {
                                         p.SetOffline ();
@@ -46 +48 @@
                                 }
                                 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.104.*")]
+[assembly: AssemblyVersion("0.110.*")]
 
 // The following attributes are used to specify the signing key for the assembly, 

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

@@ -12 +12 @@
                         try {
                                 ConsoleSdtd cons = manager.m_GUIConsole;
-                                string ns = "AllocsFixes.CustomCommands";
-                                string basetype = "ConsoleCommand";
+                                Type commandType = typeof (ConsoleCommand);
 
-                                foreach (Type t in Assembly.GetExecutingAssembly ().GetTypes()) {
-                                        if (t.IsClass && t.Namespace.Equals (ns) && t.BaseType.Name.Equals (basetype)) {
-                                                try {
-                                                        ConstructorInfo ctor = t.GetConstructor (new Type[] {typeof(ConsoleSdtd)});
-                                                        cons.AddCommand ((ConsoleCommand)ctor.Invoke (new object[] {cons}));
-                                                } catch (Exception e) {
-                                                        Log.Out ("Could not register custom command \"" + t.Name + "\": " + e);
+                                Mods.ModData thisMd = new Mods.ModData ();
+                                thisMd.assembly = Assembly.GetExecutingAssembly ();
+
+                                List<Mods.ModData> mods = Mods.LoadedMods ();
+                                mods.Add (thisMd);
+
+                                foreach (Mods.ModData md in mods) {
+                                        foreach (Type t in md.assembly.GetTypes()) {
+                                                if (t.IsClass && commandType.IsAssignableFrom (t)) {
+                                                        try {
+                                                                ConstructorInfo ctor = t.GetConstructor (new Type[] {typeof(ConsoleSdtd)});
+                                                                cons.AddCommand ((ConsoleCommand)ctor.Invoke (new object[] {cons}));
+                                                        } catch (Exception e) {
+                                                                Log.Out ("Could not register custom command \"" + t.Name + "\": " + e);
+                                                        }
                                                 }
                                         }

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

@@ -15 +15 @@
                 public static GameManager GetGameManager ()
                 {
-                        return GetConnectionManager ().gameManager;
+                        return GameManager.Instance;
                 }
 
@@ -25 +25 @@
                 public static EntityPlayer GetEntityPlayer (ClientInfo _ci)
                 {
-                        return GetGameManager ().World.playerEntities.dict [_ci.entityId];
+                        return GetGameManager ().World.Players.dict [_ci.entityId];
                 }
 

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

@@ -27 +27 @@
                 }
 
-                public Nullable<ItemValue> GetItemValue (string itemName)
+                public ItemValue GetItemValue (string itemName)
                 {
                         if (items.ContainsKey (itemName)) {
-                                return items [itemName];
+                                return items [itemName].Clone ();
                         } else {
                                 itemName = itemName.ToLower ();
                                 foreach (KeyValuePair<string, ItemValue> kvp in items) {
                                         if (kvp.Key.ToLower ().Equals (itemName)) {
-                                                return kvp.Value;
+                                                return kvp.Value.Clone ();
                                         }
                                 }
@@ -47 +47 @@
                         foreach (InventoryField invF in cm.GetAllItems()) {
                                 ItemBase ib = ItemBase.list [invF.itemValue.type];
-                                string name = ib.GetItemName (invF.itemValue);
+                                string name = ib.GetItemName ();
                                 if (name != null && name.Length > 0) {
                                         if (!items.ContainsKey (name)) {
@@ -58 +58 @@
                         foreach (InventoryField invF in cm.GetAllBlocks()) {
                                 ItemBase ib = ItemBase.list [invF.itemValue.type];
-                                string name = ib.GetItemName (invF.itemValue);
+                                string name = ib.GetItemName ();
                                 if (name != null && name.Length > 0) {
                                         if (!items.ContainsKey (name)) {

binary-improvements/7dtd-server-fixes/src/NetConnections/ConsoleOutputSeparator.cs

@@ -22 +22 @@
                 private static List<NetCommand> netCommandQueue = new List<NetCommand> ();
                 private static bool isCurrentCommandFromClient = false;
+                private static int issuerOfCurrentClientCommand = -1;
                 private static IConnection issuerOfCurrentCommand;
 
-                public static void C_ExecuteCmdFromClient (ConsoleSdtd console, NetworkPlayer _networkPlayer, string _playerName, string _playerID, string _command)
+                public static void C_ExecuteCmdFromClient (ConsoleSdtd console, int _entityId, string _playerName, string _playerID, string _command)
                 {
                         Log.Out ("Executed command \"" + _command + "\" from player \"" + _playerName + "\"");
@@ -30 +31 @@
                         lock (netCommandQueue) {
                                 isCurrentCommandFromClient = true;
-                                console.issuerOfCurrentClientCommand = _networkPlayer;
-                                console.ExecuteClientCmdInternal (_playerName, _playerID, _command);
+                                issuerOfCurrentClientCommand = _entityId;
+
+                                string[] array = _command.Split (' ');
+                                if (array.Length == 0) {
+                                        C_SendResult (console, "*** ERROR: empty command '" + _command + "'");
+                                } else {
+                                        ConsoleCommand cmd = console.getCommand (_command);
+                                        if (cmd != null) {
+                                                string[] array2 = new string[array.Length - 1];
+                                                for (int i = 1; i < array.Length; i++) {
+                                                        array2 [i - 1] = array [i];
+                                                }
+                                                cmd.ExecuteRemote (_playerID, array2);
+                                        } else {
+                                                C_SendResult (console, "*** ERROR: unknown command '" + array [0] + "'");
+                                        }
+                                }
+
                                 isCurrentCommandFromClient = false;
                         }
@@ -40 +57 @@
                 {
                         if (isCurrentCommandFromClient) {
-                                console.gameManager.GetRPCNetworkView ().RPC ("RPC_Console", console.issuerOfCurrentClientCommand, new object[]
-                        {
-                                _line,
-                                false
-                        }
-                                );
+                                CommonMappingFunctions.GetConnectionManager ().SendPackage (new NetPackage_ConsoleCmdClient (_line, false), new PackageDestinationSingleEntityID (issuerOfCurrentClientCommand));
                         } else {
                                 if (console.telnetServer != null && issuerOfCurrentCommand != null)

binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Telnet/TelnetConnection.cs

@@ -13 +13 @@
                 private readonly BlockingQueue<string> toClientQueue = new BlockingQueue<string> ();
                 private readonly Telnet telnet;
-                private readonly Thread receiveThread = null;
-                private readonly Thread sendThread = null;
                 private bool authenticated = false;
                 private readonly bool authEnabled;
@@ -44 +42 @@
                         Log.Out ("Telnet connection from: " + endpoint);
 
-                        receiveThread = ThreadMaster.Create ("TelnetClientReceive_" + endpoint.ToString (), new ThreadStart (ReceiveThread));
-                        receiveThread.Start ();
-                        sendThread = ThreadMaster.Create ("TelnetClientSend" + endpoint.ToString (), new ThreadStart (SendThread));
-                        sendThread.Start ();
+                        ThreadManager.StartThread ("TelnetClientReceive_" + endpoint.ToString (), new ThreadManager.ThreadFunctionDelegate (ReceiveThread), System.Threading.ThreadPriority.BelowNormal);
+                        ThreadManager.StartThread ("TelnetClientSend_" + endpoint.ToString (), new ThreadManager.ThreadFunctionDelegate (SendThread), System.Threading.ThreadPriority.BelowNormal);
 
                         if (authEnabled) {
@@ -77 +73 @@
                 }
 
-                private void ReceiveThread ()
+                private void ReceiveThread (ThreadManager.ThreadInfo _tInfo)
                 {
                         try {
@@ -116 +112 @@
                         if (!closed)
                                 Close ();
-                        ThreadMaster.Remove (Thread.CurrentThread.Name);
                 }
 
-                private void SendThread ()
+                private void SendThread (ThreadManager.ThreadInfo _tInfo)
                 {
                         try {
@@ -140 +135 @@
                         if (!closed)
                                 Close ();
-                        ThreadMaster.Remove (Thread.CurrentThread.Name);
                 }
 

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

@@ -32 +32 @@
                                         if (sourceFields [i].count > 0) {
                                                 int count = sourceFields [i].count;
-                                                int maxAllowed = ItemBase.list [sourceFields [i].itemValue.type].StackNumber;
+                                                int maxAllowed = ItemBase.list [sourceFields [i].itemValue.type].Stacknumber.Value;
                                                 string name = getInvFieldName (sourceFields [i]);
 
@@ -48 +48 @@
                 {
                         ItemBase iBase = ItemBase.list [item.itemValue.type];
-                        return iBase.GetItemName (item.itemValue);
+                        return iBase.GetItemName ();
                 }
 

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

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

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

@@ -1 +1 @@
 using AllocsFixes.NetConnections.Servers.Telnet;
-using AllocsFixes.NetConnections.Servers.Web;
 using System;
 using System.Reflection;
@@ -12 +11 @@
                         try {
                                 Log.Out ("[7dtd-server-fixes by Alloc] Version: " + Assembly.GetExecutingAssembly ().GetName ().Version);
-                                new Web ();
+
+                                Mods.LoadMods ();
+                                Mods.CallGameAwake ();
+                                CommandExtensions.InitCommandExtensions (manager);
+
                                 new Telnet ();
 
                                 ItemList.Instance.Init ();
-                                CommandExtensions.InitCommandExtensions (manager);
 
                                 PersistentData.PersistentContainer.Load ();
@@ -28 +30 @@
                         try {
                                 Log.Out ("Server shutting down!");
+                                Mods.CallGameShutdown ();
                                 PersistentData.PersistentContainer.Instance.Save ();
                         } catch (Exception e) {