Merge branch 'develop' into frame-song-position-for-note-rendering

FunkinCrew · Oct 3, 2024 · 50fc90f · 50fc90f
2 parents b974ef8 + a561bd2
commit 50fc90f
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 3 deletions.
diff --git a/source/funkin/Conductor.hx b/source/funkin/Conductor.hx
@@ -421,7 +421,7 @@ class Conductor
     var frameSongPos:Float = frameSongPosition + FlxG.elapsed * 1000;
 
     // Take into account instrumental and file format song offsets.
-    songPos += applyOffsets ? (instrumentalOffset + formatOffset + audioVisualOffset) : 0;
+    songPos += applyOffsets ? (combinedOffset) : 0;
 
     var oldMeasure:Float = this.currentMeasure;
     var oldBeat:Float = this.currentBeat;

diff --git a/source/funkin/modding/PolymodHandler.hx b/source/funkin/modding/PolymodHandler.hx
@@ -282,6 +282,13 @@ class PolymodHandler
     // System.load() can load malicious DLLs
     Polymod.blacklistImport('lime.system.System');
 
+    // `lime.utils.Assets`
+    // Literally just has a private `resolveClass` function for some reason?
+    Polymod.blacklistImport('lime.utils.Assets');
+    Polymod.blacklistImport('openfl.utils.Assets');
+    Polymod.blacklistImport('openfl.Lib');
+    Polymod.blacklistImport('openfl.system.ApplicationDomain');
+
     // `openfl.desktop.NativeProcess`
     // Can load native processes on the host operating system.
     Polymod.blacklistImport('openfl.desktop.NativeProcess');

diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
@@ -1458,10 +1458,34 @@ class PlayState extends MusicBeatSubState
     {
       var correctSync:Float = Math.min(FlxG.sound.music.length, Math.max(0, Conductor.instance.songPosition - Conductor.instance.combinedOffset));
 
-      if (!startingSong && (Math.abs(FlxG.sound.music.time - correctSync) > 5 || Math.abs(vocals.checkSyncError(correctSync)) > 5))
+      var playerVoicesError:Float = 0;
+      var opponentVoicesError:Float = 0;
+
+      if (vocals != null)
+      {
+        @:privateAccess // todo: maybe make the groups public :thinking:
+        {
+          vocals.playerVoices.forEachAlive(function(voice:FunkinSound) {
+            var currentRawVoiceTime:Float = voice.time + vocals.playerVoicesOffset;
+            if (Math.abs(currentRawVoiceTime - correctSync) > Math.abs(playerVoicesError)) playerVoicesError = currentRawVoiceTime - correctSync;
+          });
+
+          vocals.opponentVoices.forEachAlive(function(voice:FunkinSound) {
+            var currentRawVoiceTime:Float = voice.time + vocals.opponentVoicesOffset;
+            if (Math.abs(currentRawVoiceTime - correctSync) > Math.abs(opponentVoicesError)) opponentVoicesError = currentRawVoiceTime - correctSync;
+          });
+        }
+      }
+
+      if (!startingSong
+        && (Math.abs(FlxG.sound.music.time - correctSync) > 5 || Math.abs(playerVoicesError) > 5 || Math.abs(opponentVoicesError) > 5))
       {
         trace("VOCALS NEED RESYNC");
-        if (vocals != null) trace(vocals.checkSyncError(correctSync));
+        if (vocals != null)
+        {
+          trace(playerVoicesError);
+          trace(opponentVoicesError);
+        }
         trace(FlxG.sound.music.time);
         trace(correctSync);
         resyncVocals();
@@ -1837,6 +1861,17 @@ class PlayState extends MusicBeatSubState
         smallImageKey: discordRPCIcon
       });
     #end
+
+    #if FEATURE_DISCORD_RPC
+    // Updating Discord Rich Presence.
+    DiscordClient.instance.setPresence(
+      {
+        state: buildDiscordRPCState(),
+        details: buildDiscordRPCDetails(),
+        largeImageKey: discordRPCAlbum,
+        smallImageKey: discordRPCIcon
+      });
+    #end
   }
 
   function buildDiscordRPCDetails():String