Update manual.md

Add the 'console' command to list of console commands.

SRMP/Globals.cs

@@ -70,7 +70,8 @@ namespace SRMultiplayer
                         !assembly.GetName().Name.Contains("Logger") && !assembly.GetName().Name.Contains("Mono.") && !assembly.GetName().Name.Contains("Harmony") &&
                         !assembly.GetName().Name.Equals("SRML") && !assembly.GetName().Name.Equals("SRML.Editor") && !assembly.GetName().Name.Equals("Newtonsoft.Json") &&
                         !assembly.GetName().Name.Equals("INIFileParser") && !assembly.GetName().Name.Equals("SRMultiplayer") && !assembly.GetName().Name.Contains("Microsoft.") &&
-                        !assembly.GetName().Name.Equals("SRMP") && !assembly.GetName().Name.Equals("XGamingRuntime") && !Globals.UserData.IgnoredMods.Contains(assembly.GetName().Name))
+                        !assembly.GetName().Name.Equals("SRMP") && !assembly.GetName().Name.Equals("XGamingRuntime") && !assembly.GetName().Name.Contains("MonoMod.Utils.") 
+                        && !Globals.UserData.IgnoredMods.Contains(assembly.GetName().Name))
                     {
                         mods.Add(assembly.GetName().Name);
                     }

SRMP/Lidgren.Network/NetPeer.Internal.cs

@@ -123,7 +123,7 @@ namespace Lidgren.Network
 					mutex.WaitOne();
 
 					if (m_socket == null)
-						m_socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
+						m_socket = new Socket(m_configuration.LocalAddress.AddressFamily, SocketType.Dgram, ProtocolType.Udp);
 
 					if (reBind)
 						m_socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, (int)1);
@@ -132,7 +132,19 @@ namespace Lidgren.Network
 					m_socket.SendBufferSize = m_configuration.SendBufferSize;
 					m_socket.Blocking = false;
 
-					var ep = (EndPoint)new NetEndPoint(m_configuration.LocalAddress, reBind ? m_listenPort : m_configuration.Port);
+                    if (m_configuration.DualStack)
+                    {
+                        if (m_configuration.LocalAddress.AddressFamily != AddressFamily.InterNetworkV6)
+                        {
+                            LogWarning("Configuration specifies Dual Stack but does not use IPv6 local address; Dual stack will not work.");
+                        }
+                        else
+                        {
+                            m_socket.DualMode = true;
+                        }
+                    }
+
+                    var ep = (EndPoint)new NetEndPoint(m_configuration.LocalAddress, reBind ? m_listenPort : m_configuration.Port);
 					m_socket.Bind(ep);
 
 					try
@@ -412,172 +424,175 @@ namespace Lidgren.Network
 			// update now
 			now = NetTime.Now;
 
-			do
+            try
+            {
+		        do
+                {
+                    ReceiveSocketData(now);
+                } while (m_socket.Available > 0);
+            }
+            catch (SocketException sx)
+            {
+                switch (sx.SocketErrorCode)
+                {
+                    case SocketError.ConnectionReset:
+                        // connection reset by peer, aka connection forcibly closed aka "ICMP port unreachable"
+                        // we should shut down the connection; but m_senderRemote seemingly cannot be trusted, so which connection should we shut down?!
+                        // So, what to do?
+                        LogWarning("ConnectionReset");
+                        return;
+
+                    case SocketError.NotConnected:
+                        // socket is unbound; try to rebind it (happens on mobile when process goes to sleep)
+                        BindSocket(true);
+                        return;
+
+                    default:
+                        LogWarning("Socket exception: " + sx.ToString());
+                        return;
+                }
+            }
+		}
+
+        private void ReceiveSocketData(double now)
+        {
+            int bytesReceived = m_socket.ReceiveFrom(m_receiveBuffer, 0, m_receiveBuffer.Length, SocketFlags.None, ref m_senderRemote);
+
+			if (bytesReceived < NetConstants.HeaderByteSize)
+				return;
+
+			//LogVerbose("Received " + bytesReceived + " bytes");
+
+			var ipsender = (NetEndPoint)m_senderRemote;
+
+			if (m_upnp != null && now < m_upnp.m_discoveryResponseDeadline && bytesReceived > 32)
 			{
-				int bytesReceived = 0;
-				try
+				// is this an UPnP response?
+				string resp = System.Text.Encoding.UTF8.GetString(m_receiveBuffer, 0, bytesReceived);
+				if (resp.Contains("upnp:rootdevice") || resp.Contains("UPnP/1.0"))
 				{
-					bytesReceived = m_socket.ReceiveFrom(m_receiveBuffer, 0, m_receiveBuffer.Length, SocketFlags.None, ref m_senderRemote);
-				}
-				catch (SocketException sx)
-				{
-					switch (sx.SocketErrorCode)
-					{
-						case SocketError.ConnectionReset:
-							// connection reset by peer, aka connection forcibly closed aka "ICMP port unreachable"
-							// we should shut down the connection; but m_senderRemote seemingly cannot be trusted, so which connection should we shut down?!
-							// So, what to do?
-							LogWarning("ConnectionReset");
-							return;
-
-						case SocketError.NotConnected:
-							// socket is unbound; try to rebind it (happens on mobile when process goes to sleep)
-							BindSocket(true);
-							return;
-
-						default:
-							LogWarning("Socket exception: " + sx.ToString());
-							return;
-					}
-				}
-
-				if (bytesReceived < NetConstants.HeaderByteSize)
-					return;
-
-				//LogVerbose("Received " + bytesReceived + " bytes");
-
-				var ipsender = (NetEndPoint)m_senderRemote;
-
-				if (m_upnp != null && now < m_upnp.m_discoveryResponseDeadline && bytesReceived > 32)
-				{
-					// is this an UPnP response?
-					string resp = System.Text.Encoding.UTF8.GetString(m_receiveBuffer, 0, bytesReceived);
-					if (resp.Contains("upnp:rootdevice") || resp.Contains("UPnP/1.0"))
-					{
-						try
-						{
-							resp = resp.Substring(resp.ToLower().IndexOf("location:") + 9);
-							resp = resp.Substring(0, resp.IndexOf("\r")).Trim();
-							m_upnp.ExtractServiceUrl(resp);
-							return;
-						}
-						catch (Exception ex)
-						{
-							LogDebug("Failed to parse UPnP response: " + ex.ToString());
-
-							// don't try to parse this packet further
-							return;
-						}
-					}
-				}
-
-				NetConnection sender = null;
-				m_connectionLookup.TryGetValue(ipsender, out sender);
-
-				//
-				// parse packet into messages
-				//
-				int numMessages = 0;
-				int numFragments = 0;
-				int ptr = 0;
-				while ((bytesReceived - ptr) >= NetConstants.HeaderByteSize)
-				{
-					// decode header
-					//  8 bits - NetMessageType
-					//  1 bit  - Fragment?
-					// 15 bits - Sequence number
-					// 16 bits - Payload length in bits
-
-					numMessages++;
-
-					NetMessageType tp = (NetMessageType)m_receiveBuffer[ptr++];
-
-					byte low = m_receiveBuffer[ptr++];
-					byte high = m_receiveBuffer[ptr++];
-
-					bool isFragment = ((low & 1) == 1);
-					ushort sequenceNumber = (ushort)((low >> 1) | (((int)high) << 7));
-
-					if (isFragment)
-						numFragments++;
-
-					ushort payloadBitLength = (ushort)(m_receiveBuffer[ptr++] | (m_receiveBuffer[ptr++] << 8));
-					int payloadByteLength = NetUtility.BytesToHoldBits(payloadBitLength);
-
-					if (bytesReceived - ptr < payloadByteLength)
-					{
-						LogWarning("Malformed packet; stated payload length " + payloadByteLength + ", remaining bytes " + (bytesReceived - ptr));
-						return;
-					}
-
-					if (tp >= NetMessageType.Unused1 && tp <= NetMessageType.Unused29)
-					{
-						ThrowOrLog("Unexpected NetMessageType: " + tp);
-						return;
-					}
-
 					try
 					{
-						if (tp >= NetMessageType.LibraryError)
-						{
-							if (sender != null)
-								sender.ReceivedLibraryMessage(tp, ptr, payloadByteLength);
-							else
-								ReceivedUnconnectedLibraryMessage(now, ipsender, tp, ptr, payloadByteLength);
-						}
-						else
-						{
-							if (sender == null && !m_configuration.IsMessageTypeEnabled(NetIncomingMessageType.UnconnectedData))
-								return; // dropping unconnected message since it's not enabled
-
-							NetIncomingMessage msg = CreateIncomingMessage(NetIncomingMessageType.Data, payloadByteLength);
-							msg.m_isFragment = isFragment;
-							msg.m_receiveTime = now;
-							msg.m_sequenceNumber = sequenceNumber;
-							msg.m_receivedMessageType = tp;
-							msg.m_senderConnection = sender;
-							msg.m_senderEndPoint = ipsender;
-							msg.m_bitLength = payloadBitLength;
-
-							Buffer.BlockCopy(m_receiveBuffer, ptr, msg.m_data, 0, payloadByteLength);
-							if (sender != null)
-							{
-								if (tp == NetMessageType.Unconnected)
-								{
-									// We're connected; but we can still send unconnected messages to this peer
-									msg.m_incomingMessageType = NetIncomingMessageType.UnconnectedData;
-									ReleaseMessage(msg);
-								}
-								else
-								{
-									// connected application (non-library) message
-									sender.ReceivedMessage(msg);
-								}
-							}
-							else
-							{
-								// at this point we know the message type is enabled
-								// unconnected application (non-library) message
-								msg.m_incomingMessageType = NetIncomingMessageType.UnconnectedData;
-								ReleaseMessage(msg);
-							}
-						}
+						resp = resp.Substring(resp.ToLower().IndexOf("location:") + 9);
+						resp = resp.Substring(0, resp.IndexOf("\r")).Trim();
+						m_upnp.ExtractServiceUrl(resp);
+						return;
 					}
 					catch (Exception ex)
 					{
-						LogError("Packet parsing error: " + ex.Message + " from " + ipsender);
+						LogDebug("Failed to parse UPnP response: " + ex.ToString());
+
+						// don't try to parse this packet further
+						return;
 					}
-					ptr += payloadByteLength;
+				}
+			}
+
+			NetConnection sender = null;
+			m_connectionLookup.TryGetValue(ipsender, out sender);
+
+			//
+			// parse packet into messages
+			//
+			int numMessages = 0;
+			int numFragments = 0;
+			int ptr = 0;
+			while ((bytesReceived - ptr) >= NetConstants.HeaderByteSize)
+			{
+				// decode header
+				//  8 bits - NetMessageType
+				//  1 bit  - Fragment?
+				// 15 bits - Sequence number
+				// 16 bits - Payload length in bits
+
+				numMessages++;
+
+				NetMessageType tp = (NetMessageType)m_receiveBuffer[ptr++];
+
+				byte low = m_receiveBuffer[ptr++];
+				byte high = m_receiveBuffer[ptr++];
+
+				bool isFragment = ((low & 1) == 1);
+				ushort sequenceNumber = (ushort)((low >> 1) | (((int)high) << 7));
+
+				if (isFragment)
+					numFragments++;
+
+				ushort payloadBitLength = (ushort)(m_receiveBuffer[ptr++] | (m_receiveBuffer[ptr++] << 8));
+				int payloadByteLength = NetUtility.BytesToHoldBits(payloadBitLength);
+
+				if (bytesReceived - ptr < payloadByteLength)
+				{
+					LogWarning("Malformed packet; stated payload length " + payloadByteLength + ", remaining bytes " + (bytesReceived - ptr));
+					return;
 				}
 
-				m_statistics.PacketReceived(bytesReceived, numMessages, numFragments);
-				if (sender != null)
-					sender.m_statistics.PacketReceived(bytesReceived, numMessages, numFragments);
+				if (tp >= NetMessageType.Unused1 && tp <= NetMessageType.Unused29)
+				{
+					ThrowOrLog("Unexpected NetMessageType: " + tp);
+					return;
+				}
 
-			} while (m_socket.Available > 0);
-		}
+				try
+				{
+					if (tp >= NetMessageType.LibraryError)
+					{
+						if (sender != null)
+							sender.ReceivedLibraryMessage(tp, ptr, payloadByteLength);
+						else
+							ReceivedUnconnectedLibraryMessage(now, ipsender, tp, ptr, payloadByteLength);
+					}
+					else
+					{
+						if (sender == null && !m_configuration.IsMessageTypeEnabled(NetIncomingMessageType.UnconnectedData))
+							return; // dropping unconnected message since it's not enabled
 
-		/// <summary>
+						NetIncomingMessage msg = CreateIncomingMessage(NetIncomingMessageType.Data, payloadByteLength);
+						msg.m_isFragment = isFragment;
+						msg.m_receiveTime = now;
+						msg.m_sequenceNumber = sequenceNumber;
+						msg.m_receivedMessageType = tp;
+						msg.m_senderConnection = sender;
+						msg.m_senderEndPoint = ipsender;
+						msg.m_bitLength = payloadBitLength;
+
+						Buffer.BlockCopy(m_receiveBuffer, ptr, msg.m_data, 0, payloadByteLength);
+						if (sender != null)
+						{
+							if (tp == NetMessageType.Unconnected)
+							{
+								// We're connected; but we can still send unconnected messages to this peer
+								msg.m_incomingMessageType = NetIncomingMessageType.UnconnectedData;
+								ReleaseMessage(msg);
+							}
+							else
+							{
+								// connected application (non-library) message
+								sender.ReceivedMessage(msg);
+							}
+						}
+						else
+						{
+							// at this point we know the message type is enabled
+							// unconnected application (non-library) message
+							msg.m_incomingMessageType = NetIncomingMessageType.UnconnectedData;
+							ReleaseMessage(msg);
+						}
+					}
+				}
+				catch (Exception ex)
+				{
+					LogError("Packet parsing error: " + ex.Message + " from " + ipsender);
+				}
+				ptr += payloadByteLength;
+			}
+
+			m_statistics.PacketReceived(bytesReceived, numMessages, numFragments);
+			if (sender != null)
+				sender.m_statistics.PacketReceived(bytesReceived, numMessages, numFragments);
+        }
+
+        /// <summary>
 		/// If NetPeerConfiguration.AutoFlushSendQueue() is false; you need to call this to send all messages queued using SendMessage()
 		/// </summary>
 		public void FlushSendQueue()
