Merge pull request #22 from GregTaoo/dev

GregTaoo · web-flow · commit 623bad1fc1e1 · 2025-03-20T14:42:50.000+08:00
fix. 单人游戏会发送服务器点歌邀请
diff --git a/src/main/java/top/gregtao/concerto/api/MusicSourceNotFoundException.java b/src/main/java/top/gregtao/concerto/api/MusicSourceNotFoundException.java
@@ -1,4 +1,4 @@
-package top.gregtao.concerto.music;
+package top.gregtao.concerto.api;
 
 public class MusicSourceNotFoundException extends UnsupportedOperationException {
 
diff --git a/src/main/java/top/gregtao/concerto/api/UnsafeMusicException.java b/src/main/java/top/gregtao/concerto/api/UnsafeMusicException.java
@@ -1,4 +1,4 @@
-package top.gregtao.concerto.music;
+package top.gregtao.concerto.api;
 
 public class UnsafeMusicException extends UnsupportedOperationException {
 
diff --git a/src/main/java/top/gregtao/concerto/command/ConcertoServerCommand.java b/src/main/java/top/gregtao/concerto/command/ConcertoServerCommand.java
@@ -11,7 +11,7 @@
 import net.minecraft.util.Formatting;
 import top.gregtao.concerto.ConcertoServer;
 import top.gregtao.concerto.network.MusicDataPacket;
-import top.gregtao.concerto.network.ServerMusicAgent;
+import top.gregtao.concerto.network.room.ServerMusicAgent;
 import top.gregtao.concerto.network.ServerMusicNetworkHandler;
 import top.gregtao.concerto.player.MusicPlayer;
 import top.gregtao.concerto.util.TextUtil;
diff --git a/src/main/java/top/gregtao/concerto/command/MusicRoomCommand.java b/src/main/java/top/gregtao/concerto/command/MusicRoomCommand.java
@@ -11,7 +11,7 @@
 import net.minecraft.text.Text;
 import top.gregtao.concerto.ConcertoClient;
 import top.gregtao.concerto.network.ClientMusicNetworkHandler;
-import top.gregtao.concerto.network.MusicRoom;
+import top.gregtao.concerto.network.room.MusicRoom;
 
 public class MusicRoomCommand {
 
diff --git a/src/main/java/top/gregtao/concerto/command/ShareMusicCommand.java b/src/main/java/top/gregtao/concerto/command/ShareMusicCommand.java
@@ -9,7 +9,7 @@
 import net.minecraft.command.argument.UuidArgumentType;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
-import top.gregtao.concerto.music.UnsafeMusicException;
+import top.gregtao.concerto.api.UnsafeMusicException;
 import top.gregtao.concerto.command.argument.ShareMusicTargetArgumentType;
 import top.gregtao.concerto.music.Music;
 import top.gregtao.concerto.network.ClientMusicNetworkHandler;
diff --git a/src/main/java/top/gregtao/concerto/config/MusicCacheManager.java b/src/main/java/top/gregtao/concerto/config/MusicCacheManager.java
@@ -3,7 +3,7 @@
 import com.google.gson.JsonObject;
 import top.gregtao.concerto.api.CacheableMusic;
 import top.gregtao.concerto.api.MusicJsonParsers;
-import top.gregtao.concerto.music.MusicSourceNotFoundException;
+import top.gregtao.concerto.api.MusicSourceNotFoundException;
 import top.gregtao.concerto.util.HashUtil;
 
 import javax.sound.sampled.UnsupportedAudioFileException;
diff --git a/src/main/java/top/gregtao/concerto/mixin/MinecraftClientMixin.java b/src/main/java/top/gregtao/concerto/mixin/MinecraftClientMixin.java
@@ -8,7 +8,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import top.gregtao.concerto.ConcertoClient;
 import top.gregtao.concerto.network.ClientMusicNetworkHandler;
-import top.gregtao.concerto.network.MusicRoom;
+import top.gregtao.concerto.network.room.MusicRoom;
 import top.gregtao.concerto.player.MusicPlayer;
 import top.gregtao.concerto.screen.MusicAuditionScreen;
 
diff --git a/src/main/java/top/gregtao/concerto/mixin/PlayerManagerMixin.java b/src/main/java/top/gregtao/concerto/mixin/PlayerManagerMixin.java
@@ -8,8 +8,8 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import top.gregtao.concerto.network.MusicRoom;
-import top.gregtao.concerto.network.ServerMusicAgent;
+import top.gregtao.concerto.network.room.MusicRoom;
+import top.gregtao.concerto.network.room.ServerMusicAgent;
 import top.gregtao.concerto.network.ServerMusicNetworkHandler;
 
 import java.util.ArrayList;
diff --git a/src/main/java/top/gregtao/concerto/music/BilibiliMusic.java b/src/main/java/top/gregtao/concerto/music/BilibiliMusic.java
@@ -4,6 +4,7 @@
 import top.gregtao.concerto.api.CacheableMusic;
 import top.gregtao.concerto.api.JsonParser;
 import top.gregtao.concerto.api.MusicJsonParsers;
+import top.gregtao.concerto.api.MusicSourceNotFoundException;
 import top.gregtao.concerto.config.MusicCacheManager;
 import top.gregtao.concerto.enums.Sources;
 import top.gregtao.concerto.http.HttpURLInputStream;
diff --git a/src/main/java/top/gregtao/concerto/music/HttpFileMusic.java b/src/main/java/top/gregtao/concerto/music/HttpFileMusic.java
@@ -3,6 +3,7 @@
 import top.gregtao.concerto.api.CacheableMusic;
 import top.gregtao.concerto.api.JsonParser;
 import top.gregtao.concerto.api.MusicJsonParsers;
+import top.gregtao.concerto.api.MusicSourceNotFoundException;
 import top.gregtao.concerto.enums.Sources;
 import top.gregtao.concerto.http.HttpURLInputStream;
 import top.gregtao.concerto.music.meta.music.TimelessMusicMetaData;
diff --git a/src/main/java/top/gregtao/concerto/music/Music.java b/src/main/java/top/gregtao/concerto/music/Music.java
@@ -1,9 +1,6 @@
 package top.gregtao.concerto.music;
 
-import top.gregtao.concerto.api.CacheableMusic;
-import top.gregtao.concerto.api.JsonParsable;
-import top.gregtao.concerto.api.LazyLoadable;
-import top.gregtao.concerto.api.WithMetaData;
+import top.gregtao.concerto.api.*;
 import top.gregtao.concerto.config.MusicCacheManager;
 import top.gregtao.concerto.music.lyrics.Lyrics;
 import top.gregtao.concerto.music.meta.music.MusicMetaData;
diff --git a/src/main/java/top/gregtao/concerto/music/QQMusic.java b/src/main/java/top/gregtao/concerto/music/QQMusic.java
@@ -1,10 +1,7 @@
 package top.gregtao.concerto.music;
 
 import com.google.gson.JsonObject;
-import top.gregtao.concerto.api.CacheableMusic;
-import top.gregtao.concerto.api.DynamicPath;
-import top.gregtao.concerto.api.JsonParser;
-import top.gregtao.concerto.api.MusicJsonParsers;
+import top.gregtao.concerto.api.*;
 import top.gregtao.concerto.enums.Sources;
 import top.gregtao.concerto.http.HttpURLInputStream;
 import top.gregtao.concerto.http.qq.QQMusicApiClient;
diff --git a/src/main/java/top/gregtao/concerto/music/SharedMusic.java b/src/main/java/top/gregtao/concerto/music/SharedMusic.java
@@ -2,6 +2,7 @@
 
 import top.gregtao.concerto.api.JsonParser;
 import top.gregtao.concerto.api.MusicJsonParsers;
+import top.gregtao.concerto.api.MusicSourceNotFoundException;
 import top.gregtao.concerto.http.HttpURLInputStream;
 import top.gregtao.concerto.music.lyrics.DefaultFormatLyrics;
 import top.gregtao.concerto.music.lyrics.Lyrics;
diff --git a/src/main/java/top/gregtao/concerto/network/ClientMusicNetworkHandler.java b/src/main/java/top/gregtao/concerto/network/ClientMusicNetworkHandler.java
@@ -14,6 +14,7 @@
 import top.gregtao.concerto.config.ClientConfig;
 import top.gregtao.concerto.config.PresetRadioConfig;
 import top.gregtao.concerto.music.Music;
+import top.gregtao.concerto.network.room.MusicRoom;
 import top.gregtao.concerto.player.MusicPlayer;
 import top.gregtao.concerto.player.MusicPlayerHandler;
 import top.gregtao.concerto.screen.MusicAuditionScreen;
@@ -162,7 +163,7 @@ public static void playerJoinHandshake(ConcertoPayload payload, ClientPlayNetwor
             if (player != null && playerName.equals(player.getName().getString())) {
                 ConcertoClient.serverAvailable = true;
                 ConcertoClient.LOGGER.info("Concerto has been installed in this server");
-                if (args.length > 3 && args[3].equals("Invite")) {
+                if (args.length > 3 && !MinecraftClient.getInstance().isInSingleplayer() && args[3].equals("Invite")) {
                     if (ClientConfig.INSTANCE.options.joinAgentWhenInvited) {
                         player.networkHandler.sendChatCommand("/musicroom agent join");
                     } else {
diff --git a/src/main/java/top/gregtao/concerto/network/MusicDataPacket.java b/src/main/java/top/gregtao/concerto/network/MusicDataPacket.java
@@ -3,7 +3,7 @@
 import com.google.gson.JsonObject;
 import net.minecraft.server.MinecraftServer;
 import top.gregtao.concerto.api.MusicJsonParsers;
-import top.gregtao.concerto.music.UnsafeMusicException;
+import top.gregtao.concerto.api.UnsafeMusicException;
 import top.gregtao.concerto.enums.Sources;
 import top.gregtao.concerto.music.Music;
 import top.gregtao.concerto.util.JsonUtil;
diff --git a/src/main/java/top/gregtao/concerto/network/ServerMusicNetworkHandler.java b/src/main/java/top/gregtao/concerto/network/ServerMusicNetworkHandler.java
@@ -16,6 +16,8 @@
 import top.gregtao.concerto.config.ServerConfig;
 import top.gregtao.concerto.music.Music;
 import top.gregtao.concerto.music.meta.music.MusicMetaData;
+import top.gregtao.concerto.network.room.MusicRoom;
+import top.gregtao.concerto.network.room.ServerMusicAgent;
 import top.gregtao.concerto.util.TextUtil;
 
 import java.util.*;
diff --git a/src/main/java/top/gregtao/concerto/network/room/MusicRoom.java b/src/main/java/top/gregtao/concerto/network/room/MusicRoom.java
@@ -1,4 +1,4 @@
-package top.gregtao.concerto.network;
+package top.gregtao.concerto.network.room;
 
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
@@ -14,6 +14,8 @@
 import top.gregtao.concerto.config.ServerConfig;
 import top.gregtao.concerto.music.Music;
 import top.gregtao.concerto.music.SharedMusic;
+import top.gregtao.concerto.network.ConcertoPayload;
+import top.gregtao.concerto.network.MusicDataPacket;
 import top.gregtao.concerto.player.MusicPlayer;
 import top.gregtao.concerto.util.TextUtil;
 
diff --git a/src/main/java/top/gregtao/concerto/network/room/ServerMusicAgent.java b/src/main/java/top/gregtao/concerto/network/room/ServerMusicAgent.java
@@ -1,4 +1,4 @@
-package top.gregtao.concerto.network;
+package top.gregtao.concerto.network.room;
 
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
@@ -7,6 +7,7 @@
 import top.gregtao.concerto.http.HttpURLInputStream;
 import top.gregtao.concerto.music.Music;
 import top.gregtao.concerto.music.SharedMusic;
+import top.gregtao.concerto.network.ServerMusicNetworkHandler;
 import top.gregtao.concerto.player.MusicPlayer;
 
 import java.util.ArrayList;
diff --git a/src/main/java/top/gregtao/concerto/player/MusicPlayer.java b/src/main/java/top/gregtao/concerto/player/MusicPlayer.java
@@ -14,7 +14,7 @@
 import top.gregtao.concerto.ConcertoClient;
 import top.gregtao.concerto.api.MusicJsonParsers;
 import top.gregtao.concerto.music.Music;
-import top.gregtao.concerto.network.MusicRoom;
+import top.gregtao.concerto.network.room.MusicRoom;
 
 import java.io.File;
 import java.io.IOException;
@@ -233,6 +233,7 @@ public void playTempMusic(Music music, Runnable callback) {
             try {
                 this.open(source);
                 this.play();
+                ConcertoClient.LOGGER.info("Start playing temporary music {} - {}", music.getMeta().title(), music.getMeta().author());
                 this.isPlayingTemp = true;
             } catch (StreamPlayerException e) {
                 this.started = this.isPlayingTemp = this.forcePaused = false;
@@ -285,7 +286,7 @@ public void playNext(int forward, Consumer<Integer> callback) {
                     MusicPlayerHandler.INSTANCE.currentSource = source;
                     this.open(source);
                     this.play();
-                    ConcertoClient.LOGGER.info("Start playing music: {}", music.getMeta().title());
+                    ConcertoClient.LOGGER.info("Start playing music {} - {}", music.getMeta().title(), music.getMeta().author());
                     MusicRoom.clientUpdate(music);
                     callback.accept(MusicPlayerHandler.INSTANCE.getCurrentIndex());
                 }
diff --git a/src/main/java/top/gregtao/concerto/screen/AddMusicScreen.java b/src/main/java/top/gregtao/concerto/screen/AddMusicScreen.java
@@ -6,6 +6,7 @@
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.client.gui.widget.TextWidget;
 import net.minecraft.text.Text;
+import top.gregtao.concerto.api.UnsafeMusicException;
 import top.gregtao.concerto.music.*;
 import top.gregtao.concerto.music.list.NeteaseCloudPlaylist;
 import top.gregtao.concerto.player.MusicPlayer;
diff --git a/src/main/java/top/gregtao/concerto/screen/ApplyDraggedFileScreen.java b/src/main/java/top/gregtao/concerto/screen/ApplyDraggedFileScreen.java
@@ -5,7 +5,7 @@
 import net.minecraft.text.Text;
 import top.gregtao.concerto.music.LocalFileMusic;
 import top.gregtao.concerto.music.Music;
-import top.gregtao.concerto.music.UnsafeMusicException;
+import top.gregtao.concerto.api.UnsafeMusicException;
 import top.gregtao.concerto.player.MusicPlayer;
 import top.gregtao.concerto.player.MusicPlayerHandler;
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package top.gregtao.concerto.music;`
	`1`	`+package top.gregtao.concerto.api;`
`2`	`2`
`3`	`3`	`public class MusicSourceNotFoundException extends UnsupportedOperationException {`
`4`	`4`