Skip to content

Commit

Permalink
V5.0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
@hardcpp
hardcpp committed Mar 30, 2023
1 parent 3c1fb5d commit e538e8b
Show file tree
Hide file tree
Showing 24 changed files with 49 additions and 49 deletions.
14 changes: 7 additions & 7 deletions BeatSaberPlus/CP_SDK/Chat/Services/Twitch/7TVDataProvider.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
{
Expand All @@ -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++;
}
Expand Down
2 changes: 1 addition & 1 deletion BeatSaberPlus/CP_SDK/Network/WebClient_Unity.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

////////////////////////////////////////////////////////////////////////////
Expand Down
4 changes: 2 additions & 2 deletions BeatSaberPlus/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
2 changes: 1 addition & 1 deletion BeatSaberPlus/UI/InfoView.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ internal class InfoView : SDK.UI.ResourceViewController<InfoView>
[UIValue("Line1")]
private readonly string m_Line1 = "<u><b>Welcome to BeatSaberPlus by HardCPP#1985</b></u>";
[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")]
Expand Down
2 changes: 1 addition & 1 deletion BeatSaberPlus/UI/MainViewFlowCoordinator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public class MainViewFlowCoordinator : SDK.UI.ViewFlowCoordinator<MainViewFlowCo
/// <summary>
/// Title
/// </summary>
public override string Title => "Beat Saber Plus V5.0.6";
public override string Title => "Beat Saber Plus V5.0.7";

////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion BeatSaberPlus/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions Modules/BeatSaberPlus_Chat/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
4 changes: 2 additions & 2 deletions Modules/BeatSaberPlus_Chat/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions Modules/BeatSaberPlus_ChatEmoteRain/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
4 changes: 2 additions & 2 deletions Modules/BeatSaberPlus_ChatEmoteRain/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions Modules/BeatSaberPlus_ChatIntegrations/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
4 changes: 2 additions & 2 deletions Modules/BeatSaberPlus_ChatIntegrations/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions Modules/BeatSaberPlus_ChatRequest/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
4 changes: 2 additions & 2 deletions Modules/BeatSaberPlus_ChatRequest/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions Modules/BeatSaberPlus_GameTweaker/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
4 changes: 2 additions & 2 deletions Modules/BeatSaberPlus_GameTweaker/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions Modules/BeatSaberPlus_MenuMusic/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
4 changes: 2 additions & 2 deletions Modules/BeatSaberPlus_MenuMusic/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions Modules/BeatSaberPlus_NoteTweaker/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
4 changes: 2 additions & 2 deletions Modules/BeatSaberPlus_NoteTweaker/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions Modules/BeatSaberPlus_SongChartVisualizer/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
4 changes: 2 additions & 2 deletions Modules/BeatSaberPlus_SongChartVisualizer/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions Modules/BeatSaberPlus_SongOverlay/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
4 changes: 2 additions & 2 deletions Modules/BeatSaberPlus_SongOverlay/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit e538e8b

Please sign in to comment.