mirror/Javascript-Expansion
1
0
Fork 1
mirror of https://github.com/PlaceholderAPI/Javascript-Expansion.git synced 2025-05-23 10:39:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #15 from PlaceholderAPI/development

Browse Source 
[1.5.4] Code cleanup and improved data_example.js
This commit is contained in:
Gabriel Dumitru 2020-04-29 22:55:00 +03:00 committed by GitHub
commit 18398c8c5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 145 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
scripts/data_example.js
View File

@ -2,46 +2,54 @@ function set(path, data) {
Data.set(path, data);
return "";
}
function add(path, amount) {
if (isNaN(amount)) {
return "";
}
var amt = Data.exists(path) ? Data.get(path) : 0;
if (isNaN(amt)) {
amt = 0;
var current = Data.exists(path) ? Data.get(path) : 0;
if (isNaN(current)) {
current = 0;
}
amt = parseInt(amt) + parseInt(amount);
Data.set(path, amt.toFixed());
current = parseInt(current) + parseInt(amount);
Data.set(path, current.toFixed());
return "";
}
function subtract(path, amount) {
if (isNaN(amount)) {
return "";
}
var amt = Data.exists(path) ? parseInt(Data.get(path)) : 0;
if (isNaN(amt)) {
amt = 0;
}
amt = parseInt(amt) - parseInt(amount);
Data.set(path, amt.toFixed());
return "";
}
function get(path) {
return Data.exists(path) ? Data.get(path) : "";
}
function getInt(path) {
if (Data.exists(path)) {
var amt = Data.get(path);
if (isNaN(amt)) {
return 0;
} else {
return parseInt(amt).toFixed();
}
if (Data.get(path) != null) {
var value = Data.get(path);
return isNaN(value) ? 0 : parseInt(value).toFixed();
}
return 0;
}
function getUsage(firstArg) {
switch(firstArg) {
function getUsage(action) {
switch(action) {
case "get":
return "get,<path>";
case "getint":
@ -53,36 +61,50 @@ function getUsage(firstArg) {
case "set":
return "set,<path>,<value>";
default:
return "first argument must be get, getint, set, add, subtract";
return "First argument must be get, getint, set, add, subtract";
}
}
function runPlaceholder() {
if (args.length == 0) {
return getUsage("no args");
}
else if (args.length == 1) {
return getUsage(args[0]);
}
if (args.length == 2) {
if (args[0].equals("get")) {
return get(args[1]);
function runPlaceholder() {
if (args.length === 0) {
return getUsage("No arguments");
}
else if (args[0].equals("getint")) {
return getInt(args[1]);
var action = args[0].toLowerCase();
if (args.length === 1) {
return getUsage(action);
}
var path = args[1];
if (args.length === 2) {
if (action.equals("get")) {
return get(path);
}
if (action.equals("getint")) {
return getInt(path);
}
}
else if (args.length == 3) {
if (args[0].equals("set")) {
return set(args[1], args[2]);
var value = args[2];
if (args.length === 3) {
if (action.equals("set")) {
return set(path, value);
}
else if (args[0].equals("add")) {
return add(args[1], args[2]);
if (action.equals("add")) {
return add(path, value);
}
else if (args[0].equals("subtract")) {
return subtract(args[1], args[2]);
if (action.equals("subtract")) {
return subtract(path, value);
}
}
return getUsage(args[0]);
return getUsage(action);
}
runPlaceholder();

89
src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptExpansion.java
View File

@ -33,6 +33,8 @@ import javax.script.ScriptEngineFactory;
import javax.script.ScriptEngineManager;
import java.lang.reflect.Field;
import java.util.*;
import java.util.logging.Level;
import java.util.stream.Collectors;
public class JavascriptExpansion extends PlaceholderExpansion implements Cacheable, Configurable {
@ -50,11 +52,11 @@ public class JavascriptExpansion extends PlaceholderExpansion implements Cacheab
public JavascriptExpansion() {
instance = this;
try {
final Field f = Bukkit.getServer().getClass().getDeclaredField("commandMap");
f.setAccessible(true);
commandMap = (CommandMap) f.get(Bukkit.getServer());
} catch (Exception e) {
e.printStackTrace();
final Field field = Bukkit.getServer().getClass().getDeclaredField("commandMap");
field.setAccessible(true);
commandMap = (CommandMap) field.get(Bukkit.getServer());
} catch (NoSuchFieldException | IllegalAccessException e) {
getPlaceholderAPI().getLogger().log(Level.SEVERE, "[JavaScript Expansion] An error occurred while accessing CommandMap.", e);
}
}
@ -68,11 +70,6 @@ public class JavascriptExpansion extends PlaceholderExpansion implements Cacheab
return "javascript";
}
@Override
public String getPlugin() {
return null;
}
@Override
public String getVersion() {
return VERSION;
@ -84,7 +81,7 @@ public class JavascriptExpansion extends PlaceholderExpansion implements Cacheab
try {
globalEngine = new ScriptEngineManager().getEngineByName(getString("engine", "nashorn"));
} catch (NullPointerException ex) {
getPlaceholderAPI().getLogger().warning("Javascript engine type was invalid! Defaulting to 'nashorn'");
getPlaceholderAPI().getLogger().warning("[JavaScript Expansion] Javascript engine type was invalid! Defaulting to 'nashorn'");
globalEngine = new ScriptEngineManager().getEngineByName("nashorn");
}
}
@ -94,10 +91,10 @@ public class JavascriptExpansion extends PlaceholderExpansion implements Cacheab
config.loadPlaceholders();
if (debug) {
System.out.println("Java version: " + System.getProperty("java.version"));
getPlaceholderAPI().getLogger().info("[JavaScript Expansion] Java version: " + System.getProperty("java.version"));
final ScriptEngineManager manager = new ScriptEngineManager();
final List<ScriptEngineFactory> factories = manager.getEngineFactories();
System.out.println("Displaying all script engine factories.");
getPlaceholderAPI().getLogger().info("Displaying all script engine factories.");
for (ScriptEngineFactory factory : factories) {
System.out.println(factory.getEngineName());
@ -122,9 +119,10 @@ public class JavascriptExpansion extends PlaceholderExpansion implements Cacheab
@Override
public void clear() {
unregisterCommand();
scripts.forEach(s -> {
s.saveData();
s.cleanup();
scripts.forEach(script -> {
script.saveData();
script.cleanup();
});
if (githubManager != null) {
@ -138,43 +136,41 @@ public class JavascriptExpansion extends PlaceholderExpansion implements Cacheab
}
@Override
public String onRequest(OfflinePlayer p, String identifier) {
if (p == null) {
public String onRequest(OfflinePlayer player, String identifier) {
if (player == null || scripts.size() == 0) {
return "";
}
if (scripts.isEmpty()) {
return null;
}
for (JavascriptPlaceholder script : scripts) {
if (identifier.startsWith(script.getIdentifier() + "_")) {
identifier = identifier.replace(script.getIdentifier() + "_", "");
return !identifier.contains(",") ? script.evaluate(p, identifier)
: script.evaluate(p, identifier.split(","));
} else if (identifier.equalsIgnoreCase(script.getIdentifier())) {
return script.evaluate(p);
return !identifier.contains(",") ? script.evaluate(player, identifier) : script.evaluate(player, identifier.split(","));
}
if (identifier.equalsIgnoreCase(script.getIdentifier())) {
return script.evaluate(player);
}
}
return null;
}
public boolean addJSPlaceholder(JavascriptPlaceholder p) {
if (p == null) {
public boolean addJSPlaceholder(JavascriptPlaceholder placeholder) {
if (placeholder == null) {
return false;
}
if (scripts.isEmpty()) {
scripts.add(p);
scripts.add(placeholder);
return true;
}
if (scripts.stream().filter(s -> s.getIdentifier().equalsIgnoreCase(p.getIdentifier()))
.findFirst().orElse(null) != null) {
if (getJSPlaceholder(placeholder.getIdentifier()) != null) {
return false;
}
scripts.add(p);
scripts.add(placeholder);
return true;
}
@ -183,9 +179,9 @@ public class JavascriptExpansion extends PlaceholderExpansion implements Cacheab
}
public List<String> getLoadedIdentifiers() {
List<String> l = new ArrayList<>();
scripts.forEach(s -> l.add(s.getIdentifier()));
return l;
return scripts.stream()
.map(JavascriptPlaceholder::getIdentifier)
.collect(Collectors.toList());
}
public JavascriptPlaceholder getJSPlaceholder(String identifier) {
@ -209,18 +205,20 @@ public class JavascriptExpansion extends PlaceholderExpansion implements Cacheab
@Override
public Map<String, Object> getDefaults() {
Map<String, Object> def = new HashMap<>();
def.put("engine", "javascript");
def.put("debug", false);
def.put("github_script_downloads", false);
return def;
final Map<String, Object> defaults = new HashMap<>();
defaults.put("engine", "javascript");
defaults.put("debug", false);
defaults.put("github_script_downloads", false);
return defaults;
}
protected int reloadScripts() {
scripts.forEach(s -> {
s.saveData();
s.cleanup();
scripts.forEach(script -> {
script.saveData();
script.cleanup();
});
scripts.clear();
config.reload();
return config.loadPlaceholders();
@ -240,10 +238,7 @@ public class JavascriptExpansion extends PlaceholderExpansion implements Cacheab
@SuppressWarnings("UnusedReturnValue")
private boolean unregisterCommand() {
if (commandMap == null || commands == null) {
return false;
}
return commands.unregister(commandMap);
return commandMap != null && commands != null && commands.unregister(commandMap);
}
@SuppressWarnings("UnusedReturnValue")

2
src/main/java/com/extendedclip/papi/expansion/javascript/ScriptData.java
View File

@ -44,7 +44,7 @@ public class ScriptData {
}
public boolean exists(String key) {
return map.containsKey(key) && map.get(key) != null;
return map.get(key) != null;
}
public Object get(String key) {