@@ -686,7 +701,7 @@ namespace Lidgren.Network
 				case NetMessageType.Connect:
 					if (m_configuration.AcceptIncomingConnections == false)
 					{
-						LogWarning(m_configuration.AppIdentifier + " Received Connect, but we're not accepting incoming connections!");
+						LogWarning("Received Connect, but we're not accepting incoming connections!");
 						return;
 					}
 					// handle connect

SRMP/Lidgren.Network/NetPeer.LatencySimulation.cs

@@ -132,6 +132,9 @@ namespace Lidgren.Network
 			catch { }
 		}
 
+        //Avoids allocation on mapping to IPv6
+        private IPEndPoint targetCopy = new IPEndPoint(IPAddress.Any, 0);
+
 		internal bool ActuallySendPacket(byte[] data, int numBytes, NetEndPoint target, out bool connectionReset)
 		{
 			connectionReset = false;
@@ -140,17 +143,25 @@ namespace Lidgren.Network
 			{
 				ba = NetUtility.GetCachedBroadcastAddress();
 
-				// TODO: refactor this check outta here
-				if (target.Address.Equals(ba))
-				{
-					// Some networks do not allow 
-					// a global broadcast so we use the BroadcastAddress from the configuration
-					// this can be resolved to a local broadcast addresss e.g 192.168.x.255                    
-					target.Address = m_configuration.BroadcastAddress;
-					m_socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.Broadcast, true);
-				}
+                // TODO: refactor this check outta here
+                if (target.Address.Equals(ba))
+                {
+                    // Some networks do not allow 
+                    // a global broadcast so we use the BroadcastAddress from the configuration
+                    // this can be resolved to a local broadcast addresss e.g 192.168.x.255                    
+                    targetCopy.Address = m_configuration.BroadcastAddress;
+                    targetCopy.Port = target.Port;
+                    m_socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.Broadcast, true);
+                }
+                else if(m_configuration.DualStack && m_configuration.LocalAddress.AddressFamily == AddressFamily.InterNetworkV6)
+                    NetUtility.CopyEndpoint(target, targetCopy); //Maps to IPv6 for Dual Mode
+                else
+                {
+	                targetCopy.Port = target.Port;
+	                targetCopy.Address = target.Address;
+                }
 
-				int bytesSent = m_socket.SendTo(data, 0, numBytes, SocketFlags.None, target);
+                int bytesSent = m_socket.SendTo(data, 0, numBytes, SocketFlags.None, targetCopy);
 				if (numBytes != bytesSent)
 					LogWarning("Failed to send the full " + numBytes + "; only " + bytesSent + " bytes sent in packet!");
 
@@ -178,7 +189,7 @@ namespace Lidgren.Network
 			}
 			finally
 			{
-				if (target.Address == ba)
+				if (target.Address.Equals(ba))
 					m_socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.Broadcast, false);
 			}
 			return true;

