From a0be0e4528f9b5f963dd6fc42f148a41d8217731 Mon Sep 17 00:00:00 2001 From: "game.crash" <73080127+gamecrash534@users.noreply.github.com> Date: Sat, 8 Feb 2025 17:40:22 +0100 Subject: [PATCH 1/6] Update pom.xml Update Maven Dependencies to work on newer Bungee Versions --- pom.xml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index ac2ac39..111173b 100644 --- a/pom.xml +++ b/pom.xml @@ -8,15 +8,17 @@ 1.2 - dev-cmc - http://nexus.cmc.im/content/groups/public/ + bungeecord-repo + https://oss.sonatype.org/content/repositories/snapshots net.md-5 bungeecord-api - 1.7-SNAPSHOT + 1.21-R0.1-SNAPSHOT + jar + provided @@ -33,8 +35,8 @@ maven-compiler-plugin 3.0 - 1.7 - 1.7 + 1.8 + 1.8 From 40ab136d4f0402a4c6ff7459b3b99115fbe9b86c Mon Sep 17 00:00:00 2001 From: "game.crash" <73080127+gamecrash534@users.noreply.github.com> Date: Fri, 4 Apr 2025 18:58:22 +0200 Subject: [PATCH 2/6] Implement tab completion for ReloadCommand --- .../bungee/movemenow/ReloadCommand.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/craftminecraft/bungee/movemenow/ReloadCommand.java b/src/main/java/net/craftminecraft/bungee/movemenow/ReloadCommand.java index 69a4e80..b562c1e 100644 --- a/src/main/java/net/craftminecraft/bungee/movemenow/ReloadCommand.java +++ b/src/main/java/net/craftminecraft/bungee/movemenow/ReloadCommand.java @@ -1,11 +1,12 @@ package net.craftminecraft.bungee.movemenow; -import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.plugin.Command; +import net.md_5.bungee.api.plugin.TabExecutor; +import java.util.ArrayList; -public class ReloadCommand extends Command { +public class ReloadCommand extends Command implements TabExecutor { MoveMeNow plugin; public ReloadCommand(MoveMeNow plugin) { @@ -23,4 +24,12 @@ public void execute(CommandSender sender, String[] args) { plugin.loadConfig(); } } + + @Override + public Iterable onTabComplete(CommandSender sender, String[] args) + { + ArrayList list = new ArrayList<>(); + list.add("reload"); + return list; + } } \ No newline at end of file From ea2daff3d402e44d2499c292ddb1aa92d0937bb5 Mon Sep 17 00:00:00 2001 From: "game.crash" <73080127+gamecrash534@users.noreply.github.com> Date: Fri, 4 Apr 2025 18:58:48 +0200 Subject: [PATCH 3/6] Enhance ReloadCommand to provide user feedback on config reload --- .../net/craftminecraft/bungee/movemenow/ReloadCommand.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/net/craftminecraft/bungee/movemenow/ReloadCommand.java b/src/main/java/net/craftminecraft/bungee/movemenow/ReloadCommand.java index b562c1e..5814aa3 100644 --- a/src/main/java/net/craftminecraft/bungee/movemenow/ReloadCommand.java +++ b/src/main/java/net/craftminecraft/bungee/movemenow/ReloadCommand.java @@ -18,10 +18,13 @@ public ReloadCommand(MoveMeNow plugin) { public void execute(CommandSender sender, String[] args) { if (args.length != 1) { sender.sendMessage(new TextComponent("Please use /mmn reload.")); + return; } switch (args[0]) { case "reload": plugin.loadConfig(); + sender.sendMessage(new TextComponent("Reloaded config!")); + break; } } From b0ce294a09f325240aa0b280e346a761f461017a Mon Sep 17 00:00:00 2001 From: "game.crash" <73080127+gamecrash534@users.noreply.github.com> Date: Fri, 4 Apr 2025 18:59:22 +0200 Subject: [PATCH 4/6] Refactor ReloadCommand to simplify, as only one statement was used --- .../craftminecraft/bungee/movemenow/ReloadCommand.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/craftminecraft/bungee/movemenow/ReloadCommand.java b/src/main/java/net/craftminecraft/bungee/movemenow/ReloadCommand.java index 5814aa3..e6e2b95 100644 --- a/src/main/java/net/craftminecraft/bungee/movemenow/ReloadCommand.java +++ b/src/main/java/net/craftminecraft/bungee/movemenow/ReloadCommand.java @@ -20,11 +20,9 @@ public void execute(CommandSender sender, String[] args) { sender.sendMessage(new TextComponent("Please use /mmn reload.")); return; } - switch (args[0]) { - case "reload": - plugin.loadConfig(); - sender.sendMessage(new TextComponent("Reloaded config!")); - break; + if (args[0].equals("reload")) { + plugin.loadConfig(); + sender.sendMessage(new TextComponent("Reloaded config!")); } } From 2ebe07e68dbe00a5fb18736851162a93de26a45b Mon Sep 17 00:00:00 2001 From: "game.crash" <73080127+gamecrash534@users.noreply.github.com> Date: Fri, 4 Apr 2025 19:00:46 +0200 Subject: [PATCH 5/6] Add .gitignore and vcs.xml for project configuration and ignored files --- .idea/.gitignore | 9 +++++++++ .idea/vcs.xml | 4 ++++ 2 files changed, 13 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..cf1b22d --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,9 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +/misc.xml diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..d843f34 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file From 0a06dff7a02c72378483b8a1a5ce4d92a5babbed Mon Sep 17 00:00:00 2001 From: "game.crash" <73080127+gamecrash534@users.noreply.github.com> Date: Sat, 23 Aug 2025 00:07:55 +0200 Subject: [PATCH 6/6] Update README --- README.md | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1b754a9..bce7661 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,24 @@ -BungeeKickMove -============== \ No newline at end of file +MoveMeNow +---- + +This is a port of the known [MoveMeNow](https://www.spigotmc.org/resources/movemenow.17/)-Plugin from SpigotMC, to use on BungeeCord-Proxies. It will move a player, when he gets kicked, to a predefined other server on the proxy, based on a white/blacklist. +#### Configuration: +```yml +message: "%kickmsg%" +servername: "server2" +mode: whitelist +list: +- ban +- kick +``` +> [!NOTE] +> Mode can either be blacklist or whitelist. In blacklist mode, player will always be moved to default server unless his kick message contains one of the words/phrases in list. In whitelist mode, he will always be kicked unless his kick message contains one of the phrases in list. The servername is the name of the server (in the bungee config) to kick to. +> +> Message is the message sent to the player when he switches server. It can be spanned over multiple lines using the following syntax: +> ```yml +> message: | +> "This is the first line" +> "%kickmsg%" +> "This is the third line" +> ``` +> The `%kickmsg%` will be replaced by the reason the server kicked the user in the first place.