Skip to content
This repository was archived by the owner on Oct 23, 2025. It is now read-only.

feat: implement command output #3

Merged
HuoHuas001 merged 3 commits into from
Oct 17, 2025
Merged

feat: implement command output #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19a4073
feat: implement command output
smartcmd Oct 17, 2025
914a54d
fix: fix build
smartcmd Oct 17, 2025
9ddbf17
fix: fix build
smartcmd Oct 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@

专为AllayMC设计的下一代基岩版服务器管理解决方案，提供安全的无第三方QQ机器人依赖管理体验。

> [!NOTE]
> 由于技术原因，暂时无法为Allay提供命令回调，请等待后续更新.
>
## 🌟 核心优势

| 特性 | 传统方案 | HuHoBot |
Expand Down
6 changes: 3 additions & 3 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ plugins {
id("com.github.johnrengelman.shadow") version "8.1.1"
}

group = "cn.huohuas001.huHoBot"
group = "cn.huohuas001.huhobot"
description = "HuHoBot Allay Adapter"
version = "0.0.10"
version = "0.1.0"

java {
toolchain {
Expand All @@ -21,7 +21,7 @@ repositories {
}

dependencies {
compileOnly(group = "org.allaymc.allay", name = "api", version = "0.13.0")
compileOnly(group = "org.allaymc.allay", name = "api", version = "0.14.0")
compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.34")

implementation(group = "org.java-websocket", name = "Java-WebSocket", version = "1.5.4")
Expand Down
40 changes: 0 additions & 40 deletions src/main/java/cn/huohuas001/huHoBot/Api/BotCustomCommand.java
View file
Open in desktop

This file was deleted.

18 changes: 12 additions & 6 deletions src/main/java/cn/huohuas001/huHoBot/Command/HuHoBotCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package cn.huohuas001.huHoBot.Command;
package cn.huohuas001.huhobot.command;

import cn.huohuas001.huHoBot.HuHoBot;
import cn.huohuas001.huHoBot.NetEvent.bindRequest;
import cn.huohuas001.huhobot.HuHoBot;
import cn.huohuas001.huhobot.websocket.handler.BindRequest;
import org.allaymc.api.command.Command;
import org.allaymc.api.command.tree.CommandTree;
import org.allaymc.api.permission.PermissionGroups;
Expand All @@ -18,7 +18,7 @@ public void prepareCommandTree(CommandTree tree) {
tree.getRoot()
.key("reconnect")
.exec(context -> {
if (HuHoBot.getPlugin().reconnect()) {
if (HuHoBot.getInstance().reconnect()) {
context.addOutput(TextFormat.GOLD + "重连机器人成功.");
} else {
context.addOutput(TextFormat.DARK_RED + "重连机器人失败：已在连接状态.");
Expand All @@ -29,7 +29,7 @@ public void prepareCommandTree(CommandTree tree) {
.root()
.key("disconnect")
.exec(context -> {
if (HuHoBot.getPlugin().disConnectServer()) {
if (HuHoBot.getInstance().disConnectServer()) {
context.addOutput(TextFormat.GOLD + "已断开机器人连接.");
}
return context.success();
Expand All @@ -39,7 +39,7 @@ public void prepareCommandTree(CommandTree tree) {
.str("code")
.exec(context -> {
String Code = context.getResult(1);
bindRequest obj = HuHoBot.getPlugin().bindRequestObj;
BindRequest obj = HuHoBot.getInstance().getBindRequest();
if (obj.confirmBind(Code)) {
context.addOutput(TextFormat.GOLD + "已向服务器发送确认绑定请求，请等待服务端下发配置文件.");
} else {
Expand All @@ -63,6 +63,12 @@ public void prepareCommandTree(CommandTree tree) {
HuHoBot.reloadConfig();
context.addOutput(TextFormat.GOLD + "已重载配置文件.");
return context.success();
})
.root()
.key("test")
.exec(ctx -> {
HuHoBot.getInstance().runCommand("version", "");
return ctx.success();
});

}
Expand Down
29 changes: 0 additions & 29 deletions src/main/java/cn/huohuas001/huHoBot/GameEvent/GameEventListener.java
View file
Open in desktop

This file was deleted.

147 changes: 81 additions & 66 deletions src/main/java/cn/huohuas001/huHoBot/HuHoBot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
package cn.huohuas001.huHoBot;
package cn.huohuas001.huhobot;

import cn.huohuas001.huHoBot.Command.HuHoBotCommand;
import cn.huohuas001.huHoBot.GameEvent.GameEventListener;
import cn.huohuas001.huHoBot.NetEvent.*;
import cn.huohuas001.huHoBot.Settings.PluginConfig;
import cn.huohuas001.huhobot.command.HuHoBotCommand;
import cn.huohuas001.huhobot.utils.HuHoBotCommandSender;
import cn.huohuas001.huhobot.websocket.WSClientManager;
import cn.huohuas001.huhobot.websocket.handler.*;
import com.alibaba.fastjson2.JSONObject;
import eu.okaeri.configs.ConfigManager;
import eu.okaeri.configs.yaml.snakeyaml.YamlSnakeYamlConfigurer;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.allaymc.api.command.CommandResult;
import org.allaymc.api.command.CommandSender;
import org.allaymc.api.eventbus.EventHandler;
import org.allaymc.api.eventbus.event.player.PlayerChatEvent;
import org.allaymc.api.plugin.Plugin;
import org.allaymc.api.registry.Registries;
import org.allaymc.api.server.Server;
Expand All @@ -19,39 +18,38 @@
import java.util.HashMap;
import java.util.Map;

@Slf4j
public class HuHoBot extends Plugin {

private static final String CONFIG_FILE_NAME = "plugins/HuHoBot/config.yml";

@Getter
private static HuHoBot instance;
@Getter
private static PluginConfig config;
private static HuHoBotConfig config;
@Getter
private static WebsocketClientManager clientManager; //Websocket客户端
private final Map<String, EventRunner> eventList = new HashMap<>(); //事件列表
private static WSClientManager clientManager; //Websocket客户端

public bindRequest bindRequestObj;
private final Map<String, RequestHandler> requestHandlers; //事件处理器列表

@Getter
private BindRequest bindRequest;

public static HuHoBot getPlugin() {
return instance;
public HuHoBot() {
this.requestHandlers = new HashMap<>();
}

public static void reloadConfig() {
config.load();
config.save();
}

@Override
public void onEnable() {
Server.getInstance().getEventBus().registerListener(new GameEventListener());
}

@Override
public void onLoad() {
instance = this;

// 创建配置管理器
config = ConfigManager.create(
PluginConfig.class,
HuHoBotConfig.class,
it -> {
// Specify configurer implementation, optionally additional serdes packages
it.withConfigurer(new YamlSnakeYamlConfigurer());
Expand All @@ -66,79 +64,80 @@ public void onLoad() {
}
);

// 初始化默认值
config.initializeDefaults();
config.save();

//注册命令
Registries.COMMANDS.register(new HuHoBotCommand());

//注册事件
totalRegEvent();
registerRequestHandlers();

pluginLogger.info("HuHoBot Loaded. By HuoHuas001");
}

@Override
public void onEnable() {
//连接
clientManager = new WebsocketClientManager();
clientManager = new WSClientManager();
clientManager.connectServer();

log.info("HuHoBot Loaded. By HuoHuas001");
Server.getInstance().getEventBus().registerListener(this);
}

/**
* 注册Websocket事件
* 注册Websocket请求处理器
*
* @param eventName 事件名称
* @param event 事件对象
* @param requestName 请求名称
* @param handler 请求处理器
*/
private void registerEvent(String eventName, EventRunner event) {
eventList.put(eventName, event);
private void registerRequestHandler(String requestName, RequestHandler handler) {
requestHandlers.put(requestName, handler);
}

/**
* 统一事件注册
* 统一请求处理器注册
*/
private void totalRegEvent() {
registerEvent("sendConfig", new SendConfig());
registerEvent("shaked", new Shaked());
registerEvent("chat", new Chat());
registerEvent("add", new AddAllowList());
registerEvent("delete", new DelAllowList());
registerEvent("cmd", new RunCommand());
registerEvent("queryList", new QueryAllowList());
registerEvent("queryOnline", new QueryOnline());
registerEvent("shutdown", new ShutDown());
registerEvent("run", new CustomRun());
registerEvent("runAdmin", new CustomRunAdmin());
registerEvent("heart", new Heart());
bindRequestObj = new bindRequest();
registerEvent("bindRequest", bindRequestObj);
private void registerRequestHandlers() {
registerRequestHandler("sendConfig", new SendConfig());
registerRequestHandler("shaked", new Shaked());
registerRequestHandler("chat", new Chat());
registerRequestHandler("add", new EditAllowList(true));
registerRequestHandler("delete", new EditAllowList(false));
registerRequestHandler("cmd", new RunCommand());
registerRequestHandler("queryList", new QueryAllowList());
registerRequestHandler("queryOnline", new QueryOnline());
registerRequestHandler("shutdown", new ShutDown());
registerRequestHandler("run", new CustomRun(false));
registerRequestHandler("runAdmin", new CustomRun(true));
registerRequestHandler("heart", new Heart());
bindRequest = new BindRequest();
registerRequestHandler("bindRequest", bindRequest);
}

public void onWsMsg(JSONObject data) {
JSONObject header = data.getJSONObject("header");
JSONObject body = data.getJSONObject("body");

String type = header.getString("type");
String packId = header.getString("id");
String id = header.getString("id");

EventRunner event = eventList.get(type);
if (event != null) {
event.EventCall(packId, body);
RequestHandler handler = requestHandlers.get(type);
if (handler != null) {
handler.handle(id, body);
} else {
log.error("在处理消息是遇到错误: 未知的消息类型{}", type);
log.error("此错误具有不可容错性!请检查插件是否为最新!");
log.info("正在断开连接...");
pluginLogger.error("在处理消息是遇到错误: 未知的消息类型{}", type);
pluginLogger.error("此错误具有不可容错性!请检查插件是否为最新!");
pluginLogger.info("正在断开连接...");
clientManager.shutdownClient();
}
}

public void runCommand(String command, String packId) {
CommandSender orginalSender = Server.getInstance();
CommandResult result = Registries.COMMANDS.execute(orginalSender, command);
String resultTextBuilder = "暂不支持返回值.";
public void runCommand(String command, String requestId) {
var sender = new HuHoBotCommandSender();
var result = Registries.COMMANDS.execute(sender, command);
var message = sender.getOutputs().toString();
if (result.isSuccess()) {
clientManager.getClient().respone("已执行,命令回调如下:\n" + resultTextBuilder, "success", packId);
clientManager.getClient().response("已执行,命令回调如下:\n" + message, "success", requestId);
} else {
clientManager.getClient().respone("已执行,命令回调如下:\n" + resultTextBuilder, "error", packId);
clientManager.getClient().response("已执行,命令回调如下:\n" + message, "error", requestId);
}

}
Expand All @@ -157,9 +156,7 @@ public boolean isBind() {
*/
public void sendBindMessage() {
if (!isBind()) {
String serverId = config.getServerId();
String message = "服务器尚未在机器人进行绑定，请在群内输入\"/绑定 " + serverId + "\"";
log.warn(message);
pluginLogger.warn("服务器尚未在机器人进行绑定，请在群内输入\"/绑定 " + config.getServerId() + "\"");
}

}
Expand Down Expand Up @@ -187,5 +184,23 @@ public boolean disConnectServer() {
return clientManager.shutdownClient();
}


@EventHandler
private void onPlayerChat(PlayerChatEvent event) {
String message = event.getMessage();
String playerName = event.getPlayer().getDisplayName();

HuHoBotConfig config = HuHoBot.getConfig();

String format = config.getChatConfig().getFromGame();
String prefix = config.getChatConfig().getPostPrefix();
boolean isPostChat = config.getChatConfig().isPostChat();
String serverId = config.getServerId();
if (message.startsWith(prefix) && isPostChat) {
JSONObject body = new JSONObject();
body.put("serverId", serverId);
String formated = format.replace("{name}", playerName).replace("{msg}", message.substring(prefix.length()));
body.put("msg", formated);
HuHoBot.getClientManager().getClient().sendMessage("chat", body);
}
}
}
Loading