diff --git a/README.md b/README.md index b99ec27..c48428b 100644 --- a/README.md +++ b/README.md @@ -1,48 +1,3 @@ # HamsterLittlePlugins 叁只仓鼠的开源小插件 - -# 项目以来 - -| 名称 | 描述 | -|:----------------------------------------------------------------|:------------------------------------------| -| [hamster-core](https://github.com/MiniDay/hamster-core) | 仓鼠核心: 叁只仓鼠的 Minecraft 插件开发通用工具包 | -| [hamster-ball](https://github.com/MiniDay/hamster-ball) | **仓鼠球**：一个基于 Netty 的 Minecraft 服务端通用消息中间件 | -| [hamster-currency](https://github.com/MiniDay/hamster-currency) | 仓鼠经济: 叁只仓鼠的 Minecraft 跨服多货币经济插件 | - -# 项目列表 - -| 名称 | 描述 | -|:-----------------------------------------------------|:----------------------------------| -| [hamster-auto-game-rule](hamster-auto-game-rule) | 服务器启动后自动设置 GameRule | -| [hamster-auto-log-clear](hamster-auto-log-clear) | 服务器启动后自动清理过期日志 | -| [hamster-auto-server-info](hamster-auto-server-info) | 自动将接入仓鼠球的子服注册到连接配置中 | -| [hamster-ball-bridge](hamster-ball-bridge) | 让 **仓鼠球** 兼容旧版 HamsterService API | -| [hamster-lobby](hamster-lobby) | 仓鼠大厅 | -| [hamster-spawn](hamster-spawn) | 重生点设定 | - -# 未完成 - -| 名称 | 描述 | -|:-----------------------------|:---------------------------------------| -| hamster-admin-command | 提供一些管理员常用的命令 | -| hamster-auto-stop | 自动重启服务器 | -| hamster-battle-actionbar | 战斗中 actionbar 显示敌方血条 | -| hamster-ban | 依赖于 **仓鼠球** 实现的跨服封禁玩家指令 | -| hamster-command-redirect | 指令重定向 | -| hamster-crates | 宝藏箱 | -| hamster-command-block | 与方块交互执行命令 | -| hamster-custom-recipe | 自定义合成配方 | -| hamster-drop-head | 生物死亡时掉落头颅 | -| hamster-killer-money | 杀怪掉钱 | -| hamster-online-money | 在线获得游戏币 | -| hamster-kick | 依赖于 **仓鼠球** 实现的跨服 /kick 和 /kick-all 指令 | -| hamster-list | 依赖于 **仓鼠球** 实现的跨服统计玩家数量指令 | -| hamster-name-case-fix | 依赖于 **仓鼠球** 实现的玩家名称大小写冲突修复 | -| hamster-permission-manager | 依赖于 **仓鼠球** 实现的跨服权限管理器 | -| hamster-simple-data-manager | 依赖于 **仓鼠球** 实现的跨服简单数据管理插件 | -| hamster-safe-mode | 依赖于 **仓鼠球** 实现的跨服 开/关 维护模式插件 | -| [hamster-sudo](hamster-sudo) | 依赖于 **仓鼠球** 实现的跨服强制执行命令插件 | -| hamster-protect-explosion | 爆炸防护插件 | -| hamster-protect-farmland | 耕地践踏保护插件 | -| hamster-protect-fire | 方块防火保护插件 | diff --git a/build.gradle b/build.gradle index 5a94ef4..5e476e6 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ subprojects { repositories { maven { - url = "https://maven.airgame.net/maven-public/" + url = uri("https://maven.airgame.net/maven-public/") } } diff --git a/hamster-ball-bridge/build.gradle b/hamster-ball-bridge/build.gradle deleted file mode 100644 index aacb0f3..0000000 --- a/hamster-ball-bridge/build.gradle +++ /dev/null @@ -1,10 +0,0 @@ -version = '1.4.4' -setArchivesBaseName("HamsterBall-Bridge") - -dependencies { - compileOnly "cn.hamster3.mc.plugin:core-bukkit:${hamster_core_version}" - compileOnly "cn.hamster3.mc.plugin:ball-bukkit:${hamster_ball_version}" - compileOnly "cn.hamster3.mc.plugin:ball-bungee:${hamster_ball_version}" - - compileOnly "me.clip:placeholderapi:${placeholder_api_version}" -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/BallBridgePlugin.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/BallBridgePlugin.java deleted file mode 100644 index 54524e9..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/BallBridgePlugin.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.hamster3.service.bukkit; - -import cn.hamster3.mc.plugin.ball.common.api.BallAPI; -import cn.hamster3.service.bukkit.command.ServiceCommand; -import cn.hamster3.service.bukkit.hook.ServicePlaceholderHook; -import cn.hamster3.service.bukkit.listener.ServiceMainListener; -import cn.hamster3.service.bukkit.listener.BridgeListener; -import cn.hamster3.service.common.util.ServiceLogUtils; -import org.bukkit.Bukkit; -import org.bukkit.plugin.java.JavaPlugin; - -public class BallBridgePlugin extends JavaPlugin { - private static BallBridgePlugin instance; - - public static BallBridgePlugin getInstance() { - return instance; - } - - @Override - public void onLoad() { - instance = this; - ServiceLogUtils.setLogger(getLogger()); - } - - @Override - public void onEnable() { - ServiceCommand.INSTANCE.register(); - BallAPI.getInstance().getEventBus().register(BridgeListener.INSTANCE); - Bukkit.getPluginManager().registerEvents(ServiceMainListener.INSTANCE, this); - Bukkit.getScheduler().runTask(this, () -> { - if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) { - ServicePlaceholderHook.INSTANCE.register(); - getLogger().info("已注册 PlaceholderAPI 占位符."); - } else { - getLogger().warning("未找到 PlaceholderAPI 插件, 取消注册占位符."); - } - }); - BallAPI.getInstance().subscribeIgnorePrefix("HamsterService"); - } -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/api/ServiceInfoAPI.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/api/ServiceInfoAPI.java deleted file mode 100644 index 222480a..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/api/ServiceInfoAPI.java +++ /dev/null @@ -1,141 +0,0 @@ -package cn.hamster3.service.bukkit.api; - -import cn.hamster3.mc.plugin.ball.common.api.BallAPI; -import cn.hamster3.mc.plugin.ball.common.entity.BallPlayerInfo; -import cn.hamster3.mc.plugin.ball.common.entity.BallServerInfo; -import cn.hamster3.mc.plugin.ball.common.entity.BallServerType; -import cn.hamster3.service.common.data.ServicePlayerInfo; -import cn.hamster3.service.common.entity.ServiceSenderInfo; -import cn.hamster3.service.common.entity.ServiceSenderType; -import org.jetbrains.annotations.NotNull; - -import java.util.HashSet; -import java.util.UUID; -import java.util.stream.Collectors; - -@SuppressWarnings("unused") -public class ServiceInfoAPI { - /** - * 获取玩家信息，当玩家不在线时返回 null - * - * @param uuid 玩家的UUID - * @return 玩家信息 - */ - public static ServicePlayerInfo getPlayerInfo(@NotNull UUID uuid) { - return transfer(BallAPI.getInstance().getPlayerInfo(uuid)); - } - - /** - * 获取玩家信息，当玩家不在线时返回 null - * - * @param playerName 玩家ID - * @return 玩家信息 - */ - public static ServicePlayerInfo getPlayerInfo(@NotNull String playerName) { - return transfer(BallAPI.getInstance().getPlayerInfoExact(playerName)); - } - - /** - * 获取全部在线玩家的信息 - * - * @return 玩家们的信息 - */ - public static HashSet getOnlinePlayers() { - return BallAPI.getInstance().getAllPlayerInfo().values() - .stream() - .filter(BallPlayerInfo::isOnline) - .map(ServiceInfoAPI::transfer) - .collect(Collectors.toCollection(HashSet::new)); - } - - /** - * 获取全部在线玩家的信息 - * - * @return 玩家们的信息 - */ - public static HashSet getAllPlayerInfo() { - return BallAPI.getInstance().getAllPlayerInfo().values() - .stream() - .map(ServiceInfoAPI::transfer) - .collect(Collectors.toCollection(HashSet::new)); - } - - /** - * 获取服务端信息 - * - * @param senderName 服务端id - * @return 服务端信息 - */ - public static ServiceSenderInfo getSenderInfo(String senderName) { - return transfer(BallAPI.getInstance().getServerInfo(senderName)); - } - - /** - * 获取所有连接至服务中心的信息 - * - * @return 服务器信息 - */ - public static HashSet getAllSenderInfo() { - return BallAPI.getInstance().getAllServerInfo().values() - .stream() - .map(ServiceInfoAPI::transfer) - .collect(Collectors.toCollection(HashSet::new)); - - } - - /** - * 获取当前服务器的名称 - * - * @return 服务器id - */ - public static String getLocalServerName() { - return BallAPI.getInstance().getLocalServerId(); - } - - /** - * 获取当前服务器的别名 - * - * @return 服务器别名 - */ - public static String getLocalServerNickName() { - return BallAPI.getInstance().getLocalServerInfo().getName(); - } - - /** - * 获取当前服务器的SenderInfo对象 - * - * @return 当前服务器的发送者信息 - */ - public static ServiceSenderInfo getLocalSenderInfo() { - return new ServiceSenderInfo( - ServiceSenderType.BUKKIT, - BallAPI.getInstance().getLocalServerInfo().getId(), - BallAPI.getInstance().getLocalServerInfo().getName() - ); - } - - public static ServiceSenderInfo transfer(BallServerInfo info) { - if (info == null) { - return null; - } - return new ServiceSenderInfo( - info.getType() == BallServerType.PROXY ? ServiceSenderType.PROXY : ServiceSenderType.BUKKIT, - info.getId(), - info.getName() - ); - } - - public static ServicePlayerInfo transfer(BallPlayerInfo info) { - if (info == null) { - return null; - } - return new ServicePlayerInfo( - info.getUuid(), - info.getName(), - info.getGameServer(), - info.getProxyServer(), - info.isOnline() - ); - } - -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/api/ServiceMessageAPI.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/api/ServiceMessageAPI.java deleted file mode 100644 index ef7b700..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/api/ServiceMessageAPI.java +++ /dev/null @@ -1,356 +0,0 @@ -package cn.hamster3.service.bukkit.api; - -import cn.hamster3.mc.plugin.ball.common.api.BallAPI; -import cn.hamster3.mc.plugin.ball.common.data.BallMessage; -import cn.hamster3.service.bukkit.BallBridgePlugin; -import cn.hamster3.service.bukkit.data.BukkitLocation; -import cn.hamster3.service.common.data.ServiceLocation; -import cn.hamster3.service.common.data.ServicePlayerInfo; -import cn.hamster3.service.common.entity.ServiceMessageInfo; -import cn.hamster3.service.common.util.ComponentUtils; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonPrimitive; -import net.md_5.bungee.api.chat.TextComponent; -import org.bukkit.Bukkit; -import org.bukkit.entity.Player; -import org.bukkit.event.player.PlayerTeleportEvent; - -import java.util.UUID; - -@SuppressWarnings("unused") -public abstract class ServiceMessageAPI { - - /** - * 订阅某个标签的消息 - * - * @param tag 标签 - */ - public static void subscribeTag(String tag) { - BallAPI.getInstance().subscribe(tag); - } - - /** - * 取消订阅某个标签的消息 - * - * @param tag 标签 - */ - public static void unsubscribeTag(String tag) { - BallAPI.getInstance().unsubscribe(tag); - } - - /** - * 发送一条服务消息 - * - * @param tag 消息标签 - * @param action 执行动作 - */ - public static void sendServiceMessage(String tag, String action) { - BallAPI.getInstance().sendRawBallMessage(tag, action); - } - - /** - * 发送一条有附加参数的服务消息 - * - * @param tag 消息标签 - * @param action 执行动作 - * @param content 附加参数 - */ - public static void sendServiceMessage(String tag, String action, String content) { - BallAPI.getInstance().sendRawBallMessage(tag, action, content); - } - - /** - * 发送一条有附加参数的服务消息，使用 String.format() 替换附加参数 - * - * @param tag 消息标签 - * @param action 执行动作 - * @param content 附加参数 - * @param args 替换参数 - * @see String#format(String, Object...) - */ - public static void sendServiceMessage(String tag, String action, String content, Object... args) { - BallAPI.getInstance().sendRawBallMessage(tag, action, new JsonPrimitive(String.format(content, args))); - } - - /** - * 发送一条有附加参数的消息 - * - * @param tag 消息标签 - * @param action 执行动作 - * @param content 附加参数 - */ - public static void sendServiceMessage(String tag, String action, JsonElement content) { - BallAPI.getInstance().sendBallMessage(tag, new BallMessage(action, content), false, false); - } - - /** - * 自定义服务消息信息并发送 - * - * @param info 消息内容 - * @param block 是否阻塞（即必须等待消息发送完成，该方法才会返回） - */ - public static void sendServiceMessage(ServiceMessageInfo info, boolean block) { - BallMessage message = new BallMessage( - info.getSenderInfo().getName(), - info.getToServer(), - null, - info.getAction(), - info.getContent() - ); - BallAPI.getInstance().sendBallMessage(info.getTag(), message, false, block); - } - - /** - * 强制玩家执行一个 bukkit 命令 - * - * @param uuid 玩家的uuid - * @param command 命令内容 - */ - public static void dispatchBukkitCommand(UUID uuid, String command) { - sendServiceMessage("HamsterService", "dispatchBukkitCommand", command); - } - - /** - * 强制玩家执行一个代理端（指BungeeCord等）命令 - * - * @param uuid 玩家的uuid - * @param command 命令内容 - */ - public static void dispatchProxyCommand(UUID uuid, String command) { - sendServiceMessage("HamsterService", "dispatchProxyCommand", command); - } - - /** - * 给玩家发送一条消息 - * - * @param uuid 玩家 - * @param message 消息 - */ - public static void sendPlayerMessage(UUID uuid, String message) { - JsonObject object = new JsonObject(); - object.addProperty("text", message); - sendPlayerMessage(uuid, object); - } - - /** - * 给玩家发送一条消息 - * - * @param uuid 玩家 - * @param message 消息 - */ - public static void sendPlayerMessage(UUID uuid, JsonElement message) { - Player player = Bukkit.getPlayer(uuid); - if (player != null) { - player.spigot().sendMessage(ComponentUtils.parseComponentFromJson(message)); - return; - } - JsonObject object = new JsonObject(); - object.addProperty("uuid", uuid.toString()); - object.add("message", message); - sendServiceMessage("HamsterService", "sendPlayerMessage", object); - } - - /** - * 给服务器的在线玩家广播一条消息 - * - * @param message 消息 - * @since 2.1.0 - */ - public static void broadcastMessage(String message) { - JsonObject object = new JsonObject(); - object.addProperty("text", message); - broadcastMessage(object); - } - - /** - * 给服务器的在线玩家广播一条消息 - * - * @param message 消息 - * @since 2.1.0 - */ - public static void broadcastMessage(JsonElement message) { - sendServiceMessage("HamsterService", "broadcastMessage", message); - } - - /** - * 把玩家传送到另一个玩家身边 - *

