diff --git a/Torch.API/Torch.API.csproj b/Torch.API/Torch.API.csproj index 63f8766..a35db6d 100644 --- a/Torch.API/Torch.API.csproj +++ b/Torch.API/Torch.API.csproj @@ -18,7 +18,7 @@ - + runtime diff --git a/Torch.API/packages.lock.json b/Torch.API/packages.lock.json index 0ce908a..ab90ed4 100644 --- a/Torch.API/packages.lock.json +++ b/Torch.API/packages.lock.json @@ -54,9 +54,9 @@ }, "SpaceEngineersDedicated.ReferenceAssemblies": { "type": "Direct", - "requested": "[1.204.18, )", - "resolved": "1.204.18", - "contentHash": "GT7/9CBMx4jjor41zLOOl87YYM/JdJD8xp9ccXyuhP2oUaz25H3ZmCQuGeAuZNENKru1a/7hZrId4PwlMDGoew==", + "requested": "[1.*, )", + "resolved": "1.205.23", + "contentHash": "J7mF5hY39PzzCZps6vhIRzKiq8vD6Af9TgumTJR068vjEi+BzyeEFhqX+cl2Dd1ngOmsBtGWc5m+vxgTfs5YuA==", "dependencies": { "SharpDX": "4.2.0-keen-cringe", "protobuf-net": "1.0.0" diff --git a/Torch.Server.Tests/packages.lock.json b/Torch.Server.Tests/packages.lock.json index 748361d..5836dbe 100644 --- a/Torch.Server.Tests/packages.lock.json +++ b/Torch.Server.Tests/packages.lock.json @@ -468,8 +468,8 @@ }, "SpaceEngineersDedicated.ReferenceAssemblies": { "type": "Transitive", - "resolved": "1.204.18", - "contentHash": "GT7/9CBMx4jjor41zLOOl87YYM/JdJD8xp9ccXyuhP2oUaz25H3ZmCQuGeAuZNENKru1a/7hZrId4PwlMDGoew==", + "resolved": "1.205.23", + "contentHash": "J7mF5hY39PzzCZps6vhIRzKiq8vD6Af9TgumTJR068vjEi+BzyeEFhqX+cl2Dd1ngOmsBtGWc5m+vxgTfs5YuA==", "dependencies": { "SharpDX": "4.2.0-keen-cringe", "protobuf-net": "1.0.0" @@ -630,7 +630,7 @@ "NuGet.Commands": "[6.11.0, )", "NuGet.DependencyResolver.Core": "[6.11.0, )", "SemanticVersioning": "[2.0.2, )", - "SpaceEngineersDedicated.ReferenceAssemblies": "[1.204.18, )", + "SpaceEngineersDedicated.ReferenceAssemblies": "[1.*, )", "System.Linq.Async": "[6.0.1, )" } }, diff --git a/Torch.Server/packages.lock.json b/Torch.Server/packages.lock.json index e202cf6..89a3d7c 100644 --- a/Torch.Server/packages.lock.json +++ b/Torch.Server/packages.lock.json @@ -472,8 +472,8 @@ }, "SpaceEngineersDedicated.ReferenceAssemblies": { "type": "Transitive", - "resolved": "1.204.18", - "contentHash": "GT7/9CBMx4jjor41zLOOl87YYM/JdJD8xp9ccXyuhP2oUaz25H3ZmCQuGeAuZNENKru1a/7hZrId4PwlMDGoew==", + "resolved": "1.205.23", + "contentHash": "J7mF5hY39PzzCZps6vhIRzKiq8vD6Af9TgumTJR068vjEi+BzyeEFhqX+cl2Dd1ngOmsBtGWc5m+vxgTfs5YuA==", "dependencies": { "SharpDX": "4.2.0-keen-cringe", "protobuf-net": "1.0.0" @@ -581,7 +581,7 @@ "NuGet.Commands": "[6.11.0, )", "NuGet.DependencyResolver.Core": "[6.11.0, )", "SemanticVersioning": "[2.0.2, )", - "SpaceEngineersDedicated.ReferenceAssemblies": "[1.204.18, )", + "SpaceEngineersDedicated.ReferenceAssemblies": "[1.*, )", "System.Linq.Async": "[6.0.1, )" } } diff --git a/Torch.Tests/packages.lock.json b/Torch.Tests/packages.lock.json index 9777740..6125631 100644 --- a/Torch.Tests/packages.lock.json +++ b/Torch.Tests/packages.lock.json @@ -313,8 +313,8 @@ }, "SpaceEngineersDedicated.ReferenceAssemblies": { "type": "Transitive", - "resolved": "1.204.18", - "contentHash": "GT7/9CBMx4jjor41zLOOl87YYM/JdJD8xp9ccXyuhP2oUaz25H3ZmCQuGeAuZNENKru1a/7hZrId4PwlMDGoew==", + "resolved": "1.205.23", + "contentHash": "J7mF5hY39PzzCZps6vhIRzKiq8vD6Af9TgumTJR068vjEi+BzyeEFhqX+cl2Dd1ngOmsBtGWc5m+vxgTfs5YuA==", "dependencies": { "SharpDX": "4.2.0-keen-cringe", "protobuf-net": "1.0.0" @@ -454,7 +454,7 @@ "NuGet.Commands": "[6.11.0, )", "NuGet.DependencyResolver.Core": "[6.11.0, )", "SemanticVersioning": "[2.0.2, )", - "SpaceEngineersDedicated.ReferenceAssemblies": "[1.204.18, )", + "SpaceEngineersDedicated.ReferenceAssemblies": "[1.*, )", "System.Linq.Async": "[6.0.1, )" } } diff --git a/Torch/Managers/ChatManager/ChatManagerClient.cs b/Torch/Managers/ChatManager/ChatManagerClient.cs index cb0d65d..3888562 100644 --- a/Torch/Managers/ChatManager/ChatManagerClient.cs +++ b/Torch/Managers/ChatManager/ChatManagerClient.cs @@ -10,6 +10,7 @@ using Torch.API; using Torch.API.Managers; using Torch.Utils; using VRage.Game; +using VRage.GameServices; using Color = VRageMath.Color; namespace Torch.Managers.ChatManager @@ -76,7 +77,7 @@ namespace Torch.Managers.ChatManager _chatMessageRecievedReplacer = _chatMessageReceivedFactory.Invoke(); _scriptedChatMessageRecievedReplacer = _scriptedChatMessageReceivedFactory.Invoke(); _chatMessageRecievedReplacer.Replace( - new Action(Multiplayer_ChatMessageReceived), + new Action(Multiplayer_ChatMessageReceived), MyMultiplayer.Static); _scriptedChatMessageRecievedReplacer.Replace( new Action(Multiplayer_ScriptedChatMessageReceived), @@ -133,14 +134,14 @@ namespace Torch.Managers.ChatManager } - private void Multiplayer_ChatMessageReceived(ulong steamUserId, string messageText, ChatChannel channel, long targetId, string customAuthorName, ulong? customSenderId = null) + private void Multiplayer_ChatMessageReceived(ulong steamUserId, string messageText, ChatChannel channel, long targetId, ChatMessageCustomData? customData ) { #pragma warning disable CS0612 var torchMsg = new TorchChatMessage(steamUserId, messageText, channel, targetId, #pragma warning restore CS0612 (steamUserId == MyGameService.UserId) ? MyFontEnum.DarkBlue : MyFontEnum.Blue); if (!RaiseMessageRecieved(torchMsg) && HasHud) - _hudChatMessageReceived.Invoke(MyHud.Chat, steamUserId, messageText, channel, targetId, customAuthorName, customSenderId); + _hudChatMessageReceived.Invoke(MyHud.Chat, steamUserId, messageText, channel, targetId, customData); } private void Multiplayer_ScriptedChatMessageReceived(string message, string author, string font, Color color) @@ -165,7 +166,7 @@ namespace Torch.Managers.ChatManager protected static bool HasHud => !Sandbox.Engine.Platform.Game.IsDedicated; [ReflectedMethod(Name = _hudChatMessageReceivedName)] - private static Action _hudChatMessageReceived = null!; + private static Action _hudChatMessageReceived = null!; [ReflectedMethod(Name = _hudChatScriptedMessageReceivedName)] private static Action _hudChatScriptedMessageReceived = null!; diff --git a/Torch/packages.lock.json b/Torch/packages.lock.json index 384cb14..e3ce0bd 100644 --- a/Torch/packages.lock.json +++ b/Torch/packages.lock.json @@ -314,8 +314,8 @@ }, "SpaceEngineersDedicated.ReferenceAssemblies": { "type": "Transitive", - "resolved": "1.204.18", - "contentHash": "GT7/9CBMx4jjor41zLOOl87YYM/JdJD8xp9ccXyuhP2oUaz25H3ZmCQuGeAuZNENKru1a/7hZrId4PwlMDGoew==", + "resolved": "1.205.23", + "contentHash": "J7mF5hY39PzzCZps6vhIRzKiq8vD6Af9TgumTJR068vjEi+BzyeEFhqX+cl2Dd1ngOmsBtGWc5m+vxgTfs5YuA==", "dependencies": { "SharpDX": "4.2.0-keen-cringe", "protobuf-net": "1.0.0" @@ -387,7 +387,7 @@ "NuGet.Commands": "[6.11.0, )", "NuGet.DependencyResolver.Core": "[6.11.0, )", "SemanticVersioning": "[2.0.2, )", - "SpaceEngineersDedicated.ReferenceAssemblies": "[1.204.18, )", + "SpaceEngineersDedicated.ReferenceAssemblies": "[1.*, )", "System.Linq.Async": "[6.0.1, )" } }