SRMP/Lidgren.Network/NetPeer.cs

@@ -2,7 +2,7 @@
 using System.Threading;
 using System.Collections.Generic;
 using System.Net;
-
+using System.Net.Sockets;
 #if !__NOIPENDPOINT__
 using NetEndPoint = System.Net.IPEndPoint;
 #endif
@@ -32,8 +32,8 @@ namespace Lidgren.Network
 
 		/// <summary>
 		/// Signalling event which can be waited on to determine when a message is queued for reading.
-		/// Note that there is no guarantee that after the event is signaled the blocked thread will 
-		/// find the message in the queue. Other user created threads could be preempted and dequeue 
+		/// Note that there is no guarantee that after the event is signaled the blocked thread will
+		/// find the message in the queue. Other user created threads could be preempted and dequeue
 		/// the message before the waiting thread wakes up.
 		/// </summary>
 		public AutoResetEvent MessageReceivedEvent
@@ -121,9 +121,16 @@ namespace Lidgren.Network
 			m_connections = new List<NetConnection>();
 			m_connectionLookup = new Dictionary<NetEndPoint, NetConnection>();
 			m_handshakes = new Dictionary<NetEndPoint, NetConnection>();
-			m_senderRemote = (EndPoint)new NetEndPoint(IPAddress.Any, 0);
+            if (m_configuration.LocalAddress.AddressFamily == AddressFamily.InterNetworkV6)
+            {
+                m_senderRemote = (EndPoint)new IPEndPoint(IPAddress.IPv6Any, 0);
+            }
+            else
+            {
+                m_senderRemote = (EndPoint)new IPEndPoint(IPAddress.Any, 0);
+            }
 			m_status = NetPeerStatus.NotRunning;
-			m_receivedFragmentGroups = new Dictionary<NetConnection, Dictionary<int, ReceivedFragmentGroup>>();	
+			m_receivedFragmentGroups = new Dictionary<NetConnection, Dictionary<int, ReceivedFragmentGroup>>();
 		}
 
 		/// <summary>
@@ -148,7 +155,7 @@ namespace Lidgren.Network
 			}
 
 			InitializeNetwork();
-			
+
 			// start network thread
 			m_networkThread = new Thread(new ThreadStart(NetworkLoop));
 			m_networkThread.Name = m_configuration.NetworkThreadName;
@@ -183,7 +190,7 @@ namespace Lidgren.Network
 	        public NetIncomingMessage WaitMessage(int maxMillis)
 	        {
 	            NetIncomingMessage msg = ReadMessage();
-	
+
 	            while (msg == null)
 	            {
 	                // This could return true...
@@ -191,11 +198,11 @@ namespace Lidgren.Network
 	                {
 	                    return null;
 	                }
-	
+
 	                // ... while this will still returns null. That's why we need to cycle.
 	                msg = ReadMessage();
 	            }
-	
+
 	            return msg;
         	}
 
@@ -215,7 +222,7 @@ namespace Lidgren.Network
 			}
 			return retval;
 		}
-		
+
         	/// <summary>
 	        /// Reads a pending message from any connection, if any.
 	        /// Returns true if message was read, otherwise false.
@@ -303,6 +310,8 @@ namespace Lidgren.Network
 		{
 			if (remoteEndPoint == null)
 				throw new ArgumentNullException("remoteEndPoint");
+            if(m_configuration.DualStack)
+                remoteEndPoint = NetUtility.MapToIPv6(remoteEndPoint);
 
 			lock (m_connections)
 			{

SRMP/Lidgren.Network/NetPeerConfiguration.cs

@@ -35,12 +35,12 @@ namespace Lidgren.Network
 		//  -4 bytes to be on the safe side and align to 8-byte boundary
 		// Total 1408 bytes
 		// Note that lidgren headers (5 bytes) are not included here; since it's part of the "mtu payload"
-		
+
 		/// <summary>
 		/// Default MTU value in bytes
 		/// </summary>
 		public const int kDefaultMTU = 1408;
-		
+
 		private const string c_isLockedMessage = "You may not modify the NetPeerConfiguration after it has been used to initialize a NetPeer";
 
 		private bool m_isLocked;
@@ -48,6 +48,8 @@ namespace Lidgren.Network
 		private string m_networkThreadName;
 		private IPAddress m_localAddress;
 		private IPAddress m_broadcastAddress;
+        private bool m_dualStack;
+
 		internal bool m_acceptIncomingConnections;
 		internal int m_maximumConnections;
 		internal int m_defaultOutgoingMessageCapacity;
@@ -341,10 +343,26 @@ namespace Lidgren.Network
 			}
 		}
 
-		/// <summary>
-		/// Gets or sets the local broadcast address to use when broadcasting
-		/// </summary>
-		public IPAddress BroadcastAddress
+        /// <summary>
+        /// Gets or sets a value indicating whether the library should use IPv6 dual stack mode.
+        /// If you enable this you should make sure that the <see cref="LocalAddress"/> is an IPv6 address.
+        /// Cannot be changed once NetPeer is initialized.
+        /// </summary>
+        public bool DualStack
+        {
+            get { return m_dualStack;  }
+            set
+            {
+                if (m_isLocked)
+                    throw new NetException(c_isLockedMessage);
+                m_dualStack = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the local broadcast address to use when broadcasting
+        /// </summary>
+        public IPAddress BroadcastAddress
 		{
 			get { return m_broadcastAddress; }
 			set

SRMP/Lidgren.Network/NetUtility.cs

@@ -98,7 +98,7 @@ namespace Lidgren.Network
 			NetAddress ipAddress = null;
 			if (NetAddress.TryParse(ipOrHost, out ipAddress))
 			{
-				if (ipAddress.AddressFamily == AddressFamily.InterNetwork)
+				if (ipAddress.AddressFamily == AddressFamily.InterNetwork || ipAddress.AddressFamily == AddressFamily.InterNetworkV6)
 				{
 					callback(ipAddress);
 					return;
@@ -139,7 +139,7 @@ namespace Lidgren.Network
 					// check each entry for a valid IP address
 					foreach (var ipCurrent in entry.AddressList)
 					{
-						if (ipCurrent.AddressFamily == AddressFamily.InterNetwork)
+						if (ipCurrent.AddressFamily == AddressFamily.InterNetwork || ipCurrent.AddressFamily == AddressFamily.InterNetworkV6)
 						{
 							callback(ipCurrent);
 							return;
@@ -163,7 +163,7 @@ namespace Lidgren.Network
 			}
 		}
 
-		/// <summary>
+        /// <summary>
 		/// Get IPv4 address from notation (xxx.xxx.xxx.xxx) or hostname
 		/// </summary>
 		public static NetAddress Resolve(string ipOrHost)
@@ -176,9 +176,9 @@ namespace Lidgren.Network
 			NetAddress ipAddress = null;
 			if (NetAddress.TryParse(ipOrHost, out ipAddress))
 			{
-				if (ipAddress.AddressFamily == AddressFamily.InterNetwork)
+				if (ipAddress.AddressFamily == AddressFamily.InterNetwork || ipAddress.AddressFamily == AddressFamily.InterNetworkV6)
 					return ipAddress;
-				throw new ArgumentException("This method will not currently resolve other than ipv4 addresses");
+				throw new ArgumentException("This method will not currently resolve other than IPv4 or IPv6 addresses");
 			}
 
 			// ok must be a host name
@@ -189,7 +189,7 @@ namespace Lidgren.Network
 					return null;
 				foreach (var address in addresses)
 				{
-					if (address.AddressFamily == AddressFamily.InterNetwork)
+					if (address.AddressFamily == AddressFamily.InterNetwork || address.AddressFamily == AddressFamily.InterNetworkV6)
 						return address;
 				}
 				return null;
@@ -240,7 +240,7 @@ namespace Lidgren.Network
 			}
 			return new string(c);
 		}
-	
+
 		/// <summary>
 		/// Returns true if the endpoint supplied is on the same subnet as this host
 		/// </summary>
@@ -465,5 +465,29 @@ namespace Lidgren.Network
 			// this is defined in the platform specific files
 			return ComputeSHAHash(bytes, 0, bytes.Length);
 		}
-	}
-}
+
+        /// <summary>
+        /// Copies from <paramref name="src"/> to <paramref name="dst"/>. Maps to an IPv6 address
+        /// </summary>
+        /// <param name="src">Source.</param>
+        /// <param name="dst">Destination.</param>
+        internal static void CopyEndpoint(IPEndPoint src, IPEndPoint dst)
+        {
+            dst.Port = src.Port;
+            if (src.AddressFamily == AddressFamily.InterNetwork)
+                dst.Address = src.Address.MapToIPv6();
+            else
+                dst.Address = src.Address;
+        }
+
+        /// <summary>
+        /// Maps the IPEndPoint object to an IPv6 address. Has allocation
+        /// </summary>
+        internal static IPEndPoint MapToIPv6(IPEndPoint endPoint)
+        {
+            if (endPoint.AddressFamily == AddressFamily.InterNetwork)
+                return new IPEndPoint(endPoint.Address.MapToIPv6(), endPoint.Port);
+            return endPoint;
+        }
+    }
+}

