Skip to content

Commit 9a30574

Browse files
Remove nashorn-type.js wrapper
1 parent 09ee166 commit 9a30574

3 files changed

Lines changed: 3 additions & 14 deletions

File tree

src/main/js/lib/events-canary.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*global nashorn, exports, require, Packages, __plugin*/
1+
/*global exports, require, Packages, __plugin*/
22
var cmPriority = Packages.net.canarymod.plugin.Priority,
33
cmCanary = Packages.net.canarymod.Canary,
44
cmPluginListener = Packages.net.canarymod.plugin.PluginListener;
@@ -58,10 +58,7 @@ exports.on = function(
5858
The workaround is to make the ScriptCraftPlugin java class a Listener.
5959
Should only unregister() registered plugins in ScriptCraft js code.
6060
*/
61-
if (nashorn) {
62-
// nashorn
63-
eventType = require('nashorn-type')(eventType);
64-
}
61+
eventType = eventType.class;
6562
regd = new cmPluginListener({});
6663
cmHookExecutor.registerHook(
6764
regd,

src/main/js/lib/nashorn-type.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/main/js/modules/canary/items.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ if (nashorn) {
3838
/*
3939
nashorn
4040
*/
41-
var itemTypeClass = require('nashorn-type')(ItemType);
41+
var itemTypeClass = ItemType.class;
4242
var materials = itemTypeClass.getDeclaredFields();
4343
var name;
4444
for (var i = 0; i < materials.length; i++) {

0 commit comments

Comments
 (0)