- * 支持跨服传送 - * - * @param sendPlayer 被传送的玩家 - * @param toPlayer 传送的目标玩家 - * @since 2.1.0 - */ - public static void sendPlayerToPlayer(UUID sendPlayer, UUID toPlayer) { - Player player = Bukkit.getPlayer(toPlayer); - if (player != null) { - sendPlayerToLocation(sendPlayer, new BukkitLocation(player)); - return; - } - - ServicePlayerInfo sendPlayerInfo = ServiceInfoAPI.getPlayerInfo(sendPlayer); - // 如果被传送玩家不在线 - if (sendPlayerInfo == null || !sendPlayerInfo.isOnline()) { - return; - } - - ServicePlayerInfo toPlayerInfo = ServiceInfoAPI.getPlayerInfo(toPlayer); - // 如果目标玩家不在线 - if (toPlayerInfo == null || !toPlayerInfo.isOnline()) { - return; - } - - JsonObject object = new JsonObject(); - object.addProperty("sendPlayer", sendPlayer.toString()); - object.addProperty("toPlayer", toPlayer.toString()); - sendServiceMessage("HamsterService", "sendPlayerToPlayer", object); - } - - /** - * 把玩家传送到一个位置 - *

- * 支持跨服传送 - * - * @param uuid 玩家的uuid - * @param location 坐标 - * @since 2.1.0 - */ - public static void sendPlayerToLocation(UUID uuid, ServiceLocation location) { - Player player = Bukkit.getPlayer(uuid); - - // 如果玩家在线且目标服务器为当前服务器，则直接传送 - if (player != null && ServiceInfoAPI.getLocalServerName().equals(location.getServerName())) { - Bukkit.getScheduler().runTaskLater( - BallBridgePlugin.getInstance(), - () -> player.teleport( - new BukkitLocation(location).toBukkitLocation(), - PlayerTeleportEvent.TeleportCause.UNKNOWN - ), - 1 - ); - return; - } - - ServicePlayerInfo playerInfo = ServiceInfoAPI.getPlayerInfo(uuid); - - // 如果玩家不在线则什么都不做 - if (playerInfo == null || !playerInfo.isOnline()) { - return; - } - // 如果目标服务器不在线则什么都不做 - if (ServiceInfoAPI.getSenderInfo(location.getServerName()) == null) { - return; - } - - JsonObject object = new JsonObject(); - object.addProperty("uuid", uuid.toString()); - object.add("location", location.saveToJson()); - sendServiceMessage("HamsterService", "sendPlayerToLocation", object); - } - - public static void kickPlayer(UUID uuid, String reason) { - kickPlayer(uuid, new JsonPrimitive(reason)); - } - - public static void kickPlayer(UUID uuid, JsonElement reason) { - Player player = Bukkit.getPlayer(uuid); - if (player != null) { - player.kickPlayer(new TextComponent(ComponentUtils.parseComponentFromJson(reason)).toLegacyText()); - return; - } - JsonObject object = new JsonObject(); - object.addProperty("uuid", uuid.toString()); - object.add("reason", reason); - sendServiceMessage("HamsterService", "kickPlayer", object); - } - - /** - * 开启/关闭 安全模式 - *

- * 在安全模式开启时玩家将无法连接至服务器 - *

- * 且根据 config 的配置不同，有可能会踢出全部在线玩家 - * - * @param enable 是否启用 - */ - public static void setSafeMode(boolean enable) { - sendServiceMessage("HamsterService", "setSafeMode", new JsonPrimitive(enable)); - } - - /** - * 发送一条服务消息 - * - * @param tag 消息标签 - * @param action 执行动作 - * @deprecated 你应该使用 sendServiceMessage - *

- * 因为这个方法名有歧义 - */ - @Deprecated - public static void sendMessage(String tag, String action) { - sendServiceMessage(tag, action); - } - - /** - * 发送一条有附加参数的服务消息 - * - * @param tag 消息标签 - * @param action 执行动作 - * @param content 附加参数 - * @deprecated 你应该使用 sendServiceMessage - *

- * 因为这个方法名有歧义 - */ - @Deprecated - public static void sendMessage(String tag, String action, String content) { - sendServiceMessage(tag, action, content); - } - - /** - * 发送一条有附加参数的服务消息，使用 String.format() 替换附加参数 - * - * @param tag 消息标签 - * @param action 执行动作 - * @param content 附加参数 - * @param args 替换参数 - * @see String#format(String, Object...) - * @deprecated 你应该使用 sendServiceMessage - *

- * 因为这个方法名有歧义 - */ - @Deprecated - public static void sendMessage(String tag, String action, String content, Object... args) { - sendServiceMessage(tag, action, content, args); - } - - /** - * 发送一条有附加参数的服务消息 - * - * @param tag 消息标签 - * @param action 执行动作 - * @param content 附加参数 - * @deprecated 你应该使用 sendServiceMessage - *

- * 因为这个方法名有歧义 - */ - @Deprecated - public static void sendMessage(String tag, String action, JsonElement content) { - sendServiceMessage(tag, action, content); - } - - /** - * 自定义服务消息信息并发送 - * - * @param info 消息内容 - * @param block 是否阻塞（即必须等待消息发送完成，该方法才会返回） - * @deprecated 你应该使用 sendServiceMessage - *

- * 因为这个方法名有歧义 - */ - @Deprecated - public static void sendMessage(ServiceMessageInfo info, boolean block) { - sendServiceMessage(info, block); - } - -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/command/ServiceCommand.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/command/ServiceCommand.java deleted file mode 100644 index b0b43d3..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/command/ServiceCommand.java +++ /dev/null @@ -1,35 +0,0 @@ -package cn.hamster3.service.bukkit.command; - -import cn.hamster3.mc.plugin.core.bukkit.command.ParentCommand; -import cn.hamster3.service.bukkit.BallBridgePlugin; -import cn.hamster3.service.bukkit.command.sub.PlayerInfoCommand; -import cn.hamster3.service.bukkit.command.sub.ServerInfoCommand; -import cn.hamster3.service.bukkit.command.sub.SudoConsoleCommand; -import org.bukkit.command.CommandSender; -import org.bukkit.plugin.java.JavaPlugin; -import org.jetbrains.annotations.NotNull; - -public class ServiceCommand extends ParentCommand { - public static final ServiceCommand INSTANCE = new ServiceCommand(); - - private ServiceCommand() { - addChildCommand(PlayerInfoCommand.INSTANCE); - addChildCommand(ServerInfoCommand.INSTANCE); - addChildCommand(SudoConsoleCommand.INSTANCE); - } - - @Override - public @NotNull JavaPlugin getPlugin() { - return BallBridgePlugin.getInstance(); - } - - @Override - public @NotNull String getName() { - return "hamster-service"; - } - - @Override - public boolean hasPermission(@NotNull CommandSender sender) { - return sender.hasPermission("hamster.service.admin"); - } -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/command/sub/PlayerInfoCommand.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/command/sub/PlayerInfoCommand.java deleted file mode 100644 index e7b0bf0..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/command/sub/PlayerInfoCommand.java +++ /dev/null @@ -1,71 +0,0 @@ -package cn.hamster3.service.bukkit.command.sub; - -import cn.hamster3.mc.plugin.core.bukkit.command.ChildCommand; -import cn.hamster3.service.bukkit.api.ServiceInfoAPI; -import cn.hamster3.service.common.data.ServicePlayerInfo; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - -public class PlayerInfoCommand extends ChildCommand { - public static final PlayerInfoCommand INSTANCE = new PlayerInfoCommand(); - - private PlayerInfoCommand() { - } - - @Override - public @NotNull String getName() { - return "player-info"; - } - - @Override - public @NotNull String getUsage() { - return "player-info <玩家名>"; - } - - @Override - public boolean hasPermission(@NotNull CommandSender sender) { - return sender.hasPermission("hamster.service.admin"); - } - - @Override - public @NotNull String getDescription() { - return "查看玩家的信息"; - } - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (args.length < 1) { - sender.sendMessage("§a/service player-info <玩家名>"); - return true; - } - ServicePlayerInfo playerInfo = ServiceInfoAPI.getPlayerInfo(args[0]); - if (playerInfo == null) { - sender.sendMessage("§c未找到玩家 " + args[0] + " 的信息！"); - return true; - } - sender.sendMessage("§a玩家UUID: " + playerInfo.getUuid()); - sender.sendMessage("§a玩家名称: " + playerInfo.getPlayerName()); - sender.sendMessage("§a在线状态: " + playerInfo.isOnline()); - sender.sendMessage("§a所在子服: " + playerInfo.getBukkitServer()); - sender.sendMessage("§a代理接入: " + playerInfo.getProxyServer()); - return true; - } - - @Nullable - @Override - public List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (args.length == 1) { - return ServiceInfoAPI.getAllPlayerInfo().stream() - .map(ServicePlayerInfo::getPlayerName) - .filter(o -> o.toLowerCase().startsWith(args[0].toLowerCase())) - .collect(Collectors.toList()); - } - return Collections.emptyList(); - } -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/command/sub/ServerInfoCommand.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/command/sub/ServerInfoCommand.java deleted file mode 100644 index 212ffb8..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/command/sub/ServerInfoCommand.java +++ /dev/null @@ -1,69 +0,0 @@ -package cn.hamster3.service.bukkit.command.sub; - -import cn.hamster3.mc.plugin.core.bukkit.command.ChildCommand; -import cn.hamster3.service.bukkit.api.ServiceInfoAPI; -import cn.hamster3.service.common.entity.ServiceSenderInfo; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - -public class ServerInfoCommand extends ChildCommand { - public static final ServerInfoCommand INSTANCE = new ServerInfoCommand(); - - private ServerInfoCommand() { - } - - @Override - public @NotNull String getName() { - return "server-info"; - } - - @Override - public @NotNull String getUsage() { - return "server-info <服务器ID>"; - } - - @Override - public boolean hasPermission(@NotNull CommandSender sender) { - return sender.hasPermission("hamster.service.admin"); - } - - @Override - public @NotNull String getDescription() { - return "查看服务器的信息"; - } - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (args.length < 1) { - sender.sendMessage("§a/service server-info <服务器ID>"); - return true; - } - ServiceSenderInfo senderInfo = ServiceInfoAPI.getSenderInfo(args[0]); - if (senderInfo == null) { - sender.sendMessage("§c未找到服务器 " + args[0] + " 的信息！"); - return true; - } - sender.sendMessage("§a服务器ID: " + senderInfo.getName()); - sender.sendMessage("§a服务器别名: " + senderInfo.getNickName()); - sender.sendMessage("§a服务器类型: " + senderInfo.getType().name()); - return true; - } - - @Nullable - @Override - public List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (args.length == 1) { - return ServiceInfoAPI.getAllSenderInfo().stream() - .map(ServiceSenderInfo::getName) - .filter(o -> o.toLowerCase().startsWith(args[0].toLowerCase())) - .collect(Collectors.toList()); - } - return Collections.emptyList(); - } -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/command/sub/SudoConsoleCommand.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/command/sub/SudoConsoleCommand.java deleted file mode 100644 index 0ea1b97..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/command/sub/SudoConsoleCommand.java +++ /dev/null @@ -1,79 +0,0 @@ -package cn.hamster3.service.bukkit.command.sub; - -import cn.hamster3.mc.plugin.core.bukkit.command.ChildCommand; -import cn.hamster3.service.bukkit.api.ServiceMessageAPI; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -public class SudoConsoleCommand extends ChildCommand { - public static final SudoConsoleCommand INSTANCE = new SudoConsoleCommand(); - - private SudoConsoleCommand() { - } - - @Override - public @NotNull String getName() { - return "command"; - } - - @Override - public @NotNull String getUsage() { - return "command [bukkit/proxy] [命令内容]"; - } - - @Override - public boolean hasPermission(@NotNull CommandSender sender) { - return sender.hasPermission("hamster.service.admin"); - } - - @Override - public @NotNull String getDescription() { - return "广播控制台执行命令"; - } - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (args.length < 2) { - sender.sendMessage("§c/service command [bukkit/proxy] [命令内容]"); - return true; - } - - String action; - switch (args[0].toLowerCase()) { - case "bukkit": { - action = "bukkitConsoleCommand"; - break; - } - case "proxy": { - action = "proxyConsoleCommand"; - break; - } - default: { - sender.sendMessage("§c/service command [bukkit/proxy] [命令内容]"); - return true; - } - } - StringBuilder builder = new StringBuilder(); - for (int i = 1; i < args.length; i++) { - builder.append(args[i]).append(" "); - } - ServiceMessageAPI.sendServiceMessage("HamsterService", action, builder.toString()); - sender.sendMessage("§c已广播命令执行信息."); - return true; - } - - @Nullable - @Override - public List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - if (args.length == 1) { - return Arrays.asList("bukkit", "proxy"); - } - return Collections.emptyList(); - } -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/data/BukkitBlockPos.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/data/BukkitBlockPos.java deleted file mode 100644 index cc93bf3..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/data/BukkitBlockPos.java +++ /dev/null @@ -1,59 +0,0 @@ -package cn.hamster3.service.bukkit.data; - -import cn.hamster3.service.bukkit.api.ServiceInfoAPI; -import cn.hamster3.service.common.data.ServiceBlockPos; -import com.google.gson.JsonObject; -import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.block.Block; -import org.bukkit.entity.Entity; -import org.jetbrains.annotations.NotNull; - -@SuppressWarnings("unused") -public class BukkitBlockPos extends ServiceBlockPos { - public BukkitBlockPos(@NotNull String serverName, @NotNull String worldName, int x, int y, int z) { - super(serverName, worldName, x, y, z); - } - - public BukkitBlockPos(@NotNull JsonObject object) { - super(object); - } - - public BukkitBlockPos(@NotNull Entity player) { - this(player.getLocation()); - } - - public BukkitBlockPos(@NotNull Block block) { - this(block.getLocation()); - } - - public BukkitBlockPos(@NotNull Location location) { - super( - ServiceInfoAPI.getLocalServerName(), - location.getWorld().getName(), - location.getBlockX(), - location.getBlockY(), - location.getBlockZ() - ); - } - - public BukkitBlockPos(@NotNull ServiceBlockPos location) { - super( - ServiceInfoAPI.getLocalServerName(), - location.getWorldName(), - location.getX(), - location.getY(), - location.getZ() - ); - } - - @NotNull - public Location toBukkitLocation() { - return new Location(Bukkit.getWorld(getWorldName()), getX(), getY(), getZ(), 0, 0); - } - - @NotNull - public BukkitLocation toServiceLocation() { - return new BukkitLocation(getServerName(), getWorldName(), getX(), getY(), getZ()); - } -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/data/BukkitLocation.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/data/BukkitLocation.java deleted file mode 100644 index 0fe7f1d..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/data/BukkitLocation.java +++ /dev/null @@ -1,68 +0,0 @@ -package cn.hamster3.service.bukkit.data; - -import cn.hamster3.service.bukkit.api.ServiceInfoAPI; -import cn.hamster3.service.common.data.ServiceLocation; -import com.google.gson.JsonObject; -import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.block.Block; -import org.bukkit.entity.Entity; -import org.jetbrains.annotations.NotNull; - -@SuppressWarnings("unused") -public class BukkitLocation extends ServiceLocation { - - public BukkitLocation(@NotNull String serverName, @NotNull String worldName, double x, double y, double z) { - super(serverName, worldName, x, y, z); - } - - public BukkitLocation(@NotNull String serverName, @NotNull String worldName, double x, double y, double z, float yaw, float pitch) { - super(serverName, worldName, x, y, z, yaw, pitch); - } - - public BukkitLocation(@NotNull JsonObject object) { - super(object); - } - - public BukkitLocation(@NotNull Entity player) { - this(player.getLocation()); - } - - public BukkitLocation(@NotNull Block block) { - this(block.getLocation()); - } - - public BukkitLocation(@NotNull Location location) { - super( - ServiceInfoAPI.getLocalServerName(), - location.getWorld().getName(), - location.getX(), - location.getY(), - location.getZ(), - location.getYaw(), - location.getPitch() - ); - } - - public BukkitLocation(@NotNull ServiceLocation location) { - super( - location.getServerName(), - location.getWorldName(), - location.getX(), - location.getY(), - location.getZ(), - location.getYaw(), - location.getPitch() - ); - } - - @NotNull - public Location toBukkitLocation() { - return new Location(Bukkit.getWorld(getWorldName()), getX(), getY(), getZ(), getYaw(), getPitch()); - } - - @NotNull - public BukkitBlockPos toServiceBlockPos() { - return new BukkitBlockPos(getServerName(), getWorldName(), getBlockX(), getBlockY(), getBlockZ()); - } -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/event/MessageEvent.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/event/MessageEvent.java deleted file mode 100644 index 5a00442..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/event/MessageEvent.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.hamster3.service.bukkit.event; - -import cn.hamster3.service.common.entity.ServiceMessageInfo; -import org.bukkit.Bukkit; -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; -import org.jetbrains.annotations.NotNull; - -/** - * 服务消息事件的基类 - */ -@SuppressWarnings("unused") -public class MessageEvent extends Event { - private static final HandlerList handlers = new HandlerList(); - private final ServiceMessageInfo messageInfo; - - public MessageEvent(ServiceMessageInfo messageInfo) { - super(!Bukkit.getServer().isPrimaryThread()); - this.messageInfo = messageInfo; - } - - public static HandlerList getHandlerList() { - return handlers; - } - - /** - * 获取这次事件相关的消息信息 - * - * @return 消息信息 - */ - public ServiceMessageInfo getMessageInfo() { - return messageInfo; - } - - @Override - @NotNull - public HandlerList getHandlers() { - return handlers; - } -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/event/MessageReceivedEvent.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/event/MessageReceivedEvent.java deleted file mode 100644 index aa02053..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/event/MessageReceivedEvent.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.hamster3.service.bukkit.event; - -import cn.hamster3.service.common.entity.ServiceMessageInfo; -import org.bukkit.event.HandlerList; -import org.jetbrains.annotations.NotNull; - -/** - * 从服务中心收到消息时产生的事件 - */ -@SuppressWarnings("unused") -public class MessageReceivedEvent extends MessageEvent { - private static final HandlerList handlers = new HandlerList(); - - public MessageReceivedEvent(ServiceMessageInfo info) { - super(info); - } - - public static HandlerList getHandlerList() { - return handlers; - } - - @Override - @NotNull - public HandlerList getHandlers() { - return handlers; - } -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/event/MessageSentEvent.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/event/MessageSentEvent.java deleted file mode 100644 index 001b8ac..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/event/MessageSentEvent.java +++ /dev/null @@ -1,57 +0,0 @@ -package cn.hamster3.service.bukkit.event; - -import cn.hamster3.service.common.entity.ServiceMessageInfo; -import org.bukkit.event.HandlerList; -import org.jetbrains.annotations.NotNull; - -/** - * 消息发送出去之后产生的事件 - */ -@SuppressWarnings("unused") -public class MessageSentEvent extends MessageEvent { - private static final HandlerList handlers = new HandlerList(); - - private final boolean success; - private final Throwable cause; - - public MessageSentEvent(ServiceMessageInfo info) { - super(info); - success = true; - cause = null; - } - - public MessageSentEvent(ServiceMessageInfo messageInfo, Throwable cause) { - super(messageInfo); - success = false; - this.cause = cause; - } - - public static HandlerList getHandlerList() { - return handlers; - } - - /** - * 消息是否成功发送出去了 - * - * @return true代表成功发送 - */ - public boolean isSuccess() { - return success; - } - - /** - * 若消息发送失败，则失败原因为何 - * 若发送成功，则返回null - * - * @return 失败原因 - */ - public Throwable getCause() { - return cause; - } - - @Override - @NotNull - public HandlerList getHandlers() { - return handlers; - } -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/event/ServiceConnectEvent.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/event/ServiceConnectEvent.java deleted file mode 100644 index c778afe..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/event/ServiceConnectEvent.java +++ /dev/null @@ -1,58 +0,0 @@ -package cn.hamster3.service.bukkit.event; - -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; -import org.jetbrains.annotations.NotNull; - -/** - * 服务连接事件 - */ - -@SuppressWarnings("unused") -public class ServiceConnectEvent extends Event { - private static final HandlerList handlers = new HandlerList(); - private final boolean success; - private final Throwable cause; - - public ServiceConnectEvent() { - super(true); - success = true; - cause = null; - } - - public ServiceConnectEvent(Throwable cause) { - super(true); - success = false; - this.cause = cause; - } - - public static HandlerList getHandlerList() { - return handlers; - } - - /** - * 是否成功连接到服务中心 - * - * @return true代表成功 - */ - public boolean isSuccess() { - return success; - } - - /** - * 如果连接失败了，则返回失败原因 - *

- * 如果连接成功了，则返回null - * - * @return 失败原因 - */ - public Throwable getCause() { - return cause; - } - - @Override - @NotNull - public HandlerList getHandlers() { - return handlers; - } -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/hook/ServicePlaceholderHook.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/hook/ServicePlaceholderHook.java deleted file mode 100644 index 695c412..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/hook/ServicePlaceholderHook.java +++ /dev/null @@ -1,58 +0,0 @@ -package cn.hamster3.service.bukkit.hook; - -import cn.hamster3.service.bukkit.api.ServiceInfoAPI; -import cn.hamster3.service.common.data.ServicePlayerInfo; -import cn.hamster3.service.common.entity.ServiceSenderInfo; -import me.clip.placeholderapi.expansion.PlaceholderExpansion; -import org.bukkit.OfflinePlayer; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public class ServicePlaceholderHook extends PlaceholderExpansion { - public static final ServicePlaceholderHook INSTANCE = new ServicePlaceholderHook(); - - private ServicePlaceholderHook() { - } - - @Override - public @NotNull String getIdentifier() { - return "HamsterService"; - } - - @Override - public @NotNull String getAuthor() { - return "Hamster3"; - } - - @Override - public @NotNull String getVersion() { - return "1.0.0"; - } - - @Override - public String onRequest(OfflinePlayer player, @NotNull String params) { - ServiceSenderInfo localSenderInfo = ServiceInfoAPI.getLocalSenderInfo(); - switch (params) { - case "server_name": - return localSenderInfo.getName(); - case "server_nick_name": - return localSenderInfo.getNickName(); - } - ServicePlayerInfo info = ServiceInfoAPI.getPlayerInfo(player.getUniqueId()); - if (info == null) { - return null; - } - switch (params) { - case "proxy_name": - return info.getProxyServer(); - case "proxy_nick_name": - return ServiceInfoAPI.getSenderInfo(info.getProxyServer()).getNickName(); // 不可能为 null - } - return null; - } - - @Override - public String onPlaceholderRequest(Player player, @NotNull String params) { - return onRequest(player, params); - } -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/listener/BridgeListener.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/listener/BridgeListener.java deleted file mode 100644 index 81b2760..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/listener/BridgeListener.java +++ /dev/null @@ -1,37 +0,0 @@ -package cn.hamster3.service.bukkit.listener; - -import cn.hamster3.service.bukkit.api.ServiceInfoAPI; -import cn.hamster3.service.bukkit.event.MessageReceivedEvent; -import cn.hamster3.service.bukkit.event.MessageSentEvent; -import cn.hamster3.service.common.entity.ServiceMessageInfo; -import com.google.common.eventbus.Subscribe; -import org.bukkit.Bukkit; - -public class BridgeListener { - public static final BridgeListener INSTANCE = new BridgeListener(); - - private BridgeListener() { - } - - @Subscribe - public void onMessageSent(cn.hamster3.mc.plugin.ball.common.event.message.MessageSentEvent event) { - Bukkit.getPluginManager().callEvent(new MessageSentEvent(new ServiceMessageInfo( - ServiceInfoAPI.getSenderInfo(event.getSenderID()), - event.getReceiverID(), - event.getChannel(), - event.getAction(), - event.getContent() - ))); - } - - @Subscribe - public void onMessageReceived(cn.hamster3.mc.plugin.ball.common.event.message.MessageReceivedEvent event) { - Bukkit.getPluginManager().callEvent(new MessageReceivedEvent(new ServiceMessageInfo( - ServiceInfoAPI.getSenderInfo(event.getSenderID()), - event.getReceiverID(), - event.getChannel(), - event.getAction(), - event.getContent() - ))); - } -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/listener/ServiceMainListener.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/listener/ServiceMainListener.java deleted file mode 100644 index 74dc0e2..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/listener/ServiceMainListener.java +++ /dev/null @@ -1,105 +0,0 @@ -package cn.hamster3.service.bukkit.listener; - -import cn.hamster3.service.bukkit.BallBridgePlugin; -import cn.hamster3.service.bukkit.api.ServiceInfoAPI; -import cn.hamster3.service.bukkit.api.ServiceMessageAPI; -import cn.hamster3.service.bukkit.data.BukkitLocation; -import cn.hamster3.service.bukkit.event.MessageReceivedEvent; -import cn.hamster3.service.common.entity.ServiceMessageInfo; -import com.google.gson.JsonObject; -import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.Listener; -import org.bukkit.event.player.PlayerJoinEvent; -import org.bukkit.event.player.PlayerTeleportEvent; - -import java.util.HashMap; -import java.util.UUID; - -public class ServiceMainListener implements Listener { - public static final ServiceMainListener INSTANCE = new ServiceMainListener(); - - private final HashMap playerToLocations; - - private ServiceMainListener() { - playerToLocations = new HashMap<>(); - } - - @EventHandler(ignoreCancelled = true, priority = EventPriority.LOW) - public void onPlayerJoin(PlayerJoinEvent event) { - Player player = event.getPlayer(); - UUID uuid = player.getUniqueId(); - Location location = playerToLocations.remove(uuid); - if (location == null) { - return; - } - Bukkit.getScheduler().runTaskLater( - BallBridgePlugin.getInstance(), - () -> player.teleport(location, PlayerTeleportEvent.TeleportCause.PLUGIN), - 20 - ); - } - - @EventHandler(ignoreCancelled = true) - public void onMessageReceived(MessageReceivedEvent event) { - ServiceMessageInfo info = event.getMessageInfo(); - if (!"HamsterService".equals(info.getTag())) { - return; - } - switch (info.getAction()) { - case "bukkitConsoleCommand": { - Bukkit.getScheduler().runTask( - BallBridgePlugin.getInstance(), - () -> Bukkit.dispatchCommand(Bukkit.getConsoleSender(), info.getContentAsString()) - ); - break; - } - case "dispatchBukkitCommand": { - JsonObject object = info.getContentAsJsonObject(); - UUID uuid = UUID.fromString(object.get("uuid").getAsString()); - Player player = Bukkit.getPlayer(uuid); - if (player == null) { - return; - } - Bukkit.getScheduler().runTask( - BallBridgePlugin.getInstance(), - () -> Bukkit.dispatchCommand(player, object.get("command").getAsString()) - ); - break; - } - case "sendPlayerToPlayer": { - JsonObject object = info.getContentAsJsonObject(); - Player player = Bukkit.getPlayer(UUID.fromString(object.get("toPlayer").getAsString())); - if (player != null) { - UUID uuid = UUID.fromString(object.get("sendPlayer").getAsString()); - ServiceMessageAPI.sendPlayerToLocation(uuid, new BukkitLocation(player)); - } - break; - } - case "sendPlayerToLocation": { - JsonObject object = info.getContentAsJsonObject(); - UUID uuid = UUID.fromString(object.get("uuid").getAsString()); - BukkitLocation location = new BukkitLocation(object.getAsJsonObject("location")); - if (!ServiceInfoAPI.getLocalServerName().equals(location.getServerName())) { - return; - } - Player player = Bukkit.getPlayer(uuid); - Location bukkitLocation = location.toBukkitLocation(); - if (player == null) { - playerToLocations.put(uuid, bukkitLocation); - return; - } - Bukkit.getScheduler().runTaskLater( - BallBridgePlugin.getInstance(), - () -> player.teleport(bukkitLocation, PlayerTeleportEvent.TeleportCause.UNKNOWN), - 1 - ); - break; - } - } - } - -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/BallBridgePlugin.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/BallBridgePlugin.java deleted file mode 100644 index 6a28424..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/BallBridgePlugin.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.hamster3.service.bungee; - -import cn.hamster3.mc.plugin.ball.common.api.BallAPI; -import cn.hamster3.service.bungee.command.ServiceCommand; -import cn.hamster3.service.bungee.listener.BridgeListener; -import cn.hamster3.service.bungee.listener.ServiceMainListener; -import cn.hamster3.service.common.util.ServiceLogUtils; -import net.md_5.bungee.api.ProxyServer; -import net.md_5.bungee.api.plugin.Plugin; - -public class BallBridgePlugin extends Plugin { - public static void main(String[] args) { - } - - @Override - public void onLoad() { - ServiceLogUtils.setLogger(getLogger()); - } - - @Override - public void onEnable() { - BallAPI.getInstance().getEventBus().register(BridgeListener.INSTANCE); - ProxyServer.getInstance().getPluginManager().registerListener(this, ServiceMainListener.INSTANCE); - ProxyServer.getInstance().getPluginManager().registerCommand(this, ServiceCommand.INSTANCE); - BallAPI.getInstance().subscribeIgnorePrefix("HamsterService"); - } -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/api/ServiceInfoAPI.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/api/ServiceInfoAPI.java deleted file mode 100644 index f331ec4..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/api/ServiceInfoAPI.java +++ /dev/null @@ -1,141 +0,0 @@ -package cn.hamster3.service.bungee.api; - -import cn.hamster3.mc.plugin.ball.common.api.BallAPI; -import cn.hamster3.mc.plugin.ball.common.entity.BallPlayerInfo; -import cn.hamster3.mc.plugin.ball.common.entity.BallServerInfo; -import cn.hamster3.mc.plugin.ball.common.entity.BallServerType; -import cn.hamster3.service.common.data.ServicePlayerInfo; -import cn.hamster3.service.common.entity.ServiceSenderInfo; -import cn.hamster3.service.common.entity.ServiceSenderType; -import org.jetbrains.annotations.NotNull; - -import java.util.HashSet; -import java.util.UUID; -import java.util.stream.Collectors; - -@SuppressWarnings("unused") -public class ServiceInfoAPI { - /** - * 获取玩家信息，当玩家不在线时返回 null - * - * @param uuid 玩家的UUID - * @return 玩家信息 - */ - public static ServicePlayerInfo getPlayerInfo(@NotNull UUID uuid) { - return transfer(BallAPI.getInstance().getPlayerInfo(uuid)); - } - - /** - * 获取玩家信息，当玩家不在线时返回 null - * - * @param playerName 玩家ID - * @return 玩家信息 - */ - public static ServicePlayerInfo getPlayerInfo(@NotNull String playerName) { - return transfer(BallAPI.getInstance().getPlayerInfo(playerName)); - } - - /** - * 获取全部在线玩家的信息 - * - * @return 玩家们的信息 - */ - public static HashSet getOnlinePlayers() { - return BallAPI.getInstance().getAllPlayerInfo().values() - .stream() - .filter(BallPlayerInfo::isOnline) - .map(ServiceInfoAPI::transfer) - .collect(Collectors.toCollection(HashSet::new)); - } - - /** - * 获取全部在线玩家的信息 - * - * @return 玩家们的信息 - */ - public static HashSet getAllPlayerInfo() { - return BallAPI.getInstance().getAllPlayerInfo().values() - .stream() - .map(ServiceInfoAPI::transfer) - .collect(Collectors.toCollection(HashSet::new)); - } - - /** - * 获取服务端信息 - * - * @param senderName 服务端id - * @return 服务端信息 - */ - public static ServiceSenderInfo getSenderInfo(String senderName) { - return transfer(BallAPI.getInstance().getServerInfo(senderName)); - } - - /** - * 获取所有连接至服务中心的信息 - * - * @return 服务器信息 - */ - public static HashSet getAllSenderInfo() { - return BallAPI.getInstance().getAllServerInfo().values() - .stream() - .map(ServiceInfoAPI::transfer) - .collect(Collectors.toCollection(HashSet::new)); - - } - - /** - * 获取当前服务器的名称 - * - * @return 服务器id - */ - public static String getLocalServerName() { - return BallAPI.getInstance().getLocalServerId(); - } - - /** - * 获取当前服务器的别名 - * - * @return 服务器别名 - */ - public static String getLocalServerNickName() { - return BallAPI.getInstance().getLocalServerInfo().getName(); - } - - /** - * 获取当前服务器的SenderInfo对象 - * - * @return 当前服务器的发送者信息 - */ - public static ServiceSenderInfo getLocalSenderInfo() { - return new ServiceSenderInfo( - ServiceSenderType.PROXY, - BallAPI.getInstance().getLocalServerInfo().getId(), - BallAPI.getInstance().getLocalServerInfo().getName() - ); - } - - public static ServiceSenderInfo transfer(BallServerInfo info) { - if (info == null) { - return null; - } - return new ServiceSenderInfo( - info.getType() == BallServerType.PROXY ? ServiceSenderType.PROXY : ServiceSenderType.BUKKIT, - info.getId(), - info.getName() - ); - } - - public static ServicePlayerInfo transfer(BallPlayerInfo info) { - if (info == null) { - return null; - } - return new ServicePlayerInfo( - info.getUuid(), - info.getName(), - info.getGameServer(), - info.getProxyServer(), - info.isOnline() - ); - } - -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/api/ServiceMessageAPI.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/api/ServiceMessageAPI.java deleted file mode 100644 index 714a58b..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/api/ServiceMessageAPI.java +++ /dev/null @@ -1,329 +0,0 @@ -package cn.hamster3.service.bungee.api; - -import cn.hamster3.mc.plugin.ball.common.api.BallAPI; -import cn.hamster3.mc.plugin.ball.common.data.BallMessage; -import cn.hamster3.service.common.data.ServiceLocation; -import cn.hamster3.service.common.data.ServicePlayerInfo; -import cn.hamster3.service.common.entity.ServiceMessageInfo; -import cn.hamster3.service.common.util.ComponentUtils; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonPrimitive; -import net.md_5.bungee.api.ProxyServer; -import net.md_5.bungee.api.connection.ProxiedPlayer; - -import java.util.UUID; - -@SuppressWarnings("unused") -public abstract class ServiceMessageAPI { - - /** - * 订阅某个标签的消息 - * - * @param tag 标签 - */ - public static void subscribeTag(String tag) { - sendServiceMessage("HamsterService", "subscribeTag", tag); - } - - /** - * 取消订阅某个标签的消息 - * - * @param tag 标签 - */ - public static void unsubscribeTag(String tag) { - sendServiceMessage("HamsterService", "unsubscribeTag", tag); - } - - /** - * 发送一条服务消息 - * - * @param tag 消息标签 - * @param action 执行动作 - */ - public static void sendServiceMessage(String tag, String action) { - BallAPI.getInstance().sendRawBallMessage(tag, action); - } - - /** - * 发送一条有附加参数的服务消息 - * - * @param tag 消息标签 - * @param action 执行动作 - * @param content 附加参数 - */ - public static void sendServiceMessage(String tag, String action, String content) { - BallAPI.getInstance().sendRawBallMessage(tag, action, content); - } - - /** - * 发送一条有附加参数的服务消息，使用 String.format() 替换附加参数 - * - * @param tag 消息标签 - * @param action 执行动作 - * @param content 附加参数 - * @param args 替换参数 - * @see String#format(String, Object...) - */ - public static void sendServiceMessage(String tag, String action, String content, Object... args) { - BallAPI.getInstance().sendRawBallMessage(tag, action, new JsonPrimitive(String.format(content, args))); - } - - /** - * 发送一条有附加参数的消息 - * - * @param tag 消息标签 - * @param action 执行动作 - * @param content 附加参数 - */ - public static void sendServiceMessage(String tag, String action, JsonElement content) { - BallAPI.getInstance().sendBallMessage(tag, new BallMessage(action, content), false, false); - } - - /** - * 自定义服务消息信息并发送 - * - * @param info 消息内容 - * @param block 是否阻塞（即必须等待消息发送完成，该方法才会返回） - */ - public static void sendServiceMessage(ServiceMessageInfo info, boolean block) { - BallMessage message = new BallMessage( - info.getSenderInfo().getName(), - info.getToServer(), - null, - info.getAction(), - info.getContent() - ); - BallAPI.getInstance().sendBallMessage(info.getTag(), message, false, block); - } - - /** - * 强制玩家执行一个 bukkit 命令 - * - * @param uuid 玩家的uuid - * @param command 命令内容 - */ - public static void dispatchBukkitCommand(UUID uuid, String command) { - sendServiceMessage("HamsterService", "dispatchBukkitCommand", command); - } - - /** - * 强制玩家执行一个代理端（指BungeeCord等）命令 - * - * @param uuid 玩家的uuid - * @param command 命令内容 - */ - public static void dispatchProxyCommand(UUID uuid, String command) { - sendServiceMessage("HamsterService", "dispatchProxyCommand", command); - } - - /** - * 给玩家发送一条消息 - * - * @param uuid 玩家 - * @param message 消息 - */ - public static void sendPlayerMessage(UUID uuid, String message) { - sendPlayerMessage(uuid, new JsonPrimitive(message)); - } - - /** - * 给玩家发送一条消息 - * - * @param uuid 玩家 - * @param message 消息 - */ - public static void sendPlayerMessage(UUID uuid, JsonElement message) { - ProxiedPlayer player = ProxyServer.getInstance().getPlayer(uuid); - if (player != null) { - player.sendMessage(ComponentUtils.parseComponentFromJson(message)); - return; - } - JsonObject object = new JsonObject(); - object.addProperty("uuid", uuid.toString()); - object.add("message", message); - sendServiceMessage("HamsterService", "sendPlayerMessage", object); - } - - /** - * 给服务器的在线玩家广播一条消息 - * - * @param message 消息 - * @since 2.1.0 - */ - public static void broadcastMessage(String message) { - JsonObject object = new JsonObject(); - object.addProperty("text", message); - broadcastMessage(object); - } - - /** - * 给服务器的在线玩家广播一条消息 - * - * @param message 消息 - * @since 2.1.0 - */ - public static void broadcastMessage(JsonElement message) { - sendServiceMessage("HamsterService", "broadcastMessage", message); - } - - /** - * 把玩家传送到另一个玩家身边 - *

- * 支持跨服传送 - * - * @param sendPlayer 被传送的玩家 - * @param toPlayer 传送的目标玩家 - * @since 2.1.0 - */ - public static void sendPlayerToPlayer(UUID sendPlayer, UUID toPlayer) { - ServicePlayerInfo sendPlayerInfo = ServiceInfoAPI.getPlayerInfo(sendPlayer); - // 如果被传送玩家不在线 - if (sendPlayerInfo == null || !sendPlayerInfo.isOnline()) { - return; - } - - ServicePlayerInfo toPlayerInfo = ServiceInfoAPI.getPlayerInfo(toPlayer); - // 如果目标玩家不在线 - if (toPlayerInfo == null || !toPlayerInfo.isOnline()) { - return; - } - - JsonObject object = new JsonObject(); - object.addProperty("sendPlayer", sendPlayer.toString()); - object.addProperty("toPlayer", toPlayer.toString()); - sendServiceMessage("HamsterService", "sendPlayerToPlayer", object); - } - - /** - * 把玩家传送到一个位置 - *

- * 支持跨服传送 - * - * @param uuid 玩家的uuid - * @param location 坐标 - * @since 2.1.0 - */ - public static void sendPlayerToLocation(UUID uuid, ServiceLocation location) { - ServicePlayerInfo playerInfo = ServiceInfoAPI.getPlayerInfo(uuid); - - // 如果玩家不在线 - if (playerInfo == null || !playerInfo.isOnline()) { - return; - } - // 如果目标服务器不在线 - if (ServiceInfoAPI.getSenderInfo(location.getServerName()) == null) { - return; - } - - JsonObject object = new JsonObject(); - object.addProperty("uuid", uuid.toString()); - object.add("location", location.saveToJson()); - sendServiceMessage("HamsterService", "sendPlayerToLocation", object); - } - - public static void kickPlayer(UUID uuid, String reason) { - kickPlayer(uuid, new JsonPrimitive(reason)); - } - - public static void kickPlayer(UUID uuid, JsonElement reason) { - ProxiedPlayer player = ProxyServer.getInstance().getPlayer(uuid); - if (player != null) { - player.disconnect(ComponentUtils.parseComponentFromJson(reason)); - return; - } - JsonObject object = new JsonObject(); - object.addProperty("uuid", uuid.toString()); - object.add("reason", reason); - sendServiceMessage("HamsterService", "kickPlayer", object); - } - - /** - * 开启/关闭 安全模式 - *

- * 在安全模式开启时玩家将无法连接至服务器 - *

- * 且根据 config 的配置不同，有可能会踢出全部在线玩家 - * - * @param enable 是否启用 - */ - public static void setSafeMode(boolean enable) { - sendServiceMessage("HamsterService", "setSafeMode", new JsonPrimitive(enable)); - } - - /** - * 发送一条服务消息 - * - * @param tag 消息标签 - * @param action 执行动作 - * @deprecated 你应该使用 sendServiceMessage - *

- * 因为这个方法名有歧义 - */ - @Deprecated - public static void sendMessage(String tag, String action) { - sendServiceMessage(tag, action); - } - - /** - * 发送一条有附加参数的服务消息 - * - * @param tag 消息标签 - * @param action 执行动作 - * @param content 附加参数 - * @deprecated 你应该使用 sendServiceMessage - *

- * 因为这个方法名有歧义 - */ - @Deprecated - public static void sendMessage(String tag, String action, String content) { - sendServiceMessage(tag, action, content); - } - - /** - * 发送一条有附加参数的服务消息，使用 String.format() 替换附加参数 - * - * @param tag 消息标签 - * @param action 执行动作 - * @param content 附加参数 - * @param args 替换参数 - * @see String#format(String, Object...) - * @deprecated 你应该使用 sendServiceMessage - *

- * 因为这个方法名有歧义 - */ - @Deprecated - public static void sendMessage(String tag, String action, String content, Object... args) { - sendServiceMessage(tag, action, content, args); - } - - /** - * 发送一条有附加参数的服务消息 - * - * @param tag 消息标签 - * @param action 执行动作 - * @param content 附加参数 - * @deprecated 你应该使用 sendServiceMessage - *

- * 因为这个方法名有歧义 - */ - @Deprecated - public static void sendMessage(String tag, String action, JsonElement content) { - sendServiceMessage(tag, action, content); - } - - /** - * 自定义服务消息信息并发送 - * - * @param info 消息内容 - * @param block 是否阻塞（即必须等待消息发送完成，该方法才会返回） - * @deprecated 你应该使用 sendServiceMessage - *

- * 因为这个方法名有歧义 - */ - @Deprecated - public static void sendMessage(ServiceMessageInfo info, boolean block) { - sendServiceMessage(info, block); - } - -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/command/ServiceCommand.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/command/ServiceCommand.java deleted file mode 100644 index 8c863eb..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/command/ServiceCommand.java +++ /dev/null @@ -1,35 +0,0 @@ -package cn.hamster3.service.bungee.command; - -import net.md_5.bungee.api.CommandSender; -import net.md_5.bungee.api.chat.TextComponent; -import net.md_5.bungee.api.plugin.Command; - -public class ServiceCommand extends Command { - public static final ServiceCommand INSTANCE = new ServiceCommand(); - - private ServiceCommand() { - super("serviceb", "service.admin"); - } - - @Override - public void execute(CommandSender sender, String[] args) { - if (!sender.hasPermission("service.admin")) { - sender.sendMessage(new TextComponent("§c你没有权限执行这个命令!")); - return; - } - if (args.length < 1) { - sender.sendMessage(new TextComponent("§c/service command [bukkit/proxy] [命令内容]")); - return; - } - switch (args[0]) { - case "command": { - SudoConsoleCommand.INSTANCE.onCommand(sender, args); - break; - } - case "": { - break; - } - } - - } -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/command/SudoConsoleCommand.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/command/SudoConsoleCommand.java deleted file mode 100644 index c02887e..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/command/SudoConsoleCommand.java +++ /dev/null @@ -1,42 +0,0 @@ -package cn.hamster3.service.bungee.command; - -import cn.hamster3.service.bungee.api.ServiceMessageAPI; -import net.md_5.bungee.api.CommandSender; -import net.md_5.bungee.api.chat.TextComponent; -import org.jetbrains.annotations.NotNull; - -public class SudoConsoleCommand { - public static final SudoConsoleCommand INSTANCE = new SudoConsoleCommand(); - - private SudoConsoleCommand() { - } - - public void onCommand(@NotNull CommandSender sender, @NotNull String[] args) { - if (args.length < 3) { - sender.sendMessage(new TextComponent("§c/service command [bukkit/proxy] [命令内容]")); - return; - } - - String action; - switch (args[1].toLowerCase()) { - case "bukkit": { - action = "bukkitConsoleCommand"; - break; - } - case "proxy": { - action = "proxyConsoleCommand"; - break; - } - default: { - sender.sendMessage(new TextComponent("§c/service command [bukkit/proxy] [命令内容]")); - return; - } - } - StringBuilder builder = new StringBuilder(); - for (int i = 2; i < args.length; i++) { - builder.append(args[i]).append(" "); - } - ServiceMessageAPI.sendServiceMessage("HamsterService", action, builder.toString()); - sender.sendMessage(new TextComponent("§c已广播命令执行信息.")); - } -} \ No newline at end of file diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/event/MessageEvent.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/event/MessageEvent.java deleted file mode 100644 index 9a1e101..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/event/MessageEvent.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.hamster3.service.bungee.event; - -import cn.hamster3.service.common.entity.ServiceMessageInfo; -import net.md_5.bungee.api.plugin.Event; - -/** - * 服务消息事件的基类 - */ -@SuppressWarnings("unused") -public class MessageEvent extends Event { - private final ServiceMessageInfo messageInfo; - - public MessageEvent(ServiceMessageInfo messageInfo) { - this.messageInfo = messageInfo; - } - - public ServiceMessageInfo getMessageInfo() { - return messageInfo; - } - -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/event/MessageReceivedEvent.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/event/MessageReceivedEvent.java deleted file mode 100644 index ae33d13..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/event/MessageReceivedEvent.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.hamster3.service.bungee.event; - -import cn.hamster3.service.common.entity.ServiceMessageInfo; - -/** - * 从服务中心收到消息时产生的事件 - */ -@SuppressWarnings("unused") -public class MessageReceivedEvent extends MessageEvent { - - public MessageReceivedEvent(ServiceMessageInfo info) { - super(info); - } -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/event/MessageSentEvent.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/event/MessageSentEvent.java deleted file mode 100644 index c8db2ed..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/event/MessageSentEvent.java +++ /dev/null @@ -1,44 +0,0 @@ -package cn.hamster3.service.bungee.event; - -import cn.hamster3.service.common.entity.ServiceMessageInfo; - -/** - * 消息发送出去之后产生的事件 - */ -@SuppressWarnings("unused") -public class MessageSentEvent extends MessageEvent { - private final boolean success; - private final Throwable cause; - - public MessageSentEvent(ServiceMessageInfo info) { - super(info); - success = true; - cause = null; - } - - public MessageSentEvent(ServiceMessageInfo messageInfo, Throwable cause) { - super(messageInfo); - success = false; - this.cause = cause; - } - - - /** - * 消息是否成功发送出去了 - * - * @return true代表成功发送 - */ - public boolean isSuccess() { - return success; - } - - /** - * 若消息发送失败，则失败原因为何 - * 若发送成功，则返回null - * - * @return 失败原因 - */ - public Throwable getCause() { - return cause; - } -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/event/ServiceConnectEvent.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/event/ServiceConnectEvent.java deleted file mode 100644 index b397520..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/event/ServiceConnectEvent.java +++ /dev/null @@ -1,45 +0,0 @@ -package cn.hamster3.service.bungee.event; - - -import net.md_5.bungee.api.plugin.Event; - -/** - * 服务连接事件 - */ - -@SuppressWarnings("unused") -public class ServiceConnectEvent extends Event { - private final boolean success; - private final Throwable cause; - - public ServiceConnectEvent() { - success = true; - cause = null; - } - - public ServiceConnectEvent(Throwable cause) { - success = false; - this.cause = cause; - } - - - /** - * 是否成功连接到服务中心 - * - * @return true代表成功 - */ - public boolean isSuccess() { - return success; - } - - /** - * 如果连接失败了，则返回失败原因 - *

- * 如果连接成功了，则返回null - * - * @return 失败原因 - */ - public Throwable getCause() { - return cause; - } -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/listener/BridgeListener.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/listener/BridgeListener.java deleted file mode 100644 index 5ac676c..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/listener/BridgeListener.java +++ /dev/null @@ -1,37 +0,0 @@ -package cn.hamster3.service.bungee.listener; - -import cn.hamster3.service.bungee.api.ServiceInfoAPI; -import cn.hamster3.service.bungee.event.MessageReceivedEvent; -import cn.hamster3.service.bungee.event.MessageSentEvent; -import cn.hamster3.service.common.entity.ServiceMessageInfo; -import com.google.common.eventbus.Subscribe; -import net.md_5.bungee.api.ProxyServer; - -public class BridgeListener { - public static final BridgeListener INSTANCE = new BridgeListener(); - - private BridgeListener() { - } - - @Subscribe - public void onMessageSent(cn.hamster3.mc.plugin.ball.common.event.message.MessageSentEvent event) { - ProxyServer.getInstance().getPluginManager().callEvent(new MessageSentEvent(new ServiceMessageInfo( - ServiceInfoAPI.getSenderInfo(event.getSenderID()), - event.getReceiverID(), - event.getChannel(), - event.getAction(), - event.getContent() - ))); - } - - @Subscribe - public void onMessageReceived(cn.hamster3.mc.plugin.ball.common.event.message.MessageReceivedEvent event) { - ProxyServer.getInstance().getPluginManager().callEvent(new MessageReceivedEvent(new ServiceMessageInfo( - ServiceInfoAPI.getSenderInfo(event.getSenderID()), - event.getReceiverID(), - event.getChannel(), - event.getAction(), - event.getContent() - ))); - } -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/listener/ServiceMainListener.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/listener/ServiceMainListener.java deleted file mode 100644 index c21eb63..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/listener/ServiceMainListener.java +++ /dev/null @@ -1,158 +0,0 @@ -package cn.hamster3.service.bungee.listener; - -import cn.hamster3.service.bungee.api.ServiceInfoAPI; -import cn.hamster3.service.bungee.api.ServiceMessageAPI; -import cn.hamster3.service.bungee.event.MessageReceivedEvent; -import cn.hamster3.service.bungee.event.ServiceConnectEvent; -import cn.hamster3.service.common.data.ServiceLocation; -import cn.hamster3.service.common.data.ServicePlayerInfo; -import cn.hamster3.service.common.entity.ServiceMessageInfo; -import cn.hamster3.service.common.entity.ServiceSenderInfo; -import cn.hamster3.service.common.util.ComponentUtils; -import cn.hamster3.service.common.util.ServiceLogUtils; -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; -import net.md_5.bungee.api.ProxyServer; -import net.md_5.bungee.api.connection.ProxiedPlayer; -import net.md_5.bungee.api.event.PlayerDisconnectEvent; -import net.md_5.bungee.api.event.PostLoginEvent; -import net.md_5.bungee.api.event.ServerConnectedEvent; -import net.md_5.bungee.api.plugin.Listener; -import net.md_5.bungee.event.EventHandler; -import net.md_5.bungee.event.EventPriority; - -import java.util.UUID; - -public class ServiceMainListener implements Listener { - public static final ServiceMainListener INSTANCE = new ServiceMainListener(); - - private ServiceMainListener() { - } - - @EventHandler - public void onServiceConnect(ServiceConnectEvent event) { - if (!event.isSuccess()) { - return; - } - ServiceLogUtils.info("连接至服务中心成功..."); - JsonArray playerInfoArray = new JsonArray(); - for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) { - ServicePlayerInfo playerInfo = new ServicePlayerInfo( - player.getUniqueId(), - player.getName(), - player.getServer().getInfo().getName(), - ServiceInfoAPI.getLocalServerName() - ); - playerInfoArray.add(playerInfo.saveToJson()); - } - ServiceMessageAPI.sendServiceMessage("HamsterService", "updatePlayerInfoArray", playerInfoArray); - } - - @EventHandler - public void onMessageReceived(MessageReceivedEvent event) { - ServiceMessageInfo info = event.getMessageInfo(); - if (!"HamsterService".equals(info.getTag())) { - return; - } - switch (info.getAction()) { - case "sendPlayerMessage": { - JsonObject object = info.getContentAsJsonObject(); - UUID uuid = UUID.fromString(object.get("uuid").getAsString()); - ProxiedPlayer player = ProxyServer.getInstance().getPlayer(uuid); - if (player == null) { - return; - } - player.sendMessage(ComponentUtils.parseComponentFromJson(object.get("message"))); - break; - } - case "broadcastMessage": { - ProxyServer.getInstance().broadcast(ComponentUtils.parseComponentFromJson(info.getContentAsJsonObject())); - break; - } - case "proxyConsoleCommand": { - ProxyServer.getInstance().getPluginManager().dispatchCommand( - ProxyServer.getInstance().getConsole(), - info.getContentAsString() - ); - break; - } - case "dispatchProxyCommand": { - JsonObject object = info.getContentAsJsonObject(); - UUID uuid = UUID.fromString(object.get("uuid").getAsString()); - ProxiedPlayer player = ProxyServer.getInstance().getPlayer(uuid); - if (player == null) { - return; - } - ProxyServer.getInstance().getPluginManager().dispatchCommand(player, object.get("command").getAsString()); - break; - } - case "sendPlayerToLocation": { - JsonObject object = info.getContent().getAsJsonObject(); - UUID uuid = UUID.fromString(object.get("uuid").getAsString()); - ProxiedPlayer player = ProxyServer.getInstance().getPlayer(uuid); - if (player == null) { - return; - } - ServiceLocation location = new ServiceLocation(object.getAsJsonObject("location")); - if (location.getServerName().equals(player.getServer().getInfo().getName())) { - return; - } - ServiceSenderInfo senderInfo = ServiceInfoAPI.getSenderInfo(location.getServerName()); - if (senderInfo == null) { - return; - } - player.connect(ProxyServer.getInstance().getServerInfo(location.getServerName())); - break; - } - case "kickPlayer": { - JsonObject object = info.getContentAsJsonObject(); - UUID uuid = UUID.fromString(object.get("uuid").getAsString()); - ProxiedPlayer player = ProxyServer.getInstance().getPlayer(uuid); - if (player != null) { - player.disconnect(ComponentUtils.parseComponentFromJson(object.get("reason"))); - return; - } - break; - } - } - } - - @EventHandler - public void onServerConnected(ServerConnectedEvent event) { - ProxiedPlayer player = event.getPlayer(); - ServicePlayerInfo playerInfo = new ServicePlayerInfo( - player.getUniqueId(), - player.getName(), - event.getServer().getInfo().getName(), - ServiceInfoAPI.getLocalServerName() - ); - ServiceMessageAPI.sendServiceMessage("HamsterService", "updatePlayerInfo", playerInfo.saveToJson()); - } - - @EventHandler(priority = EventPriority.HIGH) - public void onPostLogin(PostLoginEvent event) { - ProxiedPlayer player = event.getPlayer(); - ServicePlayerInfo playerInfo = new ServicePlayerInfo( - player.getUniqueId(), - player.getName(), - null, - ServiceInfoAPI.getLocalServerName(), - true - ); - ServiceMessageAPI.sendServiceMessage("HamsterService", "playerPostLogin", playerInfo.saveToJson()); - } - - @EventHandler - public void onPlayerDisconnect(PlayerDisconnectEvent event) { - ProxiedPlayer player = event.getPlayer(); - ServicePlayerInfo playerInfo = new ServicePlayerInfo( - player.getUniqueId(), - player.getName(), - null, - ServiceInfoAPI.getLocalServerName(), - false - ); - ServiceMessageAPI.sendServiceMessage("HamsterService", "playerDisconnect", playerInfo.saveToJson()); - } - -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/common/data/ServiceBlockPos.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/common/data/ServiceBlockPos.java deleted file mode 100644 index bed91e6..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/common/data/ServiceBlockPos.java +++ /dev/null @@ -1,101 +0,0 @@ -package cn.hamster3.service.common.data; - -import com.google.gson.JsonObject; -import org.jetbrains.annotations.NotNull; - -import java.util.Objects; - -@SuppressWarnings("unused") -public class ServiceBlockPos { - @NotNull - private String serverName; - @NotNull - private String worldName; - private int x; - private int y; - private int z; - - public ServiceBlockPos(@NotNull String serverName, @NotNull String worldName, int x, int y, int z) { - this.serverName = serverName; - this.worldName = worldName; - this.x = x; - this.y = y; - this.z = z; - } - - public ServiceBlockPos(@NotNull JsonObject object) { - serverName = object.get("serverName").getAsString(); - worldName = object.get("worldName").getAsString(); - - x = object.get("x").getAsInt(); - y = object.get("y").getAsInt(); - z = object.get("z").getAsInt(); - } - - @NotNull - public JsonObject saveToJson() { - JsonObject object = new JsonObject(); - object.addProperty("serverName", serverName); - object.addProperty("worldName", worldName); - - object.addProperty("x", x); - object.addProperty("y", y); - object.addProperty("z", z); - return object; - } - - @NotNull - public String getServerName() { - return serverName; - } - - public void setServerName(@NotNull String serverName) { - this.serverName = serverName; - } - - @NotNull - public String getWorldName() { - return worldName; - } - - public void setWorldName(@NotNull String worldName) { - this.worldName = worldName; - } - - public int getX() { - return x; - } - - public void setX(int x) { - this.x = x; - } - - public int getY() { - return y; - } - - public void setY(int y) { - this.y = y; - } - - public int getZ() { - return z; - } - - public void setZ(int z) { - this.z = z; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - ServiceBlockPos that = (ServiceBlockPos) o; - return x == that.x && y == that.y && z == that.z && serverName.equals(that.serverName) && worldName.equals(that.worldName); - } - - @Override - public int hashCode() { - return Objects.hash(serverName, worldName, x, y, z); - } -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/common/data/ServiceLocation.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/common/data/ServiceLocation.java deleted file mode 100644 index 0b84da5..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/common/data/ServiceLocation.java +++ /dev/null @@ -1,148 +0,0 @@ -package cn.hamster3.service.common.data; - -import com.google.gson.JsonObject; -import org.jetbrains.annotations.NotNull; - -import java.util.Objects; - -@SuppressWarnings("unused") -public class ServiceLocation { - @NotNull - private String serverName; - @NotNull - private String worldName; - private double x; - private double y; - private double z; - - private float yaw; - private float pitch; - - public ServiceLocation(@NotNull String serverName, @NotNull String worldName, double x, double y, double z) { - this.serverName = serverName; - this.worldName = worldName; - this.x = x; - this.y = y; - this.z = z; - } - - public ServiceLocation(@NotNull String serverName, @NotNull String worldName, double x, double y, double z, float yaw, float pitch) { - this.serverName = serverName; - this.worldName = worldName; - this.x = x; - this.y = y; - this.z = z; - this.yaw = yaw; - this.pitch = pitch; - } - - public ServiceLocation(@NotNull JsonObject object) { - serverName = object.get("serverName").getAsString(); - worldName = object.get("worldName").getAsString(); - - x = object.get("x").getAsDouble(); - y = object.get("y").getAsDouble(); - z = object.get("z").getAsDouble(); - - yaw = object.get("yaw").getAsFloat(); - pitch = object.get("pitch").getAsFloat(); - } - - @NotNull - public JsonObject saveToJson() { - JsonObject object = new JsonObject(); - object.addProperty("serverName", serverName); - object.addProperty("worldName", worldName); - - object.addProperty("x", x); - object.addProperty("y", y); - object.addProperty("z", z); - - object.addProperty("yaw", yaw); - object.addProperty("pitch", pitch); - return object; - } - - @NotNull - public String getServerName() { - return serverName; - } - - public void setServerName(@NotNull String serverName) { - this.serverName = serverName; - } - - @NotNull - public String getWorldName() { - return worldName; - } - - public void setWorldName(@NotNull String worldName) { - this.worldName = worldName; - } - - public double getX() { - return x; - } - - public void setX(double x) { - this.x = x; - } - - public int getBlockX() { - return (int) x; - } - - public int getBlockY() { - return (int) y; - } - - public int getBlockZ() { - return (int) z; - } - - public double getY() { - return y; - } - - public void setY(double y) { - this.y = y; - } - - public double getZ() { - return z; - } - - public void setZ(double z) { - this.z = z; - } - - public float getYaw() { - return yaw; - } - - public void setYaw(float yaw) { - this.yaw = yaw; - } - - public float getPitch() { - return pitch; - } - - public void setPitch(float pitch) { - this.pitch = pitch; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - ServiceLocation that = (ServiceLocation) o; - return Double.compare(that.x, x) == 0 && Double.compare(that.y, y) == 0 && Double.compare(that.z, z) == 0 && Float.compare(that.yaw, yaw) == 0 && Float.compare(that.pitch, pitch) == 0 && serverName.equals(that.serverName) && worldName.equals(that.worldName); - } - - @Override - public int hashCode() { - return Objects.hash(serverName, worldName, x, y, z, yaw, pitch); - } -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/common/data/ServicePlayerInfo.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/common/data/ServicePlayerInfo.java deleted file mode 100644 index ed55d50..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/common/data/ServicePlayerInfo.java +++ /dev/null @@ -1,153 +0,0 @@ -package cn.hamster3.service.common.data; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.UUID; - -/** - * 玩家信息 - */ -@SuppressWarnings("unused") -public class ServicePlayerInfo { - /** - * 玩家的uuid - */ - private final UUID uuid; - /** - * 玩家的名称 - */ - private final String playerName; - /** - * 玩家所在的 bukkit 服务器名称 - */ - private final String bukkitServer; - /** - * 玩家所在的 代理 服务器名称 - */ - private final String proxyServer; - /** - * 玩家是否在线 - */ - private boolean online; - - public ServicePlayerInfo(@NotNull UUID uuid, @NotNull String playerName, @Nullable String bukkitServer, @Nullable String proxyServer) { - this.uuid = uuid; - this.playerName = playerName; - this.bukkitServer = bukkitServer; - this.proxyServer = proxyServer; - online = true; - } - - public ServicePlayerInfo(@NotNull UUID uuid, @NotNull String playerName, @Nullable String bukkitServer, @Nullable String proxyServer, boolean online) { - this.uuid = uuid; - this.playerName = playerName; - this.bukkitServer = bukkitServer; - this.proxyServer = proxyServer; - this.online = online; - } - - public ServicePlayerInfo(JsonObject object) { - uuid = UUID.fromString(object.get("uuid").getAsString()); - playerName = object.get("playerName").getAsString(); - online = object.get("online").getAsBoolean(); - if (object.has("bukkitServer")) { - JsonElement bukkitServerJson = object.get("bukkitServer"); - if (!bukkitServerJson.isJsonNull()) { - bukkitServer = bukkitServerJson.getAsString(); - } else { - bukkitServer = null; - } - } else { - bukkitServer = null; - } - if (object.has("proxyServer")) { - JsonElement proxyServerJson = object.get("proxyServer"); - if (!proxyServerJson.isJsonNull()) { - proxyServer = proxyServerJson.getAsString(); - } else { - proxyServer = null; - } - } else { - proxyServer = null; - } - } - - public JsonObject saveToJson() { - JsonObject object = new JsonObject(); - object.addProperty("uuid", uuid.toString()); - object.addProperty("playerName", playerName); - object.addProperty("online", online); - object.addProperty("bukkitServer", bukkitServer); - object.addProperty("proxyServer", proxyServer); - return object; - } - - /** - * 获取玩家的UUID - * - * @return 玩家的UUID - */ - @NotNull - public UUID getUuid() { - return uuid; - } - - /** - * 获取玩家的名称 - * - * @return 玩家名称 - */ - @NotNull - public String getPlayerName() { - return playerName; - } - - public boolean isOnline() { - return online; - } - - public void setOnline(boolean online) { - this.online = online; - } - - /** - * 获取玩家所在的子服 - * - * @return 子服名称 - */ - public String getBukkitServer() { - return bukkitServer; - } - - /** - * 获取玩家所在的代理节点 - * - * @return 代理节点名称 - */ - public String getProxyServer() { - return proxyServer; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - - ServicePlayerInfo that = (ServicePlayerInfo) o; - - return uuid.equals(that.uuid); - } - - @Override - public int hashCode() { - return uuid.hashCode(); - } - - @Override - public String toString() { - return saveToJson().toString(); - } -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/common/entity/ServiceMessageInfo.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/common/entity/ServiceMessageInfo.java deleted file mode 100644 index 4f5cfec..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/common/entity/ServiceMessageInfo.java +++ /dev/null @@ -1,202 +0,0 @@ -package cn.hamster3.service.common.entity; - -import cn.hamster3.mc.plugin.core.common.api.CoreAPI; -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -/** - * 消息内容 - */ -@SuppressWarnings("unused") -public class ServiceMessageInfo { - /** - * 消息发送者 - */ - private final ServiceSenderInfo senderInfo; - /** - * 接受该消息的目标服务器 - *

- * 一旦设定该值，则此条消息将会由 HamsterService-Server 过滤 - *

- * 仅服务器名称匹配的子端才能接收到这条消息 - *

- * 若不设定（值为null），则该消息会广播给所有子端 - */ - private final String toServer; - /** - * 消息标签 - *

- * 一般用这个来判断消息由哪个插件发出 - */ - private String tag; - /** - * 消息动作 - *

- * 一般用这个来判断插件应该如何处理这条消息 - */ - private String action; - /** - * 消息内容 - *

- * 这里是消息的附加参数 - */ - private JsonElement content; - - public ServiceMessageInfo(@NotNull ServiceSenderInfo senderInfo, @NotNull String tag, @NotNull String action) { - this(senderInfo, tag, action, null); - } - - public ServiceMessageInfo(@NotNull ServiceSenderInfo senderInfo, @NotNull String tag, @NotNull String action, @Nullable JsonElement content) { - this(senderInfo, null, tag, action, content); - } - - public ServiceMessageInfo(@NotNull ServiceSenderInfo senderInfo, @Nullable String toServer, @NotNull String tag, @NotNull String action, @Nullable JsonElement content) { - this.senderInfo = senderInfo; - this.toServer = toServer; - this.tag = tag; - this.action = action; - this.content = content; - } - - public ServiceMessageInfo(@NotNull JsonObject object) { - senderInfo = new ServiceSenderInfo(object.getAsJsonObject("senderInfo")); - if (object.has("toServer")) { - toServer = object.get("toServer").getAsString(); - } else { - toServer = null; - } - tag = object.get("tag").getAsString(); - action = object.get("action").getAsString(); - content = object.get("content"); - } - - /** - * 序列化至Json - * - * @return json对象 - */ - @NotNull - public JsonObject saveToJson() { - JsonObject object = new JsonObject(); - object.add("senderInfo", senderInfo.saveToJson()); - if (toServer != null) { - object.addProperty("toServer", toServer); - } - object.addProperty("tag", tag); - object.addProperty("action", action); - object.add("content", content); - return object; - } - - /** - * 获取消息发送者 - * - * @return 发送者 - */ - @NotNull - public ServiceSenderInfo getSenderInfo() { - return senderInfo; - } - - /** - * 获取定向发送的接受者 - *

- * 如果返回为 null 则代表广播消息 - * - * @return 定向发送的接受者 - */ - public String getToServer() { - return toServer; - } - - /** - * 获取消息标签 - * - * @return 消息标签 - */ - @NotNull - public String getTag() { - return tag; - } - - /** - * 设置消息标签 - * - * @param tag 消息标签 - */ - public void setTag(@NotNull String tag) { - this.tag = tag; - } - - /** - * 获取消息动作 - * - * @return 消息动作 - */ - @NotNull - public String getAction() { - return action; - } - - /** - * 设置消息动作 - * - * @param action 消息动作 - */ - public void setAction(@NotNull String action) { - this.action = action; - } - - /** - * 获取消息内容 - * - * @return 消息内容 - */ - public JsonElement getContent() { - return content; - } - - /** - * 设置消息内容 - * - * @param content 消息内容 - */ - public void setContent(@Nullable JsonElement content) { - this.content = content; - } - - /** - * 以字符串形式获取消息内容 - * - * @return 消息内容 - */ - public String getContentAsString() { - return content.getAsString(); - } - - /** - * 以 JsonObject 对象获取消息内容 - * - * @return 消息内容 - */ - public JsonObject getContentAsJsonObject() { - return content.getAsJsonObject(); - } - - /** - * 以 JsonArray 对象获取消息内容 - * - * @return 消息内容 - */ - public JsonArray getContentAsJsonArray() { - return content.getAsJsonArray(); - } - - @Override - public String toString() { - return CoreAPI.getInstance().getGson().toJson(this); - } -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/common/entity/ServiceSenderInfo.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/common/entity/ServiceSenderInfo.java deleted file mode 100644 index 045f89f..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/common/entity/ServiceSenderInfo.java +++ /dev/null @@ -1,82 +0,0 @@ -package cn.hamster3.service.common.entity; - -import com.google.gson.JsonObject; -import org.jetbrains.annotations.NotNull; - -/** - * 消息发送者信息 - */ -@SuppressWarnings("unused") -public class ServiceSenderInfo { - private final ServiceSenderType type; - private final String name; - private final String nickName; - - /** - * 缓存用的 jsonInfo - */ - private JsonObject jsonInfo; - - public ServiceSenderInfo(@NotNull ServiceSenderType type, @NotNull String name, @NotNull String nickName) { - this.type = type; - this.name = name; - this.nickName = nickName; - } - - public ServiceSenderInfo(@NotNull JsonObject object) { - type = ServiceSenderType.valueOf(object.get("type").getAsString()); - name = object.get("name").getAsString(); - nickName = object.get("nickName").getAsString(); - } - - /** - * 序列化至Json - * - * @return json对象 - */ - @NotNull - public JsonObject saveToJson() { - if (jsonInfo == null) { - jsonInfo = new JsonObject(); - jsonInfo.addProperty("type", type.name()); - jsonInfo.addProperty("name", name); - jsonInfo.addProperty("nickName", nickName); - } - return jsonInfo; - } - - @NotNull - public ServiceSenderType getType() { - return type; - } - - @NotNull - public String getName() { - return name; - } - - @NotNull - public String getNickName() { - return nickName; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - - ServiceSenderInfo that = (ServiceSenderInfo) o; - - return name.equals(that.name); - } - - @Override - public int hashCode() { - return name.hashCode(); - } - - @Override - public String toString() { - return saveToJson().toString(); - } -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/common/entity/ServiceSenderType.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/common/entity/ServiceSenderType.java deleted file mode 100644 index ba9f9e9..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/common/entity/ServiceSenderType.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.hamster3.service.common.entity; - -/** - * 消息发送者类型 - */ -@SuppressWarnings("unused") -public enum ServiceSenderType { - /** - * Bukkit服务器 - */ - BUKKIT, - /** - * BungeeCord 等代理服务器 - */ - PROXY, - /** - * 消息中心服务器（名称为：ServiceCentre） - */ - SERVICE_CENTRE -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/common/util/ComponentUtils.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/common/util/ComponentUtils.java deleted file mode 100644 index 5c2fa84..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/common/util/ComponentUtils.java +++ /dev/null @@ -1,106 +0,0 @@ -package cn.hamster3.service.common.util; - -import com.google.gson.*; -import net.md_5.bungee.api.ChatColor; -import net.md_5.bungee.api.chat.BaseComponent; -import net.md_5.bungee.api.chat.ClickEvent; -import net.md_5.bungee.api.chat.ComponentBuilder; -import net.md_5.bungee.api.chat.HoverEvent; - -import java.util.ArrayList; -import java.util.Collections; - -public class ComponentUtils { - private static final Gson gson = new GsonBuilder() - .setLenient()// json宽松 - .enableComplexMapKeySerialization()//支持Map的key为复杂对象的形式 - .serializeNulls() //智能null - .setPrettyPrinting()// 调教格式 - .create(); - - private ComponentUtils() { - } - - public static BaseComponent[] parseComponentFromJson(JsonElement json) { - if (json.isJsonPrimitive()) { - return new ComponentBuilder(json.getAsString()).create(); - } - if (json.isJsonArray()) { - JsonArray array = json.getAsJsonArray(); - ArrayList list = new ArrayList<>(); - for (JsonElement element : array) { - Collections.addAll(list, parseComponentFromJson(element)); - } - BaseComponent[] components = new BaseComponent[list.size()]; - for (int i = 0; i < list.size(); i++) { - components[i] = list.get(i); - } - return components; - } - if (json.isJsonObject()) { - JsonObject object = json.getAsJsonObject(); - ComponentBuilder builder = new ComponentBuilder(object.get("text").getAsString()); - if (object.has("color")) { - builder.color(ChatColor.of(object.get("color").getAsString())); - } - if (object.has("bold")) { - builder.bold(object.get("bold").getAsBoolean()); - } - if (object.has("italic")) { - builder.italic(object.get("italic").getAsBoolean()); - } - if (object.has("underlined")) { - builder.underlined(object.get("underlined").getAsBoolean()); - } - if (object.has("strikethrough")) { - builder.strikethrough(object.get("strikethrough").getAsBoolean()); - } - if (object.has("obfuscated")) { - builder.obfuscated(object.get("obfuscated").getAsBoolean()); - } - if (object.has("insertion")) { - builder.insertion(object.get("insertion").getAsString()); - } - if (object.has("clickEvent")) { - builder.event(parseClickEvent(object.getAsJsonObject("clickEvent"))); - } - if (object.has("hoverEvent")) { - builder.event(parseHoverEvent(object.getAsJsonObject("hoverEvent"))); - } - if (object.has("extra")) { - builder.append(parseComponentFromJson(object.get("extra"))); - } - return builder.create(); - } - throw new IllegalArgumentException("非法json字符串: " + json); - } - - private static ClickEvent parseClickEvent(JsonObject object) { - return new ClickEvent( - ClickEvent.Action.valueOf( - object - .get("action") - .getAsString() - .toUpperCase() - ), - object.get("value").getAsString() - ); - } - - @SuppressWarnings("deprecation") - private static HoverEvent parseHoverEvent(JsonObject object) { - return new HoverEvent( - HoverEvent.Action.valueOf( - object - .get("action") - .getAsString() - .toUpperCase() - ), - parseComponentFromJson(object.get("value")) - ); - } - - public static Gson getGson() { - return gson; - } -} diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/common/util/ServiceLogUtils.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/common/util/ServiceLogUtils.java deleted file mode 100644 index 9bf9c4e..0000000 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/common/util/ServiceLogUtils.java +++ /dev/null @@ -1,38 +0,0 @@ -package cn.hamster3.service.common.util; - -import java.util.logging.Logger; - -@SuppressWarnings("unused") -public abstract class ServiceLogUtils { - private static Logger logger; - - public static void setLogger(Logger logger) { - ServiceLogUtils.logger = logger; - } - - public static void info(String info) { - logger.info(info); - } - - public static void info(String info, Object... params) { - logger.info(String.format(info, params)); - } - - public static void warning(String warning) { - logger.warning(warning); - } - - public static void warning(String warning, Object... params) { - logger.warning(String.format(warning, params)); - } - - public static void error(Throwable e, String message) { - warning(message); - e.printStackTrace(); - } - - public static void error(Throwable e, String message, Object... args) { - warning(message, args); - e.printStackTrace(); - } -} diff --git a/hamster-ball-bridge/src/main/resources/bungee.yml b/hamster-ball-bridge/src/main/resources/bungee.yml deleted file mode 100644 index 2600004..0000000 --- a/hamster-ball-bridge/src/main/resources/bungee.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: HamsterService-Proxy -main: cn.hamster3.service.bungee.BallBridgePlugin -version: ${version} - -author: MiniDay - -depends: - - HamsterBall diff --git a/hamster-ball-bridge/src/main/resources/plugin.yml b/hamster-ball-bridge/src/main/resources/plugin.yml deleted file mode 100644 index 5defb9a..0000000 --- a/hamster-ball-bridge/src/main/resources/plugin.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: HamsterService-Bukkit -main: cn.hamster3.service.bukkit.BallBridgePlugin -version: ${version} -api-version: 1.13 - -author: MiniDay -website: https://github.com/MiniDay/hamster-little-plugins -description: 将 HamsterBall 转换成 HamsterService 兼容的 API - -depend: - - HamsterCore - - HamsterBall - -softdepend: - - PlaceholderAPI - -commands: - hamster-service: - aliases: [ hservice, service ] - -permissions: - hamster.service.admin: - default: op diff --git a/hamster-sudo/README.md b/hamster-sudo/README.md deleted file mode 100644 index 1160bda..0000000 --- a/hamster-sudo/README.md +++ /dev/null @@ -1,14 +0,0 @@ -# HamsterSudo - -依赖于 [仓鼠球](https://github.com/MiniDay/hamster-ball) 实现的跨服强制执行命令插件 - -# 指令 - -| 指令 | 描述 | -|:--------------------------------------|:------------------------------| -| /sudo <玩家> <命令> | 强制玩家执行 **游戏端** 或 **代理端** 命令 | -| /sudo-server <命令> | 强制服务端执行命令 | -| /sudo-all-console <命令> | 强制所有 **游戏端** 或 **代理端** 执行某条命令 | -| /sudo-all-player <命令> | 强制所有玩家执行 **游戏端** 或 **代理端** 命令 | - -[返回首页](../README.md) diff --git a/hamster-sudo/build.gradle b/hamster-sudo/build.gradle deleted file mode 100644 index 734ebc1..0000000 --- a/hamster-sudo/build.gradle +++ /dev/null @@ -1,6 +0,0 @@ -version = '1.0.0' -setArchivesBaseName("HamsterSudo") - -dependencies { - compileOnly "cn.hamster3.mc.plugin:ball-common:${hamster_ball_version}" -} diff --git a/settings.gradle b/settings.gradle index e99b37e..27eaf3a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,16 +2,14 @@ rootProject.name = 'hamster-little-plugins' include 'hamster-auto-game-rule' include 'hamster-auto-log-clear' +include 'hamster-auto-restart' include 'hamster-auto-server-info' -include 'hamster-ball-bridge' -include 'hamster-sudo' -include 'hamster-lobby' -include 'hamster-spawn' include 'hamster-chain-break' include 'hamster-join-message' -include 'hamster-protect-explosion' -include 'hamster-protect-piston-wool-carpet' -include 'hamster-protect-farmland' +include 'hamster-lobby' include 'hamster-name-case-fix' -include 'hamster-auto-restart' +include 'hamster-protect-explosion' +include 'hamster-protect-farmland' +include 'hamster-protect-piston-wool-carpet' +include 'hamster-spawn'