SRMP/Patches/Patch_PauseFix.cs

@@ -57,6 +57,17 @@ namespace SRMultiplayer.Patches
         }
     }
 
+    [HarmonyPatch(typeof(MapUI))]
+    [HarmonyPatch("OpenMap")]
+    class FIX_MapUI_OpenMap
+    {
+        static void Postfix(MapUI __instance)
+        {
+            // Fix input mode not refreshing after dying
+            SRInput.instance.SetInputMode(SRInput.InputMode.PAUSE);
+        }
+    }
+
     [HarmonyPatch(typeof(vp_FPInput))]
     [HarmonyPatch("Update")]
     class FIX_FPInput_Pause

SRMP/Patches/Patch_Region.cs

@@ -4,6 +4,7 @@ using SRMultiplayer.Networking;
 using SRMultiplayer.Packets;
 using System;
 using System.Collections.Generic;
+
 using System.Linq;
 using System.Text;
 using UnityEngine;
@@ -38,6 +39,175 @@ namespace SRMultiplayer.Patches
             }
         }
     }
+    [HarmonyPatch(typeof(Region))]
+    [HarmonyPatch("Awake")]
+    class Region_Awake
+    {
+        static void Postfix(Region __instance)
+        {
+            var netRegion = __instance.gameObject.AddComponent<NetworkRegion>();
+            netRegion.ID = __instance.gameObject.GetGameObjectPath().GetHashCode();
+            netRegion.Region = __instance;
+            netRegion.FastForwarder = __instance.gameObject.GetComponent<RanchCellFastForwarder>();
+
+            Globals.Regions.Add(netRegion.ID, netRegion);
+
+
+            foreach (var landPlotLocation in __instance.gameObject.GetComponentsInChildren<LandPlotLocation>(true))
+            {
+                var netLandplot = landPlotLocation.gameObject.GetOrAddComponent<NetworkLandplot>();
+                netLandplot.Plot = landPlotLocation.GetComponentInChildren<LandPlot>(true);
+                netLandplot.Location = landPlotLocation;
+                netLandplot.Region = netRegion;
+
+                Globals.LandPlots.Add(netLandplot.Location.id, netLandplot);
+            }
+
+            foreach (var accessDoor in __instance.gameObject.GetComponentsInChildren<AccessDoor>(true))
+            {
+                var netAccessDoor = accessDoor.gameObject.GetOrAddComponent<NetworkAccessDoor>();
+                netAccessDoor.Door = accessDoor;
+                netAccessDoor.Region = netRegion;
+
+                Globals.AccessDoors.Add(accessDoor.id, netAccessDoor);
+            }
+
+            foreach (var gordo in __instance.gameObject.GetComponentsInChildren<GordoEat>(true))
+            {
+                var netGordo = gordo.gameObject.GetOrAddComponent<NetworkGordo>();
+                netGordo.Gordo = gordo;
+                netGordo.Region = netRegion;
+
+                Globals.Gordos.Add(netGordo.ID, netGordo);
+            }
+
+            foreach (var puzzleSlot in __instance.gameObject.GetComponentsInChildren<PuzzleSlot>(true))
+            {
+                var netPuzzleSlot = puzzleSlot.gameObject.GetOrAddComponent<NetworkPuzzleSlot>();
+                netPuzzleSlot.Slot = puzzleSlot;
+                netPuzzleSlot.Region = netRegion;
+
+                Globals.PuzzleSlots.Add(puzzleSlot.id, netPuzzleSlot);
+            }
+
+            foreach (var masterSwitch in __instance.gameObject.GetComponentsInChildren<WorldStateMasterSwitch>(true))
+            {
+                var netSwitch = masterSwitch.gameObject.GetOrAddComponent<NetworkWorldStateMasterSwitch>();
+                netSwitch.Switch = masterSwitch;
+                netSwitch.Region = netRegion;
+
+                Globals.Switches.Add(masterSwitch.id, netSwitch);
+            }
+
+            foreach (var gadgetSite in __instance.gameObject.GetComponentsInChildren<GadgetSite>(true))
+            {
+                var netGadgetSite = gadgetSite.gameObject.GetOrAddComponent<NetworkGadgetSite>();
+                netGadgetSite.Site = gadgetSite;
+                netGadgetSite.Region = netRegion;
+
+                Globals.GadgetSites.Add(gadgetSite.id, netGadgetSite);
+            }
+
+            foreach (var treaturePod in __instance.gameObject.GetComponentsInChildren<TreasurePod>(true))
+            {
+                var netTreasurePod = treaturePod.gameObject.GetOrAddComponent<NetworkTreasurePod>();
+                netTreasurePod.Pod = treaturePod;
+                netTreasurePod.Region = netRegion;
+
+                Globals.TreasurePods.Add(treaturePod.id, netTreasurePod);
+            }
+
+            foreach (var spawner in __instance.gameObject.GetComponentsInChildren<DirectedActorSpawner>(true))
+            {
+                var netSpawner = spawner.gameObject.GetOrAddComponent<NetworkDirectedActorSpawner>();
+                netSpawner.ID = spawner.gameObject.GetGameObjectPath().GetHashCode();
+                netSpawner.Spawner = spawner;
+                netSpawner.Region = netRegion;
+
+                Globals.Spawners.Add(netSpawner.ID, netSpawner);
+            }
+
+            foreach (var exchangeAcceptor in __instance.gameObject.GetComponentsInChildren<ExchangeAcceptor>(true))
+            {
+                var netAcceptor = exchangeAcceptor.gameObject.GetOrAddComponent<NetworkExchangeAcceptor>();
+                netAcceptor.ID = exchangeAcceptor.gameObject.GetGameObjectPath().GetHashCode();
+                netAcceptor.Acceptor = exchangeAcceptor;
+                netAcceptor.Region = netRegion;
+
+                Globals.ExchangeAcceptors.Add(netAcceptor.ID, netAcceptor);
+            }
+
+            foreach (var fireColumn in __instance.gameObject.GetComponentsInChildren<FireColumn>(true))
+            {
+                var netColumn = fireColumn.gameObject.GetOrAddComponent<NetworkFireColumn>();
+                netColumn.ID = fireColumn.gameObject.GetGameObjectPath().GetHashCode();
+                netColumn.Column = fireColumn;
+                netColumn.Region = netRegion;
+
+                Globals.FireColumns.Add(netColumn.ID, netColumn);
+            }
+
+            foreach (var kookadobaPatchNode in __instance.gameObject.GetComponentsInChildren<KookadobaPatchNode>(true))
+            {
+                var netNode = kookadobaPatchNode.gameObject.GetOrAddComponent<NetworkKookadobaPatchNode>();
+                netNode.ID = kookadobaPatchNode.gameObject.GetGameObjectPath().GetHashCode();
+                netNode.Node = kookadobaPatchNode;
+                netNode.Region = netRegion;
+
+                Globals.Kookadobas.Add(netNode.ID, netNode);
+            }
+
+            foreach (var nutcracker in __instance.gameObject.GetComponentsInChildren<Nutcracker>(true))
+            {
+                var netCracker = nutcracker.gameObject.GetOrAddComponent<NetworkNutcracker>();
+                netCracker.ID = nutcracker.gameObject.GetGameObjectPath().GetHashCode();
+                netCracker.Cracker = nutcracker;
+
+                Globals.Nutcrackers.Add(netCracker.ID, netCracker);
+            }
+
+            foreach (var trigger in __instance.gameObject.GetComponentsInChildren<QuicksilverAmmoReplacer>(true))
+            {
+                var netTrigger = trigger.gameObject.GetOrAddComponent<NetworkRaceTrigger>();
+                netTrigger.ID = trigger.gameObject.GetGameObjectPath().GetHashCode();
+                netTrigger.Ammo = trigger;
+
+                Globals.RaceTriggers.Add(netTrigger.ID, netTrigger);
+            }
+
+            foreach (var trigger in __instance.gameObject.GetComponentsInChildren<QuicksilverEnergyCheckpoint>(true))
+            {
+                var netTrigger = trigger.gameObject.GetOrAddComponent<NetworkRaceTrigger>();
+                netTrigger.ID = trigger.gameObject.GetGameObjectPath().GetHashCode();
+                netTrigger.Checkpoint = trigger;
+
+                Globals.RaceTriggers.Add(netTrigger.ID, netTrigger);
+            }
+
+            foreach (var trigger in __instance.gameObject.GetComponentsInChildren<QuicksilverEnergyReplacer>(true))
+            {
+                var netTrigger = trigger.gameObject.GetOrAddComponent<NetworkRaceTrigger>();
+                netTrigger.ID = trigger.gameObject.GetGameObjectPath().GetHashCode();
+                netTrigger.Energy = trigger;
+
+                Globals.RaceTriggers.Add(netTrigger.ID, netTrigger);
+            }
+
+            foreach (var spawnResource in __instance.gameObject.GetComponentsInChildren<SpawnResource>(true))
+            {
+                var netSpawnResource = spawnResource.gameObject.GetOrAddComponent<NetworkSpawnResource>();
+                netSpawnResource.ID = spawnResource.gameObject.GetGameObjectPath().GetHashCode();
+                netSpawnResource.SpawnResource = spawnResource;
+                netSpawnResource.Region = netRegion;
+                netSpawnResource.LandPlot = spawnResource.GetComponentInParent<NetworkLandplot>(true);
+
+                if (!Globals.SpawnResources.ContainsKey(netSpawnResource.ID))
+                {
+                    Globals.SpawnResources.Add(netSpawnResource.ID, netSpawnResource);
+                }
+            }
+        }
+    }
 
     [HarmonyPatch(typeof(Region))]
     [HarmonyPatch("Unproxy")]

