linting modules

Author: walterhiggins

.eslintrc.js

@@ -0,0 +1,41 @@
+module.exports = {
+  "env": {
+    "browser": true,
+    "commonjs": true,
+    "nashorn": true
+  },
+  "globals": {
+    "__plugin": true,
+    "server": true,
+    "events": true,
+    "addUnloadHandler": true,
+    "__dirname": true,
+    "persist": true,
+    "isOp": true,
+    "echo": true
+  },
+  "extends": "eslint:recommended",
+  "rules": {
+    "indent": [
+      "error",
+      2
+    ],
+    "no-fallthrough": [
+      0
+    ],
+    "no-useless-escape": [
+      0
+    ],
+    "quotes": [
+      "error",
+      "single"
+        ],
+    "no-console": [
+      0
+    ],
+    "semi": [
+      "error",
+      "always"
+    ]
+  }
+};

src/main/js/modules/at.js

@@ -1,5 +1,4 @@
 'use strict';
-/*global events, module, require, __plugin, setInterval, clearInterval, setTimeout, addUnloadHandler*/
 var utils = require('utils');
 /************************************************************************
 ## The at Module
@@ -14,11 +13,11 @@ The utils.at() function will perform a given task at a given time in the
 
 #### Parameters
 
- * time24hr : The time in 24hr form - e.g. 9:30 in the morning is '09:30' while
+* time24hr : The time in 24hr form - e.g. 9:30 in the morning is '09:30' while
    9:30 pm is '21:30', midnight is '00:00' and midday is '12:00'
- * callback : A javascript function which will be invoked at the given time.
- * worlds : (optional) An array of worlds. Each world has its own clock. If no array of worlds is specified, all the server's worlds are used.
- * repeat : (optional) true or false, default is true (repeat the task every day)
+   * callback : A javascript function which will be invoked at the given time.
+   * worlds : (optional) An array of worlds. Each world has its own clock. If no array of worlds is specified, all the server's worlds are used.
+   * repeat : (optional) true or false, default is true (repeat the task every day)
 
 #### Example
 
@@ -67,7 +66,7 @@ function at(time24hr, callback, pWorlds, repeat) {
   utils.foreach( pWorlds, function ( world ) {
     atAddTask( timeMins, callback, world, repeat);
   });
-};
+}
 var atTasks = {};
 
 function tasksToString(){
@@ -77,16 +76,16 @@ function tasksToString(){
     for (var time in atTasks[world]){
       var scheduledFuncs = atTasks[world][time];
       for (var i = 0;i < scheduledFuncs.length; i++){
-	result += ' ' + time + ': ' + scheduledFuncs[i].constructor + '\n';
+        result += ' ' + time + ': ' + scheduledFuncs[i].constructor + '\n';
       }
     }
     result += '(current world time: ' + utils.time24(world) + ')\n';
   }
   return result;
 }
 /*
- constructs a function which will be called every x ticks to 
- track the schedule for a given world
+  constructs a function which will be called every x ticks to 
+  track the schedule for a given world
 */
 function atMonitorFactory(world){
   var worldName = ''+ world.name;
@@ -110,16 +109,16 @@ function atMonitorFactory(world){
 
       var tasks = worldSchedule[lastRun++];
       if (!tasks){
-	continue;
+        continue;
       }
       utils.foreach(tasks, function(task, i){
-	if (!task){
-	  return;
-	}
-	setTimeout(task.callback.bind(null, timeMins, world), 1);
-	if (!task.repeat){
-	  tasks[i] = null;
-	}
+        if (!task){
+          return;
+        }
+        setTimeout(task.callback.bind(null, timeMins, world), 1);
+        if (!task.repeat){
+          tasks[i] = null;
+        }
       });
     }
   };

src/main/js/modules/blockhelper.js

@@ -1,7 +1,7 @@
 'use strict';
 /*global module, exports, require, Packages, __plugin, server*/
 var blocks = require('blocks'),
