Merge pull request #32 from GregTaoo/dev

feat. 选择性注册music指令

Author: GregTaoo

gradle.properties

@@ -9,6 +9,6 @@ loader_version=0.16.10
 fabric_version=0.77.0+1.18.2
 
 # Mod Properties
-mod_version=1.3.1
+mod_version=1.3.2
 maven_group=top.gregtao.concerto
 archives_base_name=Concerto-fabric

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

@@ -42,11 +42,13 @@ public class MusicCommand {
 
     public static void register() {
         LiteralCommandNode<FabricClientCommandSource> node = ClientCommandManager.DISPATCHER.register(registerPlayerControllers(
-                ClientCommandManager.literal("music")
+                ClientCommandManager.literal("concerto")
                         .then(addMusicCommand())
                         .then(insertMusicCommand())
         ));
-        ClientCommandManager.DISPATCHER.register(ClientCommandManager.literal("concerto").redirect(node));
+        if (ClientConfig.INSTANCE.options.registerMusicCommand) {
+            ClientCommandManager.DISPATCHER.register(ClientCommandManager.literal("music").redirect(node));
+        }
     }
 
     private static final List<MusicAdderBuilder.MusicGetter<Music>> GETTERS = List.of(

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

@@ -14,7 +14,7 @@
 public class MusicRoomCommand {
 
     public static void register() {
-        LiteralCommandNode<FabricClientCommandSource> node = ClientCommandManager.DISPATCHER.register(
+        ClientCommandManager.DISPATCHER.register(
                 ClientCommandManager.literal("musicroom")
                         .then(ClientCommandManager.literal("create").executes(context -> {
                             ClientPlayerEntity player = context.getSource().getPlayer();
@@ -100,7 +100,6 @@ public static void register() {
                                 )
                         )
         );
-        ClientCommandManager.DISPATCHER.register(ClientCommandManager.literal("concerto").redirect(node));
     }
 
     public static boolean checkServerAvailable(ClientPlayerEntity player) {

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

@@ -46,6 +46,7 @@ public static class ClientConfigOptions {
         public int maxCacheSize = 1000 * 1000 * 100;
         public boolean displayLyrics = true;
         public boolean joinAgentWhenInvited = false;
+        public boolean registerMusicCommand = true;
         public String lyricsPosition = "0.5,1-70";
         public TextAlignment lyricsAlignment = TextAlignment.CENTER;
         public boolean displaySubLyrics = true;