diff --git a/Assets/Mirror/Core/Mirror.asmdef b/Assets/Mirror/Core/Mirror.asmdef index 59e32aa54..2fa8d9522 100644 --- a/Assets/Mirror/Core/Mirror.asmdef +++ b/Assets/Mirror/Core/Mirror.asmdef @@ -2,9 +2,7 @@ "name": "Mirror", "rootNamespace": "", "references": [ - "GUID:325984b52e4128546bc7558552f8b1d2", - "GUID:725ee7191c021de4dbf9269590ded755", - "GUID:6806a62c384838046a3c66c44f06d75f" + "GUID:325984b52e4128546bc7558552f8b1d2" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/Mirror/Examples/Mirror.Examples.asmdef b/Assets/Mirror/Examples/Mirror.Examples.asmdef index 108d8714f..f00c85cbe 100644 --- a/Assets/Mirror/Examples/Mirror.Examples.asmdef +++ b/Assets/Mirror/Examples/Mirror.Examples.asmdef @@ -4,6 +4,7 @@ "references": [ "GUID:30817c1a0e6d646d99c048fc403f5979", "GUID:72872094b21c16e48b631b2224833d49", + "GUID:627104647b9c04b4ebb8978a92ecac63", "GUID:6055be8ebefd69e48b49212b09b47b2f" ], "includePlatforms": [], diff --git a/Assets/Mirror/Tests/Editor/Mirror.Tests.asmdef b/Assets/Mirror/Tests/Editor/Mirror.Tests.asmdef index 7de8a9517..8119b58aa 100644 --- a/Assets/Mirror/Tests/Editor/Mirror.Tests.asmdef +++ b/Assets/Mirror/Tests/Editor/Mirror.Tests.asmdef @@ -6,13 +6,11 @@ "GUID:1c7c33eb5480dd24c9e29a8250c1a775", "GUID:72872094b21c16e48b631b2224833d49", "GUID:4e9aca8a359ab48de906aedbfa1ffe21", - "GUID:725ee7191c021de4dbf9269590ded755", "GUID:27619889b8ba8c24980f49ee34dbb44a", "GUID:0acc523941302664db1f4e527237feb3", "GUID:1d0b9d21c3ff546a4aa32399dfd33474", "GUID:4887344a35d890449b35f8b1b0a3355a", - "GUID:e1cda8afe30f847fe8b40485b4768089", - "GUID:513aba84521ba40b697b5aac9ecd91fc" + "GUID:627104647b9c04b4ebb8978a92ecac63" ], "includePlatforms": [ "Editor" @@ -23,7 +21,6 @@ "precompiledReferences": [ "NSubstitute.dll", "Castle.Core.dll", - "System.Threading.Tasks.Extensions.dll", "Mono.CecilX.dll", "nunit.framework.dll" ], diff --git a/Assets/Mirror/Transports/KCP/MirrorTransport/KcpTransport.cs b/Assets/Mirror/Transports/KCP/KcpTransport.cs similarity index 100% rename from Assets/Mirror/Transports/KCP/MirrorTransport/KcpTransport.cs rename to Assets/Mirror/Transports/KCP/KcpTransport.cs diff --git a/Assets/Mirror/Transports/KCP/MirrorTransport/KcpTransport.cs.meta b/Assets/Mirror/Transports/KCP/KcpTransport.cs.meta similarity index 100% rename from Assets/Mirror/Transports/KCP/MirrorTransport/KcpTransport.cs.meta rename to Assets/Mirror/Transports/KCP/KcpTransport.cs.meta diff --git a/Assets/Mirror/Transports/KCP/kcp2k/KCP.asmdef b/Assets/Mirror/Transports/KCP/kcp2k/KCP.asmdef index 0fef91e42..66d214807 100644 --- a/Assets/Mirror/Transports/KCP/kcp2k/KCP.asmdef +++ b/Assets/Mirror/Transports/KCP/kcp2k/KCP.asmdef @@ -1,7 +1,9 @@ { "name": "kcp2k", "rootNamespace": "", - "references": [], + "references": [ + "GUID:30817c1a0e6d646d99c048fc403f5979" + ], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": true, diff --git a/Assets/Mirror/Transports/Middleware/MiddlewareTransport.asmdef b/Assets/Mirror/Transports/Middleware/MiddlewareTransport.asmdef deleted file mode 100644 index 2a44354e8..000000000 --- a/Assets/Mirror/Transports/Middleware/MiddlewareTransport.asmdef +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "MiddlewareTransport", - "rootNamespace": "", - "references": [ - "GUID:30817c1a0e6d646d99c048fc403f5979" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/Assets/Mirror/Transports/Middleware/MiddlewareTransport.asmdef.meta b/Assets/Mirror/Transports/Middleware/MiddlewareTransport.asmdef.meta deleted file mode 100644 index a6025a198..000000000 --- a/Assets/Mirror/Transports/Middleware/MiddlewareTransport.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 513aba84521ba40b697b5aac9ecd91fc -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Mirror/Transports/Multiplex/MultiplexTransport.asmdef b/Assets/Mirror/Transports/Multiplex/MultiplexTransport.asmdef deleted file mode 100644 index cb24d0dd0..000000000 --- a/Assets/Mirror/Transports/Multiplex/MultiplexTransport.asmdef +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "MultiplexTransport", - "rootNamespace": "", - "references": [ - "GUID:30817c1a0e6d646d99c048fc403f5979" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/Assets/Mirror/Transports/Multiplex/MultiplexTransport.asmdef.meta b/Assets/Mirror/Transports/Multiplex/MultiplexTransport.asmdef.meta deleted file mode 100644 index bc300a4f0..000000000 --- a/Assets/Mirror/Transports/Multiplex/MultiplexTransport.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: e1cda8afe30f847fe8b40485b4768089 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Mirror/Transports/KCP/MirrorTransport.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb.meta similarity index 77% rename from Assets/Mirror/Transports/KCP/MirrorTransport.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb.meta index dedea2fb5..c2852a840 100644 --- a/Assets/Mirror/Transports/KCP/MirrorTransport.meta +++ b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7bdb797750d0a490684410110bf48192 +guid: 8ae237a052b29fc4b8d000f48e545bb7 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Mirror/Transports/SimpleWeb/AssemblyInfo.cs b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/AssemblyInfo.cs similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/AssemblyInfo.cs rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/AssemblyInfo.cs diff --git a/Assets/Mirror/Transports/SimpleWeb/AssemblyInfo.cs.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/AssemblyInfo.cs.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/AssemblyInfo.cs.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/AssemblyInfo.cs.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/CHANGELOG.md b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/CHANGELOG.md similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/CHANGELOG.md rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/CHANGELOG.md diff --git a/Assets/Mirror/Transports/SimpleWeb/CHANGELOG.md.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/CHANGELOG.md.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/CHANGELOG.md.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/CHANGELOG.md.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/Client.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Client.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/Client/SimpleWebClient.cs b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/SimpleWebClient.cs similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Client/SimpleWebClient.cs rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/SimpleWebClient.cs diff --git a/Assets/Mirror/Transports/SimpleWeb/Client/SimpleWebClient.cs.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/SimpleWebClient.cs.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Client/SimpleWebClient.cs.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/SimpleWebClient.cs.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/Client/StandAlone.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/StandAlone.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Client/StandAlone.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/StandAlone.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/Client/StandAlone/ClientHandshake.cs b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/StandAlone/ClientHandshake.cs similarity index 90% rename from Assets/Mirror/Transports/SimpleWeb/Client/StandAlone/ClientHandshake.cs rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/StandAlone/ClientHandshake.cs index a48b21c1b..7f01a1698 100644 --- a/Assets/Mirror/Transports/SimpleWeb/Client/StandAlone/ClientHandshake.cs +++ b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/StandAlone/ClientHandshake.cs @@ -57,9 +57,18 @@ public bool TryHandshake(Connection conn, Uri uri) } string responseString = Encoding.ASCII.GetString(responseBuffer, 0, lengthOrNull.Value); + Log.Verbose($"[SimpleWebTransport] Handshake Response {responseString}"); string acceptHeader = "Sec-WebSocket-Accept: "; int startIndex = responseString.IndexOf(acceptHeader, StringComparison.InvariantCultureIgnoreCase) + acceptHeader.Length; + + if (startIndex < 0) + { + Log.Error($"[SimpleWebTransport] Unexpected Handshake Response {responseString}"); + return false; + } + + startIndex += acceptHeader.Length; int endIndex = responseString.IndexOf("\r\n", startIndex); string responseKey = responseString.Substring(startIndex, endIndex - startIndex); diff --git a/Assets/Mirror/Transports/SimpleWeb/Client/StandAlone/ClientHandshake.cs.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/StandAlone/ClientHandshake.cs.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Client/StandAlone/ClientHandshake.cs.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/StandAlone/ClientHandshake.cs.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/Client/StandAlone/ClientSslHelper.cs b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/StandAlone/ClientSslHelper.cs similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Client/StandAlone/ClientSslHelper.cs rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/StandAlone/ClientSslHelper.cs diff --git a/Assets/Mirror/Transports/SimpleWeb/Client/StandAlone/ClientSslHelper.cs.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/StandAlone/ClientSslHelper.cs.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Client/StandAlone/ClientSslHelper.cs.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/StandAlone/ClientSslHelper.cs.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/Client/StandAlone/WebSocketClientStandAlone.cs b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/StandAlone/WebSocketClientStandAlone.cs similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Client/StandAlone/WebSocketClientStandAlone.cs rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/StandAlone/WebSocketClientStandAlone.cs diff --git a/Assets/Mirror/Transports/SimpleWeb/Client/StandAlone/WebSocketClientStandAlone.cs.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/StandAlone/WebSocketClientStandAlone.cs.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Client/StandAlone/WebSocketClientStandAlone.cs.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/StandAlone/WebSocketClientStandAlone.cs.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/Client/Webgl.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/Webgl.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Client/Webgl.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/Webgl.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/Client/Webgl/SimpleWebJSLib.cs b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/Webgl/SimpleWebJSLib.cs similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Client/Webgl/SimpleWebJSLib.cs rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/Webgl/SimpleWebJSLib.cs diff --git a/Assets/Mirror/Transports/SimpleWeb/Client/Webgl/SimpleWebJSLib.cs.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/Webgl/SimpleWebJSLib.cs.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Client/Webgl/SimpleWebJSLib.cs.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/Webgl/SimpleWebJSLib.cs.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/Client/Webgl/WebSocketClientWebGl.cs b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/Webgl/WebSocketClientWebGl.cs similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Client/Webgl/WebSocketClientWebGl.cs rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/Webgl/WebSocketClientWebGl.cs diff --git a/Assets/Mirror/Transports/SimpleWeb/Client/Webgl/WebSocketClientWebGl.cs.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/Webgl/WebSocketClientWebGl.cs.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Client/Webgl/WebSocketClientWebGl.cs.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/Webgl/WebSocketClientWebGl.cs.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/Client/Webgl/plugin.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/Webgl/plugin.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Client/Webgl/plugin.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/Webgl/plugin.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/Client/Webgl/plugin/SimpleWeb.jslib b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/Webgl/plugin/SimpleWeb.jslib similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Client/Webgl/plugin/SimpleWeb.jslib rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/Webgl/plugin/SimpleWeb.jslib diff --git a/Assets/Mirror/Transports/SimpleWeb/Client/Webgl/plugin/SimpleWeb.jslib.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/Webgl/plugin/SimpleWeb.jslib.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Client/Webgl/plugin/SimpleWeb.jslib.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/Webgl/plugin/SimpleWeb.jslib.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/Common.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Common.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/Common/BufferPool.cs b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/BufferPool.cs similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Common/BufferPool.cs rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/BufferPool.cs diff --git a/Assets/Mirror/Transports/SimpleWeb/Common/BufferPool.cs.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/BufferPool.cs.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Common/BufferPool.cs.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/BufferPool.cs.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/Common/Connection.cs b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/Connection.cs similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Common/Connection.cs rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/Connection.cs diff --git a/Assets/Mirror/Transports/SimpleWeb/Common/Connection.cs.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/Connection.cs.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Common/Connection.cs.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/Connection.cs.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/Common/Constants.cs b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/Constants.cs similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Common/Constants.cs rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/Constants.cs diff --git a/Assets/Mirror/Transports/SimpleWeb/Common/Constants.cs.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/Constants.cs.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Common/Constants.cs.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/Constants.cs.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/Common/EventType.cs b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/EventType.cs similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Common/EventType.cs rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/EventType.cs diff --git a/Assets/Mirror/Transports/SimpleWeb/Common/EventType.cs.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/EventType.cs.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Common/EventType.cs.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/EventType.cs.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/Common/Log.cs b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/Log.cs similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Common/Log.cs rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/Log.cs diff --git a/Assets/Mirror/Transports/SimpleWeb/Common/Log.cs.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/Log.cs.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Common/Log.cs.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/Log.cs.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/Common/Message.cs b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/Message.cs similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Common/Message.cs rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/Message.cs diff --git a/Assets/Mirror/Transports/SimpleWeb/Common/Message.cs.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/Message.cs.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Common/Message.cs.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/Message.cs.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/Common/MessageProcessor.cs b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/MessageProcessor.cs similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Common/MessageProcessor.cs rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/MessageProcessor.cs diff --git a/Assets/Mirror/Transports/SimpleWeb/Common/MessageProcessor.cs.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/MessageProcessor.cs.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Common/MessageProcessor.cs.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/MessageProcessor.cs.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/Common/ReadHelper.cs b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/ReadHelper.cs similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Common/ReadHelper.cs rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/ReadHelper.cs diff --git a/Assets/Mirror/Transports/SimpleWeb/Common/ReadHelper.cs.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/ReadHelper.cs.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Common/ReadHelper.cs.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/ReadHelper.cs.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/Common/ReceiveLoop.cs b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/ReceiveLoop.cs similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Common/ReceiveLoop.cs rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/ReceiveLoop.cs diff --git a/Assets/Mirror/Transports/SimpleWeb/Common/ReceiveLoop.cs.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/ReceiveLoop.cs.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Common/ReceiveLoop.cs.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/ReceiveLoop.cs.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/Common/SendLoop.cs b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/SendLoop.cs similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Common/SendLoop.cs rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/SendLoop.cs diff --git a/Assets/Mirror/Transports/SimpleWeb/Common/SendLoop.cs.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/SendLoop.cs.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Common/SendLoop.cs.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/SendLoop.cs.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/Common/TcpConfig.cs b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/TcpConfig.cs similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Common/TcpConfig.cs rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/TcpConfig.cs diff --git a/Assets/Mirror/Transports/SimpleWeb/Common/TcpConfig.cs.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/TcpConfig.cs.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Common/TcpConfig.cs.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/TcpConfig.cs.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/Common/Utils.cs b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/Utils.cs similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Common/Utils.cs rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/Utils.cs diff --git a/Assets/Mirror/Transports/SimpleWeb/Common/Utils.cs.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/Utils.cs.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Common/Utils.cs.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/Utils.cs.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/LICENSE b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/LICENSE similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/LICENSE rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/LICENSE diff --git a/Assets/Mirror/Transports/SimpleWeb/LICENSE.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/LICENSE.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/LICENSE.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/LICENSE.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/README.txt b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/README.txt similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/README.txt rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/README.txt diff --git a/Assets/Mirror/Transports/SimpleWeb/README.txt.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/README.txt.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/README.txt.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/README.txt.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/Server.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Server.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Server.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Server.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/Server/ServerHandshake.cs b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Server/ServerHandshake.cs similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Server/ServerHandshake.cs rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Server/ServerHandshake.cs diff --git a/Assets/Mirror/Transports/SimpleWeb/Server/ServerHandshake.cs.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Server/ServerHandshake.cs.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Server/ServerHandshake.cs.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Server/ServerHandshake.cs.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/Server/ServerSslHelper.cs b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Server/ServerSslHelper.cs similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Server/ServerSslHelper.cs rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Server/ServerSslHelper.cs diff --git a/Assets/Mirror/Transports/SimpleWeb/Server/ServerSslHelper.cs.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Server/ServerSslHelper.cs.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Server/ServerSslHelper.cs.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Server/ServerSslHelper.cs.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/Server/SimpleWebServer.cs b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Server/SimpleWebServer.cs similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Server/SimpleWebServer.cs rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Server/SimpleWebServer.cs diff --git a/Assets/Mirror/Transports/SimpleWeb/Server/SimpleWebServer.cs.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Server/SimpleWebServer.cs.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Server/SimpleWebServer.cs.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Server/SimpleWebServer.cs.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/Server/WebSocketServer.cs b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Server/WebSocketServer.cs similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Server/WebSocketServer.cs rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Server/WebSocketServer.cs diff --git a/Assets/Mirror/Transports/SimpleWeb/Server/WebSocketServer.cs.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Server/WebSocketServer.cs.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/Server/WebSocketServer.cs.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Server/WebSocketServer.cs.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/SimpleWebTransport.asmdef b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/SimpleWebTransport.asmdef similarity index 81% rename from Assets/Mirror/Transports/SimpleWeb/SimpleWebTransport.asmdef rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/SimpleWebTransport.asmdef index 18e77fd02..dfb91ea02 100644 --- a/Assets/Mirror/Transports/SimpleWeb/SimpleWebTransport.asmdef +++ b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/SimpleWebTransport.asmdef @@ -1,9 +1,7 @@ { "name": "SimpleWebTransport", "rootNamespace": "", - "references": [ - "GUID:30817c1a0e6d646d99c048fc403f5979" - ], + "references": [], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, diff --git a/Assets/Mirror/Transports/SimpleWeb/SimpleWebTransport.asmdef.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/SimpleWebTransport.asmdef.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/SimpleWebTransport.asmdef.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/SimpleWebTransport.asmdef.meta diff --git a/Assets/Mirror/Transports/SimpleWeb/SslConfigLoader.cs b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/SslConfigLoader.cs similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/SslConfigLoader.cs rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/SslConfigLoader.cs diff --git a/Assets/Mirror/Transports/SimpleWeb/SslConfigLoader.cs.meta b/Assets/Mirror/Transports/SimpleWeb/SimpleWeb/SslConfigLoader.cs.meta similarity index 100% rename from Assets/Mirror/Transports/SimpleWeb/SslConfigLoader.cs.meta rename to Assets/Mirror/Transports/SimpleWeb/SimpleWeb/SslConfigLoader.cs.meta