Merge pull request #61 from GregTaoo/dev

Dev 1.4.1

Author: GregTaoo

README.md

@@ -11,9 +11,9 @@
 -----------------------------
 
 
-**Wiki 基准模组版本：1.3.8**
+**Wiki 基准模组版本：1.4.1**
 
-目前已知支持版本：1.21.5, 1.21.4, 1.21.1, 1.20.6, 1.20.1, 1.19.4, 1.18.2, 1.17.1, 1.16.5，其余版本未经测试
+目前已知支持版本：1.21.7, 1.21.6, 1.21.5, 1.21.4, 1.21.1, 1.21, 1.20.6, 1.20.1, 1.19.4, 1.18.2, 1.17.1, 1.16.5，其余版本未经测试
 
 ### 安全提醒！
 
@@ -64,6 +64,7 @@
 
    `export-as-playlist`: 导出当前播放队列为服务端预设歌单格式 `JSON`（详见 服务端预设歌单）
 
+   `clean-cache`: 删除客户端 `Concerto/cache` 文件夹下所有文件（包括cookie）
 
 2. `/concerto-server`（服务端指令，仅限管理员）
 
@@ -79,12 +80,18 @@
 
    `reload-cookie`: 重新加载所有cookie文件
 
+   `clean-cache`: 删除服务端 `Concerto/cache` 文件夹下所有文件（包括cookie）
+
    `fetch-radios`: 技术性指令，同步服务端预设歌单到本地（允许普通用户使用）
 
    `agent reset`: 重新加载服务端歌曲点播队列
 
    `agent cut`: 强制让服务端点播队列播放下一首/切歌
 
+   `agent stop`: 停止点播歌曲的播放（注意：当前歌曲会被直接切掉）
+
+   `agent start`: 继续点播歌曲的播放（注意：从下一首开始）
+
 
 3. `/sharemusic`（客户端指令，服务端不安装 Concerto 也可使用，非音乐室功能）
 
@@ -105,7 +112,7 @@
 
    `join [UUID]`: 加入编号为 `[UUID]` 的音乐室
 
-   `quit`: 退出当前音乐室
+   `quit`: 退出当前音乐室（或者点播室）
 
    `members`: 显示当前所在音乐室的成员
 
@@ -131,13 +138,21 @@
 - 单击选中音乐，再点击详情按钮查看音乐具体信息（内有**服务器点歌**按钮）
 - 可将多个文件/文件夹拖入 播放队列管理界面/添加音乐界面 进行添加
 
+
+### 本地预设歌单
+
+- 使用 `/concerto export-as-playlist` 或歌单详情页面按钮导出歌单
+- 导出的 `JSON` 文件已经被放置于 `Concerto/local_playlists` 文件夹下
+- 可用 `/concerto reload` 重新加载最新添加的预设歌单
+- 可在 Concerto 主菜单里看到本地预设歌单的入口
+
 ### 服务端预设歌单
 
 - 使用 `/concerto export-as-playlist` 或歌单详情页面按钮导出歌单
-- 将导出的 `JSON` 文件放置于 `Concerto/preset_radios` 文件夹下
+- 将导出的 `JSON` 文件复制并放置于 `Concerto/preset_radios` 文件夹下（默认是导出到本地的文件夹，`Concerto/local_playlists`）
 - 若文件名为 `music_agent.json` 将作为音乐点播室空闲时候的歌单
 - 可用 `/concerto-server reload` 重新加载最新添加的预设歌单
-- 玩家可在 Concerto 主菜单里看到服务端预设歌单的入口
+- 服务器玩家可在 Concerto 主菜单里看到服务端预设歌单的入口
 
 ### 服务端配置文件
 
@@ -225,19 +240,28 @@
 
 即网易云音乐和QQ音乐，不含本地资源、其他网络资源
 
