Skip to content

Commit ff9c238

Browse files
hardcpphardcpp
committed
V6.3.0
1 parent eab1ab0 commit ff9c238

File tree

70 files changed

+704
-442
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+704
-442
lines changed

‎ChatPlexSDK-BS‎

‎Modules/BeatSaberPlus_Chat/BeatSaberPlus_Chat.csproj‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
<DebugSymbols>true</DebugSymbols>
2525
<Optimize>false</Optimize>
2626
<OutputPath>bin\Debug\</OutputPath>
27-
<DefineConstants>TRACE;DEBUG;BEATSABER;BEATSABER_1_29_4_OR_NEWER</DefineConstants>
27+
<DefineConstants>TRACE;DEBUG;BEATSABER;BEATSABER_1_35_0_OR_NEWER</DefineConstants>
2828
<ErrorReport>prompt</ErrorReport>
2929
<WarningLevel>4</WarningLevel>
3030
</PropertyGroup>
3131
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3232
<Optimize>true</Optimize>
3333
<OutputPath>bin\Release\</OutputPath>
34-
<DefineConstants>BEATSABER;BEATSABER_1_29_4_OR_NEWER</DefineConstants>
34+
<DefineConstants>BEATSABER;BEATSABER_1_35_0_OR_NEWER</DefineConstants>
3535
<ErrorReport>prompt</ErrorReport>
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
@@ -52,10 +52,13 @@
5252
</PackageReference>
5353
</ItemGroup>
5454
<ItemGroup>
55+
<Reference Include="DataModels">
56+
<HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\DataModels.dll</HintPath>
57+
<Private>False</Private>
58+
</Reference>
5559
<Reference Include="Newtonsoft.Json">
5660
<HintPath>$(BeatSaberDir)\Libs\Newtonsoft.Json.dll</HintPath>
5761
<Private>False</Private>
58-
<SpecificVersion>False</SpecificVersion>
5962
</Reference>
6063
<Reference Include="System" />
6164
<Reference Include="Main">
@@ -88,12 +91,10 @@
8891
<Reference Include="UnityEngine.TextCoreModule">
8992
<HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.TextCoreModule.dll</HintPath>
9093
<Private>False</Private>
91-
<SpecificVersion>False</SpecificVersion>
9294
</Reference>
9395
<Reference Include="UnityEngine.TextRenderingModule">
9496
<HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.TextRenderingModule.dll</HintPath>
9597
<Private>False</Private>
96-
<SpecificVersion>False</SpecificVersion>
9798
</Reference>
9899
<Reference Include="UnityEngine.UI">
99100
<HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.UI.dll</HintPath>

‎Modules/BeatSaberPlus_Chat/BeatSaberPlus_Chat.csproj.user‎

-60 Bytes
Binary file not shown.

‎Modules/BeatSaberPlus_Chat/ChatPlexMod_Chat/Components/ChatMessageText.cs‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ internal class ChatMessageText : TextMeshProUGUI
3939
/// <summary>
4040
/// Images to add
4141
/// </summary>
42-
private List<(Vector3, CP_SDK.Unity.EnhancedImage)> m_ImagesToAdd;
42+
private List<(Vector3, CP_SDK.Unity.EnhancedImage, float)> m_ImagesToAdd;
4343

4444
////////////////////////////////////////////////////////////////////////////
4545
////////////////////////////////////////////////////////////////////////////
@@ -99,7 +99,7 @@ internal class ChatMessageText : TextMeshProUGUI
9999
defaultCapacity: 10
100100
);
101101

102-
m_ImagesToAdd = new List<(Vector3, CP_SDK.Unity.EnhancedImage)>(20);
102+
m_ImagesToAdd = new List<(Vector3, CP_SDK.Unity.EnhancedImage, float)>(20);
103103
}
104104

105105
////////////////////////////////////////////////////////////////////////////
@@ -166,7 +166,7 @@ public override void Rebuild(CanvasUpdate p_UpdateType)
166166
if (FontInfo == null || !FontInfo.TryGetImageInfo(l_Character, out var l_ImageInfo))
167167
continue;
168168

169-
m_ImagesToAdd.Add((l_CharacterInfo.topLeft, l_ImageInfo));
169+
m_ImagesToAdd.Add((l_CharacterInfo.topLeft, l_ImageInfo, l_CharacterInfo.scale));
170170
}
171171

172172
CP_SDK.Unity.MTMainThreadInvoker.Enqueue(() => RebuildImagesInternal());
@@ -195,8 +195,6 @@ private void RebuildImagesInternal()
195195
if (!this)
196196
return;
197197

