Version 6.4.1

Author: hardcpp

ChatPlexSDK-BS

@@ -24,14 +24,14 @@
     <DebugSymbols>true</DebugSymbols>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;BEATSABER;BEATSABER_1_35_0_OR_NEWER</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;BEATSABER</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>BEATSABER;BEATSABER_1_35_0_OR_NEWER</DefineConstants>
+    <DefineConstants>BEATSABER</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>

Modules/BeatSaberPlus_Chat/BeatSaberPlus_Chat.csproj

@@ -141,9 +141,7 @@ internal bool TryRegisterImageInfo(CP_SDK.Unity.EnhancedImage p_ImageInfo, out u
 
                     var l_Glypth = new Glyph(l_ReplaceCharacter, new GlyphMetrics(0, 0, 0, 0, p_ImageInfo.Width), new GlyphRect(0, 0, 0, 0));
 
-#if BEATSABER && !BEATSABER_1_35_0_OR_NEWER
-                    Font.characterLookupTable.Add(l_ReplaceCharacter, new TMP_Character(l_ReplaceCharacter, l_Glypth));
-#elif BEATSABER_1_35_0_OR_NEWER || UNITY_TESTING || SYNTHRIDERS || AUDIOTRIP || BOOMBOX || DANCEDASH
+#if BEATSABER || UNITY_TESTING || SYNTHRIDERS || AUDIOTRIP || BOOMBOX || DANCEDASH
                     Font.characterLookupTable.Add(l_ReplaceCharacter, new TMP_Character(l_ReplaceCharacter, Font, l_Glypth));
 #else
 #error Missing game implementation

Modules/BeatSaberPlus_Chat/BeatSaberPlus_Chat.csproj.user

@@ -482,7 +482,7 @@ internal void OnChannelPoints(IChatService p_Service, IChatChannel p_Channel, IC
             if (!CConfig.Instance.ShowChannelPointsEvent)
                 return;
 
-            if (!m_ChatFont.HasReplaceCharacter("TwitchChannelPoint_" + p_Event.Title))
+            if (p_Event.Image != null && !m_ChatFont.HasReplaceCharacter("TwitchChannelPoint_" + p_Event.Title))
             {
                 TaskCompletionSource<CP_SDK.Unity.EnhancedImage> l_TaskCompletionSource = new TaskCompletionSource<CP_SDK.Unity.EnhancedImage>();
 
@@ -499,7 +499,7 @@ internal void OnChannelPoints(IChatService p_Service, IChatChannel p_Channel, IC
 
             var l_ImagePart = "for";
 
-            if (m_ChatFont.TryGetReplaceCharacter("TwitchChannelPoint_" + p_Event.Title, out uint p_Character))
+            if (p_Event.Image != null && m_ChatFont.TryGetReplaceCharacter("TwitchChannelPoint_" + p_Event.Title, out uint p_Character))
                 l_ImagePart = char.ConvertFromUtf32((int)p_Character);
 
             var l_Prefix        = !string.IsNullOrEmpty(p_Channel.Prefix) ? $"<b><color=yellow>[{p_Channel.Prefix}]</color></b> " : string.Empty;
@@ -543,9 +543,9 @@ internal void OnChannelSubsciption(IChatService p_Service, IChatChannel p_Channe
             var l_Prefix        = !string.IsNullOrEmpty(p_Channel.Prefix) ? $"<b><color=yellow>[{p_Channel.Prefix}]</color></b> " : string.Empty;
             var l_MessageStr    = $"{l_Prefix}<#FFFFFFBB>[<b>{p_Service.DisplayName}</b>] <color={p_User.Color}><b>@{p_User.PaintedName}</b> ";
             if (p_Event.IsGift)
-                l_MessageStr += $"gifted <color={p_User.Color}><b>{p_Event.PurchasedMonthCount}</b></color> month of <color={p_User.Color}><b>{p_Event.SubPlan}</b></color> to <color={p_User.Color}><b>@{p_Event.RecipientDisplayName}</b></color>!";
+                l_MessageStr += $"was gifted a month of <color={p_User.Color}><b>{p_Event.SubPlan}</b></color>!";
             else
-                l_MessageStr += $"did get a <color={p_User.Color}><b>{p_Event.PurchasedMonthCount}</b></color> month of <color={p_User.Color}><b>{p_Event.SubPlan}</b></color>!";
+                l_MessageStr += $"did get a month of <color={p_User.Color}><b>{p_Event.SubPlan}</b></color>!";
 
             CP_SDK.Unity.MTMainThreadInvoker.Enqueue(() =>
             {

Modules/BeatSaberPlus_Chat/ChatPlexMod_Chat/Extensions/EnhancedFontInfo.cs

@@ -31,5 +31,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("6.3.3")]
-[assembly: AssemblyFileVersion("6.3.3")]
+[assembly: AssemblyVersion("6.4.1")]
+[assembly: AssemblyFileVersion("6.4.1")]

Modules/BeatSaberPlus_Chat/ChatPlexMod_Chat/UI/ChatFloatingPanelView.cs

@@ -3,12 +3,12 @@
   "id": "BeatSaberPlus_Chat",
   "name": "BeatSaberPlus_Chat",
   "author": "HardCPP",
-  "version": "6.3.3",
+  "version": "6.4.1",
   "description": "",
   "gameVersion": "1.40.0",
   "dependsOn": {
     "BSIPA": "^4.3.0",
-    "ChatPlexSDK_BS": "^6.3.3"
+    "ChatPlexSDK_BS": "^6.4.1"
   },
   "links": {
     "project-home": "https://discord.chatplex.org",

Modules/BeatSaberPlus_Chat/Properties/AssemblyInfo.cs

@@ -31,5 +31,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("6.3.3")]
-[assembly: AssemblyFileVersion("6.3.3")]
+[assembly: AssemblyVersion("6.4.1")]
+[assembly: AssemblyFileVersion("6.4.1")]

Modules/BeatSaberPlus_Chat/manifest.json

@@ -3,12 +3,12 @@
   "id": "BeatSaberPlus_ChatEmoteRain",
   "name": "BeatSaberPlus_ChatEmoteRain",
   "author": "HardCPP",
-  "version": "6.3.3",
+  "version": "6.4.1",
   "description": "",
   "gameVersion": "1.40.0",
   "dependsOn": {
     "BSIPA": "^4.3.0",
-    "ChatPlexSDK_BS": "^6.3.3"
+    "ChatPlexSDK_BS": "^6.4.1"
   },
   "links": {
     "project-home": "https://discord.chatplex.org",