+### 关于直接输入Cookie的登录方式
+
+- 方法1: 打开对应网站登录后，电脑浏览器点按 F12 打开开发者面板的网络面板 (Network)，刷新页面，点击第一个条目，往下滑动找到并复制所有Cookie
+- 方法2（推荐）: 使用 Cookie-Editor 浏览器插件
+
 ### Q & A
 
 - Q: 网易云音乐用密码或验证码登录时出现“当前登录存在安全风险”
-- A: 网易云风控导致，请优先考虑使用二维码登录
+- A: 网易云风控导致，请优先考虑使用二维码登录或直接复制Cookie
 
 
 - Q: QQ音乐无法查看个人歌单/无法播放
-- A: 只能重新登录，目前无解决方法，每次开游戏都得重新登录
+- A: 尝试重新登录
 
 
 - Q: QQ音乐服务端cookie隔一段时间就失效
 - A: 只能重新复制，目前无解决方法。可用 `/concerto-server reload-cookie` 重新加载cookie
 
+
+- Q: neoforge+互联环境下二维码无法加载
+- A: 使用 `/concerto clean-cache` 清除缓存后重试，如果还是不行，删除 `.minecraft/Concerto/cache` 文件夹
+
 ### 使用的开源项目
 
 - [java-stream-player](https://github.com/goxr3plus/java-stream-player)

gradle.properties

@@ -9,6 +9,6 @@ loader_version=0.16.10
 fabric_version=0.119.5+1.21.5
 
 # Mod Properties
-mod_version=1.4.0
+mod_version=1.4.1
 maven_group=top.gregtao.concerto
 archives_base_name=Concerto-fabric

src/main/java/top/gregtao/concerto/ConcertoClient.java

@@ -15,6 +15,7 @@
 import top.gregtao.concerto.command.ShareMusicCommand;
 import top.gregtao.concerto.config.ClientConfig;
 import top.gregtao.concerto.config.ConfigFile;
+import top.gregtao.concerto.config.PresetPlaylistsConfig;
 import top.gregtao.concerto.http.netease.NeteaseCloudApiClient;
 import top.gregtao.concerto.http.qq.QQMusicApiClient;
 import top.gregtao.concerto.music.list.Playlist;
@@ -73,6 +74,7 @@ public void reload(ResourceManager manager) {
 					ClientConfig.INSTANCE.readOptions();
 					ConcertoOptions.INSTANCE.readOptions();
 					MusicPlayer.INSTANCE.reloadConfig(() -> LOGGER.info("Loaded general music playlist"));
+                    PresetPlaylistsConfig.LOCAL_PLAYLISTS.read();
 					NeteaseCloudApiClient.LOCAL_USER.updateLoginStatus();
 					QQMusicApiClient.LOCAL_USER.updateLoginStatus();
 				});

src/main/java/top/gregtao/concerto/ConcertoServer.java

@@ -10,7 +10,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import top.gregtao.concerto.command.ConcertoServerCommand;
-import top.gregtao.concerto.config.PresetRadioConfig;
+import top.gregtao.concerto.config.PresetPlaylistsConfig;
 import top.gregtao.concerto.config.ServerConfig;
 import top.gregtao.concerto.http.netease.NeteaseCloudApiClient;
 import top.gregtao.concerto.http.qq.QQMusicApiClient;
@@ -42,7 +42,7 @@ public void reload(ResourceManager manager) {
 
     public static void reload() {
         ServerConfig.INSTANCE.readOptions();
-        PresetRadioConfig.INSTANCE.read();
+        PresetPlaylistsConfig.PRESET_RADIOS.read();
         NeteaseCloudApiClient.INSTANCE.readCookie();
         QQMusicApiClient.INSTANCE.readCookie();
     }

src/main/java/top/gregtao/concerto/command/ConcertoServerCommand.java

@@ -10,6 +10,7 @@
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import top.gregtao.concerto.ConcertoServer;
+import top.gregtao.concerto.config.CacheManager;
 import top.gregtao.concerto.http.netease.NeteaseCloudApiClient;
 import top.gregtao.concerto.http.qq.QQMusicApiClient;
 import top.gregtao.concerto.network.MusicDataPacket;
@@ -83,6 +84,12 @@ public static void register(CommandDispatcher<ServerCommandSource> dispatcher, C
                                     QQMusicApiClient.INSTANCE.readCookie();
                                     return 0;
                                 })
