diff --git a/pom.xml b/pom.xml
index 55cf1fa..1e08c2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
4.0.0
com.extendedclip.papi.expansion.javascript
javascript-expansion
- 0.0.1-SNAPSHOT
+ 1.3.1
PAPI-Expansion-Javascript
PlaceholderAPI expansion for javascript placeholders
@@ -40,6 +40,12 @@
2.3.2
${name}
+
+
+ true
+ true
+
+
@@ -55,5 +61,6 @@
+
\ 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 scripts = new HashSet();
+ 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 + " ");
}