diff --git a/build.xml b/build.xml
index 267caa7..9362446 100644
--- a/build.xml
+++ b/build.xml
@@ -2,12 +2,31 @@
Builds the scriptcraft.jar file - a plugin for bukkit
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -35,7 +54,7 @@
-
+
@@ -45,30 +64,19 @@
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
@@ -80,32 +88,22 @@
-
-
-
-
-
-
+
-
+
-
+
-
-
-
-
-
-
-
-
+
+
+
-
+
@@ -124,25 +122,17 @@ Walter Higgins
-
+
-
-
-
-
-
+
-
+
-
-
-
-
-
+
-
+
diff --git a/src/docs/java/jscript.java b/src/docs/java/jscript.java
index 777fe7d..b524681 100644
--- a/src/docs/java/jscript.java
+++ b/src/docs/java/jscript.java
@@ -1,5 +1,7 @@
import javax.script.*;
import java.io.FileReader;
+import net.canarymod.api.Server;
+import net.canarymod.api.inventory.ItemType;
public class jscript
{
@@ -10,6 +12,7 @@ public class jscript
java.io.File file = new java.io.File(args[0]);
engine.put("engine",engine);
engine.put("args",args);
+ engine.put("itemTypeClass",ItemType.class);
FileReader fr = new java.io.FileReader(file);
engine.eval(fr);
fr.close();
diff --git a/src/docs/js/generateApiDocs.js b/src/docs/js/generateApiDocs.js
index 7e77609..3a7155c 100644
--- a/src/docs/js/generateApiDocs.js
+++ b/src/docs/js/generateApiDocs.js
@@ -106,11 +106,10 @@ if (typeof importPackage == 'undefined'){
}
var dir = args[0];
-
-importPackage(java.io);
-
+var io = Packages.java.io;
+var File = io.File;
var store = [];
-find(new File(dir),store,/\/[a-zA-Z0-9_\-]+\.js$/);
+find(new io.File(dir),store,/\/[a-zA-Z0-9_\-]+\.js$/);
store.sort(sorter([
/lib\/scriptcraft\.js$/,
@@ -127,7 +126,7 @@ store.sort(sorter([
var contents = [];
foreach(store, function(filename){
- var br = new BufferedReader(new FileReader(filename));
+ var br = new io.BufferedReader(new io.FileReader(filename));
var line ;
while ( (line = br.readLine()) != null){
contents.push(line);
diff --git a/src/generateEventsHelper.js b/src/docs/js/generateEventsHelper.js
similarity index 98%
rename from src/generateEventsHelper.js
rename to src/docs/js/generateEventsHelper.js
index feb59fa..c95493d 100644
--- a/src/generateEventsHelper.js
+++ b/src/docs/js/generateEventsHelper.js
@@ -33,12 +33,12 @@ for (var i = 0; i< content.length; i++){
out.println(content[i]);
}
while ( ( entry = zis.nextEntry) != null) {
- var name = '' + entry.name;
+ var name = new String( entry.name );
var re1 = /org\/bukkit\/event\/.+Event\.class$/;
if (args[0] == 'canary'){
re1 = /net\/canarymod\/hook\/.+Hook\.class$/;
}
- if (name.match(re1)){
+ if ( re1.test(name) ) {
name = name.replace(/\//g,'.').replace('.class','');
try {
clz = java.lang.Class.forName(name);
diff --git a/src/docs/js/generateItemsDoc.js b/src/docs/js/generateItemsDoc.js
index c9f6bc9..07610c5 100644
--- a/src/docs/js/generateItemsDoc.js
+++ b/src/docs/js/generateItemsDoc.js
@@ -20,13 +20,12 @@ var content = [
];
//var ItemType = java.lang.Class.forName('net.canarymod.api.inventory.ItemType');
-var ItemType = Packages.net.canarymod.api.inventory.ItemType;
-var materials = ItemType.class.getDeclaredFields();
+var materials = itemTypeClass.getDeclaredFields();
var enumVals = [];
for (var i = 0;i < materials.length; i++ ){
- if (materials[i].type != ItemType.class) {
+ if (materials[i].type != itemTypeClass) {
continue;
}
var materialField = materials[i];
diff --git a/src/main/js/modules/canary/items.js b/src/main/js/modules/canary/items.js
index 3eebf51..54af546 100644
--- a/src/main/js/modules/canary/items.js
+++ b/src/main/js/modules/canary/items.js
@@ -17,7 +17,10 @@ for (var i = 0;i < materials.length; i++ ){
continue;
}
var materialField = materials[i];
- var name = (''+materialField.name).replace(/^(.)/,function(a){ return a.toLowerCase() });
+ var name = (''+materialField.name);
+ name = name.replace(/^(.)/,function(a){
+ return a.toLowerCase();
+ });
items[name] = (function(material){
return function(amount){