Skip to content

Commit

Permalink
Update to 6.3.3 for bs 1.40.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@hardcpp
hardcpp committed Jan 7, 2025
1 parent 28e5b71 commit 8170c7e
Show file tree
Hide file tree
Showing 53 changed files with 608 additions and 244 deletions.
5 changes: 5 additions & 0 deletions BeatSaberPlus.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeatSaberPlusKick", "Privat
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChatPlexSDK_BS", "ChatPlexSDK_BS\ChatPlexSDK_BS.csproj", "{84972BAC-4FAF-4DA8-92ED-E3A735AF0E92}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6A616A79-5E4B-4610-B1E4-CF409D236657}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down
4 changes: 4 additions & 0 deletions Modules/BeatSaberPlus_Chat/BeatSaberPlus_Chat.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@
</PackageReference>
</ItemGroup>
<ItemGroup>
<Reference Include="BeatSaber.ViewSystem" Publicize="true">
<HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\BeatSaber.ViewSystem.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="DataModels">
<HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\DataModels.dll</HintPath>
<Private>False</Private>
Expand Down
Binary file modified Modules/BeatSaberPlus_Chat/BeatSaberPlus_Chat.csproj.user
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion Modules/BeatSaberPlus_Chat/ChatPlexMod_Chat/Chat.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ internal void UpdateFloatingPanels()

/// Prepare data for level with rotations
#if BEATSABER
var l_Is360Level = CP_SDK_BS.Game.Logic.LevelData?.Data?.transformedBeatmapData?.spawnRotationEventsCount > 0;
var l_Is360Level = CP_SDK_BS.Game.Logic.LevelData?.HasRotations ?? false;
var l_RotationRef = l_Is360Level ? Resources.FindObjectsOfTypeAll<FlyingGameHUDRotation>().FirstOrDefault()?.gameObject : null as GameObject;
#elif SYNTHRIDERS
var l_RotationRef = Resources.FindObjectsOfTypeAll<GameObject>().FirstOrDefault(x => x.name == "[Score & Misc]");
Expand Down
2 changes: 1 addition & 1 deletion Modules/BeatSaberPlus_Chat/ChatPlexMod_Chat/Utils/ChatMessageBuilder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public static async Task<string> BuildMessage(IChatMessage p_Message, Extensions
}
}
}
Logger.Instance.Error(l_StringBuilder.ToString());

return l_StringBuilder.ToString();
}
catch (Exception p_Exception)
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 @@ -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.0")]
[assembly: AssemblyFileVersion("6.3.0")]
[assembly: AssemblyVersion("6.3.3")]
[assembly: AssemblyFileVersion("6.3.3")]
6 changes: 3 additions & 3 deletions Modules/BeatSaberPlus_Chat/manifest.json
View file
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.3.0",
"version": "6.3.3",
"description": "",
"gameVersion": "1.37.1",
"gameVersion": "1.40.0",
"dependsOn": {
"BSIPA": "^4.3.0",
"ChatPlexSDK_BS": "^6.3.0"
"ChatPlexSDK_BS": "^6.3.3"
},
"links": {
"project-home": "https://discord.chatplex.org",
Expand Down
Binary file modified Modules/BeatSaberPlus_ChatEmoteRain/BeatSaberPlus_ChatEmoteRain.csproj.user
View file
Binary file not shown.
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 @@ -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.0")]
[assembly: AssemblyFileVersion("6.3.0")]
[assembly: AssemblyVersion("6.3.3")]
[assembly: AssemblyFileVersion("6.3.3")]
6 changes: 3 additions & 3 deletions Modules/BeatSaberPlus_ChatEmoteRain/manifest.json
View file
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.3.0",
"version": "6.3.3",
"description": "",
"gameVersion": "1.37.1",
"gameVersion": "1.40.0",
"dependsOn": {
"BSIPA": "^4.3.0",
"ChatPlexSDK_BS": "^6.3.0"
"ChatPlexSDK_BS": "^6.3.3"
},
"links": {
"project-home": "https://discord.chatplex.org",
Expand Down
6 changes: 6 additions & 0 deletions Modules/BeatSaberPlus_ChatIntegrations/BeatSaber/Actions/GamePlay.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1358,6 +1358,8 @@ public override IEnumerator Eval(ChatPlexMod_ChatIntegrations.Models.EventContex
var l_Current = l_SpawnList[l_S];
l_BeatmapObjectSpawnController.HandleNoteDataCallback(NoteData.CreateBombNoteData(
l_AudioTimeSyncController.songTime + l_Time,
0.0f /* TODO */,
0,
l_Current.Item1,
(NoteLineLayer)l_Current.Item2
)
Expand Down Expand Up @@ -1445,7 +1447,11 @@ public override IEnumerator Eval(ChatPlexMod_ChatIntegrations.Models.EventContex
for (int l_I = 0; l_I < Model.Count; ++l_I)
{
l_BeatmapObjectSpawnController.HandleObstacleDataCallback(new ObstacleData(
#if BEATSABER_1_38_0_OR_NEWER
l_AudioTimeSyncController.songTime + l_Time, 0.0f /* TODO */, 0.0f /* TODO */, 0, 4, NoteLineLayer.Top, 0.3f, -4, 3
#else
l_AudioTimeSyncController.songTime + l_Time, 4, NoteLineLayer.Top, 0.3f, -4, 3
#endif
));
l_Time += Model.Interval;
}
Expand Down
8 changes: 6 additions & 2 deletions Modules/BeatSaberPlus_ChatIntegrations/BeatSaberPlus_ChatIntegrations.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
<DebugSymbols>true</DebugSymbols>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;BEATSABER_1_35_0_OR_NEWER</DefineConstants>
<DefineConstants>TRACE;DEBUG;BEATSABER_1_35_0_OR_NEWER;BEATSABER_1_38_0_OR_NEWER</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>BEATSABER_1_35_0_OR_NEWER</DefineConstants>
<DefineConstants>BEATSABER_1_35_0_OR_NEWER;BEATSABER_1_38_0_OR_NEWER</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
Expand All @@ -56,6 +56,10 @@
<HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\BeatmapCore.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="BeatSaber.ViewSystem" Publicize="true">
<HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\BeatSaber.ViewSystem.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Camera2">
<HintPath>$(BeatSaberDir)\Plugins\Camera2.dll</HintPath>
<Private>False</Private>
Expand Down
Binary file modified Modules/BeatSaberPlus_ChatIntegrations/BeatSaberPlus_ChatIntegrations.csproj.user
View file
Binary file not shown.
Loading

0 comments on commit 8170c7e

Please sign in to comment.