SRMP/Properties/AssemblyInfo.cs

@@ -15,7 +15,7 @@ using System.Resources;
 [assembly: AssemblyCulture("")]
 
 // Version informationr(
-[assembly: AssemblyVersion("0.0.0.1510")]
-[assembly: AssemblyFileVersion("0.0.0.1510")]
+[assembly: AssemblyVersion("0.0.0.1525")]
+[assembly: AssemblyFileVersion("0.0.0.1525")]
 [assembly: NeutralResourcesLanguageAttribute( "en-US" )]
 

SRMP/SRMP.cs

@@ -215,169 +215,6 @@ namespace SRMultiplayer
             Globals.FXPrefabs.Add(splashOnTrigger.playerSplashFX.name, splashOnTrigger.playerSplashFX);
             Globals.FXPrefabs.Add(splashOnTrigger.splashFX.name, splashOnTrigger.splashFX);
 
-            foreach (var region in Resources.FindObjectsOfTypeAll<Region>())
-            {
-                var netRegion = region.gameObject.AddComponent<NetworkRegion>();
-                netRegion.ID = region.gameObject.GetGameObjectPath().GetHashCode();
-                netRegion.Region = region;
-                netRegion.FastForwarder = region.gameObject.GetComponent<RanchCellFastForwarder>();
-
-                Globals.Regions.Add(netRegion.ID, netRegion);
-
-                foreach(var landPlotLocation in region.gameObject.GetComponentsInChildren<LandPlotLocation>(true))
-                {
-                    var netLandplot = landPlotLocation.gameObject.GetOrAddComponent<NetworkLandplot>();
-                    netLandplot.Plot = landPlotLocation.GetComponentInChildren<LandPlot>(true);
-                    netLandplot.Location = landPlotLocation;
-                    netLandplot.Region = netRegion;
-
-                    Globals.LandPlots.Add(netLandplot.Location.id, netLandplot);
-                }
-
-                foreach (var accessDoor in region.gameObject.GetComponentsInChildren<AccessDoor>(true))
-                {
-                    var netAccessDoor = accessDoor.gameObject.GetOrAddComponent<NetworkAccessDoor>();
-                    netAccessDoor.Door = accessDoor;
-                    netAccessDoor.Region = netRegion;
-
-                    Globals.AccessDoors.Add(accessDoor.id, netAccessDoor);
-                }
-
-                foreach (var gordo in region.gameObject.GetComponentsInChildren<GordoEat>(true))
-                {
-                    var netGordo = gordo.gameObject.GetOrAddComponent<NetworkGordo>();
-                    netGordo.Gordo = gordo;
-                    netGordo.Region = netRegion;
-
-                    Globals.Gordos.Add(netGordo.ID, netGordo);
-                }
-
-                foreach (var puzzleSlot in region.gameObject.GetComponentsInChildren<PuzzleSlot>(true))
-                {
-                    var netPuzzleSlot = puzzleSlot.gameObject.GetOrAddComponent<NetworkPuzzleSlot>();
-                    netPuzzleSlot.Slot = puzzleSlot;
-                    netPuzzleSlot.Region = netRegion;
-
-                    Globals.PuzzleSlots.Add(puzzleSlot.id, netPuzzleSlot);
-                }
-
-                foreach (var masterSwitch in region.gameObject.GetComponentsInChildren<WorldStateMasterSwitch>(true))
-                {
-                    var netSwitch = masterSwitch.gameObject.GetOrAddComponent<NetworkWorldStateMasterSwitch>();
-                    netSwitch.Switch = masterSwitch;
-                    netSwitch.Region = netRegion;
-
-                    Globals.Switches.Add(masterSwitch.id, netSwitch);
-                }
-
-                foreach (var gadgetSite in region.gameObject.GetComponentsInChildren<GadgetSite>(true))
-                {
-                    var netGadgetSite = gadgetSite.gameObject.GetOrAddComponent<NetworkGadgetSite>();
-                    netGadgetSite.Site = gadgetSite;
-                    netGadgetSite.Region = netRegion;
-
-                    Globals.GadgetSites.Add(gadgetSite.id, netGadgetSite);
-                }
-
-                foreach (var treaturePod in region.gameObject.GetComponentsInChildren<TreasurePod>(true))
-                {
-                    var netTreasurePod = treaturePod.gameObject.GetOrAddComponent<NetworkTreasurePod>();
-                    netTreasurePod.Pod = treaturePod;
-                    netTreasurePod.Region = netRegion;
-
-                    Globals.TreasurePods.Add(treaturePod.id, netTreasurePod);
-                }
-
-                foreach (var spawner in region.gameObject.GetComponentsInChildren<DirectedActorSpawner>(true))
-                {
-                    var netSpawner = spawner.gameObject.GetOrAddComponent<NetworkDirectedActorSpawner>();
-                    netSpawner.ID = spawner.gameObject.GetGameObjectPath().GetHashCode();
-                    netSpawner.Spawner = spawner;
-                    netSpawner.Region = netRegion;
-
-                    Globals.Spawners.Add(netSpawner.ID, netSpawner);
-                }
-
-                foreach (var exchangeAcceptor in region.gameObject.GetComponentsInChildren<ExchangeAcceptor>(true))
-                {
-                    var netAcceptor = exchangeAcceptor.gameObject.GetOrAddComponent<NetworkExchangeAcceptor>();
-                    netAcceptor.ID = exchangeAcceptor.gameObject.GetGameObjectPath().GetHashCode();
-                    netAcceptor.Acceptor = exchangeAcceptor;
-                    netAcceptor.Region = netRegion;
-
-                    Globals.ExchangeAcceptors.Add(netAcceptor.ID, netAcceptor);
-                }
-
-                foreach (var fireColumn in region.gameObject.GetComponentsInChildren<FireColumn>(true))
-                {
-                    var netColumn = fireColumn.gameObject.GetOrAddComponent<NetworkFireColumn>();
-                    netColumn.ID = fireColumn.gameObject.GetGameObjectPath().GetHashCode();
-                    netColumn.Column = fireColumn;
-                    netColumn.Region = netRegion;
-
-                    Globals.FireColumns.Add(netColumn.ID, netColumn);
-                }
-
-                foreach (var kookadobaPatchNode in region.gameObject.GetComponentsInChildren<KookadobaPatchNode>(true))
-                {
-                    var netNode = kookadobaPatchNode.gameObject.GetOrAddComponent<NetworkKookadobaPatchNode>();
-                    netNode.ID = kookadobaPatchNode.gameObject.GetGameObjectPath().GetHashCode();
-                    netNode.Node = kookadobaPatchNode;
-                    netNode.Region = netRegion;
-
-                    Globals.Kookadobas.Add(netNode.ID, netNode);
-                }
-
-                foreach (var nutcracker in region.gameObject.GetComponentsInChildren<Nutcracker>(true))
-                {
-                    var netCracker = nutcracker.gameObject.GetOrAddComponent<NetworkNutcracker>();
-                    netCracker.ID = nutcracker.gameObject.GetGameObjectPath().GetHashCode();
-                    netCracker.Cracker = nutcracker;
-
-                    Globals.Nutcrackers.Add(netCracker.ID, netCracker);
-                }
-
-                foreach (var trigger in region.gameObject.GetComponentsInChildren<QuicksilverAmmoReplacer>(true))
-                {
-                    var netTrigger = trigger.gameObject.GetOrAddComponent<NetworkRaceTrigger>();
-                    netTrigger.ID = trigger.gameObject.GetGameObjectPath().GetHashCode();
-                    netTrigger.Ammo = trigger;
-
-                    Globals.RaceTriggers.Add(netTrigger.ID, netTrigger);
-                }
-
-                foreach (var trigger in region.gameObject.GetComponentsInChildren<QuicksilverEnergyCheckpoint>(true))
-                {
-                    var netTrigger = trigger.gameObject.GetOrAddComponent<NetworkRaceTrigger>();
-                    netTrigger.ID = trigger.gameObject.GetGameObjectPath().GetHashCode();
-                    netTrigger.Checkpoint = trigger;
-
-                    Globals.RaceTriggers.Add(netTrigger.ID, netTrigger);
-                }
-
-                foreach (var trigger in region.gameObject.GetComponentsInChildren<QuicksilverEnergyReplacer>(true))
-                {
-                    var netTrigger = trigger.gameObject.GetOrAddComponent<NetworkRaceTrigger>();
-                    netTrigger.ID = trigger.gameObject.GetGameObjectPath().GetHashCode();
-                    netTrigger.Energy = trigger;
-
-                    Globals.RaceTriggers.Add(netTrigger.ID, netTrigger);
-                }
-
-                foreach (var spawnResource in region.gameObject.GetComponentsInChildren<SpawnResource>(true))
-                {
-                    var netSpawnResource = spawnResource.gameObject.GetOrAddComponent<NetworkSpawnResource>();
-                    netSpawnResource.ID = spawnResource.gameObject.GetGameObjectPath().GetHashCode();
-                    netSpawnResource.SpawnResource = spawnResource;
-                    netSpawnResource.Region = netRegion;
-                    netSpawnResource.LandPlot = spawnResource.GetComponentInParent<NetworkLandplot>(true);
-
-                    if (!Globals.SpawnResources.ContainsKey(netSpawnResource.ID))
-                    {
-                        Globals.SpawnResources.Add(netSpawnResource.ID, netSpawnResource);
-                    }
-                }
-            }
 
             if (Globals.IsClient)
             {

SRMP/SRMP.csproj

@@ -496,6 +496,10 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Console\Console Commands.txt" />
+    <Content Include="modinfo.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>modinfo.json</LastGenOutput>
+    </Content>
     <Content Include="Properties\AssemblyInfo.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>AssemblyInfo.cs</LastGenOutput>
@@ -509,11 +513,20 @@
       <HintPath>..\Libs\SRML.dll</HintPath>
     </Reference>
   </ItemGroup>
+  <ItemGroup Condition=" '$(Configuration)|$(Platform)' == 'SRML NoVer|AnyCPU' ">
+    <Reference Include="SRML">
+      <HintPath>..\Libs\SRML.dll</HintPath>
+    </Reference>
+  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="srmultiplayer.dat" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="modinfo.json" />
+    <EmbeddedResource Include="modinfo.json">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>modinfo.tt</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
@@ -521,7 +534,13 @@
     </PostBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
+    <PreBuildEvent>if "$(ConfigurationName)" == "Standalone" (
+"$(DevEnvDir)TextTransform.exe" "$(ProjectDir)Properties\AssemblyInfo.tt"
+"$(DevEnvDir)TextTransform.exe" "$(ProjectDir)modinfo.tt"
+)
+if "$(ConfigurationName)" == "SRML" (
+"$(DevEnvDir)TextTransform.exe" "$(ProjectDir)Properties\AssemblyInfo.tt"
+"$(DevEnvDir)TextTransform.exe" "$(ProjectDir)modinfo.tt"
+)</PreBuildEvent>
   </PropertyGroup>
 </Project>

SRMP/modinfo.json

@@ -1,9 +1,10 @@
 {
-  "id": "srmp",
-  "name": "Slime Rancher Multiplayer",
-  "version": "0.0.1510",
-  "author": "SatyPardus",
-  "dependencies": [
+	"id": "srmp",
+	"name": "Slime Rancher Multiplayer",
+	"version": "0.0.1525",
+	"author": "SatyPardus",
+	"dependencies": [
+
+	]
+}
 
-  ]
-}

