Make yacl dependency soft

zbx1425 · zbx1425 · commit 83f8bb73d1d5 · 2025-01-20T15:05:30.000+08:00
diff --git a/common/src/main/java/cn/zbx1425/minopp/entity/EntityAutoPlayer.java b/common/src/main/java/cn/zbx1425/minopp/entity/EntityAutoPlayer.java
@@ -189,10 +189,15 @@ public void tick() {
         if (level().isClientSide) {
             if (player.hasPermissions(2) && player.isShiftKeyDown()) {
                 return InteractionResult.SUCCESS;
+            } else if (getActive() && !player.isShiftKeyDown()) {
+                return InteractionResult.SUCCESS;
             }
         } else {
-            if (player instanceof ServerPlayer serverPlayer && player.hasPermissions(2) && player.isShiftKeyDown()) {
-                S2CAutoPlayerScreenPacket.sendS2C(serverPlayer, this);
+            if (player.hasPermissions(2) && player.isShiftKeyDown()) {
+                S2CAutoPlayerScreenPacket.sendS2C((ServerPlayer) player, this);
+                return InteractionResult.SUCCESS;
+            } else if (!getActive() && !player.isShiftKeyDown()) {
+                setActive(true);
                 return InteractionResult.SUCCESS;
             }
         }
diff --git a/common/src/main/java/cn/zbx1425/minopp/gui/AutoPlayerScreen.java b/common/src/main/java/cn/zbx1425/minopp/gui/AutoPlayerScreen.java
@@ -7,6 +7,7 @@
 import dev.isxander.yacl3.api.controller.FloatSliderControllerBuilder;
 import dev.isxander.yacl3.api.controller.IntegerSliderControllerBuilder;
 import dev.isxander.yacl3.api.controller.StringControllerBuilder;
+import net.minecraft.ChatFormatting;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
 
@@ -16,6 +17,7 @@ public static Screen create(EntityAutoPlayer target, Screen parent) {
         ConfigCategory.Builder categoryBuilder = ConfigCategory.createBuilder();
         putEntityPreferences(categoryBuilder, target);
         putAIPreferences(categoryBuilder, target);
+        putDismantlePreferences(categoryBuilder, target);
         return YetAnotherConfigLib.createBuilder()
                 .title(Component.translatable("gui.minopp.bot_config.title"))
                 .category(categoryBuilder.name(Component.translatable("gui.minopp.bot_config.title")).build())
@@ -33,14 +35,6 @@ private static void putEntityPreferences(ConfigCategory.Builder builder, EntityA
                         .controller(opt -> BooleanControllerBuilder.create(opt).onOffFormatter())
                         .build()
                 )
-                .option(ButtonOption.createBuilder()
-                        .name(Component.translatable("gui.minopp.bot_config.remove"))
-                        .action((screen, opt) -> {
-                            C2SAutoPlayerConfigPacket.Client.sendDeleteC2S(target);
-                            screen.onClose();
-                        })
-                        .build()
-                )
                 .option(Option.<String>createBuilder()
                         .name(Component.translatable("gui.minopp.bot_config.custom_name"))
                         .binding("",
@@ -112,4 +106,19 @@ private static void putAIPreferences(ConfigCategory.Builder builder, EntityAutoP
                 .build();
         builder.group(aiOpts).group(aiMetaOpts);
     }
+
+    private static void putDismantlePreferences(ConfigCategory.Builder builder, EntityAutoPlayer target) {
+        OptionGroup dismantleOpts = OptionGroup.createBuilder()
+                .name(Component.translatable("gui.minopp.bot_config.remove"))
+                .option(ButtonOption.createBuilder()
+                        .name(Component.translatable("gui.minopp.bot_config.remove").withStyle(ChatFormatting.RED))
+                        .action((screen, opt) -> {
+                            C2SAutoPlayerConfigPacket.Client.sendDeleteC2S(target);
+                            screen.onClose();
+                        })
+                        .build()
+                )
+                .build();
+        builder.group(dismantleOpts);
+    }
 }
diff --git a/common/src/main/java/cn/zbx1425/minopp/network/C2SAutoPlayerConfigPacket.java b/common/src/main/java/cn/zbx1425/minopp/network/C2SAutoPlayerConfigPacket.java
@@ -9,6 +9,7 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.Entity;
 
 public class C2SAutoPlayerConfigPacket {
 
@@ -23,7 +24,7 @@ public static void handleC2S(MinecraftServer server, ServerPlayer player, Friend
             if (!player.hasPermissions(2)) return; // Re-check permission on server side
             if (player.level().getEntity(entityId) instanceof EntityAutoPlayer autoPlayer) {
                 if (shouldDelete) {
-                    autoPlayer.kill();
+                    autoPlayer.remove(Entity.RemovalReason.KILLED);
                 } else {
                     autoPlayer.readConfigFromTag(config);
                 }
diff --git a/common/src/main/java/cn/zbx1425/minopp/network/S2CAutoPlayerScreenPacket.java b/common/src/main/java/cn/zbx1425/minopp/network/S2CAutoPlayerScreenPacket.java
@@ -8,12 +8,26 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
 
 public class S2CAutoPlayerScreenPacket {
 
     public static final ResourceLocation ID = Mino.id("auto_player_screen");
+    private static Boolean yaclAvailable = null;
+
+    private static boolean isYaclAvailable() {
+        if (yaclAvailable == null) {
+            try {
+                Class.forName("dev.isxander.yacl3.api.YetAnotherConfigLib");
+                yaclAvailable = true;
+            } catch (ClassNotFoundException e) {
+                yaclAvailable = false;
+            }
+        }
+        return yaclAvailable;
+    }
 
     public static void sendS2C(ServerPlayer target, EntityAutoPlayer autoPlayer) {
         FriendlyByteBuf packet = new FriendlyByteBuf(Unpooled.buffer());
@@ -31,7 +45,12 @@ public static void handleS2C(FriendlyByteBuf packet) {
             Minecraft.getInstance().execute(() -> {
                 if (Minecraft.getInstance().level.getEntity(entityId) instanceof EntityAutoPlayer autoPlayer) {
                     autoPlayer.readConfigFromTag(config);
-                    Minecraft.getInstance().setScreen(AutoPlayerScreen.create(autoPlayer, Minecraft.getInstance().screen));
+                    if (isYaclAvailable()) {
+                        Minecraft.getInstance().setScreen(AutoPlayerScreen.create(autoPlayer, Minecraft.getInstance().screen));
+                    } else {
+                        Minecraft.getInstance().player.displayClientMessage(
+                            Component.translatable("gui.minopp.bot_config.yacl_missing"), false);
+                    }
                 }
             });
         }
diff --git a/common/src/main/resources/assets/minopp/lang/en_us.json b/common/src/main/resources/assets/minopp/lang/en_us.json
@@ -96,7 +96,6 @@
   "gui.minopp.bot_config.title": "MinoBot Preferences",
   "gui.minopp.bot_config.category.entity": "MinoBot Entity",
   "gui.minopp.bot_config.active": "Power",
-  "gui.minopp.bot_config.remove": "Dismantle",
   "gui.minopp.bot_config.custom_name": "Custom Name",
   "gui.minopp.bot_config.skin": "Skin",
   "gui.minopp.bot_config.skin.summary": "Name or UUID of the player whose skin is to be used.",
@@ -115,5 +114,7 @@
   "gui.minopp.bot_config.no_delay.1": "Fast",
   "gui.minopp.bot_config.no_delay.2": "Instant",
   "gui.minopp.bot_config.start_game": "Proposes Starting the Game",
-  "gui.minopp.bot_config.start_game.summary": "If the bot should automatically propose starting the game when enough players are seated."
+  "gui.minopp.bot_config.start_game.summary": "If the bot should automatically propose starting the game when enough players are seated.",
+  "gui.minopp.bot_config.remove": "Dismantle",
+  "gui.minopp.bot_config.yacl_missing": "YetAnotherConfigLib is required to show the configuration screen. Please install it and then try again."
 }
diff --git a/common/src/main/resources/assets/minopp/lang/zh_cn.json b/common/src/main/resources/assets/minopp/lang/zh_cn.json
@@ -96,7 +96,6 @@
   "gui.minopp.bot_config.title": "MinoBot 机器人偏好设置",
   "gui.minopp.bot_config.category.entity": "MinoBot 实体设定",
   "gui.minopp.bot_config.active": "电源",
-  "gui.minopp.bot_config.remove": "拆除",
   "gui.minopp.bot_config.custom_name": "自定义名称",
   "gui.minopp.bot_config.skin": "皮肤",
   "gui.minopp.bot_config.skin.summary": "如要使用某玩家的皮肤，在此处填入名称或 UUID。",
@@ -115,6 +114,7 @@
   "gui.minopp.bot_config.no_delay.1": "快速",
   "gui.minopp.bot_config.no_delay.2": "最快",
   "gui.minopp.bot_config.start_game": "自动开始游戏",
-  "gui.minopp.bot_config.start_game.summary": "启用时，机器人在入座人数满足条件时自动提议开始游戏。"
-
+  "gui.minopp.bot_config.start_game.summary": "启用时，机器人在入座人数满足条件时自动提议开始游戏。",
+  "gui.minopp.bot_config.remove": "拆除",
+  "gui.minopp.bot_config.yacl_missing": "需要安装 YetAnotherConfigLib 模组才能显示配置界面，请安装后再重新打开。"
 }
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -48,7 +48,7 @@ dependencies {
     modImplementation ("org.teacon:SignMeUp-NeoForge-1.21.1:+") { transitive false }
 
 //    modImplementation "dev.architectury:architectury-neoforge:$rootProject.architectury_api_version"
-    modImplementation "dev.isxander:yet-another-config-lib:$rootProject.yacl_version-neoforge"
+    // modImplementation "dev.isxander:yet-another-config-lib:$rootProject.yacl_version-neoforge"
 
     common(project(path: ':common', configuration: 'namedElements')) { transitive false }
     shadowBundle project(path: ':common', configuration: 'transformProductionNeoForge')

Original file line number	Diff line number	Diff line change
`@@ -189,10 +189,15 @@ public void tick() {`
`189`	`189`	`if (level().isClientSide) {`
`190`	`190`	`if (player.hasPermissions(2) && player.isShiftKeyDown()) {`
`191`	`191`	`return InteractionResult.SUCCESS;`
	`192`	`+ } else if (getActive() && !player.isShiftKeyDown()) {`
	`193`	`+ return InteractionResult.SUCCESS;`
`192`	`194`	`}`
`193`	`195`	`} else {`
`194`		`- if (player instanceof ServerPlayer serverPlayer && player.hasPermissions(2) && player.isShiftKeyDown()) {`
`195`		`- S2CAutoPlayerScreenPacket.sendS2C(serverPlayer, this);`
	`196`	`+ if (player.hasPermissions(2) && player.isShiftKeyDown()) {`
	`197`	`+ S2CAutoPlayerScreenPacket.sendS2C((ServerPlayer) player, this);`
	`198`	`+ return InteractionResult.SUCCESS;`
	`199`	`+ } else if (!getActive() && !player.isShiftKeyDown()) {`
	`200`	`+ setActive(true);`
`196`	`201`	`return InteractionResult.SUCCESS;`
`197`	`202`	`}`
`198`	`203`	`}`