Update for Beat Saber 1.34.5

nicoco007 · Mar 14, 2024 · ebe1c4e · ebe1c4e
1 parent 2443a08
commit ebe1c4e
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 21 deletions.
diff --git a/Source/CustomAvatar/CustomAvatar.csproj b/Source/CustomAvatar/CustomAvatar.csproj
@@ -32,46 +32,64 @@
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\BGLib.AppFlow.dll</HintPath>
       <Private>false</Private>
     </Reference>
+    <Reference Include="BGLib.Polyglot">
+      <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\BGLib.Polyglot.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
     <Reference Include="BGLib.UnityExtension">
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\BGLib.UnityExtension.dll</HintPath>
       <Private>false</Private>
     </Reference>
-    <Reference Include="BGNet">
-      <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\BGNet.dll</HintPath>
+    <Reference Include="BGNetCore">
+      <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\BGNetCore.dll</HintPath>
       <Private>false</Private>
     </Reference>
     <Reference Include="BSML">
       <HintPath>$(BeatSaberDir)\Plugins\BSML.dll</HintPath>
       <Private>false</Private>
     </Reference>
-    <Reference Include="DynamicBone" Publicize="true">
+    <Reference Include="DataModels">
+      <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\DataModels.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="DynamicBone">
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\DynamicBone.dll</HintPath>
       <Private>false</Private>
+      <Publicize>true</Publicize>
       <Aliases>BeatSaberDynamicBone</Aliases>
     </Reference>
-    <Reference Include="FinalIK" Publicize="true">
+    <Reference Include="FinalIK">
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\FinalIK.dll</HintPath>
       <Private>false</Private>
+      <Publicize>true</Publicize>
       <Aliases>BeatSaberFinalIK</Aliases>
     </Reference>
     <Reference Include="GameplayCore">
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\GameplayCore.dll</HintPath>
       <Private>false</Private>
     </Reference>
+    <Reference Include="Helpers">
+      <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Helpers.dll</HintPath>
+      <Private>false</Private>
+      <Publicize>true</Publicize>
+    </Reference>
     <Reference Include="Hive.Versioning">
       <HintPath>$(BeatSaberDir)\Libs\Hive.Versioning.dll</HintPath>
+      <Private>false</Private>
     </Reference>
-    <Reference Include="HMLib" Publicize="true">
+    <Reference Include="HMLib">
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\HMLib.dll</HintPath>
       <Private>false</Private>
+      <Publicize>true</Publicize>
     </Reference>
     <Reference Include="HMRendering">
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\HMRendering.dll</HintPath>
       <Private>false</Private>
     </Reference>
-    <Reference Include="HMUI" Publicize="true">
+    <Reference Include="HMUI">
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\HMUI.dll</HintPath>
       <Private>false</Private>
+      <Publicize>true</Publicize>
     </Reference>
     <Reference Include="IPA.Loader">
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\IPA.Loader.dll</HintPath>
@@ -81,9 +99,10 @@
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Menu.CommonLib.dll</HintPath>
       <Private>false</Private>
     </Reference>
-    <Reference Include="Main" Publicize="true">
+    <Reference Include="Main">
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Main.dll</HintPath>
       <Private>false</Private>
+      <Publicize>true</Publicize>
     </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>$(BeatSaberDir)\Libs\Newtonsoft.Json.dll</HintPath>
@@ -93,21 +112,19 @@
       <HintPath>$(BeatSaberDir)\Libs\OpenVR.dll</HintPath>
       <Private>false</Private>
     </Reference>
-    <Reference Include="Unity.XR.Hands" Publicize="true">
+    <Reference Include="Unity.XR.Hands">
       <HintPath>$(BeatSaberDir)\Libs\Unity.XR.Hands.dll</HintPath>
       <Private>false</Private>
-    </Reference>
-    <Reference Include="Polyglot">
-      <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Polyglot.dll</HintPath>
-      <Private>false</Private>
+      <Publicize>true</Publicize>
     </Reference>
     <Reference Include="protobuf-net">
       <HintPath>$(BeatSaberDir)\Libs\protobuf-net.dll</HintPath>
       <Private>false</Private>
     </Reference>
-    <Reference Include="Rendering" Publicize="true">
+    <Reference Include="Rendering">
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Rendering.dll</HintPath>
       <Private>false</Private>
