diff --git a/pom.xml b/pom.xml index 2f00565..3d6403a 100644 --- a/pom.xml +++ b/pom.xml @@ -59,6 +59,10 @@ aliyun https://maven.aliyun.com/repository/ + + bungeecord-repo + https://oss.sonatype.org/content/repositories/snapshots + @@ -68,11 +72,6 @@ 1.20-R0.2-SNAPSHOT provided - - org.projectlombok - lombok - 1.18.28 - org.jetbrains annotations diff --git a/src/main/java/com/frontleaves/bungeecross/BungeeCross.java b/src/main/java/com/frontleaves/bungeecross/BungeeCross.java index 4373417..4f559ad 100644 --- a/src/main/java/com/frontleaves/bungeecross/BungeeCross.java +++ b/src/main/java/com/frontleaves/bungeecross/BungeeCross.java @@ -8,7 +8,6 @@ import com.frontleaves.bungeecross.configuration.ServerEnable; import com.frontleaves.bungeecross.configuration.VariableStorage; import com.frontleaves.bungeecross.events.PlayerJoinProxyEvent; import com.frontleaves.bungeecross.events.PlayerLeaveProxyEvent; -import lombok.Getter; import net.md_5.bungee.api.plugin.Plugin; /** @@ -16,9 +15,7 @@ import net.md_5.bungee.api.plugin.Plugin; * @version 见 final VERSION 变量 */ public final class BungeeCross extends Plugin { - @Getter private final static String VERSION = "v1.0-SNAPSHOT"; - @Getter private final static String AUTHOR = "筱锋xiao_lfeng"; @Override @@ -31,7 +28,7 @@ public final class BungeeCross extends Plugin { getProxy().getPluginManager().registerCommand(this, new ProxyServerListCommand("server-list")); getProxy().getPluginManager().registerCommand(this, new ReturnHubCommand("lobby", this)); getProxy().getPluginManager().registerCommand(this, new SendToServerCommand("serverTo", this)); - getProxy().getPluginManager().registerCommand(this, new SendToServerCommand("sto", this)); + getProxy().getPluginManager().registerCommand(this, new SendToServerCommand("bro", this)); // 注册监听器 getProxy().getPluginManager().registerListener(this, new PlayerJoinProxyEvent(this)); getProxy().getPluginManager().registerListener(this, new PlayerLeaveProxyEvent(this)); @@ -44,4 +41,12 @@ public final class BungeeCross extends Plugin { VariableStorage.setPrefix(null); VariableStorage.setProxyServer(null); } + + public static String getVersion() { + return VERSION; + } + + public static String getAuthor() { + return AUTHOR; + } } diff --git a/src/main/java/com/frontleaves/bungeecross/commands/PluginInfoCommand.java b/src/main/java/com/frontleaves/bungeecross/commands/PluginInfoCommand.java index ad5ffd5..6f3fb78 100644 --- a/src/main/java/com/frontleaves/bungeecross/commands/PluginInfoCommand.java +++ b/src/main/java/com/frontleaves/bungeecross/commands/PluginInfoCommand.java @@ -34,7 +34,7 @@ public class PluginInfoCommand extends Command { } } else if ("update".equals(strings[0])) { if (commandSender.hasPermission("bungeecross.admin")) { - commandSender.sendMessage(VariableStorage.getPrefix() + "您的版本为最新的 " + BungeeCross.getVERSION()); + commandSender.sendMessage(VariableStorage.getPrefix() + "您的版本为最新的 " + BungeeCross.getVersion()); } else { commandSender.sendMessage(VariableStorage.getPrefix() + "您不是管理员，无法进行操作"); } @@ -46,8 +46,8 @@ public class PluginInfoCommand extends Command { default: { commandSender.sendMessage("§9§l§m=]=======§2 Bungee§aCross §9§l§m========[="); commandSender.sendMessage(VariableStorage.getPrefix() + "跨服插件：§2Bungee§aCross"); - commandSender.sendMessage(VariableStorage.getPrefix() + "§6作者：§e" + BungeeCross.getAUTHOR()); - commandSender.sendMessage(VariableStorage.getPrefix() + "§9版本：§d" + BungeeCross.getVERSION()); + commandSender.sendMessage(VariableStorage.getPrefix() + "§6作者：§e" + BungeeCross.getAuthor()); + commandSender.sendMessage(VariableStorage.getPrefix() + "§9版本：§d" + BungeeCross.getVersion()); commandSender.sendMessage(VariableStorage.getPrefix() + "§b您的版本为最新的"); commandSender.sendMessage("§9§l§m=]=======§2 Bungee§aCross §9§l§m========[="); } diff --git a/src/main/java/com/frontleaves/bungeecross/commands/ProxyServerListCommand.java b/src/main/java/com/frontleaves/bungeecross/commands/ProxyServerListCommand.java index e5876b5..772fdab 100644 --- a/src/main/java/com/frontleaves/bungeecross/commands/ProxyServerListCommand.java +++ b/src/main/java/com/frontleaves/bungeecross/commands/ProxyServerListCommand.java @@ -25,13 +25,13 @@ public class ProxyServerListCommand extends Command { serverList = null; VariableStorage.getProxyServer().forEach((key, serverInfo) -> { if (serverList == null) { - serverList = new StringBuilder("\t" + serverInfo.getName()); + serverList = new StringBuilder(" §6" + serverInfo.getName()); } else { - serverList.append(", ").append(serverInfo.getName()); + serverList.append("§r, §6").append(serverInfo.getName()); } }); // 返回列表信息 - commandSender.sendMessage(VariableStorage.getPrefix() + "当前服务器如下："); + commandSender.sendMessage(VariableStorage.getPrefix() + "§e当前服务器如下："); commandSender.sendMessage(serverList.toString()); } } diff --git a/src/main/java/com/frontleaves/bungeecross/commands/SendToServerCommand.java b/src/main/java/com/frontleaves/bungeecross/commands/SendToServerCommand.java index e784bb3..0e0232c 100644 --- a/src/main/java/com/frontleaves/bungeecross/commands/SendToServerCommand.java +++ b/src/main/java/com/frontleaves/bungeecross/commands/SendToServerCommand.java @@ -17,8 +17,10 @@ import org.jetbrains.annotations.NotNull; */ public class SendToServerCommand extends Command { private final BungeeCross plugin; + private static String name; public SendToServerCommand(String name, BungeeCross bungeeCross) { super(name); + SendToServerCommand.name = name; plugin = bungeeCross; } @@ -111,7 +113,7 @@ public class SendToServerCommand extends Command { } break; default: { - commandSender.sendMessage(VariableStorage.getPrefix() + "使用方法 /sto [player]"); + commandSender.sendMessage(VariableStorage.getPrefix() + "使用方法 /" + name + " [player]"); } } } diff --git a/src/main/java/com/frontleaves/bungeecross/configuration/ServerEnable.java b/src/main/java/com/frontleaves/bungeecross/configuration/ServerEnable.java index 598bb0d..3976777 100644 --- a/src/main/java/com/frontleaves/bungeecross/configuration/ServerEnable.java +++ b/src/main/java/com/frontleaves/bungeecross/configuration/ServerEnable.java @@ -1,7 +1,6 @@ package com.frontleaves.bungeecross.configuration; import com.frontleaves.bungeecross.BungeeCross; -import lombok.RequiredArgsConstructor; import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.config.Configuration; import net.md_5.bungee.config.ConfigurationProvider; @@ -13,15 +12,19 @@ import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; + /** - * 服务器启动执行操作 + * 服务器启动操作内容 * * @author 筱锋xiao_lfeng */ -@RequiredArgsConstructor public class ServerEnable { private final BungeeCross plugin; + public ServerEnable(BungeeCross plugin) { + this.plugin = plugin; + } + /** * 服务器启动内容 */ @@ -32,8 +35,8 @@ public class ServerEnable { System.out.println(VariableStorage.getPrefix() + "§c配置文件加载完毕"); System.out.println("§9§l§m=]=======§2 Bungee§aCross §9§l§m========[="); - System.out.println("§6作者：§e" + BungeeCross.getAUTHOR()); - System.out.println("§9版本：§d" + BungeeCross.getVERSION()); + System.out.println("§6作者：§e" + BungeeCross.getAuthor()); + System.out.println("§9版本：§d" + BungeeCross.getVersion()); System.out.println("§9§l§m=]=======§2 Bungee§aCross §9§l§m========[="); } @@ -43,8 +46,8 @@ public class ServerEnable { System.out.println(VariableStorage.getPrefix() + "§c配置文件重载完毕"); System.out.println("§9§l§m=]=======§2 Bungee§aCross §9§l§m========[="); - System.out.println("§6作者：§e" + BungeeCross.getAUTHOR()); - System.out.println("§9版本：§d" + BungeeCross.getVERSION()); + System.out.println("§6作者：§e" + BungeeCross.getAuthor()); + System.out.println("§9版本：§d" + BungeeCross.getVersion()); System.out.println("§9§l§m=]=======§2 Bungee§aCross §9§l§m========[="); } @@ -198,7 +201,7 @@ public class ServerEnable { throw new RuntimeException(e); } } - + private void saveDefaultLangYmlFile(@NotNull File langFile) { // 将默认配置文件从资源中复制到插件目录 try (InputStream inputStream = plugin.getResourceAsStream("lang.yml")) { diff --git a/src/main/java/com/frontleaves/bungeecross/configuration/VariableStorage.java b/src/main/java/com/frontleaves/bungeecross/configuration/VariableStorage.java index eddff1a..a69df03 100644 --- a/src/main/java/com/frontleaves/bungeecross/configuration/VariableStorage.java +++ b/src/main/java/com/frontleaves/bungeecross/configuration/VariableStorage.java @@ -1,7 +1,5 @@ package com.frontleaves.bungeecross.configuration; -import lombok.Getter; -import lombok.Setter; import net.md_5.bungee.api.config.ServerInfo; import java.util.List; @@ -13,35 +11,76 @@ import java.util.Map; * @author 筱锋xiao_lfeng */ public class VariableStorage { - @Getter - @Setter private static String prefix; - - @Getter - @Setter private static Map proxyServer; - - @Getter - @Setter private static List loginServer; - - @Getter - @Setter private static List lobbyServer; - - @Getter - @Setter private static boolean bungeeCordReminder; - - @Getter - @Setter private static String joinMessage; - - @Getter - @Setter private static String leaveMessage; - - @Getter - @Setter private static boolean bungeeSilent; + + public static String getPrefix() { + return prefix; + } + + public static void setPrefix(String prefix) { + VariableStorage.prefix = prefix; + } + + public static Map getProxyServer() { + return proxyServer; + } + + public static void setProxyServer(Map proxyServer) { + VariableStorage.proxyServer = proxyServer; + } + + public static List getLoginServer() { + return loginServer; + } + + public static void setLoginServer(List loginServer) { + VariableStorage.loginServer = loginServer; + } + + public static List getLobbyServer() { + return lobbyServer; + } + + public static void setLobbyServer(List lobbyServer) { + VariableStorage.lobbyServer = lobbyServer; + } + + public static boolean isBungeeCordReminder() { + return bungeeCordReminder; + } + + public static void setBungeeCordReminder(boolean bungeeCordReminder) { + VariableStorage.bungeeCordReminder = bungeeCordReminder; + } + + public static String getJoinMessage() { + return joinMessage; + } + + public static void setJoinMessage(String joinMessage) { + VariableStorage.joinMessage = joinMessage; + } + + public static String getLeaveMessage() { + return leaveMessage; + } + + public static void setLeaveMessage(String leaveMessage) { + VariableStorage.leaveMessage = leaveMessage; + } + + public static boolean isBungeeSilent() { + return bungeeSilent; + } + + public static void setBungeeSilent(boolean bungeeSilent) { + VariableStorage.bungeeSilent = bungeeSilent; + } }