-修复了重启后配置还原的bug

cnlimiter · cnlimiter · commit 2024381eca8f · 2022-01-18T12:31:11.000+08:00
-删除了后台debug提示
-添加了控制欢迎新入群消息的开关
diff --git a/src/main/java/cn/evolvefield/mods/botapi/BotApi.java b/src/main/java/cn/evolvefield/mods/botapi/BotApi.java
@@ -1,8 +1,8 @@
 package cn.evolvefield.mods.botapi;
 
-import cn.evolvefield.mods.botapi.config.BotConfig;
-import cn.evolvefield.mods.botapi.config.ConfigManger;
-import cn.evolvefield.mods.botapi.service.ClientThreadService;
+import cn.evolvefield.mods.botapi.common.config.BotConfig;
+import cn.evolvefield.mods.botapi.common.config.ConfigManger;
+import cn.evolvefield.mods.botapi.core.service.ClientThreadService;
 import com.google.gson.Gson;
 import net.minecraft.server.MinecraftServer;
 import net.minecraftforge.common.MinecraftForge;
@@ -16,7 +16,7 @@
 import net.minecraftforge.fml.loading.FMLPaths;
 import net.minecraftforge.fmllegacy.server.ServerLifecycleHooks;
 import net.minecraftforge.fmlserverevents.FMLServerAboutToStartEvent;