+      <Publicize>true</Publicize>
     </Reference>
     <Reference Include="SiraUtil">
       <HintPath>$(BeatSaberDir)\Plugins\SiraUtil.dll</HintPath>
@@ -141,9 +158,10 @@
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.AudioModule.dll</HintPath>
       <Private>false</Private>
     </Reference>
-    <Reference Include="UnityEngine.CoreModule" Publicize="true">
+    <Reference Include="UnityEngine.CoreModule">
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
       <Private>false</Private>
+      <Publicize>true</Publicize>
     </Reference>
     <Reference Include="UnityEngine.ImageConversionModule">
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.ImageConversionModule.dll</HintPath>
@@ -181,9 +199,10 @@
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\VRUI.dll</HintPath>
       <Private>false</Private>
     </Reference>
-    <Reference Include="Zenject" Publicize="true">
+    <Reference Include="Zenject">
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Zenject.dll</HintPath>
       <Private>false</Private>
+      <Publicize>true</Publicize>
     </Reference>
     <Reference Include="Zenject-usage">
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Zenject-usage.dll</HintPath>

diff --git a/Source/CustomAvatar/Plugin.cs b/Source/CustomAvatar/Plugin.cs
@@ -25,7 +25,6 @@
 using IPA;
 using IPA.Loader;
 using SiraUtil.Zenject;
-using Zenject;
 using Logger = IPA.Logging.Logger;
 
 namespace CustomAvatar

diff --git a/Source/CustomAvatar/UI/AvatarListViewController.cs b/Source/CustomAvatar/UI/AvatarListViewController.cs
@@ -19,13 +19,13 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using BGLib.Polyglot;
 using CustomAvatar.Avatar;
 using CustomAvatar.Logging;
 using CustomAvatar.Player;
 using CustomAvatar.Utilities;
 using HMUI;
 using IPA.Utilities.Async;
-using Polyglot;
 using TMPro;
 using UnityEngine;
 using UnityEngine.U2D;

diff --git a/Source/CustomAvatar/UI/MirrorViewController.cs b/Source/CustomAvatar/UI/MirrorViewController.cs
@@ -17,14 +17,14 @@
 using System;
 using BeatSaberMarkupLanguage.Attributes;
 using BeatSaberMarkupLanguage.ViewControllers;
+using BGLib.Polyglot;
 using CustomAvatar.Avatar;
 using CustomAvatar.Configuration;
 using CustomAvatar.Player;
 using CustomAvatar.Rendering;
 using CustomAvatar.Tracking;
 using HMUI;
 using JetBrains.Annotations;
-using Polyglot;
 using TMPro;
 using UnityEngine;
 using UnityEngine.UI;

diff --git a/Source/CustomAvatar/UI/SettingsViewController.cs b/Source/CustomAvatar/UI/SettingsViewController.cs
@@ -20,10 +20,10 @@
 using BeatSaberMarkupLanguage;
 using BeatSaberMarkupLanguage.Attributes;
 using BeatSaberMarkupLanguage.ViewControllers;
+using BGLib.Polyglot;
 using CustomAvatar.Tracking;
 using HMUI;
 using IPA.Loader;
-using Polyglot;
 using TMPro;
 using UnityEngine;
 using Zenject;

diff --git a/Source/CustomAvatar/Utilities/BeatmapObjectEventFilter.cs b/Source/CustomAvatar/Utilities/BeatmapObjectEventFilter.cs
@@ -118,7 +118,7 @@ private bool ParentWasAlreadyTriggered(NoteController noteController, NoteCutRes
         {
             NoteData noteData = noteController.noteData;
 
-            if (noteData.gameplayType is not NoteData.GameplayType.BurstSliderHead and not NoteData.GameplayType.BurstSliderElement and not NoteData.GameplayType.BurstSliderElementFill)
+            if (noteData.gameplayType is not NoteData.GameplayType.BurstSliderHead and not NoteData.GameplayType.BurstSliderElement)
             {
                 return false;
             }

diff --git a/Source/CustomAvatar/manifest.json b/Source/CustomAvatar/manifest.json
@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/nike4613/ModSaber-MetadataFileSchema/master/Schema.json",
   "author": "Custom Avatars Contributors",
   "description": "Allows the use of custom player models for body presence.",
-  "gameVersion": "1.32.0",
+  "gameVersion": "1.35.0",
   "id": "CustomAvatar",
   "icon": "CustomAvatar.Resources.icon.png",
   "name": "Custom Avatars",