arg/scriptcraft
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes #114

Browse source
This commit is contained in:
walterhiggins 2014-01-31 00:36:28 +00:00
parent ca46607a47
commit 13ee0d0e9c
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/net/walterhiggins/scriptcraft/ScriptCraftPlugin.java
View file

@ -14,6 +14,7 @@ public class ScriptCraftPlugin extends JavaPlugin implements Listener
// right now all ops share the same JS context/scope // right now all ops share the same JS context/scope
// need to look at possibly having context/scope per operator // need to look at possibly having context/scope per operator
//protected Map<CommandSender,ScriptCraftEvaluator> playerContexts = new HashMap<CommandSender,ScriptCraftEvaluator>(); //protected Map<CommandSender,ScriptCraftEvaluator> playerContexts = new HashMap<CommandSender,ScriptCraftEvaluator>();
private String NO_JAVASCRIPT_MESSAGE = "No JavaScript Engine available. ScriptCraft will not work without Javascript.";
protected ScriptEngine engine = null; protected ScriptEngine engine = null;
@Override @Override
public void onEnable() public void onEnable()
@ -21,10 +22,13 @@ public class ScriptCraftPlugin extends JavaPlugin implements Listener
try{ try{
ScriptEngineManager factory = new ScriptEngineManager(); ScriptEngineManager factory = new ScriptEngineManager();
this.engine = factory.getEngineByName("JavaScript"); this.engine = factory.getEngineByName("JavaScript");
Invocable inv = (Invocable)this.engine; if (this.engine == null){
this.engine.eval(new InputStreamReader(this.getResource("boot.js"))); this.getLogger().severe(NO_JAVASCRIPT_MESSAGE);
inv.invokeFunction("__scboot", this, engine); } else {
Invocable inv = (Invocable)this.engine;
this.engine.eval(new InputStreamReader(this.getResource("boot.js")));
inv.invokeFunction("__scboot", this, engine);
}
}catch(Exception e){ }catch(Exception e){
e.printStackTrace(); e.printStackTrace();
this.getLogger().severe(e.getMessage()); this.getLogger().severe(e.getMessage());
@ -35,6 +39,10 @@ public class ScriptCraftPlugin extends JavaPlugin implements Listener
String[] args) String[] args)
{ {
List<String> result = new ArrayList<String>(); List<String> result = new ArrayList<String>();
if (this.engine == null){
this.getLogger().severe(NO_JAVASCRIPT_MESSAGE);
return null;
}
try { try {
Invocable inv = (Invocable)this.engine; Invocable inv = (Invocable)this.engine;
inv.invokeFunction("__onTabComplete", result, sender, cmd, alias, args); inv.invokeFunction("__onTabComplete", result, sender, cmd, alias, args);
@ -50,6 +58,10 @@ public class ScriptCraftPlugin extends JavaPlugin implements Listener
boolean result = false; boolean result = false;
String javascriptCode = ""; String javascriptCode = "";
Object jsResult = null; Object jsResult = null;
if (this.engine == null){
this.getLogger().severe(NO_JAVASCRIPT_MESSAGE);
return false;
}
try { try {
jsResult = ((Invocable)this.engine).invokeFunction("__onCommand", sender, cmd, label, args); jsResult = ((Invocable)this.engine).invokeFunction("__onCommand", sender, cmd, label, args);
}catch (Exception se){ }catch (Exception se){