Merge pull request #54 from GregTaoo/dev

Dev

Author: GregTaoo

README.md

@@ -11,9 +11,9 @@
 -----------------------------
 
 
-**Wiki 基准模组版本：1.3.5**
+**Wiki 基准模组版本：1.3.7**
 
-目前已知支持版本：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.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，其余版本未经测试
 
 ### 安全提醒！
 
@@ -48,6 +48,8 @@
 
    `reload`: 重新加载播放队列和客户端配置文件
 
+   `restart`: 重新启动播放器（可修复卡死）
+
    `list [页码]`: 显示第 `[页码]` 页播放队列（10条歌曲一页）
 
    `save`: 缓存当前歌曲（详见 可缓存歌曲）
@@ -97,7 +99,7 @@
 
 4. `/musicroom`（客户端指令，服务端必须安装 Concerto 才能正常使用）
 
-   `create`: 新建并加入音乐室，并自动复制音乐室的 UUID（详见 音乐室）
+   `create`: 新建并加入音乐室，并自动复制音乐室的 UUID，默认需要管理员（详见 音乐室、服务端配置文件）
 
    `join [UUID]`: 加入编号为 `[UUID]` 的音乐室
 
@@ -195,6 +197,7 @@
 - `timeProgressTextColor`: 歌曲播放进度文字颜色（格式详见下方 颜色配置，默认为 `#ffffffff` ）
 - `timeProgressColor`: 歌曲播放进度条颜色（格式详见下方 颜色配置，默认为 `#ff0155bc` ）
 - `timeProgressBgColor`:  歌曲播放进度条背景颜色（格式详见下方 颜色配置，默认为 `#ffa1c7f6`）
+- `textShadow`: 歌词/音乐信息显示文字阴影（默认开启）
 
 ### 位置格式配置
 
@@ -225,12 +228,16 @@
 - Q: 网易云音乐用密码或验证码登录时出现“当前登录存在安全风险”
 - A: 网易云风控导致，请优先考虑使用二维码登录
 