-    bountiful = false;
+  bountiful = false;
 
 if (__plugin.canary){
   bountiful = parseFloat(server.canaryModVersion) > 1.7;
@@ -78,11 +78,11 @@ function property( block ){
     set: function(name,value){
       var bp = block.getPropertyForName(name);
       if (bp === null){
-	console.warn(block + ' has no property named ' + name);
-	return result;
+        console.warn(block + ' has no property named ' + name);
+        return result;
       }
       if (lookup[bp.name]){
-	value = lookup[bp.name][value];
+        value = lookup[bp.name][value];
       }
       block.setPropertyValue(bp, value);
       return result;
@@ -104,12 +104,12 @@ function applyFacing( block, metadata ){
     switch( block.typeId ){
     case blocks.sign:
     case blocks.ladder:
-      // bug: furnace, chest, dispenser don't always use the right metadata
     case blocks.furnace:  
     case blocks.furnace_burning: 
     case blocks.chest:
     case blocks.enderchest:
     case blocks.dispenser:
+      // bug: furnace, chest, dispenser don't always use the right metadata
       face( [null,null,'north','south','west','east'][metadata] );
       break;
     case blocks.torch:
@@ -144,9 +144,9 @@ function applyRotation( block, metadata ){
 function applyVariant( block, metadata ){
   var cmQuartzProperties = Packages.net.canarymod.api.world.blocks.properties.helpers.QuartzProperties;
   switch (block.typeId){
-    case blocks.quartz:
-      cmQuartzProperties.applyVariant(block, cmQuartzProperties.Variant.valueOf(metadata));
-      break;
+  case blocks.quartz:
+    cmQuartzProperties.applyVariant(block, cmQuartzProperties.Variant.valueOf(metadata));
+    break;
   }
 }
 function applyProperties( block, metadata ){

src/main/js/modules/blocks.js

@@ -121,7 +121,6 @@ var blocks = {
       dark_oak: '126:13'
     },
     snow: 78,
-    stone: 44,
     oak: 126,
     spruce: '126:1',
     birch: '126:2',
@@ -184,7 +183,6 @@ var blocks = {
   clay: 82,
   sugar_cane: 83,
   jukebox: 84,
-  fence: 85,
   pumpkin: 86,
   netherrack: 87,
   soulsand: 88,
@@ -218,7 +216,6 @@ var blocks = {
   mycelium: 110,
   lily_pad: 111,
   nether: 112,
-  nether_fence: 113,
   netherwart: 115,
   table_enchantment: 116,
   brewing_stand: 117,
@@ -321,10 +318,12 @@ var blocks = {
     acacia: 187
   },
   fence: {
+    oak: 85,
+    nether: 113,
     spruce: 188,
     birch: 189,
     jungle: 190,
-    oak: 191,
+    darkoak: 191,
     acacia: 192
   }
 };
@@ -341,12 +340,12 @@ var colorized_blocks = [
 
 for (var i = 0, len = colorized_blocks.length; i < len; i++) {
   var block = colorized_blocks[i],
-      data_value = blocks[block].white;
+    data_value = blocks[block].white;
 
   for (var color in colors) {
     blocks[block][color] = data_value + ':' + colors[color];
   }
-};
+}
 
 /*
   rainbow colors - a convenience

src/main/js/modules/bukkit/fireworks.js

@@ -33,10 +33,10 @@ function bukkitFirework( location ) {
   var c1 = getColor( r1i );
   var c2 = getColor( r2i );
   var effectBuilder = bkFireworkEffect.builder()
-        .flicker( Math.round( Math.random() ) == 0 )
-        .withColor( c1 )
-        .withFade( c2 )
-        .trail( Math.round( Math.random() ) == 0 );
+    .flicker( Math.round( Math.random() ) == 0 )
+    .withColor( c1 )
+    .withFade( c2 )
+    .trail( Math.round( Math.random() ) == 0 );
   effectBuilder['with']( type );
   var effect = effectBuilder.build();
   fwm.addEffect( effect );

src/main/js/modules/bukkit/input.js

@@ -1,20 +1,20 @@
 var bkPrompt = org.bukkit.conversations.Prompt,
-    bkConversationFactory = org.bukkit.conversations.ConversationFactory;
+  bkConversationFactory = org.bukkit.conversations.ConversationFactory;
 
 function bukkitAsyncInput( sender, promptMesg, callback) {
   var repeat = function(){
     bukkitAsyncInput( sender, promptMesg, callback);
   };
   var prompt = new bkPrompt( { 
-    getPromptText: function( ctx ) {
+    getPromptText: function(/* ctx */) {
       return promptMesg;
     },
     acceptInput: function( ctx, value ) {
       callback.apply( { repeat: repeat, sender: sender, message: promptMesg, value: value },
-	[value, sender, repeat]);
+        [value, sender, repeat]);
       return null;
     },
-    blocksForInput: function( ctx ) {
+    blocksForInput: function(/* ctx */) {
       return true;
     }
   });

src/main/js/modules/bukkit/items.js

@@ -15,12 +15,12 @@ for (var i = 0;i < materials.length; i++ ){
   items[name] = (function(material){
     return function(amount){
       if (typeof amount == 'undefined'){
-	return material;
+        return material;
       }
       if (typeof amount == 'number'){
-	return new bkItemStack(material, amount);
+        return new bkItemStack(material, amount);
       } else {
-	return amount == material;
+        return amount == material;
       }
     };
   })(materials[i]);

src/main/js/modules/bukkit/recipes.js

@@ -1,4 +1,3 @@
-var items = require('items');
 var bkShapedRecipe = org.bukkit.inventory.ShapedRecipe;
 
 exports.add = function( recipe ){

src/main/js/modules/bukkit/sounds.js

@@ -14,26 +14,27 @@ for ( ; i < len; i++ ) {
     return function()
     {
       switch (arguments.length) { 
-	case 3:
-	  exports.play(sound, arguments[0], arguments[1], arguments[2]);
-	  break;
-	case 2:
-	  // TODO: possible combinations: 
-	  // location, volume, 
-          // volume pitch
-	  exports.play(sound, arguments[0],arguments[1]);
-	  break;
-	case 1:
-	  exports.play(sound, arguments[0]);
-	  break;
-	case 0:
-	  // play the sound at full vol, medium pitch for all players
-	  //
-	  foreach(server.onlinePlayers,function(player){
-	    exports.play(sound, player, 1, 0);
-	  });
-	default:
-	}
+      case 3:
+        exports.play(sound, arguments[0], arguments[1], arguments[2]);
+        break;
+      case 2:
+        // TODO: possible combinations: 
+        // location, volume, 
+        // volume pitch
+        exports.play(sound, arguments[0],arguments[1]);
+        break;
+      case 1:
+        exports.play(sound, arguments[0]);
+        break;
+      case 0:
+        // play the sound at full vol, medium pitch for all players
+        //
+        foreach(server.onlinePlayers,function(player){
+          exports.play(sound, player, 1, 0);
+        });
+        break;
+      default:
+      }
     };
   })(sound);
 }

src/main/js/modules/canary/input.js

@@ -11,12 +11,12 @@ function canaryAsyncInput( sender, promptMesg, callback) {
     if (event.player == sender) {
       var receivers = event.getReceiverList();
       if (receivers.size() == 1 && receivers.contains(sender)){
-	var value = event.message;
-	var that = this;
-	event.setCanceled();
-	callback.apply( { repeat: repeat, sender: sender, message: promptMesg, value: value },
-			[value, sender, repeat]);
-	setTimeout(function(){that.unregister();},10);
+        var value = event.message;
+        var that = this;
+        event.setCanceled();
+        callback.apply( { repeat: repeat, sender: sender, message: promptMesg, value: value },
+          [value, sender, repeat]);
+        setTimeout(function(){that.unregister();},10);
       }
     }
   },'CRITICAL');