+                ).then(
+                        CommandManager.literal("clean-cache").requires(source -> source.hasPermissionLevel(2))
+                                .executes(context -> {
+                                    CacheManager.cleanAllCache();
+                                    return 0;
+                                })
                 ).then(
                         CommandManager.literal("fetch-radios")
                                 .requires(source -> source.hasPermissionLevel(0)).executes(context -> {
@@ -98,7 +105,17 @@ public static void register(CommandDispatcher<ServerCommandSource> dispatcher, C
                                 })
                         ).then(
                                 CommandManager.literal("cut").executes(context -> {
-                                    ServerMusicAgent.INSTANCE.playNextMusic();
+                                    ServerMusicAgent.INSTANCE.schedulePlayNext(0, false);
+                                    return 0;
+                                })
+                        ).then(
+                                CommandManager.literal("stop").executes(context -> {
+                                    ServerMusicAgent.INSTANCE.stop();
+                                    return 0;
+                                })
+                        ).then(
+                                CommandManager.literal("start").executes(context -> {
+                                    ServerMusicAgent.INSTANCE.start();
                                     return 0;
                                 })
                         )

src/main/java/top/gregtao/concerto/command/MusicCommand.java

@@ -13,8 +13,9 @@
 import net.minecraft.text.Text;
 import top.gregtao.concerto.api.CacheableMusic;
 import top.gregtao.concerto.api.Likeable;
+import top.gregtao.concerto.config.CacheManager;
 import top.gregtao.concerto.config.MusicCacheManager;
-import top.gregtao.concerto.config.PresetRadioConfig;
+import top.gregtao.concerto.config.PresetPlaylistsConfig;
 import top.gregtao.concerto.music.list.FixedPlaylist;
 import top.gregtao.concerto.music.meta.music.MusicMetaData;
 import top.gregtao.concerto.command.argument.OrderTypeArgumentType;
@@ -141,6 +142,7 @@ public static LiteralArgumentBuilder<FabricClientCommandSource> registerPlayerCo
                     MusicPlayer.INSTANCE.reloadConfig(() ->
                             TextUtil.commandMessageClient(context, Text.translatable("concerto.player.reload")));
                     ClientConfig.INSTANCE.readOptions();
+                    PresetPlaylistsConfig.LOCAL_PLAYLISTS.read();
                     MusicPlayer.resetInstance();
                     return 0;
                 })
