Merge pull request #38 from GregTaoo/dev

1.3.2

Author: GregTaoo

gradle.properties

@@ -9,6 +9,6 @@ loader_version=0.16.10
 fabric_version=0.115.1+1.21.4
 
 # Mod Properties
-mod_version=1.3.0
+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(CommandDispatcher<FabricClientCommandSource> dispatcher, CommandRegistryAccess access) {
         LiteralCommandNode<FabricClientCommandSource> node = dispatcher.register(registerPlayerControllers(
-                ClientCommandManager.literal("music")
+                ClientCommandManager.literal("concerto")
                         .then(addMusicCommand())
                         .then(insertMusicCommand())
         ));
-        dispatcher.register(ClientCommandManager.literal("concerto").redirect(node));
+        if (ClientConfig.INSTANCE.options.registerMusicCommand) {
+            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

@@ -3,7 +3,6 @@
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.BoolArgumentType;
 import com.mojang.brigadier.arguments.StringArgumentType;
-import com.mojang.brigadier.tree.LiteralCommandNode;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.minecraft.client.network.ClientPlayerEntity;
@@ -16,7 +15,7 @@
 public class MusicRoomCommand {
 
     public static void register(CommandDispatcher<FabricClientCommandSource> dispatcher, CommandRegistryAccess access) {
-        LiteralCommandNode<FabricClientCommandSource> node = dispatcher.register(
+        dispatcher.register(
                 ClientCommandManager.literal("musicroom")
                         .then(ClientCommandManager.literal("create").executes(context -> {
                             ClientPlayerEntity player = context.getSource().getPlayer();
@@ -102,7 +101,6 @@ public static void register(CommandDispatcher<FabricClientCommandSource> dispatc
                                 )
                         )
         );
-        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;

src/main/resources/assets/concerto/lang/en_us.json

@@ -16,6 +16,7 @@
   "concerto.success": "Success",
   "concerto.fail": "Fail",
   "concerto.not_cacheable": "Not cacheable",
+  "concerto.not_available": "Concerto not available in this server!",
   "concerto.drag_confirm": "Do you want to add the following files/folders to Concerto?",
   "concerto.thank_you": "Thank you! Your support keeps me going always!",
 
@@ -90,7 +91,7 @@
   "concerto.screen.url_image.empty": "No Image",
   "concerto.screen.playlist.add": "Add all",
   "concerto.screen.audition": "Audit shared musics",
-  "concerto.screen.confirmation": "Accepted shared musics",
+  "concerto.screen.confirmation": "Accept shared musics",
   "concerto.screen.audition.permission_denied": "You don't have such permissions",
   "concerto.screen.daily_recommendation": "Daily Recommendation",
   "concerto.screen.copy_link": "Copy link",

src/main/resources/assets/concerto/lang/zh_cn.json

@@ -16,6 +16,7 @@
   "concerto.success": "成功",
   "concerto.fail": "失败",
   "concerto.not_cacheable": "不是可缓存的",
+  "concerto.not_available": "Concerto 在该服务器不可用！",
   "concerto.drag_confirm": "确认将下列 文件/文件夹 添加到 Concerto?",
   "concerto.thank_you": "感谢支持！您的支持是我更新的最大动力",
 

src/main/resources/fabric.mod.json

@@ -30,7 +30,7 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.14.11",
+    "fabricloader": ">=0.16.10",
     "fabric-api": "*",
     "minecraft": ">=1.21.4",
     "java": ">=21"