From b496a3244e9d7524eedace5622a16cedca0d9574 Mon Sep 17 00:00:00 2001
From: extendedclip <fairviewent@yahoo.com>
Date: Tue, 6 Mar 2018 11:38:25 -0500
Subject: [PATCH] Allow arguments in javascript placeholders.

---
 .../javascript/JavascriptExpansion.java       | 11 ++++++--
 .../javascript/JavascriptPlaceholder.java     | 26 +++++++++++++++++--
 .../JavascriptPlaceholdersConfig.java         |  2 +-
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptExpansion.java b/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptExpansion.java
index 67c1db0..c7eb4df 100644
--- a/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptExpansion.java
+++ b/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptExpansion.java
@@ -89,8 +89,15 @@ public class JavascriptExpansion extends PlaceholderExpansion implements Cacheab
 
 		for (JavascriptPlaceholder script : scripts) {
 			
-			if (script.getIdentifier().equalsIgnoreCase(identifier)) {
+			if (identifier.startsWith(script.getIdentifier() + "_")) {
+				identifier = identifier.replace(script.getIdentifier() + "_", "");
+				if (identifier.indexOf(",") == -1) {
+					return script.evaluate(engine, p, identifier);
+				} else {
+					return script.evaluate(engine, p, identifier.split(","));
+				}
 				
+			} else if (identifier.equalsIgnoreCase(script.getIdentifier())) {
 				return script.evaluate(engine, p);
 			}
 		}
@@ -121,7 +128,7 @@ public class JavascriptExpansion extends PlaceholderExpansion implements Cacheab
 
 	@Override
 	public String getVersion() {
-		return "1.2.0";
+		return "1.3.0";
 	}
 	
 	public boolean addJavascriptPlaceholder(JavascriptPlaceholder p) {
diff --git a/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptPlaceholder.java b/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptPlaceholder.java
index 5757867..439bb9b 100644
--- a/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptPlaceholder.java
+++ b/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptPlaceholder.java
@@ -38,6 +38,7 @@ public class JavascriptPlaceholder {
 	
 	private String falseResult;
 	
+	
 	private JavascriptReturnType type;
 	
 	public JavascriptPlaceholder(String identifier, JavascriptReturnType type, String expression, String trueResult, String falseResult) {
@@ -93,12 +94,33 @@ public class JavascriptPlaceholder {
 		return type;
 	}
 	
-	public String evaluate(ScriptEngine engine, Player p) {
-		
+	public String evaluate(ScriptEngine engine, Player p, String... args) {
 		String exp = PlaceholderAPI.setPlaceholders(p, expression);
 
         try {
         	
+        	String[] c = null;
+        	
+        	if (args != null && args.length > 0) {
+        		
+        		for (int i = 0 ; i < args.length ; i++) {
+        			if (args[i] == null || args[i].isEmpty()) {
+        				continue;
+        			}
+        			String s = PlaceholderAPI.setBracketPlaceholders(p, args[i]);
+        			if (c == null) {
+        				c = new String[args.length];
+        			}
+        			c[i] = s;
+        		}
+        	}
+        	
+        	if (c == null) {
+        		c = new String[]{};
+        	}
+
+        	engine.put("args", c);
+        	
         	engine.put("BukkitPlayer", p);
         	
             Object result = engine.eval(exp);
diff --git a/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptPlaceholdersConfig.java b/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptPlaceholdersConfig.java
index 6ceacf2..b947102 100644
--- a/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptPlaceholdersConfig.java
+++ b/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptPlaceholdersConfig.java
@@ -292,7 +292,7 @@ public class JavascriptPlaceholdersConfig {
 				
 				String line = scanner.nextLine();
 				
-				if (line == null || line.isEmpty()) {
+				if (line == null || line.isEmpty() || line.startsWith("//")) {
 					continue;
 				}