From bf2da1fddb3a660b90bf53a44873a641df87146e Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Wed, 20 Mar 2024 23:50:07 +0800 Subject: [PATCH] =?UTF-8?q?build:=20=E7=A7=BB=E9=99=A4=E6=97=A0=E6=95=88?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hamster-auto-server-info/build.gradle | 6 --- .../auto/server/info/ServerInfoPlugin.java | 36 ----------------- .../info/listener/ServerInfoListener.java | 40 ------------------- .../server/info/util/ServerInfoUtils.java | 18 --------- .../src/main/resources/bungee.yml | 6 --- settings.gradle | 1 - 6 files changed, 107 deletions(-) delete mode 100644 hamster-auto-server-info/build.gradle delete mode 100644 hamster-auto-server-info/src/main/java/cn/hamster3/mc/plugin/auto/server/info/ServerInfoPlugin.java delete mode 100644 hamster-auto-server-info/src/main/java/cn/hamster3/mc/plugin/auto/server/info/listener/ServerInfoListener.java delete mode 100644 hamster-auto-server-info/src/main/java/cn/hamster3/mc/plugin/auto/server/info/util/ServerInfoUtils.java delete mode 100644 hamster-auto-server-info/src/main/resources/bungee.yml diff --git a/hamster-auto-server-info/build.gradle b/hamster-auto-server-info/build.gradle deleted file mode 100644 index 88d77a6..0000000 --- a/hamster-auto-server-info/build.gradle +++ /dev/null @@ -1,6 +0,0 @@ -version = '1.1.0' -setArchivesBaseName("HamsterAuto-ServerInfo") - -dependencies { - compileOnly "cn.hamster3.mc.plugin:ball-bungee:${hamster_ball_version}" -} diff --git a/hamster-auto-server-info/src/main/java/cn/hamster3/mc/plugin/auto/server/info/ServerInfoPlugin.java b/hamster-auto-server-info/src/main/java/cn/hamster3/mc/plugin/auto/server/info/ServerInfoPlugin.java deleted file mode 100644 index fc5f9f0..0000000 --- a/hamster-auto-server-info/src/main/java/cn/hamster3/mc/plugin/auto/server/info/ServerInfoPlugin.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.hamster3.mc.plugin.auto.server.info; - -import cn.hamster3.mc.plugin.auto.server.info.listener.ServerInfoListener; -import cn.hamster3.mc.plugin.auto.server.info.util.ServerInfoUtils; -import cn.hamster3.mc.plugin.ball.common.api.BallAPI; -import cn.hamster3.mc.plugin.ball.common.entity.BallServerInfo; -import cn.hamster3.mc.plugin.ball.common.entity.BallServerType; -import net.md_5.bungee.api.ProxyServer; -import net.md_5.bungee.api.plugin.Plugin; - -public class ServerInfoPlugin extends Plugin { - private static ServerInfoPlugin instance; - - public static ServerInfoPlugin getInstance() { - return instance; - } - - @Override - public void onLoad() { - instance = this; - } - - @Override - public void onEnable() { - ProxyServer.getInstance().getServers().clear(); - getLogger().info("已清除配置文件中子服接入点配置."); - for (BallServerInfo serverInfo : BallAPI.getInstance().getAllServerInfo().values()) { - if (serverInfo.getType() != BallServerType.GAME) { - continue; - } - ProxyServer.getInstance().getServers().put(serverInfo.getId(), ServerInfoUtils.getServerInfo(serverInfo)); - getLogger().info("已添加子服 " + serverInfo.getId() + " 的接入点配置."); - } - BallAPI.getInstance().getEventBus().register(ServerInfoListener.INSTANCE); - } -} diff --git a/hamster-auto-server-info/src/main/java/cn/hamster3/mc/plugin/auto/server/info/listener/ServerInfoListener.java b/hamster-auto-server-info/src/main/java/cn/hamster3/mc/plugin/auto/server/info/listener/ServerInfoListener.java deleted file mode 100644 index e7f4ce3..0000000 --- a/hamster-auto-server-info/src/main/java/cn/hamster3/mc/plugin/auto/server/info/listener/ServerInfoListener.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.hamster3.mc.plugin.auto.server.info.listener; - -import cn.hamster3.mc.plugin.auto.server.info.ServerInfoPlugin; -import cn.hamster3.mc.plugin.auto.server.info.util.ServerInfoUtils; -import cn.hamster3.mc.plugin.ball.common.entity.BallServerInfo; -import cn.hamster3.mc.plugin.ball.common.entity.BallServerType; -import cn.hamster3.mc.plugin.ball.common.event.server.ServerOfflineEvent; -import cn.hamster3.mc.plugin.ball.common.event.server.ServerOnlineEvent; -import com.google.common.eventbus.Subscribe; -import net.md_5.bungee.api.ProxyServer; -import net.md_5.bungee.api.config.ServerInfo; - -import java.util.Map; - -public class ServerInfoListener { - public static final ServerInfoListener INSTANCE = new ServerInfoListener(); - - private ServerInfoListener() { - } - - @Subscribe - public void onServerOnline(ServerOnlineEvent event) { - BallServerInfo serverInfo = event.getServerInfo(); - if (serverInfo.getType() != BallServerType.GAME) { - return; - } - ProxyServer.getInstance().getServers().put(serverInfo.getId(), ServerInfoUtils.getServerInfo(serverInfo)); - ServerInfoPlugin.getInstance().getLogger().info("已添加子服 " + serverInfo.getId() + " 的接入点配置"); - } - - @Subscribe - public void onServerOffline(ServerOfflineEvent event) { - BallServerInfo info = event.getServerInfo(); - String id = info.getId(); - Map map = ProxyServer.getInstance().getServers(); - if (map.remove(id) != null) { - ServerInfoPlugin.getInstance().getLogger().info("已移除子服 " + id + " 的接入点配置"); - } - } -} diff --git a/hamster-auto-server-info/src/main/java/cn/hamster3/mc/plugin/auto/server/info/util/ServerInfoUtils.java b/hamster-auto-server-info/src/main/java/cn/hamster3/mc/plugin/auto/server/info/util/ServerInfoUtils.java deleted file mode 100644 index 06e6c8a..0000000 --- a/hamster-auto-server-info/src/main/java/cn/hamster3/mc/plugin/auto/server/info/util/ServerInfoUtils.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.hamster3.mc.plugin.auto.server.info.util; - -import cn.hamster3.mc.plugin.ball.common.entity.BallServerInfo; -import net.md_5.bungee.api.ProxyServer; -import net.md_5.bungee.api.config.ServerInfo; - -import java.net.InetSocketAddress; - -public final class ServerInfoUtils { - public static ServerInfo getServerInfo(BallServerInfo serverInfo) { - return ProxyServer.getInstance().constructServerInfo( - serverInfo.getId(), - new InetSocketAddress(serverInfo.getHost(), serverInfo.getPort()), - serverInfo.getName(), - false - ); - } -} diff --git a/hamster-auto-server-info/src/main/resources/bungee.yml b/hamster-auto-server-info/src/main/resources/bungee.yml deleted file mode 100644 index 3401539..0000000 --- a/hamster-auto-server-info/src/main/resources/bungee.yml +++ /dev/null @@ -1,6 +0,0 @@ -name: HamsterAuto-ServerInfo -main: cn.hamster3.mc.plugin.auto.server.info.ServerInfoPlugin -version: ${version} - -author: MiniDay -description: 自动将接入仓鼠球的子服注册到连接配置中 diff --git a/settings.gradle b/settings.gradle index 27eaf3a..3c94431 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,7 +3,6 @@ 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-chain-break' include 'hamster-join-message' include 'hamster-lobby'