198-
var l_ScaleFactor = (float)((double)m_currentFontSize / (double)m_currentFontAsset.faceInfo.pointSize * (double)m_currentFontAsset.faceInfo.scale * (m_isOrthographic ? 1.0 : 0.1f));
199-
var l_LocalScale = new Vector3(l_ScaleFactor * 1.08f, l_ScaleFactor * 1.08f, l_ScaleFactor * 1.08f);
200198
var l_ImagesToAddCount = m_ImagesToAdd.Count;
201199
var l_AlreadyAllocated = m_CurrentImages.Count;
202200
var l_Iterator = 0;
@@ -228,9 +226,9 @@ private void RebuildImagesInternal()
228226
}
229227

230228
var l_RectTransform = l_Image.rectTransform;
231-
l_RectTransform.localScale = l_LocalScale;
229+
l_RectTransform.localScale = Vector3.one * l_Infos.Item3;
232230
l_RectTransform.sizeDelta = new Vector2(l_Infos.Item2.Width, l_Infos.Item2.Height);
233-
l_RectTransform.localPosition = l_Infos.Item1 - new Vector3(0, l_Infos.Item2.Height * l_ScaleFactor * 0.558f / 2);
231+
l_RectTransform.localPosition = l_Infos.Item1 - new Vector3(0, l_Infos.Item2.Height * l_Infos.Item3 * 0.558f / 2);
234232
}
235233

236234
/// Allocate
@@ -251,9 +249,9 @@ private void RebuildImagesInternal()
251249
}
252250

253251
var l_RectTransform = l_Image.rectTransform;
254-
l_RectTransform.localScale = l_LocalScale;
252+
l_RectTransform.localScale = Vector3.one * l_Infos.Item3;
255253
l_RectTransform.sizeDelta = new Vector2(l_Infos.Item2.Width, l_Infos.Item2.Height);
256-
l_RectTransform.localPosition = l_Infos.Item1 - new Vector3(0, l_Infos.Item2.Height * l_ScaleFactor * 0.558f / 2);
254+
l_RectTransform.localPosition = l_Infos.Item1 - new Vector3(0, l_Infos.Item2.Height * l_Infos.Item3 * 0.558f / 2);
257255

258256
m_CurrentImages.Add(l_Image);
259257
}

