refactor: 修改音乐播放暂停的触发机制

FPSMasterTeam · Aug 10, 2024 · 3f3257f · 3f3257f
1 parent 523f039
commit 3f3257f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/shared/java/top/fpsmaster/features/GlobalSubmitter.kt b/shared/java/top/fpsmaster/features/GlobalSubmitter.kt
@@ -93,17 +93,7 @@ class GlobalSubmitter {
 
     @Subscribe
     fun onTick(e: EventTick) {
-        if (time.delay(500)) {
-            if (Minecraft.getMinecraft().currentScreen is MainMenu) {
-                if (!MusicPlayer.playList.musics.isEmpty()) {
-                    if (MusicPlayer.isPlaying) {
-                        MusicPlayer.playList.pause()
-                    }
-                }
-            }
-        }
-
-        if (musicSwitchTimer.delay(3000)) {
+        if (musicSwitchTimer.delay(1000)) {
             if (MusicPlayer.isPlaying && MusicPlayer.playProgress > 0.999) {
                 MusicPlayer.playList.next()
             }

diff --git a/shared/java/top/fpsmaster/ui/screens/mainmenu/MainMenu.kt b/shared/java/top/fpsmaster/ui/screens/mainmenu/MainMenu.kt
@@ -8,6 +8,7 @@ import net.minecraft.util.ResourceLocation
 import org.lwjgl.input.Mouse
 import top.fpsmaster.FPSMaster
 import top.fpsmaster.interfaces.ProviderManager
+import top.fpsmaster.modules.music.MusicPlayer
 import top.fpsmaster.ui.screens.account.GuiWaiting
 import top.fpsmaster.ui.screens.oobe.GuiLogin
 import top.fpsmaster.ui.screens.plugins.GuiPlugins
@@ -51,6 +52,11 @@ class MainMenu : GuiScreen() {
      */
     override fun initGui() {
         ProviderManager.mainmenuProvider.initGui()
+        if (!MusicPlayer.playList.musics.isEmpty()) {
+            if (MusicPlayer.isPlaying) {
+                MusicPlayer.playList.pause()
+            }
+        }
     }
 
     /**