Skip to content

Commit

Permalink
V6.2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
hardcpp committed Feb 19, 2024
1 parent 2886910 commit eab1ab0
Show file tree
Hide file tree
Showing 45 changed files with 165 additions and 90 deletions.
2 changes: 1 addition & 1 deletion ChatPlexSDK-BS
Binary file modified Modules/BeatSaberPlus_Chat/BeatSaberPlus_Chat.csproj.user
Binary file not shown.
4 changes: 2 additions & 2 deletions Modules/BeatSaberPlus_Chat/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.0")]
[assembly: AssemblyFileVersion("6.2.0")]
[assembly: AssemblyVersion("6.2.2")]
[assembly: AssemblyFileVersion("6.2.2")]
6 changes: 3 additions & 3 deletions Modules/BeatSaberPlus_Chat/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"id": "BeatSaberPlus_Chat",
"name": "BeatSaberPlus_Chat",
"author": "HardCPP",
"version": "6.2.0",
"version": "6.2.2",
"description": "",
"gameVersion": "1.31.0",
"gameVersion": "1.34.2",
"dependsOn": {
"BSIPA": "^4.3.0",
"ChatPlexSDK_BS": "^6.2.0"
"ChatPlexSDK_BS": "^6.2.2"
},
"links": {
"project-home": "https://discord.chatplex.org",
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.0")]
[assembly: AssemblyFileVersion("6.2.0")]
[assembly: AssemblyVersion("6.2.2")]
[assembly: AssemblyFileVersion("6.2.2")]
6 changes: 3 additions & 3 deletions Modules/BeatSaberPlus_ChatEmoteRain/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"id": "BeatSaberPlus_ChatEmoteRain",
"name": "BeatSaberPlus_ChatEmoteRain",
"author": "HardCPP",
"version": "6.2.0",
"version": "6.2.2",
"description": "",
"gameVersion": "1.31.0",
"gameVersion": "1.34.2",
"dependsOn": {
"BSIPA": "^4.3.0",
"ChatPlexSDK_BS": "^6.2.0"
"ChatPlexSDK_BS": "^6.2.2"
},
"links": {
"project-home": "https://discord.chatplex.org",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ private void PatchSabers(bool p_UseDefault)
{
/// todo
return;

/*
var l_Sabers = Resources.FindObjectsOfTypeAll<SaberModelController>();
var l_ColorManager = null as ColorManager;
var l_ColorSchemeBackup = null as ColorScheme;
Expand Down Expand Up @@ -886,7 +886,7 @@ private void PatchSabers(bool p_UseDefault)
if (!p_UseDefault && l_I == (l_Sabers.Length - 1))
l_ColorManager.SetProperty<ColorManager, ColorScheme>("_colorScheme", l_ColorSchemeBackup);
}
}*/
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Hive.Versioning, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Hive.Versioning">
<Private>False</Private>
<HintPath>$(BeatSaberDir)\Libs\Hive.Versioning.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
Expand All @@ -95,7 +95,7 @@
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="System.Net.Http" />
<Reference Include="Main" Publicize="true">
<HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Main.dll</HintPath>
<Private>False</Private>
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.0")]
[assembly: AssemblyFileVersion("6.2.0")]
[assembly: AssemblyVersion("6.2.2")]
[assembly: AssemblyFileVersion("6.2.2")]
6 changes: 3 additions & 3 deletions Modules/BeatSaberPlus_ChatIntegrations/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"id": "BeatSaberPlus_ChatIntegrations",
"name": "BeatSaberPlus_ChatIntegrations",
"author": "HardCPP",
"version": "6.2.0",
"version": "6.2.2",
"description": "",
"gameVersion": "1.31.0",
"gameVersion": "1.34.2",
"dependsOn": {
"BSIPA": "^4.3.0",
"ChatPlexSDK_BS": "^6.2.0"
"ChatPlexSDK_BS": "^6.2.2"
},
"loadAfter": [
"BeatSaberPlus_Chat",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@
</PackageReference>
</ItemGroup>
<ItemGroup>
<Reference Include="BGLib.AppFlow">
<HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\BGLib.AppFlow.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>$(BeatSaberDir)\Libs\Newtonsoft.Json.dll</HintPath>
<Private>False</Private>
Expand Down
Binary file not shown.
5 changes: 5 additions & 0 deletions Modules/BeatSaberPlus_ChatRequest/CRConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ internal class _Filters
{
[JsonProperty] internal bool NoBeatSage = false;

[JsonProperty] internal bool NoRanked = false;

[JsonProperty] internal bool NPSMin = false;
[JsonProperty] internal int NPSMinV = 0;

Expand All @@ -22,6 +24,9 @@ internal class _Filters
[JsonProperty] internal bool NJSMax = false;
[JsonProperty] internal int NJSMaxV = 30;

[JsonProperty] internal bool DurationMin = false;
[JsonProperty] internal int DurationMinV = 1;

[JsonProperty] internal bool DurationMax = false;
[JsonProperty] internal int DurationMaxV = 3;

Expand Down
2 changes: 1 addition & 1 deletion Modules/BeatSaberPlus_ChatRequest/ChatRequest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ private IEnumerator CreateButtonCoroutine()
m_ManagerButtonS.transform.localScale = new Vector3(0.8f, 0.6f, 0.8f);
m_ManagerButtonS.transform.SetAsFirstSibling();
m_ManagerButtonS.gameObject.SetActive(true);
m_ManagerButtonP.GetComponentInChildren<TextMeshProUGUI>().fontStyle = FontStyles.Normal;
m_ManagerButtonS.GetComponentInChildren<TextMeshProUGUI>().fontStyle = FontStyles.Normal;
m_ManagerButtonS.GetComponentInChildren<TextMeshProUGUI>().margin = new Vector4(0, 4, 0, 0);

var l_Images = m_ManagerButtonP.GetComponentsInChildren<HMUI.ImageView>();
Expand Down
12 changes: 11 additions & 1 deletion Modules/BeatSaberPlus_ChatRequest/ChatRequest_Logic.cs
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,12 @@ private bool FilterBeatMap(CP_SDK_BS.Game.BeatMaps.MapDetail p_BeatMap, string p

if (CRConfig.Instance.Filters.NoBeatSage && p_BeatMap.automapper)
{
p_Reply = $"@{p_SenderName} BeatSage map are not allowed!";
p_Reply = $"@{p_SenderName} BeatSage maps are not allowed!";
return false;
}
if (CRConfig.Instance.Filters.NoRanked && p_BeatMap.ranked)
{
p_Reply = $"@{p_SenderName} Ranked maps are not allowed!";
return false;
}
if (l_FilterNPSMin || l_FilterNPSMax)
Expand Down Expand Up @@ -443,6 +448,11 @@ private bool FilterBeatMap(CP_SDK_BS.Game.BeatMaps.MapDetail p_BeatMap, string p
return false;
}
}
if (CRConfig.Instance.Filters.DurationMin && (int)p_BeatMap.metadata.duration < (CRConfig.Instance.Filters.DurationMinV * 60))
{
p_Reply = $"@{p_SenderName} this song is too short ({CRConfig.Instance.Filters.DurationMaxV} minute(s) minimum)!";
return false;
}
if (CRConfig.Instance.Filters.DurationMax && (int)p_BeatMap.metadata.duration > (CRConfig.Instance.Filters.DurationMaxV * 60))
{
p_Reply = $"@{p_SenderName} this song is too long ({CRConfig.Instance.Filters.DurationMaxV} minute(s) maximum)!";
Expand Down
4 changes: 2 additions & 2 deletions Modules/BeatSaberPlus_ChatRequest/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.0")]
[assembly: AssemblyFileVersion("6.2.0")]
[assembly: AssemblyVersion("6.2.2")]
[assembly: AssemblyFileVersion("6.2.2")]
31 changes: 25 additions & 6 deletions Modules/BeatSaberPlus_ChatRequest/UI/SettingsRightView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ namespace BeatSaberPlus_ChatRequest.UI
internal sealed class SettingsRightView : CP_SDK.UI.ViewController<SettingsRightView>
{
private XUIToggle m_NoBeatSageToggle;
private XUIToggle m_NoRankedToggle;
private XUIToggle m_NPSMinToggle;
private XUIToggle m_NPSMaxToggle;
private XUIToggle m_NJSMinToggle;
private XUIToggle m_NJSMaxToggle;
private XUIToggle m_DurationMinToggle;
private XUIToggle m_DurationMaxToggle;
private XUIToggle m_VoteMinToggle;
private XUIToggle m_DateMinToggle;
Expand All @@ -20,6 +22,7 @@ internal sealed class SettingsRightView : CP_SDK.UI.ViewController<SettingsRight
private XUISlider m_NPSMax;
private XUISlider m_NJSMin;
private XUISlider m_NJSMax;
private XUISlider m_DurationMin;
private XUISlider m_DurationMax;
private XUISlider m_VoteMin;
private XUISlider m_DateMin;
Expand Down Expand Up @@ -47,39 +50,44 @@ protected override sealed void OnViewCreation()
XUIHLayout.Make(
XUIVLayout.Make(
XUIText.Make("No BeatSage"),
XUIText.Make("No Ranked"),
XUIText.Make("NPS min"),
XUIText.Make("NPS max"),
XUIText.Make("NJS min"),
XUIText.Make("NJS max"),
XUIText.Make("Duration min"),
XUIText.Make("Duration max"),
XUIText.Make("Vote min"),
XUIText.Make("Upload date min"),
XUIText.Make("Upload date max")
)
.SetSpacing(2)
.SetPadding(2)
.SetSpacing(1)
.SetPadding(0)
.SetWidth(30)
.OnReady(x => x.HOrVLayoutGroup.childForceExpandWidth = true)
.ForEachDirect<XUIText>(x => x.SetAlign(TMPro.TextAlignmentOptions.CaplineLeft)),

XUIVLayout.Make(
XUIToggle.Make().SetValue(CRConfig.Instance.Filters.NoBeatSage ).Bind(ref m_NoBeatSageToggle ),
XUIToggle.Make().SetValue(CRConfig.Instance.Filters.NoRanked ).Bind(ref m_NoRankedToggle ),
XUIToggle.Make().SetValue(CRConfig.Instance.Filters.NPSMin ).Bind(ref m_NPSMinToggle ),
XUIToggle.Make().SetValue(CRConfig.Instance.Filters.NPSMax ).Bind(ref m_NPSMaxToggle ),
XUIToggle.Make().SetValue(CRConfig.Instance.Filters.NJSMin ).Bind(ref m_NJSMinToggle ),
XUIToggle.Make().SetValue(CRConfig.Instance.Filters.NJSMax ).Bind(ref m_NJSMaxToggle ),
XUIToggle.Make().SetValue(CRConfig.Instance.Filters.DurationMin).Bind(ref m_DurationMinToggle),
XUIToggle.Make().SetValue(CRConfig.Instance.Filters.DurationMax).Bind(ref m_DurationMaxToggle),
XUIToggle.Make().SetValue(CRConfig.Instance.Filters.VoteMin ).Bind(ref m_VoteMinToggle ),
XUIToggle.Make().SetValue(CRConfig.Instance.Filters.DateMin ).Bind(ref m_DateMinToggle ),
XUIToggle.Make().SetValue(CRConfig.Instance.Filters.DateMax ).Bind(ref m_DateMaxToggle )
)
.SetSpacing(2)
.SetPadding(2)
.SetSpacing(1)
.SetPadding(0)
.SetWidth(20)
.ForEachDirect<XUIToggle>(x => x.OnValueChanged(_ => OnValueChanged())),

XUIVLayout.Make(
XUIText.Make("Discard all BeatSage maps"),
XUIText.Make("Discard all ranked maps"),
XUISlider.Make()
.SetMinValue(0f).SetMaxValue(100f).SetIncrements( 1f).SetInteger(true)
.SetValue(CRConfig.Instance.Filters.NPSMinV)
Expand All @@ -96,6 +104,10 @@ protected override sealed void OnViewCreation()
.SetMinValue(1f).SetMaxValue(100f).SetIncrements( 1f).SetInteger(true)
.SetValue(CRConfig.Instance.Filters.NJSMaxV)
.Bind(ref m_NJSMax),
XUISlider.Make()
.SetMinValue(1f).SetMaxValue( 60f).SetIncrements( 1f).SetInteger(true)
.SetValue(CRConfig.Instance.Filters.DurationMinV)
.Bind(ref m_DurationMin),
XUISlider.Make()
.SetMinValue(1f).SetMaxValue( 60f).SetIncrements( 1f).SetInteger(true)
.SetValue(CRConfig.Instance.Filters.DurationMaxV)
Expand All @@ -113,8 +125,8 @@ protected override sealed void OnViewCreation()
.SetValue(CRConfig.Instance.Filters.DateMaxV)
.Bind(ref m_DateMax)
)
.SetSpacing(2)
.SetPadding(2)
.SetSpacing(1)
.SetPadding(0)
.SetWidth(65)
.ForEachDirect<XUISlider>(x => x.OnValueChanged(_ => OnValueChanged()))
)
Expand Down Expand Up @@ -147,17 +159,20 @@ private void OnValueChanged()
m_NPSMax.SetInteractable( m_NPSMaxToggle.Element.GetValue());
m_NJSMin.SetInteractable( m_NJSMinToggle.Element.GetValue());
m_NJSMax.SetInteractable( m_NJSMaxToggle.Element.GetValue());
m_DurationMin.SetInteractable( m_DurationMinToggle.Element.GetValue());
m_DurationMax.SetInteractable( m_DurationMaxToggle.Element.GetValue());
m_VoteMin.SetInteractable( m_VoteMinToggle.Element.GetValue());
m_DateMin.SetInteractable( m_DateMinToggle.Element.GetValue());
m_DateMax.SetInteractable( m_DateMaxToggle.Element.GetValue());

/// Left
CRConfig.Instance.Filters.NoBeatSage = m_NoBeatSageToggle.Element.GetValue();
CRConfig.Instance.Filters.NoRanked = m_NoRankedToggle.Element.GetValue();
CRConfig.Instance.Filters.NPSMin = m_NPSMinToggle.Element.GetValue();
CRConfig.Instance.Filters.NPSMax = m_NPSMaxToggle.Element.GetValue();
CRConfig.Instance.Filters.NJSMin = m_NJSMinToggle.Element.GetValue();
CRConfig.Instance.Filters.NJSMax = m_NJSMaxToggle.Element.GetValue();
CRConfig.Instance.Filters.DurationMin = m_DurationMinToggle.Element.GetValue();
CRConfig.Instance.Filters.DurationMax = m_DurationMaxToggle.Element.GetValue();
CRConfig.Instance.Filters.VoteMin = m_VoteMinToggle.Element.GetValue();
CRConfig.Instance.Filters.DateMin = m_DateMinToggle.Element.GetValue();
Expand All @@ -168,6 +183,7 @@ private void OnValueChanged()
CRConfig.Instance.Filters.NPSMaxV = (int)m_NPSMax.Element.GetValue();
CRConfig.Instance.Filters.NJSMinV = (int)m_NJSMin.Element.GetValue();
CRConfig.Instance.Filters.NJSMaxV = (int)m_NJSMax.Element.GetValue();
CRConfig.Instance.Filters.DurationMinV = (int)m_DurationMin.Element.GetValue();
CRConfig.Instance.Filters.DurationMaxV = (int)m_DurationMax.Element.GetValue();
CRConfig.Instance.Filters.VoteMinV = m_VoteMin.Element.GetValue();
CRConfig.Instance.Filters.DateMinV = (int)m_DateMin.Element.GetValue();
Expand All @@ -186,10 +202,12 @@ internal void RefreshSettings()

/// Left
m_NoBeatSageToggle.SetValue( CRConfig.Instance.Filters.NoBeatSage);
m_NoRankedToggle.SetValue( CRConfig.Instance.Filters.NoRanked);
m_NPSMinToggle.SetValue( CRConfig.Instance.Filters.NPSMin);
m_NPSMaxToggle.SetValue( CRConfig.Instance.Filters.NPSMax);
m_NJSMinToggle.SetValue( CRConfig.Instance.Filters.NJSMin);
m_NJSMaxToggle.SetValue( CRConfig.Instance.Filters.NJSMax);
m_DurationMinToggle.SetValue( CRConfig.Instance.Filters.DurationMin);
m_DurationMaxToggle.SetValue( CRConfig.Instance.Filters.DurationMax);
m_VoteMinToggle.SetValue( CRConfig.Instance.Filters.VoteMin);
m_DateMinToggle.SetValue( CRConfig.Instance.Filters.DateMin);
Expand All @@ -200,6 +218,7 @@ internal void RefreshSettings()
m_NPSMax.SetValue( CRConfig.Instance.Filters.NPSMaxV);
m_NJSMin.SetValue( CRConfig.Instance.Filters.NJSMinV);
m_NJSMax.SetValue( CRConfig.Instance.Filters.NJSMaxV);
m_DurationMin.SetValue( CRConfig.Instance.Filters.DurationMinV);
m_DurationMax.SetValue( CRConfig.Instance.Filters.DurationMaxV);
m_VoteMin.SetValue( CRConfig.Instance.Filters.VoteMinV);
m_DateMin.SetValue( CRConfig.Instance.Filters.DateMinV);
Expand Down
6 changes: 3 additions & 3 deletions Modules/BeatSaberPlus_ChatRequest/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"id": "BeatSaberPlus_ChatRequest",
"name": "BeatSaberPlus_ChatRequest",
"author": "HardCPP",
"version": "6.2.0",
"version": "6.2.2",
"description": "",
"gameVersion": "1.31.0",
"gameVersion": "1.34.2",
"dependsOn": {
"BSIPA": "^4.3.0",
"ChatPlexSDK_BS": "^6.2.0"
"ChatPlexSDK_BS": "^6.2.2"
},
"links": {
"project-home": "https://discord.chatplex.org",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="BGLib.UnityExtension">
<HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\BGLib.UnityExtension.dll</HintPath>
</Reference>
<Reference Include="Colors">
<HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Colors.dll</HintPath>
<Private>False</Private>
Expand All @@ -88,6 +91,9 @@
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Menu.CommonLib">
<HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Menu.CommonLib.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>$(BeatSaberDir)\Libs\Newtonsoft.Json.dll</HintPath>
<Private>False</Private>
Expand Down
Binary file not shown.
4 changes: 2 additions & 2 deletions Modules/BeatSaberPlus_GameTweaker/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.0")]
[assembly: AssemblyFileVersion("6.2.0")]
[assembly: AssemblyVersion("6.2.2")]
[assembly: AssemblyFileVersion("6.2.2")]
6 changes: 3 additions & 3 deletions Modules/BeatSaberPlus_GameTweaker/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"id": "BeatSaberPlus_GameTweaker",
"name": "BeatSaberPlus_GameTweaker",
"author": "HardCPP",
"version": "6.2.0",
"version": "6.2.2",
"description": "",
"gameVersion": "1.31.0",
"gameVersion": "1.34.2",
"dependsOn": {
"BSIPA": "^4.3.0",
"ChatPlexSDK_BS": "^6.2.0"
"ChatPlexSDK_BS": "^6.2.2"
},
"links": {
"project-home": "https://discord.chatplex.org",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@
</ItemGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\..\..\..\..\SteamLibrary\steamapps\common\Beat Saber\Libs\Newtonsoft.Json.dll</HintPath>
<HintPath>$(BeatSaberDir)\Libs\Newtonsoft.Json.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="SongCore">
<HintPath>$(BeatSaberDir)\Plugins\SongCore.dll</HintPath>
Expand Down
Binary file not shown.
Loading

0 comments on commit eab1ab0

Please sign in to comment.