+
+- Q: QQ音乐无法查看个人歌单/无法播放
+- A: 只能重新登录，目前无解决方法，每次开游戏都得重新登录
+
 ### 使用的开源项目
 
 - [java-stream-player](https://github.com/goxr3plus/java-stream-player)
 - [ZXing](https://github.com/zxing/zxing)
 - [soundlibs](https://github.com/pdudits/soundlibs)
-- [jflac](https://github.com/nguillaumin/jflac)
+- [JustFlac](https://github.com/drogatkin/JustFLAC)
 - [java-vorbis-support](https://github.com/Trilarion/java-vorbis-support)
 - [jaudiotagger](https://github.com/marcoc1712/jaudiotagger)
 - [Fabric](https://github.com/FabricMC/fabric)

build.gradle

@@ -31,7 +31,8 @@ dependencies {
 	my('com.googlecode.soundlibs:mp3spi:1.9.5.4') {
 		exclude group: 'com.googlecode.soundlibs', module: 'tritonus-share'
 	}
-	my 'org.jflac:jflac-codec:1.5.2'
+//	my 'org.jflac:jflac-codec:1.5.2'
+	my 'com.github.GregTaoo:JustFLAC:85f0934435'
 	my 'com.github.trilarion:vorbis-support:1.1.0'
 	my('com.googlecode.soundlibs:tritonus-all:0.3.7.2') {
 		exclude group: 'com.googlecode.soundlibs', module: 'tritonus-share'

gradle.properties

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

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

@@ -12,6 +12,8 @@
 import top.gregtao.concerto.command.ConcertoServerCommand;
 import top.gregtao.concerto.config.PresetRadioConfig;
 import top.gregtao.concerto.config.ServerConfig;
+import top.gregtao.concerto.http.netease.NeteaseCloudApiClient;
+import top.gregtao.concerto.http.qq.QQMusicApiClient;
 import top.gregtao.concerto.network.ConcertoNetworking;
 import top.gregtao.concerto.network.ServerMusicNetworkHandler;
 
@@ -41,5 +43,7 @@ public void reload(ResourceManager manager) {
     public static void reload() {
         ServerConfig.INSTANCE.readOptions();
         PresetRadioConfig.INSTANCE.read();
+        NeteaseCloudApiClient.INSTANCE.readCookie();
+        QQMusicApiClient.INSTANCE.readCookie();
     }
 }

src/main/java/top/gregtao/concerto/api/DynamicPath.java

@@ -6,6 +6,8 @@ public interface DynamicPath {
 
     String updateRawPath();
 
+    String getLastSuffix();
+
     String getLastLyrics();
 
     String getLastSubLyrics();

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

@@ -10,6 +10,8 @@
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import top.gregtao.concerto.ConcertoServer;
+import top.gregtao.concerto.http.netease.NeteaseCloudApiClient;
+import top.gregtao.concerto.http.qq.QQMusicApiClient;
 import top.gregtao.concerto.network.MusicDataPacket;
 import top.gregtao.concerto.network.room.ServerMusicAgent;
 import top.gregtao.concerto.network.ServerMusicNetworkHandler;
@@ -71,9 +73,16 @@ public static void register(CommandDispatcher<ServerCommandSource> dispatcher, C
                 ).then(
                         CommandManager.literal("reload").requires(source -> source.hasPermissionLevel(2))
                                 .executes(context -> {
-                            ConcertoServer.reload();
-                            return 0;
-                        })
+                                    ConcertoServer.reload();
+                                    return 0;
+                                })
+                ).then(
+                        CommandManager.literal("reload-cookie").requires(source -> source.hasPermissionLevel(2))
+                                .executes(context -> {
+                                    NeteaseCloudApiClient.INSTANCE.readCookie();
+                                    QQMusicApiClient.INSTANCE.readCookie();
+                                    return 0;
+                                })
                 ).then(
                         CommandManager.literal("fetch-radios")
                                 .requires(source -> source.hasPermissionLevel(0)).executes(context -> {

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

@@ -121,6 +121,12 @@ public static LiteralArgumentBuilder<FabricClientCommandSource> registerPlayerCo
                     TextUtil.commandMessageClient(context, Text.translatable("concerto.player.clear"));
                     return 0;
                 })
+        ).then(
+                ClientCommandManager.literal("restart").executes(context -> {
+                    MusicPlayer.resetInstance();
+                    TextUtil.commandMessageClient(context, Text.translatable("concerto.success"));
+                    return 0;
+                })
         ).then(
                 ClientCommandManager.literal("mode").then(
                         ClientCommandManager.argument("mode", OrderTypeArgumentType.orderType()).executes((context -> {
@@ -209,11 +215,13 @@ public static LiteralArgumentBuilder<FabricClientCommandSource> registerPlayerCo
         ).then(
                 ClientCommandManager.literal("download-current").executes(context -> {
                     MusicPlayerHandler.downloadMusics(List.of(MusicPlayerHandler.INSTANCE.getCurrentMusic()));
+                    context.getSource().getPlayer().sendMessage(Text.translatable("concerto.success"), false);
                     return 0;
                 })
         ).then(
                 ClientCommandManager.literal("download-all").executes(context -> {
                     MusicPlayerHandler.downloadMusics(MusicPlayerHandler.INSTANCE.getMusicList());
+                    context.getSource().getPlayer().sendMessage(Text.translatable("concerto.success"), false);
                     return 0;
                 })
         ).then(

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

@@ -75,6 +75,8 @@ public static class ClientConfigOptions {
         public String timeProgressTextColor = "#ffffffff";
         public String timeProgressColor = "#ff0155bc";
         public String timeProgressBgColor = "#ffa1c7f6";
+
+        public boolean textShadow = true;
     }
 
     public static class PositionXYSupplier {

src/main/java/top/gregtao/concerto/http/HttpApiClient.java

@@ -34,7 +34,7 @@ public HttpApiClient(String name, Map<String, String> defaultHeaders, Map<String
         this.cookieManager.setCookiePolicy(CookiePolicy.ACCEPT_ALL);
         this.client = HttpClient.newBuilder().cookieHandler(this.cookieManager).build();
         this.defaultHeaders = defaultHeaders;
-        this.cookieFile.read(this.cookieManager);
+        this.readCookie();
         initCookies.forEach((url, list) -> {
             try {
                 this.cookieManager.put(new URI(url), Map.of("Set-Cookie", list));
@@ -67,10 +67,14 @@ public String getName() {
         return this.name;
     }
 
-    public void updateCookie() {
+    public void writeCookie() {
         this.cookieFile.write(this.cookieManager);
     }
 
+    public void readCookie() {
+        this.cookieFile.read(this.cookieManager);
+    }
+
     public void clearCookie() {
         this.cookieManager = new CookieManager();
         this.cookieManager.setCookiePolicy(CookiePolicy.ACCEPT_ALL);
@@ -91,11 +95,11 @@ public String getCookie(String url, String key) throws IOException, URISyntaxExc
 
     public void setCookie(String url, String key, String value) throws IOException, URISyntaxException {
         this.cookieManager.put(new URI(url), Map.of("Set-Cookie", List.of(key + "=" + value)));
-        this.updateCookie();
+        this.writeCookie();
     }
 
     public static Map<Character, Character> ESCAPE_MAP = Map.of(
-            '\u00a0', ' ', '\r', '\n'
+            '\u00a0', ' ', '\ufeff', ' ', '\r', '\n'
     ); // escape illegal spaces
 
     public static String escapeChars(String string) {

src/main/java/top/gregtao/concerto/http/HttpRequestBuilder.java

@@ -83,7 +83,7 @@ public HttpResponse<InputStream> openStream() {
         try {
             HttpResponse<InputStream> response = this.client.getClient().send(request, HttpResponse.BodyHandlers.ofInputStream());
             this.client.getLogger().info("STREAM {} GET {}", response.statusCode(), this.url);
-            this.client.updateCookie();
+            this.client.writeCookie();
             return response;
         } catch (IOException | InterruptedException e) {
             this.client.getLogger().error("ERROR GET STREAM {} : {}", this.url, e.getMessage());
@@ -102,7 +102,7 @@ public <T> HttpResponse<T> get(HttpResponse.BodyHandler<T> bodyHandler) {
             } else {
                 this.client.getLogger().info("{} GET {}", response.statusCode(), this.url);
             }
-            this.client.updateCookie();
+            this.client.writeCookie();
             return response;
         } catch (IOException | InterruptedException e) {
             this.client.getLogger().error("ERROR GET {} : {}", this.url, e.getMessage());
@@ -126,7 +126,7 @@ public <T> HttpResponse<T> post(HttpResponse.BodyHandler<T> bodyHandler, Content
             } else {
                 this.client.getLogger().info("{} POST {}", response.statusCode(), this.url);
             }
-            this.client.updateCookie();
+            this.client.writeCookie();
             return response;
         } catch (IOException | InterruptedException e) {
             this.client.getLogger().error("ERROR POST {} : {}", this.url, e.getMessage());