Completed for first test

Author: ZP4RKER

src/main/java/com/perceivedev/clicktpa/ClickableTPA.java

@@ -2,6 +2,7 @@
 
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
@@ -27,25 +28,60 @@ public void onCommandRun(PlayerCommandPreprocessEvent event) {
 					// Has player as argument
 					if (Bukkit.getPlayer(command.split(" ")[1]) != null) {
 						// Valid player (and online)
-						String acceptText = getConfig().getString("message.accept");
-						String denyText = getConfig().getString("message.deny");
-						boolean useDisplayName = getConfig().getBoolean("message.use-display-name");
-						String[] firstLine = getConfig().getString("message.line-1").split(" ");
-						JSONMessage message;
-						for (int i = 0; i < firstLine.length; i++) {
-							if (i == 0) {
-								message = JSONMessage.create();
-								if (firstLine[i].contains("&")) {
-									int index = firstLine[i].indexOf("&");
-									ChatColor colour = ChatColor.getByChar(firstLine[i].substring(index, index + 1));
-									// Add text to JSONMessage instance
-								}
-							}
-						}
+						sendMessages(Bukkit.getPlayer(command.split(" ")[1]));
 					}
 				}
 			}
 		}
 	}
+	
+	private JSONMessage getFirstLine(Player player) {
+		boolean useDisplayName = getConfig().getBoolean("message.use-display-name");
+		JSONMessage message = JSONMessage.create();
+		if (getConfig().getString("message.line-1") != "") {
+			String[] words = getConfig().getString("message.line-1").split(" ");
+			for (int i = 0; i < words.length; i++) {
+				String word = trans(words[i].replace("%player%", useDisplayName ? player.getDisplayName() : player.getName()));
+				if (word.equalsIgnoreCase("%accept%")) {
+					message.then(word).runCommand("tpaccept");
+				} else if (word.equalsIgnoreCase("%deny%")) {
+					message.then(word).runCommand("tpdeny");
+				} else {
+					message.then(word);
+				}
+				message.then(" ");
+			}
+		}
+		return message;
+	}
+	
+	private JSONMessage getSecondLine(Player player) {
+		boolean useDisplayName = getConfig().getBoolean("message.use-display-name");
+		JSONMessage message = JSONMessage.create();
+		if (getConfig().getString("message.line-2") != "") {
+			String[] words = getConfig().getString("message.line-2").split(" ");
+			for (int i = 0; i < words.length; i++) {
+				String word = trans(words[i].replace("%player%", useDisplayName ? player.getDisplayName() : player.getName()));
+				if (word.equalsIgnoreCase("%accept%")) {
+					message.then(word).runCommand("tpaccept");
+				} else if (word.equalsIgnoreCase("%deny%")) {
+					message.then(word).runCommand("tpdeny");
+				} else {
+					message.then(word);
+				}
+				message.then(" ");
+			}
+		}
+		return message;
+	}
+	
+	private void sendMessages(Player player) {
+		getFirstLine(player).send(player);
+		getSecondLine(player).send(player);
+	}
+	
+	private String trans(String string) {
+		return ChatColor.translateAlternateColorCodes('&', string);
+	}
 
 }

src/main/resources/config.yml

@@ -4,7 +4,7 @@ tpa-command-permission: "essentials.tpa" # The permission for running the tpa co
 #    %accept% = The clickable text to accept the request
 #    %deny% = The clickable text to deny the request
 message:
-  line-1: "&2%sender% &6has requested to teleport to you!" # Line one of the message to send to the player
+  line-1: "&2%player% &6has requested to teleport to you!" # Line one of the message to send to the player
   line-2: "&6Click %accept% or %deny%" # Line two of the message to send to the player (Leave empty for no second line, i.e "")
   accept: "&2Accept" # The text of the %accept% placeholder
   deny: "&cDeny" # The text of the %deny% placeholder