@@ -228,7 +230,7 @@ public static LiteralArgumentBuilder<FabricClientCommandSource> registerPlayerCo
                 ClientCommandManager.literal("export-as-playlist").executes(context -> {
                     ClientPlayerEntity clientPlayer = context.getSource().getPlayer();
                     Text playerName = clientPlayer.getDisplayName();
-                    if (PresetRadioConfig.saveToTmpFile(new FixedPlaylist(
+                    if (PresetPlaylistsConfig.saveToLocalPlaylists(new FixedPlaylist(
                             MusicPlayerHandler.INSTANCE.getMusicList(),
                             new PlaylistMetaData(
                                     playerName == null ? "Unknown" : playerName.getString(),
@@ -244,6 +246,11 @@ public static LiteralArgumentBuilder<FabricClientCommandSource> registerPlayerCo
                     }
                     return 0;
                 })
+        ).then(
+                ClientCommandManager.literal("clean-cache").executes(context -> {
+                    CacheManager.cleanAllCache();
+                    return 0;
+                })
         );
     }
 

src/main/java/top/gregtao/concerto/command/MusicRoomCommand.java

@@ -32,7 +32,10 @@ public static void register(CommandDispatcher<FabricClientCommandSource> dispatc
                                     return 0;
                                 })
                         )).then(ClientCommandManager.literal("quit").executes(context -> {
-                            MusicRoom.clientQuit();
+                            switch (ConcertoClient.clientState) {
+                                case MUSIC_AGENT -> ClientMusicNetworkHandler.musicAgentQuit();
+                                case MUSIC_ROOM -> MusicRoom.clientQuit();
+                            }
                             return 0;
                         })).then(ClientCommandManager.literal("members").executes(context -> {
                             if (MusicRoom.CLIENT_ROOM != null) {
@@ -124,7 +127,7 @@ public static boolean checkAgent(ClientPlayerEntity player) {
         if (ConcertoClient.clientState == ConcertoClient.ClientState.MUSIC_AGENT) {
             return true;
         } else {
-            player.sendMessage(Text.translatable("concerto.not_available"), false);
+            player.sendMessage(Text.translatable("concerto.agent.not_in"), false);
             return false;
         }
     }

src/main/java/top/gregtao/concerto/config/CacheManager.java

@@ -1,6 +1,7 @@
 package top.gregtao.concerto.config;
 
 import top.gregtao.concerto.ConcertoClient;
+import top.gregtao.concerto.ConcertoServer;
 import top.gregtao.concerto.player.MusicPlayer;
 import top.gregtao.concerto.util.Pair;
 
@@ -10,10 +11,13 @@
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.LinkOption;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.nio.file.attribute.BasicFileAttributeView;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Stream;
 
 public class CacheManager {
 
@@ -35,6 +39,35 @@ public CacheManager(String name, int maxSize) {
         this.maxSize = maxSize;
     }
 
+    public static void cleanAllCache() {
+        Path cacheRoot = Paths.get(CACHE_ROOT_FOLDER);
+
+        if (!Files.exists(cacheRoot) || !Files.isDirectory(cacheRoot)) {
+            ConcertoServer.LOGGER.error("Cache folder does not exist or is not a directory: {}", cacheRoot);
+            return;
+        }
+
+        try (Stream<Path> walk = Files.walk(cacheRoot, 1)) {
+            walk.filter(path -> !path.equals(cacheRoot)).forEach(CacheManager::deleteRecursively);
+        } catch (IOException e) {
+            ConcertoServer.LOGGER.error("Failed to scan cache folder: {}", cacheRoot, e);
+        }
+    }
+
+    private static void deleteRecursively(Path path) {
+        try (Stream<Path> walk = Files.walk(path)) {
+            walk.sorted(Comparator.reverseOrder()).forEach(p -> {
+                try {
+                    Files.delete(p);
+                } catch (IOException e) {
+                    ConcertoServer.LOGGER.error("Failed to delete: {}", p, e);
+                }
+            });
+        } catch (IOException e) {
+            ConcertoServer.LOGGER.error("Failed to traverse path: {}", path, e);
+        }
+    }
+
     public File getChild(String child) {
         return new File(this.folder.getAbsolutePath() + "/" + child);
     }
@@ -83,7 +116,7 @@ public boolean exists(String filename) {
 
     public void addFile(String filename, InputStream inputStream) throws IOException {
         File file = this.getChild(filename);
-        if (file.exists() || !file.getParentFile().mkdirs() || !file.createNewFile()) return;
+        if (file.exists() || (!file.getParentFile().exists() && !file.getParentFile().mkdirs()) || !file.createNewFile()) return;
         try (FileOutputStream outputStream = new FileOutputStream(file)) {
             outputStream.write(inputStream.readAllBytes());
         }

src/main/java/top/gregtao/concerto/config/ClientConfig.java

@@ -10,9 +10,11 @@ public class ClientConfig extends ConfigFile {
 
     public ClientConfigOptions options = new ClientConfigOptions();
 
-    public PositionXYSupplier lyricsPosSupplier, subLyricsPosSupplier, musicDetailsPosSupplier, timeProgressPosSupplier;
+    public PositionXYSupplier
+        lyricsPosSupplier, subLyricsPosSupplier, musicDetailsPosSupplier, timeProgressPosSupplier, coverImgPosSupplier;
 
-    public HexSupplier lyricsColor, subLyricsColor, musicDetailsColor, timeProgressTextColor, timeProgressColor, timeProgressBgColor;
+    public HexSupplier
+        lyricsColor, subLyricsColor, musicDetailsColor, timeProgressTextColor, timeProgressColor, timeProgressBgColor;
 
     public ClientConfig() {
         super("Concerto/client_config.json");
@@ -34,6 +36,7 @@ public void parseOptions() {
         this.subLyricsPosSupplier = new PositionXYSupplier(this.options.subLyricsPosition);
         this.musicDetailsPosSupplier = new PositionXYSupplier(this.options.musicDetailsPosition);
         this.timeProgressPosSupplier = new PositionXYSupplier(this.options.timeProgressPosition);
+        this.coverImgPosSupplier = new PositionXYSupplier(this.options.coverImgPosition);
 
         this.lyricsColor = new HexSupplier(this.options.lyricsColor);
         this.subLyricsColor = new HexSupplier(this.options.subLyricsColor);
@@ -75,17 +78,23 @@ public static class ClientConfigOptions {
         public String subLyricsColor = "#ffffaa00";
 
         public boolean displayMusicDetails = true;
-        public String musicDetailsPosition = "1-5,0+5";
+        public String musicDetailsPosition = "1-30,0+5";
         public TextAlignment musicDetailsAlignment = TextAlignment.RIGHT;
         public String musicDetailsColor = "#ffffffff";
 
         public boolean displayTimeProgress = true;
-        public String timeProgressPosition = "1-5,0+15";
+        public String timeProgressPosition = "1-30,0+15";
         public TextAlignment timeProgressAlignment = TextAlignment.RIGHT;
         public String timeProgressTextColor = "#ffffffff";
         public String timeProgressColor = "#ff0155bc";
         public String timeProgressBgColor = "#ffa1c7f6";
 
+        public boolean displayCoverImg = true;
+        public int coverImgSize = 25;
+        public String coverImgPosition = "1-25,0";
+        public boolean coverImgInCircle = true;
+        public boolean coverImgRotate = true;
+
         public boolean textShadow = true;
         public boolean handshakeRequired = true;
     }

…o/concerto/config/PresetRadioConfig.java …ncerto/config/PresetPlaylistsConfig.javasrc/main/java/top/gregtao/concerto/config/PresetRadioConfig.java renamed to src/main/java/top/gregtao/concerto/config/PresetPlaylistsConfig.java src/main/java/top/gregtao/concerto/config/PresetRadioConfig.java renamed to src/main/java/top/gregtao/concerto/config/PresetPlaylistsConfig.java

@@ -18,13 +18,18 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class PresetRadioConfig {
+public class PresetPlaylistsConfig {
 
-    public static final PresetRadioConfig INSTANCE = new PresetRadioConfig();
+    public static final PresetPlaylistsConfig PRESET_RADIOS = new PresetPlaylistsConfig("preset_radios");
+    public static final PresetPlaylistsConfig LOCAL_PLAYLISTS = new PresetPlaylistsConfig("local_playlists");
 
-    private final File folder = new File("Concerto/preset_radios");
+    private final File folder;
     private final List<Playlist> radios = new ArrayList<>();
 
+    public PresetPlaylistsConfig(String folder) {
+        this.folder = new File("Concerto/" + folder);
+    }
+
     public List<Playlist> getRadios() {
         return this.radios;
     }
@@ -102,8 +107,8 @@ public static List<Playlist> fromJson(String s) {
         return fromJson(JsonUtil.from(s));
     }
 
-    public static boolean saveToTmpFile(Playlist playlist) {
-        File file = new File("Concerto/concerto_playlist_export.json");
+    public static boolean saveToLocalPlaylists(Playlist playlist) {
+        File file = new File("Concerto/local_playlists/" + System.currentTimeMillis() + ".json");
         try {
             if (file.exists() || file.createNewFile()) {
                 FileWriter writer = new FileWriter(file);