From 32a7b5b1850dd44cbf36fcb6c27a87bcba729bf4 Mon Sep 17 00:00:00 2001 From: Coloryr <402067010@qq.com> Date: Thu, 26 Mar 2020 12:02:09 +0800 Subject: [PATCH] up --- .../java/Color_yr/ALLMusic/MusicAPI/MusicAPI1/API1.java | 7 +++++-- .../java/Color_yr/ALLMusic/MusicAPI/MusicAPI2/API2.java | 7 +++++-- .../java/Color_yr/ALLMusic/MusicAPI/MusicAPI3/API3.java | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/java/Color_yr/ALLMusic/MusicAPI/MusicAPI1/API1.java b/src/main/java/Color_yr/ALLMusic/MusicAPI/MusicAPI1/API1.java index ab1b86fb..4ac69073 100644 --- a/src/main/java/Color_yr/ALLMusic/MusicAPI/MusicAPI1/API1.java +++ b/src/main/java/Color_yr/ALLMusic/MusicAPI/MusicAPI1/API1.java @@ -146,10 +146,13 @@ public class API1 implements IMusic { if (!isUpdata && ALLMusic.Config.getPlayList().size() != 0) { String ID; if (ALLMusic.Config.isPlayListRandom()) { - ID = ALLMusic.Config.getPlayList().get(new Random().nextInt(ALLMusic.Config.getPlayList().size()) - 1); + ID = ALLMusic.Config.getPlayList().get(new Random().nextInt(ALLMusic.Config.getPlayList().size() - 1)); } else { ID = ALLMusic.Config.getPlayList().get(PlayNow); - PlayNow = PlayNow == ALLMusic.Config.getPlayList().size() ? 0 : +1; + if (PlayNow == ALLMusic.Config.getPlayList().size()) + PlayNow = 0; + else + PlayNow++; } return ID; } diff --git a/src/main/java/Color_yr/ALLMusic/MusicAPI/MusicAPI2/API2.java b/src/main/java/Color_yr/ALLMusic/MusicAPI/MusicAPI2/API2.java index 25a7764e..b32bc695 100644 --- a/src/main/java/Color_yr/ALLMusic/MusicAPI/MusicAPI2/API2.java +++ b/src/main/java/Color_yr/ALLMusic/MusicAPI/MusicAPI2/API2.java @@ -147,10 +147,13 @@ public class API2 implements IMusic { if (!isUpdata && ALLMusic.Config.getPlayList().size() != 0) { String ID; if (ALLMusic.Config.isPlayListRandom()) { - ID = ALLMusic.Config.getPlayList().get(new Random().nextInt(ALLMusic.Config.getPlayList().size()) - 1); + ID = ALLMusic.Config.getPlayList().get(new Random().nextInt(ALLMusic.Config.getPlayList().size() - 1)); } else { ID = ALLMusic.Config.getPlayList().get(PlayNow); - PlayNow = PlayNow == ALLMusic.Config.getPlayList().size() ? 0 : +1; + if (PlayNow == ALLMusic.Config.getPlayList().size()) + PlayNow = 0; + else + PlayNow++; } return ID; } diff --git a/src/main/java/Color_yr/ALLMusic/MusicAPI/MusicAPI3/API3.java b/src/main/java/Color_yr/ALLMusic/MusicAPI/MusicAPI3/API3.java index a9391143..7ee42b62 100644 --- a/src/main/java/Color_yr/ALLMusic/MusicAPI/MusicAPI3/API3.java +++ b/src/main/java/Color_yr/ALLMusic/MusicAPI/MusicAPI3/API3.java @@ -147,10 +147,13 @@ public class API3 implements IMusic { if (!isUpdata && ALLMusic.Config.getPlayList().size() != 0) { String ID; if (ALLMusic.Config.isPlayListRandom()) { - ID = ALLMusic.Config.getPlayList().get(new Random().nextInt(ALLMusic.Config.getPlayList().size()) - 1); + ID = ALLMusic.Config.getPlayList().get(new Random().nextInt(ALLMusic.Config.getPlayList().size() - 1)); } else { ID = ALLMusic.Config.getPlayList().get(PlayNow); - PlayNow = PlayNow == ALLMusic.Config.getPlayList().size() ? 0 : +1; + if (PlayNow == ALLMusic.Config.getPlayList().size()) + PlayNow = 0; + else + PlayNow++; } return ID; }