Connect Changes.

src/main/java/ch/njol/skript/effects/EffConnect.java

@@ -1,26 +1,7 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
-import org.eclipse.jdt.annotation.Nullable;
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.doc.Description;
@@ -29,65 +10,109 @@
 import ch.njol.skript.doc.Since;
 import ch.njol.skript.lang.Effect;
 import ch.njol.skript.lang.Expression;
-import ch.njol.skript.lang.SkriptParser;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.util.Utils;
 import ch.njol.util.Kleenean;
+import org.jetbrains.annotations.Nullable;
 
 @Name("Connect")
-@Description("Connects a player to another bungeecord server")
-@Examples("connect all players to \"hub\"")
-@Since("2.3")
+@Description({
+	"Connect a player to a server running on your proxy, or any server supporting transfers. Read below for more information.",
+	"If the server is running Minecraft 1.20.5 or above, you may specify an IP and Port to transfer a player over to that server.",
+	"When transferring players using an IP, the transfer will not complete if the `accepts-transfers` option isn't enabled in `server.properties` for the server specified.",
+	"If the port is not provided, it will default to `25565`."
+})
+@Examples({
+	"connect all players to proxy server \"hub\"",
+	"transfer player to server \"my.server.com\"",
+	"transfer player to server \"localhost\" on port 25566"
+})
+@Since("2.3, INSERT VERSION (transfer)")
 public class EffConnect extends Effect {
 
 	public static final String BUNGEE_CHANNEL = "BungeeCord";
 	public static final String GET_SERVERS_CHANNEL = "GetServers";
 	public static final String CONNECT_CHANNEL = "Connect";
+	private static final boolean TRANSFER_METHOD_EXISTS = Skript.methodExists(Player.class, "transfer", String.class, int.class);
 
 	static {
 		Skript.registerEffect(EffConnect.class,
-				"connect %players% to [server] %string%",
-				"send %players% to server %string%"
+				"(send|connect) %players% to [proxy|bungeecord] [server] %string%",
+				"transfer %players% to server %string% [on port %-number%]"
 		);
 	}
 
-	@SuppressWarnings("null")
 	private Expression<Player> players;
-
-	@SuppressWarnings("null")
 	private Expression<String> server;
+	private Expression<Number> port;
+	private boolean transfer;
 
 	@Override
-	protected void execute(Event e) {
-		String server = this.server.getSingle(e);
-		Player[] players = this.players.stream(e)
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		players = (Expression<Player>) exprs[0];
+		server = (Expression<String>) exprs[1];
+		transfer = matchedPattern == 1;
+
+		if (transfer) {
+			port = (Expression<Number>) exprs[2];
+			if (!TRANSFER_METHOD_EXISTS) {
+				Skript.error("Transferring players via IP is not available on this version.");
+				return false;
+			}
+		}
+		return true;
+	}
+
+	@Override
+	protected void execute(Event event) {
+		String server = this.server.getSingle(event);
+		Player[] players = this.players.stream(event)
 			.filter(Player::isOnline)
 			.toArray(Player[]::new);
+
 		if (server == null || players.length == 0)
 			return;
 
-		// the message channel is case sensitive so let's fix that
-		Utils.sendPluginMessage(players[0], BUNGEE_CHANNEL, r -> GET_SERVERS_CHANNEL.equals(r.readUTF()), GET_SERVERS_CHANNEL)
-			.thenAccept(response -> {
-				// for loop isn't as pretty a stream, but will be faster with tons of servers
-				for (String validServer : response.readUTF().split(", ")) {
-					if (validServer.equalsIgnoreCase(server)) {
-						for (Player player : players)
-							Utils.sendPluginMessage(player, BUNGEE_CHANNEL, CONNECT_CHANNEL, validServer);
-						break;
-					}
+		if (transfer) {
+			if (this.port != null) {
+				Number portNum = this.port.getSingle(event);
+				if (portNum == null) {
+					return;
+				}
+				int port = portNum.intValue();
+				for (Player player : players) {
+					player.transfer(server, port);
+				}
+			} else {
+				int defaultPort = 25565;
+				for (Player player : players) {
+					player.transfer(server, defaultPort);
 				}
-			});
+			}
+		} else {
+			// the message channel is case-sensitive, so let's fix that
+			Utils.sendPluginMessage(players[0], BUNGEE_CHANNEL, r -> GET_SERVERS_CHANNEL.equals(r.readUTF()), GET_SERVERS_CHANNEL)
+				.thenAccept(response -> {
+					// for loop isn't as pretty as a stream, but will be faster with tons of servers
+					for (String validServer : response.readUTF().split(", ")) {
+						if (validServer.equalsIgnoreCase(server)) {
+							for (Player player : players)
+								Utils.sendPluginMessage(player, BUNGEE_CHANNEL, CONNECT_CHANNEL, validServer);
+							break;
+						}
+					}
+				});
+		}
 	}
 
 	@Override
-	public String toString(@Nullable Event e, boolean debug) {
-		return "connect " + players.toString(e, debug) + " to " + server.toString(e, debug);
+	public String toString(@Nullable Event event, boolean debug) {
+		if (transfer) {
+			String portString = port != null ? " on port " + port.toString(event, debug) : "";
+			return "transfer " + players.toString(event, debug) + " to server " + server.toString(event, debug) + portString;
+		} else {
+			return "connect " + players.toString(event, debug) + " to proxy server " + server.toString(event, debug);
+		}
 	}
 
-	@Override
-	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
-		players = (Expression<Player>) exprs[0];
-		server = (Expression<String>) exprs[1];
-		return true;
-	}
 }