diff --git a/build.xml b/build.xml
index d6159bd..9681843 100644
--- a/build.xml
+++ b/build.xml
@@ -5,6 +5,7 @@
+
@@ -32,9 +33,11 @@
-
-
-
-
+
+
+
+
+
+
diff --git a/bukkit-plugin/src/net/walterhiggins/scriptcraft/ScriptCraftPlugin.java b/bukkit-plugin/src/net/walterhiggins/scriptcraft/ScriptCraftPlugin.java
index 3d8e96e..03182f6 100644
--- a/bukkit-plugin/src/net/walterhiggins/scriptcraft/ScriptCraftPlugin.java
+++ b/bukkit-plugin/src/net/walterhiggins/scriptcraft/ScriptCraftPlugin.java
@@ -36,8 +36,8 @@ public class ScriptCraftPlugin extends JavaPlugin
File jsPlugins = new File(JS_PLUGINS_DIR);
if (!jsPlugins.exists())
{
- getLogger().info("Directory " + JS_PLUGINS_DIR + " does not exist.");
- getLogger().info("Initializing " + JS_PLUGINS_DIR + " directory with contents from plugin archive.");
+ getLogger().finest("Directory " + JS_PLUGINS_DIR + " does not exist.");
+ getLogger().finest("Initializing " + JS_PLUGINS_DIR + " directory with contents from plugin archive.");
jsPlugins.mkdir();
@@ -47,7 +47,7 @@ public class ScriptCraftPlugin extends JavaPlugin
while ( ( entry = zis.getNextEntry() ) != null)
{
String filename = entry.getName();
- getLogger().info("Unzipping " + filename);
+ getLogger().finest("Unzipping " + filename);
File newFile = new File(jsPlugins.getName() + File.separator + filename);
//create all non exists folders
diff --git a/js-plugins/core/_scriptcraft.js b/js-plugins/core/_scriptcraft.js
index 9b65515..4ea2cb6 100644
--- a/js-plugins/core/_scriptcraft.js
+++ b/js-plugins/core/_scriptcraft.js
@@ -1,4 +1,5 @@
var global = this;
+var verbose = verbose || false;
var ScriptCraft = ScriptCraft || {};
ScriptCraft.core = ScriptCraft.core || {};
//
@@ -18,31 +19,38 @@ ScriptCraft.core = ScriptCraft.core || {};
};
var _load = function(filename){
var file = new java.io.File(filename);
- print("loading " + _canonize(file));
+
+ var canonizedFilename = _canonize(file);
+
+ if (verbose)
+ print("loading " + canonizedFilename);
+
if (file.exists()){
var parent = file.getParentFile();
var reader = new java.io.FileReader(file);
- __engine.put("__script",_canonize(file));
+ __engine.put("__script",canonizedFilename);
__engine.put("__folder",(parent?_canonize(parent):"")+"/");
__engine.eval(reader);
}else{
- print("Error: " + filename + " not found");
+ print("Error: " + canonizedFilename + " not found");
}
};
var _listJsFiles = function(store,dir)
{
if (typeof dir == "undefined"){
- dir = new File(_originalScript).getParentFile().getParentFile();
+ dir = new java.io.File(_originalScript).getParentFile().getParentFile();
}
var files = dir.listFiles();
for (var i = 0;i < files.length; i++){
- if (files[i].isDirectory()){
- _listJsFiles(store,files[i]);
+ var file = files[i];
+ if (file.isDirectory()){
+ _listJsFiles(store,file);
}else{
- if (files[i].getCanonicalPath().endsWith(".js") &&
- !(files[i].getName().startsWith("_")))
+ if (file.getCanonicalPath().endsWith(".js") &&
+ !(file.getName().startsWith("_")) &&
+ file.exists())
{
- store.push(files[i]);
+ store.push(file);
}
}
}