diff --git a/BeatSaberPlus/CP_SDK/Chat/Services/Twitch/7TVDataProvider.cs b/BeatSaberPlus/CP_SDK/Chat/Services/Twitch/7TVDataProvider.cs index 4c90df5..bd35413 100644 --- a/BeatSaberPlus/CP_SDK/Chat/Services/Twitch/7TVDataProvider.cs +++ b/BeatSaberPlus/CP_SDK/Chat/Services/Twitch/7TVDataProvider.cs @@ -72,7 +72,7 @@ public async Task TryRequestResources(string p_Category, string p_Token) try { - ChatPlexSDK.Logger.Debug($"Requesting 7TV {(l_IsGlobal ? "global " : "")}emotes{(l_IsGlobal ? "." : $" for channel {p_Category}")}."); + ChatPlexSDK.Logger.Debug($"Requesting 7TV {(l_IsGlobal ? "global " : "")}emotes{(l_IsGlobal ? "." : $" for channel {p_Category}")}. " + (l_IsGlobal ? "https://api.7tv.app/v2/emotes/global" : $"https://api.7tv.app/v2/users/{p_Category}/emotes")); using (HttpRequestMessage msg = new HttpRequestMessage(HttpMethod.Get, l_IsGlobal ? "https://api.7tv.app/v2/emotes/global" : $"https://api.7tv.app/v2/users/{p_Category}/emotes")) { @@ -85,15 +85,15 @@ public async Task TryRequestResources(string p_Category, string p_Token) int l_Count = 0; foreach (JSONObject l_Object in l_JSON.AsArray) { - string l_URI = $"https://cdn.7tv.app/emote/{l_Object["id"].Value}/2x"; - string l_ID = l_IsGlobal ? l_Object["name"].Value : $"{p_Category}_{l_Object["name"].Value}"; + string l_URI = l_Object["urls"].AsArray.Count >= 2 ? l_Object["urls"].AsArray[2].AsArray[1] : l_Object["urls"].AsArray[0].AsArray[0]; + string l_ID = l_IsGlobal ? l_Object["name"].Value : $"{p_Category}_{l_Object["name"].Value}"; Resources.TryAdd(l_ID, new ChatResourceData() { - Uri = l_URI, - Animation = Animation.EAnimationType.AUTODETECT, - Category = EChatResourceCategory.Emote, - Type = l_IsGlobal ? "7TVGlobalEmote" : "7TVChannelEmote" + Uri = l_URI, + Animation = Animation.EAnimationType.AUTODETECT, + Category = EChatResourceCategory.Emote, + Type = l_IsGlobal ? "7TVGlobalEmote" : "7TVChannelEmote" }); l_Count++; } diff --git a/BeatSaberPlus/CP_SDK/Network/WebClient_Unity.cs b/BeatSaberPlus/CP_SDK/Network/WebClient_Unity.cs index 0f81383..8cf4cd1 100644 --- a/BeatSaberPlus/CP_SDK/Network/WebClient_Unity.cs +++ b/BeatSaberPlus/CP_SDK/Network/WebClient_Unity.cs @@ -183,7 +183,7 @@ private IEnumerator Coroutine_DownloadAsync(string p_URL, CancellationToken p_To } } - Unity.MTThreadInvoker.EnqueueOnThread(() => p_Callback(null)); + Unity.MTThreadInvoker.EnqueueOnThread(() => p_Callback?.Invoke(null)); } //////////////////////////////////////////////////////////////////////////// diff --git a/BeatSaberPlus/Properties/AssemblyInfo.cs b/BeatSaberPlus/Properties/AssemblyInfo.cs index fcf26b8..0e9f3de 100644 --- a/BeatSaberPlus/Properties/AssemblyInfo.cs +++ b/BeatSaberPlus/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("5.0.6")] -[assembly: AssemblyFileVersion("5.0.6")] +[assembly: AssemblyVersion("5.0.7")] +[assembly: AssemblyFileVersion("5.0.7")] diff --git a/BeatSaberPlus/UI/InfoView.cs b/BeatSaberPlus/UI/InfoView.cs index 6a45215..e69e1f3 100644 --- a/BeatSaberPlus/UI/InfoView.cs +++ b/BeatSaberPlus/UI/InfoView.cs @@ -15,7 +15,7 @@ internal class InfoView : SDK.UI.ResourceViewController [UIValue("Line1")] private readonly string m_Line1 = "Welcome to BeatSaberPlus by HardCPP#1985"; [UIValue("Line2")] - private readonly string m_Line2 = "Version 5.0.6"; + private readonly string m_Line2 = "Version 5.0.7"; [UIValue("Line3")] private readonly string m_Line3 = " "; [UIValue("Line4")] diff --git a/BeatSaberPlus/UI/MainViewFlowCoordinator.cs b/BeatSaberPlus/UI/MainViewFlowCoordinator.cs index 1256910..adb26dc 100644 --- a/BeatSaberPlus/UI/MainViewFlowCoordinator.cs +++ b/BeatSaberPlus/UI/MainViewFlowCoordinator.cs @@ -8,7 +8,7 @@ public class MainViewFlowCoordinator : SDK.UI.ViewFlowCoordinator /// Title /// - public override string Title => "Beat Saber Plus V5.0.6"; + public override string Title => "Beat Saber Plus V5.0.7"; //////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////// diff --git a/BeatSaberPlus/manifest.json b/BeatSaberPlus/manifest.json index c0098c3..bb20504 100644 --- a/BeatSaberPlus/manifest.json +++ b/BeatSaberPlus/manifest.json @@ -3,7 +3,7 @@ "id": "BeatSaberPlusCORE", "name": "BeatSaberPlus", "author": "HardCPP#1985", - "version": "5.0.6", + "version": "5.0.7", "description": "", "gameVersion": "1.25.0", "dependsOn": { diff --git a/Modules/BeatSaberPlus_Chat/Properties/AssemblyInfo.cs b/Modules/BeatSaberPlus_Chat/Properties/AssemblyInfo.cs index 5227531..5364ea0 100644 --- a/Modules/BeatSaberPlus_Chat/Properties/AssemblyInfo.cs +++ b/Modules/BeatSaberPlus_Chat/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("5.0.6")] -[assembly: AssemblyFileVersion("5.0.6")] +[assembly: AssemblyVersion("5.0.7")] +[assembly: AssemblyFileVersion("5.0.7")] diff --git a/Modules/BeatSaberPlus_Chat/manifest.json b/Modules/BeatSaberPlus_Chat/manifest.json index f4d1898..a76672e 100644 --- a/Modules/BeatSaberPlus_Chat/manifest.json +++ b/Modules/BeatSaberPlus_Chat/manifest.json @@ -3,13 +3,13 @@ "id": "BeatSaberPlus_Chat", "name": "BeatSaberPlus_Chat", "author": "HardCPP#1985", - "version": "5.0.6", + "version": "5.0.7", "description": "", "gameVersion": "1.25.0", "dependsOn": { "BSIPA": "^4.0.1", "BeatSaberMarkupLanguage": "^1.3.4", - "BeatSaberPlusCORE": "^5.0.6" + "BeatSaberPlusCORE": "^5.0.7" }, "links": { "project-home": "https://discord.chatplex.org", diff --git a/Modules/BeatSaberPlus_ChatEmoteRain/Properties/AssemblyInfo.cs b/Modules/BeatSaberPlus_ChatEmoteRain/Properties/AssemblyInfo.cs index 31541aa..6599aad 100644 --- a/Modules/BeatSaberPlus_ChatEmoteRain/Properties/AssemblyInfo.cs +++ b/Modules/BeatSaberPlus_ChatEmoteRain/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("5.0.6")] -[assembly: AssemblyFileVersion("5.0.6")] +[assembly: AssemblyVersion("5.0.7")] +[assembly: AssemblyFileVersion("5.0.7")] diff --git a/Modules/BeatSaberPlus_ChatEmoteRain/manifest.json b/Modules/BeatSaberPlus_ChatEmoteRain/manifest.json index 8488d44..67456b0 100644 --- a/Modules/BeatSaberPlus_ChatEmoteRain/manifest.json +++ b/Modules/BeatSaberPlus_ChatEmoteRain/manifest.json @@ -3,13 +3,13 @@ "id": "BeatSaberPlus_ChatEmoteRain", "name": "BeatSaberPlus_ChatEmoteRain", "author": "HardCPP#1985", - "version": "5.0.6", + "version": "5.0.7", "description": "", "gameVersion": "1.25.0", "dependsOn": { "BSIPA": "^4.0.1", "BeatSaberMarkupLanguage": "^1.3.4", - "BeatSaberPlusCORE": "^5.0.6" + "BeatSaberPlusCORE": "^5.0.7" }, "links": { "project-home": "https://discord.chatplex.org", diff --git a/Modules/BeatSaberPlus_ChatIntegrations/Properties/AssemblyInfo.cs b/Modules/BeatSaberPlus_ChatIntegrations/Properties/AssemblyInfo.cs index cb7b01b..297a13e 100644 --- a/Modules/BeatSaberPlus_ChatIntegrations/Properties/AssemblyInfo.cs +++ b/Modules/BeatSaberPlus_ChatIntegrations/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("5.0.6")] -[assembly: AssemblyFileVersion("5.0.6")] \ No newline at end of file +[assembly: AssemblyVersion("5.0.7")] +[assembly: AssemblyFileVersion("5.0.7")] \ No newline at end of file diff --git a/Modules/BeatSaberPlus_ChatIntegrations/manifest.json b/Modules/BeatSaberPlus_ChatIntegrations/manifest.json index 18c5f96..a41a5d3 100644 --- a/Modules/BeatSaberPlus_ChatIntegrations/manifest.json +++ b/Modules/BeatSaberPlus_ChatIntegrations/manifest.json @@ -3,13 +3,13 @@ "id": "BeatSaberPlus_ChatIntegrations", "name": "BeatSaberPlus_ChatIntegrations", "author": "HardCPP#1985", - "version": "5.0.6", + "version": "5.0.7", "description": "", "gameVersion": "1.25.0", "dependsOn": { "BSIPA": "^4.0.1", "BeatSaberMarkupLanguage": "^1.3.4", - "BeatSaberPlusCORE": "^5.0.6" + "BeatSaberPlusCORE": "^5.0.7" }, "loadAfter": [ "BeatSaberPlus_Chat", diff --git a/Modules/BeatSaberPlus_ChatRequest/Properties/AssemblyInfo.cs b/Modules/BeatSaberPlus_ChatRequest/Properties/AssemblyInfo.cs index b5b5824..d33f216 100644 --- a/Modules/BeatSaberPlus_ChatRequest/Properties/AssemblyInfo.cs +++ b/Modules/BeatSaberPlus_ChatRequest/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("5.0.6")] -[assembly: AssemblyFileVersion("5.0.6")] +[assembly: AssemblyVersion("5.0.7")] +[assembly: AssemblyFileVersion("5.0.7")] diff --git a/Modules/BeatSaberPlus_ChatRequest/manifest.json b/Modules/BeatSaberPlus_ChatRequest/manifest.json index 3c8a5c3..80e1722 100644 --- a/Modules/BeatSaberPlus_ChatRequest/manifest.json +++ b/Modules/BeatSaberPlus_ChatRequest/manifest.json @@ -3,13 +3,13 @@ "id": "BeatSaberPlus_ChatRequest", "name": "BeatSaberPlus_ChatRequest", "author": "HardCPP#1985", - "version": "5.0.6", + "version": "5.0.7", "description": "", "gameVersion": "1.25.0", "dependsOn": { "BSIPA": "^4.0.1", "BeatSaberMarkupLanguage": "^1.3.4", - "BeatSaberPlusCORE": "^5.0.6" + "BeatSaberPlusCORE": "^5.0.7" }, "links": { "project-home": "https://discord.chatplex.org", diff --git a/Modules/BeatSaberPlus_GameTweaker/Properties/AssemblyInfo.cs b/Modules/BeatSaberPlus_GameTweaker/Properties/AssemblyInfo.cs index 3c0c4bc..d2fca29 100644 --- a/Modules/BeatSaberPlus_GameTweaker/Properties/AssemblyInfo.cs +++ b/Modules/BeatSaberPlus_GameTweaker/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("5.0.6")] -[assembly: AssemblyFileVersion("5.0.6")] +[assembly: AssemblyVersion("5.0.7")] +[assembly: AssemblyFileVersion("5.0.7")] diff --git a/Modules/BeatSaberPlus_GameTweaker/manifest.json b/Modules/BeatSaberPlus_GameTweaker/manifest.json index a43ca46..fb77d6c 100644 --- a/Modules/BeatSaberPlus_GameTweaker/manifest.json +++ b/Modules/BeatSaberPlus_GameTweaker/manifest.json @@ -3,13 +3,13 @@ "id": "BeatSaberPlus_GameTweaker", "name": "BeatSaberPlus_GameTweaker", "author": "HardCPP#1985", - "version": "5.0.6", + "version": "5.0.7", "description": "", "gameVersion": "1.25.0", "dependsOn": { "BSIPA": "^4.0.1", "BeatSaberMarkupLanguage": "^1.3.4", - "BeatSaberPlusCORE": "^5.0.6" + "BeatSaberPlusCORE": "^5.0.7" }, "links": { "project-home": "https://discord.chatplex.org", diff --git a/Modules/BeatSaberPlus_MenuMusic/Properties/AssemblyInfo.cs b/Modules/BeatSaberPlus_MenuMusic/Properties/AssemblyInfo.cs index 1a5b84a..fb7152d 100644 --- a/Modules/BeatSaberPlus_MenuMusic/Properties/AssemblyInfo.cs +++ b/Modules/BeatSaberPlus_MenuMusic/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("5.0.6")] -[assembly: AssemblyFileVersion("5.0.6")] +[assembly: AssemblyVersion("5.0.7")] +[assembly: AssemblyFileVersion("5.0.7")] diff --git a/Modules/BeatSaberPlus_MenuMusic/manifest.json b/Modules/BeatSaberPlus_MenuMusic/manifest.json index 8df31dc..e701c1e 100644 --- a/Modules/BeatSaberPlus_MenuMusic/manifest.json +++ b/Modules/BeatSaberPlus_MenuMusic/manifest.json @@ -3,13 +3,13 @@ "id": "BeatSaberPlus_MenuMusic", "name": "BeatSaberPlus_MenuMusic", "author": "HardCPP#1985", - "version": "5.0.6", + "version": "5.0.7", "description": "", "gameVersion": "1.25.0", "dependsOn": { "BSIPA": "^4.0.1", "BeatSaberMarkupLanguage": "^1.3.4", - "BeatSaberPlusCORE": "^5.0.6" + "BeatSaberPlusCORE": "^5.0.7" }, "links": { "project-home": "https://discord.chatplex.org", diff --git a/Modules/BeatSaberPlus_NoteTweaker/Properties/AssemblyInfo.cs b/Modules/BeatSaberPlus_NoteTweaker/Properties/AssemblyInfo.cs index e30ae48..f723740 100644 --- a/Modules/BeatSaberPlus_NoteTweaker/Properties/AssemblyInfo.cs +++ b/Modules/BeatSaberPlus_NoteTweaker/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("5.0.6")] -[assembly: AssemblyFileVersion("5.0.6")] +[assembly: AssemblyVersion("5.0.7")] +[assembly: AssemblyFileVersion("5.0.7")] diff --git a/Modules/BeatSaberPlus_NoteTweaker/manifest.json b/Modules/BeatSaberPlus_NoteTweaker/manifest.json index 3005f56..dbebc24 100644 --- a/Modules/BeatSaberPlus_NoteTweaker/manifest.json +++ b/Modules/BeatSaberPlus_NoteTweaker/manifest.json @@ -3,13 +3,13 @@ "id": "BeatSaberPlus_NoteTweaker", "name": "BeatSaberPlus_NoteTweaker", "author": "HardCPP#1985", - "version": "5.0.6", + "version": "5.0.7", "description": "", "gameVersion": "1.25.0", "dependsOn": { "BSIPA": "^4.0.1", "BeatSaberMarkupLanguage": "^1.3.4", - "BeatSaberPlusCORE": "^5.0.6" + "BeatSaberPlusCORE": "^5.0.7" }, "links": { "project-home": "https://discord.chatplex.org", diff --git a/Modules/BeatSaberPlus_SongChartVisualizer/Properties/AssemblyInfo.cs b/Modules/BeatSaberPlus_SongChartVisualizer/Properties/AssemblyInfo.cs index f150d26..fc1aacd 100644 --- a/Modules/BeatSaberPlus_SongChartVisualizer/Properties/AssemblyInfo.cs +++ b/Modules/BeatSaberPlus_SongChartVisualizer/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("5.0.6")] -[assembly: AssemblyFileVersion("5.0.6")] +[assembly: AssemblyVersion("5.0.7")] +[assembly: AssemblyFileVersion("5.0.7")] diff --git a/Modules/BeatSaberPlus_SongChartVisualizer/manifest.json b/Modules/BeatSaberPlus_SongChartVisualizer/manifest.json index fba1e75..1be457b 100644 --- a/Modules/BeatSaberPlus_SongChartVisualizer/manifest.json +++ b/Modules/BeatSaberPlus_SongChartVisualizer/manifest.json @@ -3,13 +3,13 @@ "id": "BeatSaberPlus_SongChartVisualizer", "name": "BeatSaberPlus_SongChartVisualizer", "author": "HardCPP#1985", - "version": "5.0.6", + "version": "5.0.7", "description": "", "gameVersion": "1.25.0", "dependsOn": { "BSIPA": "^4.0.1", "BeatSaberMarkupLanguage": "^1.3.4", - "BeatSaberPlusCORE": "^5.0.6" + "BeatSaberPlusCORE": "^5.0.7" }, "links": { "project-home": "https://discord.chatplex.org", diff --git a/Modules/BeatSaberPlus_SongOverlay/Properties/AssemblyInfo.cs b/Modules/BeatSaberPlus_SongOverlay/Properties/AssemblyInfo.cs index 8999531..0079a62 100644 --- a/Modules/BeatSaberPlus_SongOverlay/Properties/AssemblyInfo.cs +++ b/Modules/BeatSaberPlus_SongOverlay/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("5.0.6")] -[assembly: AssemblyFileVersion("5.0.6")] +[assembly: AssemblyVersion("5.0.7")] +[assembly: AssemblyFileVersion("5.0.7")] diff --git a/Modules/BeatSaberPlus_SongOverlay/manifest.json b/Modules/BeatSaberPlus_SongOverlay/manifest.json index e138140..37bec28 100644 --- a/Modules/BeatSaberPlus_SongOverlay/manifest.json +++ b/Modules/BeatSaberPlus_SongOverlay/manifest.json @@ -3,13 +3,13 @@ "id": "BeatSaberPlus_SongOverlay", "name": "BeatSaberPlus_SongOverlay", "author": "HardCPP#1985", - "version": "5.0.6", + "version": "5.0.7", "description": "BeatSaberPlus song overlay module.", "gameVersion": "1.25.0", "dependsOn": { "BSIPA": "^4.0.2", "BeatSaberMarkupLanguage": "^1.3.4", - "BeatSaberPlusCORE": "^5.0.6" + "BeatSaberPlusCORE": "^5.0.7" }, "links": { "project-home": "https://discord.chatplex.org",