feat. 进一步完善服务器点歌功能，完善语言文件

GregTaoo · GregTaoo · commit 1ccff0c4261d · 2025-03-17T23:39:30.000+08:00
diff --git a/src/main/java/top/gregtao/concerto/music/NeteaseCloudMusic.java b/src/main/java/top/gregtao/concerto/music/NeteaseCloudMusic.java
@@ -66,6 +66,7 @@ public String getLastRawPath() {
 
     @Override
     public String getLastLyrics() {
+        if (this.rawLyrics == null) this.getLyrics();
         return this.rawLyrics;
     }
 
diff --git a/src/main/java/top/gregtao/concerto/music/QQMusic.java b/src/main/java/top/gregtao/concerto/music/QQMusic.java
@@ -109,6 +109,7 @@ public String getLastRawPath() {
 
     @Override
     public String getLastLyrics() {
+        if (this.rawLyrics == null) this.getLyrics();
         return this.rawLyrics;
     }
 
@@ -119,7 +120,7 @@ public String getLastSubLyrics() {
 
     @Override
     public String getSuffix() {
-        return "mp3";
+        return "ogg";
     }
 
     @Override
diff --git a/src/main/java/top/gregtao/concerto/music/SharedMusic.java b/src/main/java/top/gregtao/concerto/music/SharedMusic.java
@@ -14,6 +14,7 @@
 
 public class SharedMusic extends PathFileMusic {
     private final String rawLyrics, rawSubLyrics;
+    public long startTime = 0, startByte = 0;
 
     public SharedMusic(String rawPath, MusicMetaData metaData, String lyrics, String subLyrics) {
         super(rawPath);
@@ -22,10 +23,12 @@ public SharedMusic(String rawPath, MusicMetaData metaData, String lyrics, String
         this.setMusicMeta(metaData);
     }
 
-    public SharedMusic(String rawPath, String lyrics, String subLyrics) {
+    public SharedMusic(String rawPath, String lyrics, String subLyrics, long startTime, long startByte) {
         super(rawPath);
         this.rawLyrics = lyrics;
         this.rawSubLyrics = subLyrics;
+        this.startTime = startTime;
+        this.startByte = startByte;
     }
 
     public String getRawLyrics() {
@@ -36,10 +39,19 @@ public String getRawSubLyrics() {
         return this.rawSubLyrics == null ? "" : this.rawSubLyrics;
     }
 
+    public long getStartTime() {
+        return this.startTime;
+    }
+
+    public long getStartByte() {
+        return this.startByte;
+    }
+
     @Override
     public InputStream getMusicSource() throws MusicSourceNotFoundException {
         try {
-            return FileUtil.createBuffered(new HttpURLInputStream(URI.create(this.getRawPath()).toURL()));
+            return FileUtil.createBuffered(new HttpURLInputStream(URI.create(this.getRawPath()).toURL(),
+                    (int) this.startByte, null));
         } catch (Exception e) {
             throw new MusicSourceNotFoundException(e);
         }
diff --git a/src/main/java/top/gregtao/concerto/music/parser/SharedMusicJsonParser.java b/src/main/java/top/gregtao/concerto/music/parser/SharedMusicJsonParser.java
@@ -11,14 +11,17 @@ public class SharedMusicJsonParser implements JsonParser<SharedMusic> {
     @Override
     public SharedMusic fromJson(JsonObject object) {
         return new SharedMusic(object.get("path").getAsString(), TextUtil.fromBase64(object.get("lyrics").getAsString()),
-                TextUtil.fromBase64(object.get("sub_lyrics").getAsString()));
+                TextUtil.fromBase64(object.get("sub_lyrics").getAsString()), object.get("start_time").getAsLong(),
+                object.get("start_byte").getAsLong());
     }
 
     @Override
     public JsonObject toJson(JsonObject object, SharedMusic music) {
         object.addProperty("lyrics", TextUtil.toBase64(music.getRawLyrics()));
         object.addProperty("sub_lyrics", TextUtil.toBase64(music.getRawSubLyrics()));
         object.addProperty("path", music.getRawPath());
+        object.addProperty("start_time", music.getStartTime());
+        object.addProperty("start_byte", music.getStartByte());
         return object;
     }
 
diff --git a/src/main/java/top/gregtao/concerto/network/ClientMusicNetworkHandler.java b/src/main/java/top/gregtao/concerto/network/ClientMusicNetworkHandler.java
@@ -6,7 +6,6 @@
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.text.Style;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import top.gregtao.concerto.ConcertoClient;
@@ -243,11 +242,12 @@ public static boolean musicAgentAddMusic(Music music) {
     }
 
     public static void musicAgentMusicReceiver(ConcertoPayload payload, ClientPlayNetworking.Context context) {
-        String[] args = payload.string.split(":");
-        if (args.length < 2 || ConcertoClient.clientState != ConcertoClient.ClientState.MUSIC_AGENT) return;
+        if (ConcertoClient.clientState != ConcertoClient.ClientState.MUSIC_AGENT) return;
         MusicPlayer.run(() -> {
-            Music music = MusicJsonParsers.from(TextUtil.fromBase64(args[0]));
-            if (music != null) MusicPlayer.INSTANCE.playTempMusic(music);
+            Music music = MusicJsonParsers.from(TextUtil.fromBase64(payload.string));
+            if (music != null) {
+                MusicPlayer.INSTANCE.playTempMusic(music);
+            }
         });
     }
 }
diff --git a/src/main/java/top/gregtao/concerto/network/ServerMusicAgent.java b/src/main/java/top/gregtao/concerto/network/ServerMusicAgent.java
@@ -74,7 +74,7 @@ public void receiveVote(ServerPlayerEntity player, boolean vote) {
                 this.endVoting();
             }
             this.voteLock.unlock();
-            player.sendMessage(Text.translatable("concerto.agent.vote", vote ?
+            player.sendMessage(Text.translatable("concerto.agent.vote_for", vote ?
                     Text.translatable("concerto.accept") : Text.translatable("concerto.reject")));
             ConcertoServer.LOGGER.info("Player {} voted {}", player.getName().getString(), vote);
         }
@@ -90,7 +90,8 @@ private synchronized void endVoting() {
         } else {
             ConcertoServer.LOGGER.info("Vote: Keep current music");
         }
-        Text text = success ? Text.translatable("concerto.agent.vote.success") : Text.translatable("concerto.agent.vote.failed");
+        Text text = Text.translatable(success ? "concerto.agent.vote.success" : "concerto.agent.vote.failed",
+                this.yesVoters.size(), this.noVoters.size());
         this.broadcast(text);
 
         this.isVoting = false;
@@ -122,7 +123,7 @@ private synchronized void playNextMusic() {
             }
             this.isPlaying.set(true);
             this.playTime = System.currentTimeMillis();
-            ServerMusicNetworkHandler.musicAgentSendMusic(this.members, this.currentSharedMusic, 0);
+            ServerMusicNetworkHandler.musicAgentSendMusic(this.members, this.currentSharedMusic);
             this.playNextFuture = this.musicScheduler.schedule(this::playNextMusic,
                     this.currentMusic.getMeta().getDuration().asSeconds(), TimeUnit.SECONDS);
         }
@@ -136,10 +137,13 @@ public synchronized boolean isMember(ServerPlayerEntity player) {
         return this.members.contains(player);
     }
 
-    public synchronized void addMusic(Music music) {
+    public synchronized void addMusic(ServerPlayerEntity player, Music music) {
         MusicPlayer.run(() -> {
             ConcertoServer.LOGGER.info("Added music {}", music.getMeta().title());
             this.musicQueue.offer(music);
+            this.broadcast(Text.translatable("concerto.agent.add",
+                    player == null ? Text.translatable("concerto.unknown") : player.getName().getString(),
+                    music.getMeta().title(), music.getMeta().author()));
             if (!this.isPlaying.get()) {
                 this.playNextFuture = this.musicScheduler.schedule(this::playNextMusic, 1, TimeUnit.SECONDS);
             }
@@ -150,9 +154,12 @@ public synchronized void playerJoin(ServerPlayerEntity player) {
         ConcertoServer.LOGGER.info("Player {} joined music agent", player.getName().getString());
         this.members.add(player);
         if (this.isPlaying.get() && this.currentSharedMusic != null) {
-            ServerMusicNetworkHandler.musicAgentSendMusic(player, this.currentSharedMusic,
-                    this.totalBytes * (System.currentTimeMillis() - this.playTime) /
-                            this.currentMusic.getMeta().getDuration().asMilliseconds());
+            if (this.currentSharedMusic instanceof SharedMusic shared) {
+                shared.startTime = System.currentTimeMillis() - this.playTime;
+                shared.startByte = this.totalBytes * (System.currentTimeMillis() - this.playTime) /
+                        this.currentMusic.getMeta().getDuration().asMilliseconds();
+            }
+            ServerMusicNetworkHandler.musicAgentSendMusic(player, this.currentSharedMusic);
         }
     }
 
diff --git a/src/main/java/top/gregtao/concerto/network/ServerMusicNetworkHandler.java b/src/main/java/top/gregtao/concerto/network/ServerMusicNetworkHandler.java
@@ -215,22 +215,22 @@ public static boolean playerExist(PlayerManager manager, String name) {
         return name.equals("@a") || (manager.getPlayer(name) != null);
     }
 
-    public static void musicAgentSendMusic(ServerPlayerEntity player, Music music, long time) {
+    public static void musicAgentSendMusic(ServerPlayerEntity player, Music music) {
         JsonObject object = MusicJsonParsers.to(music, true);
         if (object == null) return;
-        musicAgentSendMusic(player, object.toString(), time);
+        musicAgentSendMusic(player, object.toString());
     }
 
-    public static void musicAgentSendMusic(ServerPlayerEntity player, String music, long time) {
+    public static void musicAgentSendMusic(ServerPlayerEntity player, String music) {
         ConcertoPayload payload = new ConcertoPayload(ConcertoPayload.Channel.MUSIC_AGENT,
-                TextUtil.toBase64(music) + ":" + time);
+                TextUtil.toBase64(music));
         ServerPlayNetworking.send(player, payload);
     }
 
-    public static void musicAgentSendMusic(List<ServerPlayerEntity> players, Music music, long time) {
+    public static void musicAgentSendMusic(List<ServerPlayerEntity> players, Music music) {
         JsonObject object = MusicJsonParsers.to(music, true);
         if (object == null) return;
-        players.forEach(player -> musicAgentSendMusic(player, object.toString(), time));
+        players.forEach(player -> musicAgentSendMusic(player, object.toString()));
     }
 
     public static void musicAgentReceiver(ConcertoPayload payload, ServerPlayNetworking.Context context) {
@@ -268,7 +268,7 @@ public static void musicAgentReceiver(ConcertoPayload payload, ServerPlayNetwork
         } else if (args[0].equals("Add")) {
             Music music = MusicJsonParsers.from(TextUtil.fromBase64(args[1]), false);
             if (music != null) {
-                ServerMusicAgent.INSTANCE.addMusic(music);
+                ServerMusicAgent.INSTANCE.addMusic(context.player(), music);
             } else {
                 context.player().sendMessage(Text.translatable("concerto.agent.error"));
             }
diff --git a/src/main/java/top/gregtao/concerto/player/MusicPlayer.java b/src/main/java/top/gregtao/concerto/player/MusicPlayer.java
@@ -1,5 +1,6 @@
 package top.gregtao.concerto.player;
 
+import top.gregtao.concerto.music.SharedMusic;
 import top.gregtao.concerto.player.streamplayer.enums.Status;
 import top.gregtao.concerto.player.streamplayer.stream.StreamPlayer;
 import top.gregtao.concerto.player.streamplayer.stream.StreamPlayerEvent;
@@ -223,7 +224,11 @@ public void playTempMusic(Music music, Runnable callback) {
             status.resetInfo();
             status.currentMusic = music;
             status.currentSource = source;
-            status.initMusicStatus();
+            long startTime = 0;
+            if (music instanceof SharedMusic shared) {
+                startTime = shared.getStartTime();
+            }
+            status.initMusicStatus(startTime);
             status.updateDisplayTexts();
             try {
                 this.open(source);
diff --git a/src/main/java/top/gregtao/concerto/player/MusicPlayerHandler.java b/src/main/java/top/gregtao/concerto/player/MusicPlayerHandler.java
@@ -52,6 +52,8 @@ public class MusicPlayerHandler {
 
     public float progressPercentage = 0;
 
+    private long startTime = 0;
+
     private final Random random = new Random();
 
     public MusicPlayerHandler() {}
@@ -94,6 +96,7 @@ public void resetInfo() {
         this.displayTexts = new String[]{ "", "", "", ""};
         this.timeFormat = "%s" + " ".repeat(30) + "%s";
         this.progressPercentage = 0;
+        this.startTime = 0;
     }
 
     public void clear() {
@@ -162,6 +165,7 @@ public void updateDisplayTexts() {
     }
 
     public void updateDisplayTexts(long millisecond) {
+        millisecond += this.startTime;
         MusicTimestamp duration = this.currentMeta.getDuration();
         this.progressPercentage = duration == null ? 0 : ((float) millisecond / duration.asMilliseconds());
         this.currentTime = MusicTimestamp.ofMilliseconds(millisecond);
@@ -195,6 +199,11 @@ public Music playNext(int forward) {
         return this.currentMusic;
     }
 
+    public void initMusicStatus(long startTime) {
+        this.initMusicStatus();
+        this.startTime = startTime;
+    }
+
     public void initMusicStatus() {
         this.currentMeta = this.currentMusic.getMeta();
         try {
diff --git a/src/main/java/top/gregtao/concerto/screen/InGameHudRenderer.java b/src/main/java/top/gregtao/concerto/screen/InGameHudRenderer.java
@@ -35,8 +35,12 @@ public static void render(DrawContext context) {
                 }
                 if (options.displayMusicDetails) {
                     Vector2i pos = ClientConfig.INSTANCE.musicDetailsPosSupplier.getPos(scaledWidth, scaledHeight);
-                    String state = ConcertoClient.clientState == ConcertoClient.ClientState.MUSIC_AGENT ? " | AGENT" :
-                            (ConcertoClient.clientState == ConcertoClient.ClientState.MUSIC_ROOM ? " | ROOM" : "");
+
+                    String state = ConcertoClient.clientState == ConcertoClient.ClientState.MUSIC_AGENT ?
+                            " | " + Text.translatable("concerto.agent").getString() :
+                            (ConcertoClient.clientState == ConcertoClient.ClientState.MUSIC_ROOM ?
+                                    " | " + Text.translatable("concerto.room").getString() : "");
+
                     TextUtil.renderText(Text.literal(texts[2] + state), options.musicDetailsAlignment,
                             pos.x, pos.y, context, client.textRenderer, 0xffffffff);
                 }
diff --git a/src/main/resources/assets/concerto/lang/en_us.json b/src/main/resources/assets/concerto/lang/en_us.json
@@ -187,6 +187,22 @@
   "concerto.like": "Liked music %s from %s",
   "concerto.dislike": "Disliked music %s from %s",
 
+  "concerto.agent": "Server Agent",
+  "concerto.agent.invite": "Join the server music agent?",
+  "concerto.agent.join": "Joined the server music agent.",
+  "concerto.agent.quit": "Quited the server music agent.",
+  "concerto.screen.request": "Request(Server)",
+  "concerto.agent.add": "%s requested for music: %s - %s.",
+  "concerto.agent.vote": "Please vote for whether to CUT the current music",
+  "concerto.agent.vote_for": "You have voted for %s.",
+  "concerto.agent.vote.duplicate": "A vote is still processing.",
+  "concerto.agent.vote.ended": "No votes available now.",
+  "concerto.agent.vote.success": "The vote has ended with %s:%s, and the current music will be CUT",
+  "concerto.agent.vote.failed": "The vote has ended with %s:%s, and the current music will keep playing.",
+  "concerto.agent.play.failed": "Cannot play music %s - %s, it may be caused by interal server error or no VIP permissions.",
+  "concerto.agent.not_available": "The music agent service is not available!",
+  "concerto.agent.error": "Error occurs in server music agent.",
+
   "concerto.error.invalid_path": "Invalid path or file format",
   "concerto.error.unsupported_operation": "Unsupported Operation!"
 }
diff --git a/src/main/resources/assets/concerto/lang/zh_cn.json b/src/main/resources/assets/concerto/lang/zh_cn.json
@@ -187,6 +187,22 @@
   "concerto.like": "喜欢了歌曲 %s，来自 %s",
   "concerto.dislike": "取消喜欢了歌曲 %s，来自 %s",
 
+  "concerto.agent": "服务器点歌",
+  "concerto.agent.invite": "是否加入服务器点歌？",
+  "concerto.agent.join": "加入了服务器点歌",
+  "concerto.agent.quit": "退出了服务器点歌",
+  "concerto.screen.request": "服务器点歌",
+  "concerto.agent.add": "%s 点歌了 %s - %s.",
+  "concerto.agent.vote": "请投票：是否切歌？",
+  "concerto.agent.vote_for": "你投了 %s",
+  "concerto.agent.vote.duplicate": "当前投票未结束",
+  "concerto.agent.vote.ended": "没有投票进行中",
+  "concerto.agent.vote.success": "投票已结束，结果为%s:%s，决定切歌",
+  "concerto.agent.vote.failed": "投票已结束，结果为%s:%s，决定继续播放",
+  "concerto.agent.play.failed": "无法播放音乐 %s - %s，可能是由于服务器内部错误或无VIP权限",
+  "concerto.agent.not_available": "点歌服务不可用",
+  "concerto.agent.error": "使用点歌服务时遇到错误",
+
   "concerto.error.invalid_path": "不可用的路径或文件格式",
   "concerto.error.unsupported_operation": "不支持的操作！"
 }

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ public String getLastRawPath() {`
`66`	`66`
`67`	`67`	`@Override`
`68`	`68`	`public String getLastLyrics() {`
	`69`	`+ if (this.rawLyrics == null) this.getLyrics();`
`69`	`70`	`return this.rawLyrics;`
`70`	`71`	`}`
`71`	`72`
Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,7 @@ public String getLastRawPath() {`
`109`	`109`
`110`	`110`	`@Override`
`111`	`111`	`public String getLastLyrics() {`
	`112`	`+ if (this.rawLyrics == null) this.getLyrics();`
`112`	`113`	`return this.rawLyrics;`
`113`	`114`	`}`
`114`	`115`
`@@ -119,7 +120,7 @@ public String getLastSubLyrics() {`
`119`	`120`
`120`	`121`	`@Override`
`121`	`122`	`public String getSuffix() {`
`122`		`- return "mp3";`
	`123`	`+ return "ogg";`
`123`	`124`	`}`
`124`	`125`
`125`	`126`	`@Override`