-import net.minecraftforge.fmlserverevents.FMLServerStartingEvent;
+import net.minecraftforge.fmlserverevents.FMLServerStartedEvent;
 import net.minecraftforge.fmlserverevents.FMLServerStoppingEvent;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -39,14 +39,13 @@ public BotApi() {
         FMLJavaModLoadingContext.get().getModEventBus().addListener(this::processIMC);
         FMLJavaModLoadingContext.get().getModEventBus().addListener(this::doClientStuff);
         MinecraftForge.EVENT_BUS.register(this);
-        MinecraftForge.EVENT_BUS.addListener(this::onServerStarting);
+        MinecraftForge.EVENT_BUS.addListener(this::onServerStarted);
         MinecraftForge.EVENT_BUS.addListener(this::onServerStopping);
 
     }
 
     private void setup(final FMLCommonSetupEvent event) {
         CONFIG_FOLDER = FMLPaths.CONFIGDIR.get();
-        config = new BotConfig();
     }
 
     private void doClientStuff(final FMLClientSetupEvent event) {
@@ -59,9 +58,9 @@ private void processIMC(final InterModProcessEvent event) {
 
     }
 
-    private void onServerStarting(FMLServerStartingEvent event){
+    private void onServerStarted(FMLServerStartedEvent event){
         //加载配置
-        ConfigManger.initBotConfig();
+        config = ConfigManger.initBotConfig();
         if (BotApi.config.getCommon().isEnable()) {
             ClientThreadService.runWebSocketClient();
         }
diff --git a/src/main/java/cn/evolvefield/mods/botapi/api/SendMessage.java b/src/main/java/cn/evolvefield/mods/botapi/api/SendMessage.java
@@ -7,7 +7,7 @@
 
 import java.util.List;
 
-import static cn.evolvefield.mods.botapi.network.WebSocket.WebSocketChannelSupervise.sendToAll;
+import static cn.evolvefield.mods.botapi.core.network.WebSocket.WebSocketChannelSupervise.sendToAll;
 
 public class SendMessage {
 
diff --git a/src/main/java/cn/evolvefield/mods/botapi/common/command/ConnectCommand.java b/src/main/java/cn/evolvefield/mods/botapi/common/command/ConnectCommand.java
@@ -1,9 +1,9 @@
-package cn.evolvefield.mods.botapi.command;
+package cn.evolvefield.mods.botapi.common.command;
 
 
 import cn.evolvefield.mods.botapi.BotApi;
-import cn.evolvefield.mods.botapi.config.ConfigManger;
-import cn.evolvefield.mods.botapi.service.ClientThreadService;
+import cn.evolvefield.mods.botapi.common.config.ConfigManger;
+import cn.evolvefield.mods.botapi.core.service.ClientThreadService;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
diff --git a/src/main/java/cn/evolvefield/mods/botapi/common/command/DebugCommand.java b/src/main/java/cn/evolvefield/mods/botapi/common/command/DebugCommand.java
@@ -1,7 +1,7 @@
-package cn.evolvefield.mods.botapi.command;
+package cn.evolvefield.mods.botapi.common.command;
 
 import cn.evolvefield.mods.botapi.BotApi;
-import cn.evolvefield.mods.botapi.config.ConfigManger;
+import cn.evolvefield.mods.botapi.common.config.ConfigManger;
 import com.mojang.brigadier.arguments.BoolArgumentType;
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
diff --git a/src/main/java/cn/evolvefield/mods/botapi/common/command/DisconnectCommand.java b/src/main/java/cn/evolvefield/mods/botapi/common/command/DisconnectCommand.java
@@ -1,9 +1,9 @@
-package cn.evolvefield.mods.botapi.command;
+package cn.evolvefield.mods.botapi.common.command;
 
 
 import cn.evolvefield.mods.botapi.BotApi;
-import cn.evolvefield.mods.botapi.config.ConfigManger;
-import cn.evolvefield.mods.botapi.service.ClientThreadService;
+import cn.evolvefield.mods.botapi.common.config.ConfigManger;
+import cn.evolvefield.mods.botapi.core.service.ClientThreadService;
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
 import net.minecraft.commands.CommandRuntimeException;
diff --git a/src/main/java/cn/evolvefield/mods/botapi/common/command/GroupIDCommand.java b/src/main/java/cn/evolvefield/mods/botapi/common/command/GroupIDCommand.java
@@ -1,7 +1,7 @@
-package cn.evolvefield.mods.botapi.command;
+package cn.evolvefield.mods.botapi.common.command;
 
 import cn.evolvefield.mods.botapi.BotApi;
-import cn.evolvefield.mods.botapi.config.ConfigManger;
+import cn.evolvefield.mods.botapi.common.config.ConfigManger;
 import com.mojang.brigadier.arguments.IntegerArgumentType;
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
diff --git a/src/main/java/cn/evolvefield/mods/botapi/common/command/Invoke.java b/src/main/java/cn/evolvefield/mods/botapi/common/command/Invoke.java
@@ -1,4 +1,4 @@
-package cn.evolvefield.mods.botapi.command;
+package cn.evolvefield.mods.botapi.common.command;
 
 
 import cn.evolvefield.mods.botapi.BotApi;
diff --git a/src/main/java/cn/evolvefield/mods/botapi/common/command/ReceiveCommand.java b/src/main/java/cn/evolvefield/mods/botapi/common/command/ReceiveCommand.java
@@ -1,7 +1,7 @@
-package cn.evolvefield.mods.botapi.command;
+package cn.evolvefield.mods.botapi.common.command;
 
 import cn.evolvefield.mods.botapi.BotApi;
-import cn.evolvefield.mods.botapi.config.ConfigManger;
+import cn.evolvefield.mods.botapi.common.config.ConfigManger;
 import com.mojang.brigadier.arguments.BoolArgumentType;
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
diff --git a/src/main/java/cn/evolvefield/mods/botapi/common/command/SendCommand.java b/src/main/java/cn/evolvefield/mods/botapi/common/command/SendCommand.java
@@ -1,7 +1,7 @@
-package cn.evolvefield.mods.botapi.command;
+package cn.evolvefield.mods.botapi.common.command;
 
 import cn.evolvefield.mods.botapi.BotApi;
-import cn.evolvefield.mods.botapi.config.ConfigManger;
+import cn.evolvefield.mods.botapi.common.config.ConfigManger;
 import com.mojang.brigadier.arguments.BoolArgumentType;
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
@@ -34,9 +34,29 @@ public class SendCommand {
                 .then(literal("achievements")
                         .then(Commands.argument("enabled", BoolArgumentType.bool())
                                 .executes(SendCommand::achievementsExecute)))
+                .then(literal("welcome")
+                        .then(Commands.argument("enabled", BoolArgumentType.bool())
+                                .executes(SendCommand::welcomeExecute)))
                 ;
     }
 
+    public static int welcomeExecute(CommandContext<CommandSourceStack> context) throws CommandRuntimeException {
+        boolean isEnabled = context.getArgument("enabled", Boolean.class);
+        BotApi.config.getCommon().setS_WELCOME_ENABLE(isEnabled);
+        ConfigManger.saveBotConfig(BotApi.config);
+        if (isEnabled)
+        {
+            context.getSource().sendSuccess(
+                    new TextComponent("发送新人加入QQ群的消息开关已被设置为打开"), true);
+        }
+        else
+        {
+            context.getSource().sendSuccess(
+                    new TextComponent("发送新人加入QQ群的消息开关已被设置为关闭"), true);
+        }
+        return 0;
+    }
+
     public static int allExecute(CommandContext<CommandSourceStack> context) throws CommandRuntimeException {
         boolean isEnabled = context.getArgument("enabled", Boolean.class);
         BotApi.config.getCommon().setSEND_ENABLED(isEnabled);
diff --git a/src/main/java/cn/evolvefield/mods/botapi/common/command/StatusCommand.java b/src/main/java/cn/evolvefield/mods/botapi/common/command/StatusCommand.java
@@ -1,8 +1,8 @@
-package cn.evolvefield.mods.botapi.command;
+package cn.evolvefield.mods.botapi.common.command;
 
 
 import cn.evolvefield.mods.botapi.BotApi;
-import cn.evolvefield.mods.botapi.service.ClientThreadService;
+import cn.evolvefield.mods.botapi.core.service.ClientThreadService;
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
 import net.minecraft.commands.CommandRuntimeException;
diff --git a/src/main/java/cn/evolvefield/mods/botapi/common/config/BotConfig.java b/src/main/java/cn/evolvefield/mods/botapi/common/config/BotConfig.java
@@ -1,4 +1,4 @@
-package cn.evolvefield.mods.botapi.config;
+package cn.evolvefield.mods.botapi.common.config;
 
 import com.google.gson.annotations.SerializedName;
 
@@ -48,6 +48,8 @@ public static class Common {
         private boolean R_CHAT_ENABLE = true;
         @SerializedName("SEND_ENABLED")
         private boolean SEND_ENABLED = true;
+        @SerializedName("WELCOME_ENABLE")
+        private boolean S_WELCOME_ENABLE = true;
         @SerializedName("JOIN_ENABLE")
         private boolean S_JOIN_ENABLE = true;
         @SerializedName("LEAVE_ENABLE")
@@ -59,6 +61,14 @@ public static class Common {
         @SerializedName("S_ADVANCE_ENABLE")
         private boolean S_ADVANCE_ENABLE = true;
 
+        public void setS_WELCOME_ENABLE(boolean s_WELCOME_ENABLE) {
+            S_WELCOME_ENABLE = s_WELCOME_ENABLE;
+        }
+
+        public boolean isS_WELCOME_ENABLE() {
+            return S_WELCOME_ENABLE;
+        }
+
 
         public String getWelcomeNotice() {
             return welcomeNotice;
diff --git a/src/main/java/cn/evolvefield/mods/botapi/common/config/ConfigManger.java b/src/main/java/cn/evolvefield/mods/botapi/common/config/ConfigManger.java
@@ -1,4 +1,4 @@
-package cn.evolvefield.mods.botapi.config;
+package cn.evolvefield.mods.botapi.common.config;
 
 import cn.evolvefield.mods.botapi.BotApi;
 import cn.evolvefield.mods.botapi.util.json.JSONFormat;
@@ -11,11 +11,10 @@
 import java.nio.file.Path;
 
 
-
 public class ConfigManger {
     private static final Gson GSON = new Gson();
 
-    public static void initBotConfig() {
+    public static BotConfig initBotConfig() {
         BotConfig config = new BotConfig();
 
         if (!BotApi.CONFIG_FOLDER.toFile().isDirectory()) {
@@ -42,6 +41,7 @@ public static void initBotConfig() {
             }
         }
 
+        return config;
     }
 
     public static void saveBotConfig(BotConfig config) {
diff --git a/src/main/java/cn/evolvefield/mods/botapi/common/config/IConfig.java b/src/main/java/cn/evolvefield/mods/botapi/common/config/IConfig.java
@@ -1,4 +1,4 @@
-package cn.evolvefield.mods.botapi.config;
+package cn.evolvefield.mods.botapi.common.config;
 
 public interface IConfig {
     /**
diff --git a/src/main/java/cn/evolvefield/mods/botapi/core/network/WebSocket/WebSocketChannelInitializer.java b/src/main/java/cn/evolvefield/mods/botapi/core/network/WebSocket/WebSocketChannelInitializer.java
@@ -1,4 +1,4 @@
-package cn.evolvefield.mods.botapi.network.WebSocket;
+package cn.evolvefield.mods.botapi.core.network.WebSocket;
 
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelPipeline;
diff --git a/src/main/java/cn/evolvefield/mods/botapi/core/network/WebSocket/WebSocketChannelSupervise.java b/src/main/java/cn/evolvefield/mods/botapi/core/network/WebSocket/WebSocketChannelSupervise.java
@@ -1,4 +1,4 @@
-package cn.evolvefield.mods.botapi.network.WebSocket;
+package cn.evolvefield.mods.botapi.core.network.WebSocket;
 
 
 import io.netty.channel.Channel;
diff --git a/src/main/java/cn/evolvefield/mods/botapi/core/network/WebSocket/WebSocketClient.java b/src/main/java/cn/evolvefield/mods/botapi/core/network/WebSocket/WebSocketClient.java
@@ -1,8 +1,8 @@
-package cn.evolvefield.mods.botapi.network.WebSocket;
+package cn.evolvefield.mods.botapi.core.network.WebSocket;
 
 
 import cn.evolvefield.mods.botapi.BotApi;
-import cn.evolvefield.mods.botapi.service.ClientThreadService;
+import cn.evolvefield.mods.botapi.core.service.ClientThreadService;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
@@ -39,6 +39,7 @@ public WebSocketClient(String host, int port, String key) {
         this.key = key;
         setUncaughtExceptionHandler((thread, throwable) -> {
             logger.warn("连接出错，将结束客户端线程:", throwable);
+            logger.warn("请检查Go-cqhttp是否开启");
             ClientThreadService.stopWebSocketClient();
         });
     }
diff --git a/src/main/java/cn/evolvefield/mods/botapi/core/network/WebSocket/WebSocketClientHandler.java b/src/main/java/cn/evolvefield/mods/botapi/core/network/WebSocket/WebSocketClientHandler.java
@@ -1,8 +1,8 @@
-package cn.evolvefield.mods.botapi.network.WebSocket;
+package cn.evolvefield.mods.botapi.core.network.WebSocket;
 
 import cn.evolvefield.mods.botapi.BotApi;
-import cn.evolvefield.mods.botapi.service.ClientThreadService;
-import cn.evolvefield.mods.botapi.service.MessageHandlerService;
+import cn.evolvefield.mods.botapi.core.service.ClientThreadService;
+import cn.evolvefield.mods.botapi.core.service.MessageHandlerService;
 import io.netty.channel.*;
 import io.netty.handler.codec.http.FullHttpResponse;
 import io.netty.handler.codec.http.websocketx.*;
diff --git a/src/main/java/cn/evolvefield/mods/botapi/core/service/ClientThreadService.java b/src/main/java/cn/evolvefield/mods/botapi/core/service/ClientThreadService.java
@@ -1,7 +1,7 @@
-package cn.evolvefield.mods.botapi.service;
+package cn.evolvefield.mods.botapi.core.service;
 
 import cn.evolvefield.mods.botapi.BotApi;
-import cn.evolvefield.mods.botapi.network.WebSocket.WebSocketClient;
+import cn.evolvefield.mods.botapi.core.network.WebSocket.WebSocketClient;
 
 public class ClientThreadService {
     public static WebSocketClient client;
@@ -11,9 +11,9 @@ public static void runWebSocketClient() {
             client.interrupt();
         }
         client = new WebSocketClient(
-                BotApi.config.getCommon().getWsHOST(),
-                BotApi.config.getCommon().getWsPORT(),
-                BotApi.config.getCommon().getKEY());
+                BotApi.config.getCommon().getWsHost(),
+                BotApi.config.getCommon().getWsPort(),
+                BotApi.config.getCommon().getWsKey());
         client.start();
     }
     public static void runWebSocketClient(String host, int port, String key) {
diff --git a/src/main/java/cn/evolvefield/mods/botapi/core/service/MessageHandlerService.java b/src/main/java/cn/evolvefield/mods/botapi/core/service/MessageHandlerService.java
@@ -1,11 +1,11 @@
-package cn.evolvefield.mods.botapi.service;
+package cn.evolvefield.mods.botapi.core.service;
 
 
 import cn.evolvefield.mods.botapi.BotApi;
-import cn.evolvefield.mods.botapi.command.Invoke;
-import cn.evolvefield.mods.botapi.event.TickEventHandler;
 import cn.evolvefield.mods.botapi.api.MessageJson;
 import cn.evolvefield.mods.botapi.api.SendMessage;
+import cn.evolvefield.mods.botapi.common.command.Invoke;
+import cn.evolvefield.mods.botapi.init.events.TickEventHandler;
 import net.minecraftforge.event.ServerChatEvent;
 
 public class MessageHandlerService {
@@ -16,7 +16,6 @@ public class MessageHandlerService {
     public static void sendMessage(ServerChatEvent event) {
 
         SendMessage.Group(BotApi.config.getCommon().getGroupId(),String.format("[MC]<%s> %s", event.getPlayer().getDisplayName().getString(), event.getMessage()));
-        //sendToAll(new TextWebSocketFrame("/send_group_msg?group_id=" + ModConfig.GROUP_ID.get() + "&message=" + event.getMessage()));
     }
 
     /**
diff --git a/src/main/java/cn/evolvefield/mods/botapi/init/events/ChatEventHandler.java b/src/main/java/cn/evolvefield/mods/botapi/init/events/ChatEventHandler.java
@@ -1,6 +1,6 @@
-package cn.evolvefield.mods.botapi.event;
+package cn.evolvefield.mods.botapi.init.events;
 import cn.evolvefield.mods.botapi.BotApi;
-import cn.evolvefield.mods.botapi.service.MessageHandlerService;
+import cn.evolvefield.mods.botapi.core.service.MessageHandlerService;
 import net.minecraftforge.event.ServerChatEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
diff --git a/src/main/java/cn/evolvefield/mods/botapi/init/events/CommandEventHandler.java b/src/main/java/cn/evolvefield/mods/botapi/init/events/CommandEventHandler.java
@@ -1,7 +1,7 @@
-package cn.evolvefield.mods.botapi.event;
+package cn.evolvefield.mods.botapi.init.events;
 
 
-import cn.evolvefield.mods.botapi.command.*;
+import cn.evolvefield.mods.botapi.common.command.*;
 import com.mojang.brigadier.CommandDispatcher;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
diff --git a/src/main/java/cn/evolvefield/mods/botapi/network/HttpRequest.java b/src/main/java/cn/evolvefield/mods/botapi/network/HttpRequest.java
diff --git a/src/main/java/cn/evolvefield/mods/botapi/util/CoolQ.java b/src/main/java/cn/evolvefield/mods/botapi/util/CoolQ.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package cn.evolvefield.mods.botapi.command;`
	`1`	`+package cn.evolvefield.mods.botapi.common.command;`
`2`	`2`
`3`	`3`
`4`	`4`	`import cn.evolvefield.mods.botapi.BotApi;`