From 0be7ac50c6deba5622e6c55d2fa2f2ede8c2621d Mon Sep 17 00:00:00 2001
From: extendedclip <fairviewent@yahoo.com>
Date: Tue, 6 Mar 2018 19:03:17 -0500
Subject: [PATCH] Added pom versioning. Temp fix for single line comments in
 .js files

---
 pom.xml                                             |  9 ++++++++-
 .../expansion/javascript/JavascriptExpansion.java   |  5 ++++-
 .../expansion/javascript/JavascriptPlaceholder.java |  1 -
 .../javascript/JavascriptPlaceholdersConfig.java    | 13 ++++++++++++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 55cf1fa..1e08c2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.extendedclip.papi.expansion.javascript</groupId>
   <artifactId>javascript-expansion</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>1.3.1</version>
   <name>PAPI-Expansion-Javascript</name>
   <description>PlaceholderAPI expansion for javascript placeholders</description>
     
@@ -40,6 +40,12 @@
                 <version>2.3.2</version>
                 <configuration>
                     <finalName>${name}</finalName>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
                 </configuration>
             </plugin>
             <plugin>
@@ -55,5 +61,6 @@
             </plugin>
         </plugins>
     </build>
+
     
 </project>
\ No newline at end of file
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 c7eb4df..607335d 100644
--- a/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptExpansion.java
+++ b/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptExpansion.java
@@ -47,9 +47,12 @@ public class JavascriptExpansion extends PlaceholderExpansion implements Cacheab
 	
 	private final Set<JavascriptPlaceholder> scripts = new HashSet<JavascriptPlaceholder>();
 	
+	private final String VERSION = getClass().getPackage().getImplementationVersion();
+	
 	@Override
 	public boolean register() {
 		
+
 		engineType = getString("engine", "javascript");
 		
 		if (engine == null) {
@@ -128,7 +131,7 @@ public class JavascriptExpansion extends PlaceholderExpansion implements Cacheab
 
 	@Override
 	public String getVersion() {
-		return "1.3.0";
+		return VERSION;
 	}
 	
 	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 439bb9b..f34e65e 100644
--- a/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptPlaceholder.java
+++ b/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptPlaceholder.java
@@ -38,7 +38,6 @@ public class JavascriptPlaceholder {
 	
 	private String falseResult;
 	
-	
 	private JavascriptReturnType type;
 	
 	public JavascriptPlaceholder(String identifier, JavascriptReturnType type, String expression, String trueResult, String falseResult) {
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 b947102..ecdcb68 100644
--- a/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptPlaceholdersConfig.java
+++ b/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptPlaceholdersConfig.java
@@ -292,9 +292,20 @@ public class JavascriptPlaceholdersConfig {
 				
 				String line = scanner.nextLine();
 				
-				if (line == null || line.isEmpty() || line.startsWith("//")) {
+				if (line == null || line.isEmpty()) {
 					continue;
 				}
+				
+				line = line.trim();
+
+				/* temp fix for single line comments
+				 * doesnt solve every case though..
+				 * lines that start with code and may have a comment afterward still screw stuff up...
+				*/
+				if (line.startsWith("//")) {
+					continue;
+				}
+				
 
 				sb.append(line + " ");
 			}