‎Modules/BeatSaberPlus_Chat/ChatPlexMod_Chat/Extensions/EnhancedFontInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@ internal bool TryRegisterImageInfo(CP_SDK.Unity.EnhancedImage p_ImageInfo, out u
141141

142142
var l_Glypth = new Glyph(l_ReplaceCharacter, new GlyphMetrics(0, 0, 0, 0, p_ImageInfo.Width), new GlyphRect(0, 0, 0, 0));
143143

144-
#if BEATSABER && !BEATSABER_1_29_4_OR_NEWER
144+
#if BEATSABER && !BEATSABER_1_35_0_OR_NEWER
145145
Font.characterLookupTable.Add(l_ReplaceCharacter, new TMP_Character(l_ReplaceCharacter, l_Glypth));
146-
#elif BEATSABER_1_29_4_OR_NEWER || UNITY_TESTING || SYNTHRIDERS || AUDIOTRIP || BOOMBOX || DANCEDASH
146+
#elif BEATSABER_1_35_0_OR_NEWER || UNITY_TESTING || SYNTHRIDERS || AUDIOTRIP || BOOMBOX || DANCEDASH
147147
Font.characterLookupTable.Add(l_ReplaceCharacter, new TMP_Character(l_ReplaceCharacter, Font, l_Glypth));
148148
#else
149149
#error Missing game implementation

‎Modules/BeatSaberPlus_Chat/ChatPlexMod_Chat/UI/PollFloatingPanelView.cs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ private IXUIElement BuildOption(Sprite p_WhiteSprite, int p_Index)
169169
private void Update()
170170
{
171171
if (m_LastPoll != null
172-
&& m_LastPoll.status != CP_SDK.Chat.Models.Twitch.Helix_Poll.Status.ARCHIVED
173-
&& m_LastPoll.status != CP_SDK.Chat.Models.Twitch.Helix_Poll.Status.INVALID)
172+
&& m_LastPoll.status != CP_SDK.Chat.Models.Twitch.EHelix_PollStatus.ARCHIVED
173+
&& m_LastPoll.status != CP_SDK.Chat.Models.Twitch.EHelix_PollStatus.INVALID)
174174
{
175175
if (m_CurrentPollStart < 0)
176176
{
@@ -203,8 +203,8 @@ private void HelixAPI_OnActivePollChanged(CP_SDK.Chat.Models.Twitch.Helix_Poll p
203203
if ((p_Poll?.id ?? null) != (m_LastPoll?.id ?? null))
204204
{
205205
if (p_Poll != null
206-
&& p_Poll.status != CP_SDK.Chat.Models.Twitch.Helix_Poll.Status.ARCHIVED
207-
&& p_Poll.status != CP_SDK.Chat.Models.Twitch.Helix_Poll.Status.INVALID)
206+
&& p_Poll.status != CP_SDK.Chat.Models.Twitch.EHelix_PollStatus.ARCHIVED
207+
&& p_Poll.status != CP_SDK.Chat.Models.Twitch.EHelix_PollStatus.INVALID)
208208
{
209209
CurrentScreen?.gameObject?.SetActive(true);
210210

@@ -217,8 +217,8 @@ private void HelixAPI_OnActivePollChanged(CP_SDK.Chat.Models.Twitch.Helix_Poll p
217217
for (int l_I = 0; l_I < p_Poll.choices.Count && l_I < m_ProgressBars.Length; ++l_I)
218218
l_TotalVotes += p_Poll.choices[l_I].votes;
219219

220-
if ( p_Poll.status == CP_SDK.Chat.Models.Twitch.Helix_Poll.Status.TERMINATED
221-
|| p_Poll.status == CP_SDK.Chat.Models.Twitch.Helix_Poll.Status.COMPLETED)
220+
if ( p_Poll.status == CP_SDK.Chat.Models.Twitch.EHelix_PollStatus.TERMINATED
221+
|| p_Poll.status == CP_SDK.Chat.Models.Twitch.EHelix_PollStatus.COMPLETED)
222222
{
223223
var l_Sorted = p_Poll.choices.OrderByDescending(x => x.votes).ToArray();
224224

@@ -247,8 +247,8 @@ private void HelixAPI_OnActivePollChanged(CP_SDK.Chat.Models.Twitch.Helix_Poll p
247247
m_CurrentPollStart = Time.realtimeSinceStartup - Mathf.Abs((float)(l_UTCNow - l_UTCStart).TotalSeconds);
248248
m_CurrentPollEnd = m_CurrentPollStart + p_Poll.duration;
249249

250-
if ( p_Poll.status == CP_SDK.Chat.Models.Twitch.Helix_Poll.Status.TERMINATED
251-
|| p_Poll.status == CP_SDK.Chat.Models.Twitch.Helix_Poll.Status.COMPLETED)
250+
if ( p_Poll.status == CP_SDK.Chat.Models.Twitch.EHelix_PollStatus.TERMINATED
251+
|| p_Poll.status == CP_SDK.Chat.Models.Twitch.EHelix_PollStatus.COMPLETED)
252252
m_CurrentPollEnd = Time.realtimeSinceStartup;
253253
}
254254
else
@@ -262,8 +262,8 @@ private void HelixAPI_OnActivePollChanged(CP_SDK.Chat.Models.Twitch.Helix_Poll p
262262
for (var l_I = 0; l_I < p_Poll.choices.Count && l_I < m_ProgressBars.Length; ++l_I)
263263
l_TotalVotes += p_Poll.choices[l_I].votes;
264264

265-
if ( p_Poll.status == CP_SDK.Chat.Models.Twitch.Helix_Poll.Status.TERMINATED
266-
|| p_Poll.status == CP_SDK.Chat.Models.Twitch.Helix_Poll.Status.COMPLETED)
265+
if ( p_Poll.status == CP_SDK.Chat.Models.Twitch.EHelix_PollStatus.TERMINATED
266+
|| p_Poll.status == CP_SDK.Chat.Models.Twitch.EHelix_PollStatus.COMPLETED)
267267
{
268268
var l_Sorted = p_Poll.choices.OrderByDescending(x => x.votes).ToArray();
269269

@@ -277,13 +277,13 @@ private void HelixAPI_OnActivePollChanged(CP_SDK.Chat.Models.Twitch.Helix_Poll p
277277
}
278278
}
279279

280-
if ( p_Poll.status == CP_SDK.Chat.Models.Twitch.Helix_Poll.Status.TERMINATED
281-
|| p_Poll.status == CP_SDK.Chat.Models.Twitch.Helix_Poll.Status.COMPLETED)
280+
if ( p_Poll.status == CP_SDK.Chat.Models.Twitch.EHelix_PollStatus.TERMINATED
281+
|| p_Poll.status == CP_SDK.Chat.Models.Twitch.EHelix_PollStatus.COMPLETED)
282282
m_CurrentPollEnd = Time.realtimeSinceStartup;
283283

284-
if ( p_Poll.status == CP_SDK.Chat.Models.Twitch.Helix_Poll.Status.ARCHIVED
285-
|| p_Poll.status == CP_SDK.Chat.Models.Twitch.Helix_Poll.Status.INVALID
286-
|| p_Poll.status == CP_SDK.Chat.Models.Twitch.Helix_Poll.Status.MODERATED)
284+
if ( p_Poll.status == CP_SDK.Chat.Models.Twitch.EHelix_PollStatus.ARCHIVED
285+
|| p_Poll.status == CP_SDK.Chat.Models.Twitch.EHelix_PollStatus.INVALID
286+
|| p_Poll.status == CP_SDK.Chat.Models.Twitch.EHelix_PollStatus.MODERATED)
287287
CurrentScreen?.gameObject?.SetActive(false);
288288
}
289289

0 commit comments

Comments
 (0)