up mod

Author: Coloryr

README.md

@@ -195,10 +195,12 @@ Forge/Fabric/NeoForge类服务器
     - addMusicCost         点歌花费
     - useCost              启用花费
 - sendDelay                Hud信息更新延迟
+- defaultApi               默认音乐API
 
 ## 指令说明
 普通玩家指令  
 - /music [音乐ID/网易云分享链接] 点歌
+- /music [音乐API] [音乐ID] 点歌
 - /music stop 停止播放歌曲
 - /music list 查看歌曲队列
 - /music cancel [序号] 取消你的点歌
@@ -209,6 +211,7 @@ Forge/Fabric/NeoForge类服务器
 - /music mute 不再参与点歌，再输入一次恢复
 - /music mute list 不接收空闲列表点歌，再输入一次恢复
 - /music search [歌名] 搜索歌曲
+- /music search [音乐API] [歌名] 搜索歌曲
 - /music select [序列] 选择歌曲
 - /music nextpage 切换下一页歌曲搜索结果
 - /music lastpage 切换上一页歌曲搜索结果
@@ -233,16 +236,18 @@ Forge/Fabric/NeoForge类服务器
 - /music reload 重读配置文件
 - /music next 强制切歌
 - /music ban [ID] 禁止点这首歌
+- /music ban [音乐API] [ID] 禁止点这首歌
 - /music unban [ID] 解禁点这首歌
+- /music unban [音乐API] [ID] 解禁点这首歌
 - /music banplayer [ID] 禁止某位玩家点歌
 - /music unbanplayer [ID] 解禁某位玩家点歌
-- /music url [url] 播放一首自定义歌曲
 - /music delete [序号] 删除队列中的歌曲
 - /music addlist [歌单ID] 添加歌单到空闲列表
 - /music clearlist 清空空闲歌单
 - /music clearban 清空禁止点歌列表
 - /music clearbanplayer 清空禁止点歌玩家列表
 - /music test [ID] 测试歌曲内容解析
+- /music test [音乐API] [ID] 测试歌曲内容解析
 
 若开启权限后  
 - 点歌需要权限`allmusic.addmusic`

client

@@ -27,6 +27,6 @@ public void execute(Object sender, String name, String[] args) {
         }
 
         AllMusic.side.sendMessage(sender, AllMusic.getMessage().search.startSearch);
-        CommandEX.searchMusicApi(sender, name, args,false);
+        CommandEX.searchMusicApi(sender, name, args, false);
     }
 }

core/command/sub/CommandSearchApi.java

@@ -22,6 +22,7 @@ private static void task() {
                     IMusicApi api = AllMusic.MUSIC_APIS.get(obj.api);
                     if (api == null) {
                         AllMusic.side.sendMessageTask(obj.sender, AllMusic.getMessage().musicPlay.error2);
+                        return;
                     }
                     SearchPageObj search = api.search(obj.args, obj.isDefault);
                     if (search == null)

core/music/MusicSearch.java

@@ -59,7 +59,7 @@ public CompletableFuture<Suggestions> getSuggestions(CommandContext<ServerComman
         String remaining = builder.getRemaining().trim();
 
         for (String s : results) {
-            if (s.startsWith(remaining)){
+            if (s.startsWith(remaining)) {
                 builder.suggest(s);
             }
         }

fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/CommandFabric.java

@@ -3,12 +3,12 @@
 import com.coloryr.allmusic.buffercodec.MusicPacketCodec;
 import com.coloryr.allmusic.codec.CommandType;
 import com.coloryr.allmusic.server.core.AllMusic;
-import com.coloryr.allmusic.server.core.objs.music.MusicObj;
+import com.coloryr.allmusic.server.core.objs.music.PlayerAddMusicObj;
 import com.coloryr.allmusic.server.core.objs.music.SongInfoObj;
 import com.coloryr.allmusic.server.core.side.BaseSide;
-import com.coloryr.allmusic.server.mixin.IGetCommandOutput;
 import com.coloryr.allmusic.server.event.MusicAddEvent;
 import com.coloryr.allmusic.server.event.MusicPlayEvent;
+import com.coloryr.allmusic.server.mixin.IGetCommandOutput;
 import io.netty.buffer.ByteBuf;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
 import net.minecraft.network.PacketByteBuf;
@@ -160,7 +160,7 @@ public boolean onMusicPlay(SongInfoObj obj) {
     }
 
     @Override
-    public boolean onMusicAdd(Object obj, MusicObj music) {
+    public boolean onMusicAdd(Object obj, PlayerAddMusicObj music) {
         ServerCommandSource sender = (ServerCommandSource) obj;
         ServerPlayerEntity entity = null;
         if (sender.getEntity() instanceof ServerPlayerEntity) {

fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/SideFabric.java

@@ -1,6 +1,6 @@
 package com.coloryr.allmusic.server.event;
 
-import com.coloryr.allmusic.server.core.objs.music.MusicObj;
+import com.coloryr.allmusic.server.core.objs.music.PlayerAddMusicObj;
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
 import net.minecraft.server.network.ServerPlayerEntity;
@@ -20,5 +20,5 @@ public interface MusicAddEvent {
                 return ActionResult.PASS;
             });
 
-    ActionResult interact(ServerPlayerEntity player, MusicObj music);
+    ActionResult interact(ServerPlayerEntity player, PlayerAddMusicObj music);
 }

fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/event/MusicAddEvent.java

@@ -9,6 +9,7 @@
 public interface IGetCommandOutput {
     @Accessor(value = "output")
     CommandOutput getOutput();
+
     @Accessor(value = "silent")
     boolean getSilent();
 }

fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java

@@ -2,7 +2,6 @@
 
 import com.coloryr.allmusic.server.core.AllMusic;
 import net.fabricmc.api.DedicatedServerModInitializer;
-import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.minecraft.server.MinecraftServer;

fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java

@@ -59,7 +59,7 @@ public CompletableFuture<Suggestions> getSuggestions(CommandContext<ServerComman
         String remaining = builder.getRemaining().trim();
 
         for (String s : results) {
-            if (s.startsWith(remaining)){
+            if (s.startsWith(remaining)) {
                 builder.suggest(s);
             }
         }