Skip to content

Commit 4369fd7

Browse files
Remove non-Nashorn code in Canary items module
Untested, but a very straightforward change.
1 parent 01f18a7 commit 4369fd7

1 file changed

Lines changed: 14 additions & 32 deletions

File tree

Lines changed: 14 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*global nashorn, require, Packages, module*/
1+
/*global require, Packages, module*/
22
var ItemType = Packages.net.canarymod.api.inventory.ItemType;
33
var Canary = Packages.net.canarymod.Canary;
44
var itemFactory = Canary.factory().itemFactory;
@@ -34,39 +34,21 @@ function getMaterialHandler(material) {
3434
}
3535
};
3636
}
37-
if (nashorn) {
38-
/*
39-
nashorn
40-
*/
41-
var itemTypeClass = ItemType.class;
42-
var materials = itemTypeClass.getDeclaredFields();
43-
var name;
44-
for (var i = 0; i < materials.length; i++) {
45-
if (materials[i].type != itemTypeClass) {
46-
continue;
47-
}
48-
var materialField = materials[i];
49-
name = '' + materialField.name;
50-
name = name.replace(/^(.)/, function(a) {
51-
return a.toLowerCase();
52-
});
5337

54-
items[name] = getMaterialHandler(materialField.get(ItemType));
55-
}
56-
} else {
57-
// non-nashorn
58-
for (var field in ItemType) {
59-
if (ItemType[field] === undefined) {
60-
continue;
61-
}
62-
if (!(ItemType[field] instanceof ItemType)) {
63-
continue;
64-
}
65-
name = ('' + field).replace(/^(.)/, function(a) {
66-
return a.toLowerCase();
67-
});
68-
items[name] = getMaterialHandler(ItemType[field]);
38+
var itemTypeClass = ItemType.class;
39+
var materials = itemTypeClass.getDeclaredFields();
40+
var name;
41+
for (var i = 0; i < materials.length; i++) {
42+
if (materials[i].type != itemTypeClass) {
43+
continue;
6944
}
45+
var materialField = materials[i];
46+
name = '' + materialField.name;
47+
name = name.replace(/^(.)/, function(a) {
48+
return a.toLowerCase();
49+
});
50+
51+
items[name] = getMaterialHandler(materialField.get(ItemType));
7052
}
7153

7254
module.exports = items;

0 commit comments

Comments
 (0)