Merge feature/addTypedMethods into develop (#14)

* update data object and examples * add mapmarker methods * add teamchat * add getTeamInfo * add example * add getTime * partially add promoteToLeader * add strobe, toggle, setSubscription and more
HandyS11 · Jun 1, 2024 · 64cbedd · 64cbedd
1 parent f6d539d
commit 64cbedd
Show file tree

Hide file tree

Showing 69 changed files with 1,052 additions and 329 deletions.
diff --git a/RustPlusApi.sln b/RustPlusApi.sln
@@ -17,10 +17,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GetTeamInfo", "RustPlusApi\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GetTime", "RustPlusApi\Examples\GetTime\GetTime.csproj", "{E9F90342-34DE-4166-9769-483A3FA1F144}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SendTeamChat", "RustPlusApi\Examples\SendTeamChat\SendTeamChat.csproj", "{D70DD514-081F-4055-8779-6626DA96D18D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SetEntityValue", "RustPlusApi\Examples\SetEntityValue\SetEntityValue.csproj", "{4E5DCE64-A8E5-42C0-8786-EA1FF36CACE4}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GetMapMarkers", "RustPlusApi\Examples\GetMapMarkers\GetMapMarkers.csproj", "{DD34FAE8-30AA-4787-A6D1-77C330A0928F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RustPlusApi.Fcm", "RustPlusApi\RustPlusApi.Fcm\RustPlusApi.Fcm.csproj", "{CFDFB335-A783-4F82-8094-3ED14E3EBC49}"
@@ -85,11 +81,23 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SetSubscriptionLegacy", "Ru
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CheckSubscriptionLegacy", "RustPlusApi\Examples\Legacy\CheckSubscritionLegacy\CheckSubscriptionLegacy.csproj", "{846C0B38-B7F8-454C-9E3C-40DC15E0D390}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "__Events", "RustPlusApi\Examples\Legacy\__Events\__Events.csproj", "{630A388E-41EC-4AC1-9737-61759BA40164}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "__Events", "RustPlusApi\Examples\Legacy\__Events\__Events.csproj", "{630A388E-41EC-4AC1-9737-61759BA40164}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GetNexusAuthLegacy", "RustPlusApi\Examples\Legacy\GetNexusAuthLegacy\GetNexusAuthLegacy.csproj", "{54E876DD-3A7F-40B7-A46F-CADE857E70FC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SetClanMotdLegacy", "RustPlusApi\Examples\Legacy\SetClanMotdLegacy\SetClanMotdLegacy.csproj", "{5367015E-E15F-4A3A-BB23-55BAA8E0475E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CheckSubscription", "RustPlusApi\Examples\CheckSubscription\CheckSubscription.csproj", "{8B282E8C-56D7-4642-BF6C-42A286864FA1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SetSubscription", "RustPlusApi\Examples\SetSubscription\SetSubscription.csproj", "{C67205B9-6820-4D39-BB2F-874287492BCF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ToggleSmartSwitch", "RustPlusApi\Examples\ToggleSmartSwitch\ToggleSmartSwitch.csproj", "{3AF498AC-06D3-4B04-9A63-6205701C63D3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SetSmartSwitchValue", "RustPlusApi\Examples\SetSmartSwitchValue\SetSmartSwitchValue.csproj", "{9B61744E-51F4-4EBC-B42C-3EABE7CC7487}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GetNexusAuthLegacy", "RustPlusApi\Examples\Legacy\GetNexusAuthLegacy\GetNexusAuthLegacy.csproj", "{54E876DD-3A7F-40B7-A46F-CADE857E70FC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StrobeSmartSwitch", "RustPlusApi\Examples\StrobeSmartSwitch\StrobeSmartSwitch.csproj", "{EE0FE493-5230-485F-8D45-B5887FA50D86}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SetClanMotdLegacy", "RustPlusApi\Examples\Legacy\SetClanMotdLegacy\SetClanMotdLegacy.csproj", "{5367015E-E15F-4A3A-BB23-55BAA8E0475E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SendTeamMessage", "RustPlusApi\Examples\SendTeamMessage\SendTeamMessage.csproj", "{83CC5666-ABBF-4057-BCDA-66A6F1881A7E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -121,14 +129,6 @@ Global
 		{E9F90342-34DE-4166-9769-483A3FA1F144}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E9F90342-34DE-4166-9769-483A3FA1F144}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E9F90342-34DE-4166-9769-483A3FA1F144}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D70DD514-081F-4055-8779-6626DA96D18D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D70DD514-081F-4055-8779-6626DA96D18D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D70DD514-081F-4055-8779-6626DA96D18D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D70DD514-081F-4055-8779-6626DA96D18D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4E5DCE64-A8E5-42C0-8786-EA1FF36CACE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4E5DCE64-A8E5-42C0-8786-EA1FF36CACE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4E5DCE64-A8E5-42C0-8786-EA1FF36CACE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4E5DCE64-A8E5-42C0-8786-EA1FF36CACE4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DD34FAE8-30AA-4787-A6D1-77C330A0928F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DD34FAE8-30AA-4787-A6D1-77C330A0928F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DD34FAE8-30AA-4787-A6D1-77C330A0928F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -261,6 +261,30 @@ Global
 		{5367015E-E15F-4A3A-BB23-55BAA8E0475E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5367015E-E15F-4A3A-BB23-55BAA8E0475E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5367015E-E15F-4A3A-BB23-55BAA8E0475E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8B282E8C-56D7-4642-BF6C-42A286864FA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B282E8C-56D7-4642-BF6C-42A286864FA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B282E8C-56D7-4642-BF6C-42A286864FA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B282E8C-56D7-4642-BF6C-42A286864FA1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C67205B9-6820-4D39-BB2F-874287492BCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C67205B9-6820-4D39-BB2F-874287492BCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C67205B9-6820-4D39-BB2F-874287492BCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C67205B9-6820-4D39-BB2F-874287492BCF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3AF498AC-06D3-4B04-9A63-6205701C63D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3AF498AC-06D3-4B04-9A63-6205701C63D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3AF498AC-06D3-4B04-9A63-6205701C63D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3AF498AC-06D3-4B04-9A63-6205701C63D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9B61744E-51F4-4EBC-B42C-3EABE7CC7487}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B61744E-51F4-4EBC-B42C-3EABE7CC7487}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9B61744E-51F4-4EBC-B42C-3EABE7CC7487}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9B61744E-51F4-4EBC-B42C-3EABE7CC7487}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EE0FE493-5230-485F-8D45-B5887FA50D86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE0FE493-5230-485F-8D45-B5887FA50D86}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EE0FE493-5230-485F-8D45-B5887FA50D86}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EE0FE493-5230-485F-8D45-B5887FA50D86}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83CC5666-ABBF-4057-BCDA-66A6F1881A7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83CC5666-ABBF-4057-BCDA-66A6F1881A7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83CC5666-ABBF-4057-BCDA-66A6F1881A7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83CC5666-ABBF-4057-BCDA-66A6F1881A7E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -271,8 +295,6 @@ Global
 		{4E87360D-AC39-4475-957F-D49018DB2DC8} = {BC948ADE-1674-4955-B27C-F0E96100978E}
 		{70453D6E-9C19-41BC-8C96-0E20F919DB11} = {BC948ADE-1674-4955-B27C-F0E96100978E}
 		{E9F90342-34DE-4166-9769-483A3FA1F144} = {BC948ADE-1674-4955-B27C-F0E96100978E}
-		{D70DD514-081F-4055-8779-6626DA96D18D} = {BC948ADE-1674-4955-B27C-F0E96100978E}
-		{4E5DCE64-A8E5-42C0-8786-EA1FF36CACE4} = {BC948ADE-1674-4955-B27C-F0E96100978E}
 		{DD34FAE8-30AA-4787-A6D1-77C330A0928F} = {BC948ADE-1674-4955-B27C-F0E96100978E}
 		{A4EF8656-723B-4E2E-9457-57DCB24CB409} = {BC948ADE-1674-4955-B27C-F0E96100978E}
 		{FF9758F9-2500-4CE1-AACE-8C67134046F4} = {A4EF8656-723B-4E2E-9457-57DCB24CB409}
@@ -307,6 +329,12 @@ Global
 		{630A388E-41EC-4AC1-9737-61759BA40164} = {EBB661D0-93FF-4742-AF91-9036027CD136}
 		{54E876DD-3A7F-40B7-A46F-CADE857E70FC} = {EBB661D0-93FF-4742-AF91-9036027CD136}
 		{5367015E-E15F-4A3A-BB23-55BAA8E0475E} = {EBB661D0-93FF-4742-AF91-9036027CD136}
+		{8B282E8C-56D7-4642-BF6C-42A286864FA1} = {BC948ADE-1674-4955-B27C-F0E96100978E}
+		{C67205B9-6820-4D39-BB2F-874287492BCF} = {BC948ADE-1674-4955-B27C-F0E96100978E}
+		{3AF498AC-06D3-4B04-9A63-6205701C63D3} = {BC948ADE-1674-4955-B27C-F0E96100978E}
+		{9B61744E-51F4-4EBC-B42C-3EABE7CC7487} = {BC948ADE-1674-4955-B27C-F0E96100978E}
+		{EE0FE493-5230-485F-8D45-B5887FA50D86} = {BC948ADE-1674-4955-B27C-F0E96100978E}
+		{83CC5666-ABBF-4057-BCDA-66A6F1881A7E} = {BC948ADE-1674-4955-B27C-F0E96100978E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A4B4251F-ADA4-418D-95B5-27BA99A307A3}

diff --git a/RustPlusApi/Examples/CheckSubscription/CheckSubscription.csproj b/RustPlusApi/Examples/CheckSubscription/CheckSubscription.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net8.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
+
+    <ItemGroup>
+		<ProjectReference Include="..\..\RustPlusApi\RustPlusApi.csproj" />
+		<ProjectReference Include="..\__Constants\__Constants.csproj" />
+	</ItemGroup>
+
+</Project>
diff --git a/RustPlusApi/Examples/CheckSubscription/Program.cs b/RustPlusApi/Examples/CheckSubscription/Program.cs
@@ -0,0 +1,15 @@
+using Newtonsoft.Json;
+
+using RustPlusApi;
+
+using static __Constants.ExamplesConst;
+
+var rustPlus = new RustPlus(Ip, Port, PlayerId, PlayerToken);
+const uint alarmId = 0;
+
+await rustPlus.ConnectAsync();
+
+var message = await rustPlus.CheckSubscriptionAsync(alarmId);
+Console.WriteLine($"Infos:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
+
+await rustPlus.DisconnectAsync();
diff --git a/RustPlusApi/Examples/GetInfo/Program.cs b/RustPlusApi/Examples/GetInfo/Program.cs
@@ -6,13 +6,9 @@
 
 var rustPlus = new RustPlus(Ip, Port, PlayerId, PlayerToken);
 
-rustPlus.Connected += async (_, _) =>
-{
-    var message = await rustPlus.GetInfoAsync();
+await rustPlus.ConnectAsync();
 
-    Console.WriteLine($"Infos:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
+var message = await rustPlus.GetInfoAsync();
+Console.WriteLine($"Infos:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
 
-    rustPlus.Dispose();
-};
-
-await rustPlus.ConnectAsync();
+await rustPlus.DisconnectAsync();
diff --git a/RustPlusApi/Examples/GetMap/Program.cs b/RustPlusApi/Examples/GetMap/Program.cs
@@ -6,20 +6,16 @@
 
 var rustPlus = new RustPlus(Ip, Port, PlayerId, PlayerToken);
 
-rustPlus.Connected += async (_, _) =>
-{
-    var message = await rustPlus.GetMapAsync();
+await rustPlus.ConnectAsync();
 
-    if (!message.IsSuccess) return;
+var message = await rustPlus.GetMapAsync();
 
-    File.WriteAllBytes("map.jpg", message.Data?.JpgImage!);
+if (!message.IsSuccess) return;
 
-    message.Data!.JpgImage = null;
-    Console.WriteLine($"Infos:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
+File.WriteAllBytes("map.jpg", message.Data?.JpgImage!);
 
-    Console.WriteLine($"Image saved under: {Directory.GetCurrentDirectory()}");
+message.Data!.JpgImage = null;
+Console.WriteLine($"Infos:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
+Console.WriteLine($"Image saved under: {Directory.GetCurrentDirectory()}");
 
-    rustPlus.Dispose();
-};
-
-await rustPlus.ConnectAsync();
+await rustPlus.DisconnectAsync();
diff --git a/RustPlusApi/Examples/GetMapMarkers/Program.cs b/RustPlusApi/Examples/GetMapMarkers/Program.cs
@@ -6,14 +6,9 @@
 
 var rustPlus = new RustPlus(Ip, Port, PlayerId, PlayerToken);
 
-rustPlus.Connected += async (_, _) =>
-{
-    //await rustPlus.GetMapMarkersAsync(message =>
-    //{
-    //    Console.WriteLine($"Infos:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
-    //    rustPlus.Dispose();
-    //    return true;
-    //});
-};
+await rustPlus.ConnectAsync();
 
-await rustPlus.ConnectAsync();
+var message = await rustPlus.GetMapMarkersAsync();
+Console.WriteLine($"Infos:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
+
+await rustPlus.DisconnectAsync();
diff --git a/RustPlusApi/Examples/GetSmartSwitchChanges/Program.cs b/RustPlusApi/Examples/GetSmartSwitchChanges/Program.cs
@@ -7,16 +7,15 @@
 var rustPlus = new RustPlus(Ip, Port, PlayerId, PlayerToken);
 const uint entityId = 0;
 
-rustPlus.Connected += async (_, _) =>
-{
-    var message = await rustPlus.GetSmartSwitchInfoAsync(entityId);
-
-    Console.WriteLine($"Infos:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
-};
-
 rustPlus.OnSmartSwitchTriggered += (_, message) =>
 {
     Console.WriteLine($"SmartSwitch:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
 };
 
-await rustPlus.ConnectAsync();
+await rustPlus.ConnectAsync();
+
+var message = await rustPlus.GetSmartSwitchInfoAsync(entityId);
+Console.WriteLine($"Infos:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
+
+Console.ReadLine();
+await rustPlus.DisconnectAsync();
diff --git a/RustPlusApi/Examples/GetSmartSwitchInfo/Program.cs b/RustPlusApi/Examples/GetSmartSwitchInfo/Program.cs
@@ -7,13 +7,9 @@
 var rustPlus = new RustPlus(Ip, Port, PlayerId, PlayerToken);
 const uint entityId = 0;
 
-rustPlus.Connected += async (_, _) =>
-{
-    var message = await rustPlus.GetSmartSwitchInfoAsync(entityId);
+await rustPlus.ConnectAsync();
 
-    Console.WriteLine($"Infos:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
+var message = await rustPlus.GetSmartSwitchInfoAsync(entityId);
+Console.WriteLine($"Infos:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
 
-    rustPlus.Dispose();
-};
-
-await rustPlus.ConnectAsync();
+await rustPlus.DisconnectAsync();
diff --git a/RustPlusApi/Examples/GetStorageMonitorChanges/Program.cs b/RustPlusApi/Examples/GetStorageMonitorChanges/Program.cs
@@ -7,16 +7,15 @@
 var rustPlus = new RustPlus(Ip, Port, PlayerId, PlayerToken);
 const uint entityId = 0;
 
-rustPlus.Connected += async (_, _) =>
-{
-    var message = await rustPlus.GetStorageMonitorInfoAsync(entityId);
-
-    Console.WriteLine($"Infos:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
-};
-
 rustPlus.OnStorageMonitorTriggered += (_, message) =>
 {
     Console.WriteLine($"StorageMonitor:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
 };
 
-await rustPlus.ConnectAsync();
+await rustPlus.ConnectAsync();
+
+var message = await rustPlus.GetStorageMonitorInfoAsync(entityId);
+Console.WriteLine($"Infos:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
+
+Console.ReadLine();
+await rustPlus.DisconnectAsync();
diff --git a/RustPlusApi/Examples/GetStorageMonitorInfo/Program.cs b/RustPlusApi/Examples/GetStorageMonitorInfo/Program.cs
@@ -7,13 +7,9 @@
 var rustPlus = new RustPlus(Ip, Port, PlayerId, PlayerToken);
 const uint entityId = 0;
 
-rustPlus.Connected += async (_, _) =>
-{
-    var message = await rustPlus.GetStorageMonitorInfoAsync(entityId);
+await rustPlus.ConnectAsync();
 
-    Console.WriteLine($"Infos:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
+var message = await rustPlus.GetStorageMonitorInfoAsync(entityId);
+Console.WriteLine($"Infos:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
 
-    rustPlus.Dispose();
-};
-
-await rustPlus.ConnectAsync();
+await rustPlus.DisconnectAsync();
diff --git a/RustPlusApi/Examples/GetTeamChat/Program.cs b/RustPlusApi/Examples/GetTeamChat/Program.cs
@@ -6,13 +6,9 @@
 
 var rustPlus = new RustPlus(Ip, Port, PlayerId, PlayerToken);
 
-rustPlus.Connected += async (_, _) =>
-{
-    //await rustPlus.GetTeamChatAsync(message =>
-    //{
-    //    Console.WriteLine($"Infos:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
-    //    return true;
-    //});
-};
+await rustPlus.ConnectAsync();
 
-await rustPlus.ConnectAsync();
+var message = await rustPlus.GetTeamChatAsync();
+Console.WriteLine($"Infos:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
+
+await rustPlus.DisconnectAsync();
diff --git a/RustPlusApi/Examples/GetTeamChatChanges/Program.cs b/RustPlusApi/Examples/GetTeamChatChanges/Program.cs
@@ -6,21 +6,15 @@
 
 var rustPlus = new RustPlus(Ip, Port, PlayerId, PlayerToken);
 
-rustPlus.Connected += async (_, _) =>
+rustPlus.OnTeamChatReceived += (sender, message) =>
 {
-    //await rustPlus.GetTeamChatAsync(message =>
-    //{
-    //    Console.WriteLine($"Infos:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
-    //    return true;
-    //});
+    Console.WriteLine($"Infos:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
 };
 
-rustPlus.MessageReceived += (_, message) =>
-{
-    if (message.Broadcast is not { TeamMessage: not null }) return;
+await rustPlus.ConnectAsync();
 
-    var teamMessage = message.Broadcast.TeamMessage;
-    Console.WriteLine($"Message:\n{JsonConvert.SerializeObject(teamMessage, JsonSettings)}");
-};
+var message = await rustPlus.GetTeamChatAsync();
+Console.WriteLine($"Infos:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
 
-await rustPlus.ConnectAsync();
+Console.ReadLine();
+await rustPlus.DisconnectAsync();
diff --git a/RustPlusApi/Examples/GetTeamInfo/Program.cs b/RustPlusApi/Examples/GetTeamInfo/Program.cs
@@ -6,14 +6,9 @@
 
 var rustPlus = new RustPlus(Ip, Port, PlayerId, PlayerToken);
 
-rustPlus.Connected += async (_, _) =>
-{
-    //await rustPlus.GetTeamInfoAsync(message =>
-    //{
-    //    Console.WriteLine($"Infos:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
-    //    rustPlus.Dispose();
-    //    return true;
-    //});
-};
+await rustPlus.ConnectAsync();
 
-await rustPlus.ConnectAsync();
+var message = await rustPlus.GetTeamInfoAsync();
+Console.WriteLine($"Infos:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
+
+await rustPlus.DisconnectAsync();