SRMP/modinfo.tt

@@ -0,0 +1,32 @@
+<#@ template debug="true" hostspecific="true" language="C#" #>
+<#@ output extension=".json" #>
+<#@ import namespace="System.IO" #>
+<#@ import namespace="System.Text.RegularExpressions" #>
+<#
+    string output = File.ReadAllText(this.Host.ResolvePath("Properties/AssemblyInfo.cs"));
+    Regex pattern = new Regex("AssemblyVersion\\(\"(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<revision>\\d+)\\.(?<build>\\d+)\"\\)");
+    MatchCollection matches = pattern.Matches(output);
+    if( matches.Count == 1 )
+    {
+        major = Convert.ToInt32(matches[0].Groups["major"].Value);
+        minor = Convert.ToInt32(matches[0].Groups["minor"].Value);
+        build = Convert.ToInt32(matches[0].Groups["build"].Value);
+        revision = Convert.ToInt32(matches[0].Groups["revision"].Value);
+    } 
+#>
+{
+	"id": "srmp",
+	"name": "Slime Rancher Multiplayer",
+	"version": "0.0.<#= this.build #>",
+	"author": "SatyPardus",
+	"dependencies": [
+
+	]
+}
+
+<#+
+    int major = 0;
+    int minor = 0; 
+    int revision = 0;
+    int build = 0;
+#>

manual.md

@@ -81,21 +81,21 @@ If you want an explanation to a specific entry in the table, select the operatin
 <!-- REMEMBER: If you updated the table above, also update the explanation below. -->
 
 <details>
-<summary>Windows</summary>
+<summary>:window: Windows</summary>
     <details>
-        <summary>:window: Windows: Steam</summary>
+        <summary>- Steam</summary>
         🟢 Compatible: The game runs natively on Windows and Steam, no issues should be caused by this combination.
     </details>
     <details>
-        <summary>Windows: Epic Games</summary>
+        <summary>- Epic Games</summary>
         🟢 Compatible: The game runs natively on Windows and Epic Games, no issues should be caused by this combination.
     </details>
     <details>
-        <summary>Windows: GoG</summary>
+        <summary>- GoG</summary>
         🟢 Compatible: The game runs natively on Windows and GoG, no issues should be caused by this combination.
     </details>
     <details>
-        <summary>Windows: Microsoft Store</summary>
+        <summary>- Microsoft Store</summary>
         🔴 Incompatible: As with everything else from the Microsoft Store, this version of the game is scuffed.
     </details>
 </details>
@@ -103,19 +103,19 @@ If you want an explanation to a specific entry in the table, select the operatin
 <details>
 <summary>:penguin: Linux</summary>
     <details>
-        <summary>Linux: Steam</summary>
+        <summary>- Steam</summary>
         🟢 Compatible: By using proton and then installing the mod as you would on windows, you get the same performance and probably no issues.
     </details>
     <details>
-        <summary>Linux: Epic Games</summary>
+        <summary>- Epic Games</summary>
         🟡 Kinda works: So far only tested through Heroic Games Launcher as well as Lutris. I have had broken UI but that could likely be due to how bad my old setup was. Seems to have slightly worse performance than on Steam but it is likely not an issue with SRMP and that difference was pretty much eliminated for me after enabling virtual desktop.
     </details>
     <details>
-        <summary>Linux: GoG</summary>
+        <summary>- GoG</summary>
         🟡 Kinda works: I've only done minimal testing but from what the information I gathered there didn't seem to be any issues. Will still put this as Kinda works until I gather more data.
     </details>
     <details>
-        <summary>Linux: Microsoft Store</summary>
+        <summary>- Microsoft Store</summary>
         🔴 Incompatible: Good luck getting Microsoft Store working on linux. Even if you did, this version doesn't work with the mod.
     </details>
 </details>
@@ -123,19 +123,19 @@ If you want an explanation to a specific entry in the table, select the operatin
 <details>
 <summary>:apple: Mac</summary>
     <details>
-        <summary>Mac: Steam</summary>
+        <summary>- Steam</summary>
         ⚪ Unknown: Not tested (by the original manual author) yet. Not enough data to cover this entry.
     </details>
     <details>
-        <summary>Mac: Epic Games</summary>
+        <summary>- Epic Games</summary>
         ⚪ Unknown: Not tested (by the original manual author) yet. Not enough data to cover this entry.
     </details>
     <details>
-        <summary>Mac: GoG</summary>
+        <summary>- GoG</summary>
         ⚪ Unknown: Not tested (by the original manual author) yet. Not enough data to cover this entry.
     </details>
     <details>
-        <summary>Mac: Microsoft Store</summary>
+        <summary>- Microsoft Store</summary>
         🔴 Incompatible: Good luck getting Microsoft Store working on Mac. Even if you did, this version doesn't work with the mod.
     </details>
 </details>
@@ -146,7 +146,8 @@ By using the SRML version of SRMP, it is possible to play with other mods. Keep
 
 <details>
 <summary>SRMP+SRML mod compatibility list</summary>
-
+  
+‎
 **_This list may be outdated, it is currently based on information found [here](https://docs.google.com/document/d/1JsofvJNLPK5r3XIF-MHBLWBKDzB8GUmGcia9eVnYvJ4)._** I will update it with new information as I receive it. If you want to help, please follow the testing procedure described in the document I just linked. Feel free to give us any information you have to contribute with on discord, or contribute directly to this document if you feel comfortable doing that.
 
 | Mod Name                                                                     | Compatible | Date Updated | Mod Ver. | SRMP Ver. | Tested By  | Notes                    |
@@ -217,24 +218,26 @@ The most obvious place to get the mod is probably from this github repo, head ov
 
 Now that you have downloaded the mod it is time to install it. Remember that these instructions are for the Standalone version, SRML version is installed like other SRML mods and therefor instructions are not provided here. Troubleshooting tips may still apply to SRML version. Now follow the steps for your OS and platform.
 
-### Windows
+### :window: Windows
 
 <!-- Decided to put instructions in details tags to reduce the amount of scrolling needed -->
 <details>
     <summary>TL;DR</summary>
-    Find the game installation directory, extract the downloaded zip file into that directory replacing files inside. Done.
+    Find the game directory, extract the downloaded zip file into that directory. You should be prompted if you want to replace some files. Click yes. Done.
 </details>
 
 <details>
-<summary>1. Finding the game installation directory</summary>
-The first step to installing the mod is to know where to install it to. We need to find the game installation directory (we will refer to it as GID from now on). This is done a little different depending on which platform (aka launcher) you have the game on. If you have it on multiple and one of them is steam, use steam. If you pirated the game, get out of my manual. Read the section for your launcher.
+<summary>:one:. Finding the game directory</summary>
+The first step to installing the mod is to know where to install it to. We need to find the game directory (we will refer to it as GD from now on). This is done a little different depending on which platform (aka launcher) you have the game on. Steam is preferred. If you pirated the game, get out of my manual. Read the section for your launcher.
     <details>
     <summary>> 1.a. Steam</summary>
-    It is really easy to find the GID on Steam, it only takes a few clicks. Open your library and find Slime Rancher in the list. Rightclick it, hover over ‘Manage’ and click ‘Browse local files’. This should open the explorer (or your default file explorer) in the GID. You know it is the correct directory if it contains a folder called SlimeRancher_Data.
+    <!-- Thanks to Stepy in the discord for this screenshot lol, I own the game on epic, not steam (unfortunately). -->
+    ![srmpInstallLocateGIDSteam](./screenshots/srmp-install-locate-gid-steam.png)
+    To find the GD on Steam, open your library and find Slime Rancher in the list. Right-click it, hover over ‘Manage’ and click ‘Browse local files’. This should open the explorer (or your default file explorer) in the GD. You know it is the correct directory if it contains a folder called SlimeRancher_Data.
     </details>
     <details>
     <summary>1.b. Epic Games</summary>
-    Finding the GID on Epic Games can be a little more complicated, as they aren’t installed to a universal location. The easiest thing is to initialize an install for another game and check what the pre-selected installation directory is, cancel the install and then check that directory for your GID. You know it is the correct directory if it contains a folder called SlimeRancher_Data. Another way to find it is to check the path of the Slime Rancher desktop entry/shortcut, or to just reinstall the game to a known location.
+    Finding the GD on Epic Games can be a little more complicated, as they aren’t installed to a universal location. The easiest thing is to initialize an install for another game and check what the pre-selected installation directory is, cancel the install and then check that directory for your GD. You know it is the correct directory if it contains a folder called SlimeRancher_Data. Another way to find it is to check the path of the Slime Rancher desktop entry/shortcut, or to just reinstall the game to a known location.
     </details>
     <details>
     <summary>1.c. GoG</summary>
@@ -243,34 +246,34 @@ The first step to installing the mod is to know where to install it to. We need
 </details>
 
 <details>
-<summary>2. Installing the mod</summary>
-Once you know the GID (game installation directory) of your game you can move on to actually installing the mod. First up, make sure you have your GID open in a file explorer. Again the GID can be identified by having a subdirectory called SlimeRancher_Data. Next, open the directory containing the downloaded mod zip archive (probably Downloads). Copy or move the zip into the GID, not into SlimeRancher_Data or another folder inside of the GID, but the GID itself. Now that the zip archive is in place, extract it by right-clicking and selecting ‘extract here’. It should ask to replace a file in SlimeRancher_Data, if it does then select yes, if it doesn’t then you have extracted it to the wrong directory or you just need to move it out of a folder first. Once extracted correctly, it should have replaced a file in SlimeRancher_Data and created a new folder called Mods (do not put other mods in here). That’s it! Now move on to step 3.
+<summary>:two:. Installing the mod</summary>
+Once you know the GD (game directory) of your game you can move on to actually installing the mod. First, make sure you have your GD open in a file explorer. Again the GD can be identified by having a subdirectory called SlimeRancher_Data. Next, open the directory containing the downloaded mod zip archive (probably Downloads). Copy or move the zip into the GD, not into SlimeRancher_Data or another folder inside of the GD, but the GD itself. Now that the zip archive is in place, extract it by right-clicking and selecting ‘extract here’. It should ask to replace a file in SlimeRancher_Data, if it does then select yes, if it doesn’t then you have extracted it to the wrong directory or you just need to move it out of a folder first. Once extracted correctly, it should have replaced a file in SlimeRancher_Data and created a new folder called Mods (do not put other mods in here). That’s it! Now move on to step 3.
 </details>
 
 <details>
-<summary>3. Verifying the install</summary>
+<summary>:three:. Verifying the install</summary>
 Now to test if everything has installed correctly. Start the game from your launcher and wait for it to load. If installed correctly a console window will also open that probably takes focus from the game. Do not panic, this is a feature and the game is still running in another window. Once in the main menu, you should see a gray box in the top-right. If you do, you did everything correctly. If you don’t, try pressing f4 and if it still doesn’t show up then you did something wrong, go back. Now that you have the mod installed correctly, you can enter a username in the gray box, it can be anything and will be the name shown in-game. Now that the mod is installed and working you can move on to using the mod.
 </details>
 
-### Linux
+### :penguin: Linux
 
 <!-- Unless someone else does it, I will update this section to be a lot more detailed and easier to understand in the future. -->
 
 <details>
 <summary>TL;DR</summary>
-Find the game installation directory, extract the downloaded zip file into that directory replacing files inside. Done.
+Get Slime Rancher to run without the mod first. Find the game directory, extract the downloaded zip file into that directory. You should be prompted if you want to replace some files. Click yes. Done.
 
 ![smrpInstallShortLinux](./screenshots/srmp-install-short-linux.jpg)
 
 </details>
 
 <details>
-<summary>1. Getting the game to run</summary>
+<summary>:one:. Getting the game to run</summary>
 In case you haven't already, it is strongly recommended to get the game running properly without issues before moving on to modding. I won't go into detail on how to do that here, but if you have it on steam        then use proton. If you have it on Epic Games or GoG then use Lutris, Heroic Games Launcher or a similar solution. Tweak until it runs properly.
 </details>
 
 <details>
-<summary>2. Finding the game installation directory</summary>
+<summary>:two:. Finding the game directory</summary>
 
 ![srmpInstallIdentifyGID](./screenshots/srmp-install-identify-gid.jpg)
 
@@ -284,20 +287,20 @@ You know it's the correct directory if it contains another directory called "Sli
 </details>
 
 <details>
-<summary>3. Installing the mod</summary>
+<summary>:three:. Installing the mod</summary>
 
 ![srmpInstallBigLinux](./screenshots/srmp-intall-big-linux.jpg)
 
-Once you know the GID (game installation directory) of your game you can move on to actually installing the mod. First up, make sure you have your GID open in a file explorer. Again the GID can be identified by having a subdirectory called SlimeRancher_Data. Next, open the directory containing the downloaded mod zip archive (probably Downloads). Copy or move the zip into the GID, not into SlimeRancher_Data or another folder inside of the GID, but the GID itself. Now that the zip archive is in place, extract it into this directory. It should ask to replace a file in SlimeRancher_Data, if it does then select yes, if it doesn’t then you have extracted it to the wrong directory or you just need to move it out of a folder first. Once extracted correctly, it should have replaced a file in SlimeRancher_Data and created a new folder called Mods (do not put other mods in here). That’s it! Now move on to step 4.
+Once you know the GD (game directory) of your game you can move on to actually installing the mod. First, make sure you have your GD open in a file explorer. Again the GD can be identified by having a subdirectory called SlimeRancher_Data. Next, open the directory containing the downloaded mod zip archive (probably Downloads). Copy or move the zip into the GD, not into SlimeRancher_Data or another folder inside of the GD, but the GD itself. Now that the zip archive is in place, extract it into this directory. You should be prompted to replace a file in SlimeRancher_Data, if it does then select yes, if it doesn’t then you have extracted it to the wrong directory or you just need to move it out of a folder first. Once extracted correctly, it should have replaced a file in SlimeRancher_Data and created a new folder called Mods (do not put other mods in here). That’s it! Now move on to step 4.
 
 </details>
 
 <details>
-<summary>4. Verifying the install</summary>
+<summary>:four:. Verifying the install</summary>
 Now to test if everything has installed correctly. Start the game from your launcher and wait for it to load. If installed correctly a console window will also open that probably takes focus from the game. Do not panic, this is a feature and the game is still running in another window. Once in the main menu, you should see a gray box in the top-right. If you do, you did everything correctly. If you don’t, try pressing f4 and if it still doesn’t show up then you did something wrong, go back. Now that you have the mod installed correctly, you can enter a username in the gray box, it can be anything and will be the name shown in-game. Now that the mod is installed and working you can move on to using the mod.
 </details>
 
-### Mac
+### :apple: Mac
 
 As I (zervó) have never touched a Mac in my life, I have no idea how this works. Please update on this section.
 
@@ -309,7 +312,7 @@ As I (zervó) have never touched a Mac in my life, I have no idea how this works
 
 Since this mod is all about multiplayer, here are some instructions for playing togheter. There are 4 main methods to choose from: Server Codes, Playing over LAN, Playing over “fake” LAN (VPN), and Playing over the Internet (port forwarding). The options are ranked below from easiest to hardest.
 
-All four methods except server codes have a few things in common. First, make sure to choose a username if you haven’t already, this can be anything and will be the name shown in-game. Second, all three methods use some combination of IP address and port to host and join. An Ipv4 address which is the type you will most likely be using, looks like this: xxx.xxx.xxx.xxx, with x being numbers. Common ones for private IPs (local networks) are 192.168.x.xxx and 10.10.x.xxx. EG 192.168.1.43, 192.168.68.26 or 10.10.1.107. Public IPs (external/WAN connections) usually have completely different numbers but the structure is the same. The port is a combination of 5 numbers, which the host can find once they are in a loaded save.
+All four methods except server codes have a few things in common. First, make sure to choose a username if you haven’t already, this can be anything and will be the name shown in-game. Second, all three methods use some combination of IP address and port to host and join. An IPV4 address which is the type you will most likely be using, looks like this: xxx.xxx.xxx.xxx, with x being numbers. Common ones for private IPs (local networks) are 192.168.x.xxx and 10.10.x.xxx. EG 192.168.1.43, 192.168.68.26 or 10.10.1.107. Public IPs (external/WAN connections) usually have completely different numbers but the structure is the same. The port is a combination of 5 numbers, which the host can find once they are in a loaded save.
 
 Note down the port before attempting any of the methods, or use a method with a port that you choose and change the port in the game later.
 
@@ -351,7 +354,7 @@ If you aren’t on the same network then there is still a pretty simple way to d
 The third and most advanced option is port forwarding, but it is also the one giving the best results if all players aren’t on the same network. There are two ways to port forward: via your router’s admin interface or through a UPnP portmapping client. The second one is easiest and most convenient, but not all routers support it, it could also pose a potential security risk. I would recommend trying UPnP first as it is pretty easy with the client I will be using, and try to do it via the admin interface if UPnP doesn’t work. Using a UPnP client doesn't make the security problems with UPnP bigger, because if it works then it is already enabled in your router which means the security flaws are already present.
 
 <details>
-<summary>Option 1: Via the router's admin interface</summary>
+<summary>Option 1: Via the router's web interface</summary>
     
 This method of port forwarding is the most complicated of the two, to be honest the UPnP client I used in those instructions isn’t even complicated at all so try that one first if you haven’t already. Now, to get started with this method you need login credentials for your router. They are usually found on a sticker on the back of the router. There might be one for wifi credentials and one for admin credentials so doublecheck that you have the right one. If you are lucky there is a default address listed on the sticker as well (usually called “internal address” or just “ipv4 address”) that will save you some time by skipping the next part of the instruction, finding your router’s local ip.
 
@@ -380,11 +383,11 @@ Open System Preferences, navigate to Network > Advanced > TCP/IP, and find the I
 </details>
 ‎
 
-Now that you have the IP of your router, open a web browser and put it into the address field (do not search for it, enter it as an address). It should open a webpage, if it doesn’t and just searches instead, put http:// in front of the address. Now log in with the credentials you found earlier, some routers display a default status page and requires you to press something before showing the login prompt.
+Now that you have the IP of your router, open a web browser and put it into the address field (do not search for it, enter it as an address). It should open a webpage, if it doesn’t and just searches instead, put http:// in front of the address. Now log in with the credentials you found earlier. Note that some routers display a default status page and requires you to press something before showing the login prompt.
 
 ![srmpUseHostPortforwardLogin](./screenshots/srmp-use-host-portforward-login.jpg)
 
-Once you are logged in try to find the port forwarding section, for me it was under “NAT/QoS”. It will look a little different on every router. Add a new rule.
+Once you are logged in try to find the port forwarding section, it might be labeled something like "NAT" or just "Port Forward". It will look a little bit different on every router. Add a new rule.
 
 ![srmpUseHostPortforwardAdd](./screenshots/srmp-use-host-portforward-add.jpg)
 
@@ -497,6 +500,7 @@ This window can be quite handy for debugging, and can also be used to enter comm
 | tp [(TargetPlayer)] [DestinationPlayer] |        teleports target to dest player        |      Unknown       |
 | listplayers                             |     prints current players to the console     |      Unknown       |
 | sleep [hours]                           |        fastforward given in-game hours        |      Unknown       |
+| console [enable/disable] [type]         | enable/disable console logging of given type  |      Unknown       |    
 
 ## Troubleshooting
 
@@ -506,7 +510,7 @@ Here is a bunch of scenarios where some things with the mod might not work for d
 
 <details>
 <summary>Players are invisible</summary>
-If you are using Hamachi, Radmin or a similar solution then this is likely caused by rate limiting. The mod uses a lot of network traffic, especially when loading. One solution you could try is to disable encryption in Hamachi or whatever solution you are using, or if possible changing/removing any limits. If it doesn’t help immediately then wait a bit. If you have waited for a while and nothing has changed then you probably want to use another method in [using the mod](#using-the-mod). If you have tried everything up to port forwarding and it still doesn’t work then there is something on your network limiting your connection or your network/internet connection is just slow. Try to let someone else be the host.
+If you are using Hamachi, Radmin or a similar solution then this is likely caused by rate limiting. The mod uses a lot of network traffic, especially when loading. One solution you could try is to disable encryption in Hamachi or whatever solution you are using, or if possible changing/removing any limits. If it doesn’t help immediately then wait a bit. If you have waited for a while and nothing has changed then you probably want to use another method described in [using the mod](#using-the-mod). If you have tried everything up to port forwarding and it still doesn’t work then there is something on your network limiting your connection or your network/internet connection is just slow. Try letting someone else host.
 </details>
 
 <details>
@@ -523,6 +527,8 @@ This bug should be fixed in version 1510 and upward thanks to [Twirlbug](https:/
 <summary>DLC Mismatch</summary>
 This is a common connection error caused by players not having the same DLC activated. This can be solved by deactivating all DLCs or all players getting the same DLCs.
 If all players have the same dlc or if they are all deactivated, this can also be solved by going in to the "Manage DLC" menu before hosting/joining.
+
+You can also disable DLC check in the userdata.json file found in the SRMP directory.
 </details>
 
 <details>
@@ -560,4 +566,4 @@ Contact me if you need help with the manual or just the mod in general.
 
 The mod was created by the amazing [Saty](https://github.com/SatyPardus), she has done an outstanding job and deserves some recognition. Thank you Saty!
 
-The mod is currently maintainted by [Twirlbug](https://github.com/Twirlbug), thank you Twirlbug for picking up development on this mod!
+The mod was further worked on by [Twirlbug](https://github.com/Twirlbug), who helped with bugfixes. Thank you Twirlbug for the continued development on this mod!