Fixed Hoe module and a few other things.

src/main/java/net/machinemuse/api/moduletrigger/IRightClickModule.java

@@ -8,7 +8,7 @@ import net.minecraft.world.World;
 public interface IRightClickModule extends IPowerModule {
     void onRightClick(EntityPlayer playerClicking, World world, ItemStack item);
 
-    void onItemUse(
+    boolean onItemUse(
             ItemStack itemStack, EntityPlayer player, World world,
             int x, int y, int z,
             int side, float hitX, float hitY, float hitZ);

src/main/java/net/machinemuse/powersuits/item/ItemPowerFist.java

@@ -271,7 +271,7 @@ public class ItemPowerFist extends MPSItemElectricTool
         IPowerModule module2;
         IPowerModule module = module2 = ModuleManager.getModule(mode);
         if (module2 instanceof IRightClickModule) {
-            ((IRightClickModule)module2).onItemUse(itemStack, player, world, x, y, z, side, hitX, hitY, hitZ);
+            return ((IRightClickModule)module2).onItemUse(itemStack, player, world, x, y, z, side, hitX, hitY, hitZ);
         }
         return false;
     }

src/main/java/net/machinemuse/powersuits/powermodule/RightClickPowerModule.java

@@ -18,7 +18,8 @@ public class RightClickPowerModule extends PowerModule implements IRightClickMod
 	}
 
 	@Override
-	public void onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+		return false;
 	}
 
 	@Override

src/main/java/net/machinemuse/powersuits/powermodule/misc/InPlaceAssemblerModule.java

@@ -55,7 +55,8 @@ public class InPlaceAssemblerModule extends PowerModuleBase implements IRightCli
     }
 
     @Override
-    public void onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+    public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+        return false;
     }
 
     @Override

src/main/java/net/machinemuse/powersuits/powermodule/movement/BlinkDriveModule.java

@@ -73,7 +73,8 @@ public class BlinkDriveModule extends PowerModuleBase implements IRightClickModu
     }
 
     @Override
-    public void onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+    public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+        return false;
     }
 
     @Override

src/main/java/net/machinemuse/powersuits/powermodule/tool/AppEngWirelessFluidModule.java

@@ -67,7 +67,8 @@ public class AppEngWirelessFluidModule extends PowerModuleBase implements IRight
     }
 
     @Override
-    public void onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+    public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+        return false;
     }
 
     @Override

src/main/java/net/machinemuse/powersuits/powermodule/tool/AppEngWirelessModule.java

@@ -61,7 +61,8 @@ public class AppEngWirelessModule extends PowerModuleBase implements IRightClick
     }
 
     @Override
-    public void onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+    public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+        return false;
     }
 
     @Override

src/main/java/net/machinemuse/powersuits/powermodule/tool/DimensionalRiftModule.java

@@ -88,7 +88,8 @@ public class DimensionalRiftModule extends PowerModuleBase implements IRightClic
     }
 
     @Override
-    public void onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+    public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+        return false;
     }
 
     @Override

src/main/java/net/machinemuse/powersuits/powermodule/tool/FieldTinkerModule.java

@@ -47,8 +47,8 @@ public class FieldTinkerModule extends PowerModuleBase implements IRightClickMod
     }
 
     @Override
-    public void onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
-
+    public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+        return false;
     }
 
     @Override

src/main/java/net/machinemuse/powersuits/powermodule/tool/FlintAndSteelModule.java

@@ -72,7 +72,7 @@ public class FlintAndSteelModule extends PowerModuleBase implements IRightClickM
     }
 
     @Override
-    public void onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+    public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
         double energyConsumption = ModuleManager.computeModularProperty(itemStack, IGNITION_ENERGY_CONSUMPTION);
         if (energyConsumption < ElectricItemUtils.getPlayerEnergy(player)) {
             x += (side == 5 ? 1 : side == 4 ? -1 : 0);
@@ -86,9 +86,11 @@ public class FlintAndSteelModule extends PowerModuleBase implements IRightClickM
                     ElectricItemUtils.drainPlayerEnergy(player, energyConsumption);
                     world.playSoundEffect((double) x + 0.5D, (double) y + 0.5D, (double) z + 0.5D, "fire.ignite", 1.0F, ran.nextFloat() * 0.4F + 0.8F);
                     world.setBlock(x, y, z, Blocks.fire);
+                    return true;
                 }
             }
         }
+        return false;
     }
 
     @Override

src/main/java/net/machinemuse/powersuits/powermodule/tool/HoeModule.java

@@ -41,40 +41,50 @@ public class HoeModule extends PowerModuleBase implements IPowerModule, IRightCl
     }
 
     @Override
-    public void onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+    public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
         double energyConsumed = ModuleManager.computeModularProperty(itemStack, HOE_ENERGY_CONSUMPTION);
         if (player.canPlayerEdit(x, y, z, side, itemStack) && ElectricItemUtils.getPlayerEnergy(player) > energyConsumed) {
             UseHoeEvent event = new UseHoeEvent(player, itemStack, world, x, y, z);
+
             if (MinecraftForge.EVENT_BUS.post(event)) {
-                return;
+                return false;
             }
 
             if (event.getResult() == Event.Result.ALLOW) {
                 ElectricItemUtils.drainPlayerEnergy(player, energyConsumed);
-                return;
+                return true;
             }
 
             if (world.isRemote) {
-                return;
+                return true;
             }
+            boolean used = false;
             double radius = (int) ModuleManager.computeModularProperty(itemStack, HOE_SEARCH_RADIUS);
+            int newX, newZ;
             for (int i = (int) Math.floor(-radius); i < radius; i++) {
                 for (int j = (int) Math.floor(-radius); j < radius; j++) {
                     if (i * i + j * j < radius * radius) {
-                        Block block = world.getBlock(x + i, y, z + j);
-                        if (block == Blocks.grass || block == Blocks.dirt) {
-                            world.setBlock(x + i, y, z + j, Blocks.farmland);
+                        newX = x + i;
+                        newZ = z+ j;
+
+                        Block block = world.getBlock(newX, y, newZ);
+                        if (side != 0 && world.getBlock(newX, y + 1, newZ).isAir(world, newX, y + 1, newZ) && (block == Blocks.grass || block == Blocks.dirt)) {
+                            world.setBlock(newX, y, newZ, Blocks.farmland);
                             ElectricItemUtils.drainPlayerEnergy(player, ModuleManager.computeModularProperty(itemStack, HOE_ENERGY_CONSUMPTION));
+                            used = true;
                         }
                     }
                 }
             }
 // TODO: Proper sound effect
-//            world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F),
-//                    Blocks.farmland.stepSound.getStepSound(), (Blocks.farmland.stepSound.getVolume() + 1.0F) / 2.0F,
-//                    Blocks.farmland.stepSound.getPitch() * 0.8F);
-
+            if (used) {
+                world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F),
+                        Blocks.farmland.stepSound.getStepResourcePath(), (Blocks.farmland.stepSound.getVolume() + 1.0F) / 2.0F,
+                        Blocks.farmland.stepSound.getPitch() * 0.8F);
+                return true;
+            }
         }
+        return false;
     }
 
     @Override

src/main/java/net/machinemuse/powersuits/powermodule/tool/LeafBlowerModule.java

@@ -82,7 +82,7 @@ public class LeafBlowerModule extends PowerModuleBase implements IRightClickModu
             return false;
 
         // Plants
-        if ((blocktype == "plants") && (block instanceof BlockTallGrass || block instanceof BlockFlower) && block.canHarvestBlock(player, meta)) {
+        if ((blocktype == "plants") && (block instanceof BlockBush) && block.canHarvestBlock(player, meta)) {
             block.harvestBlock(world, player, x, y, z, meta);
             world.setBlockToAir(x, y, z);
             return true;
@@ -104,7 +104,7 @@ public class LeafBlowerModule extends PowerModuleBase implements IRightClickModu
     }
 
     @Override
-    public void onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+    public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
         Block blockID = world.getBlock(x, y, z);
         int plant = (int) ModuleManager.computeModularProperty(itemStack, PLANT_RADIUS);
         int leaf = (int) ModuleManager.computeModularProperty(itemStack, LEAF_RADIUS);
@@ -117,6 +117,7 @@ public class LeafBlowerModule extends PowerModuleBase implements IRightClickModu
         useBlower(leaf, "leaves", itemStack, player, world,  x, y, z);
         // Snow
         useBlower(snow, "snow", itemStack, player, world,  x, y, z);
+        return false;
     }
 
     private void useBlower(int radius, String blocktypename , ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z) {

src/main/java/net/machinemuse/powersuits/powermodule/tool/LuxCapacitor.java

@@ -74,7 +74,8 @@ public class LuxCapacitor extends PowerModuleBase implements IRightClickModule {
     }
 
     @Override
-    public void onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+    public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+        return false;
     }
 
     @Override

src/main/java/net/machinemuse/powersuits/powermodule/tool/OmniProbeModule.java

@@ -98,7 +98,8 @@ public class OmniProbeModule extends PowerModuleBase implements IRightClickModul
     }
 
     @Override
-    public void onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+    public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+        return false;
     }
 
     @Override

src/main/java/net/machinemuse/powersuits/powermodule/tool/OmniWrenchModule.java

@@ -56,7 +56,8 @@ public class OmniWrenchModule extends PowerModuleBase implements IRightClickModu
     }
 
     @Override
-    public void onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+    public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+        return false;
     }
 
     @Override

src/main/java/net/machinemuse/powersuits/powermodule/tool/OreScannerModule.java

@@ -175,8 +175,9 @@ public class OreScannerModule extends PowerModuleBase implements IRightClickModu
     }
 
     @Override
-    public void onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+    public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
         searchForValuables(itemStack, player, world, x, y, z, side);
+        return true;
     }
 
     @Override

src/main/java/net/machinemuse/powersuits/powermodule/tool/PersonalShrinkingModule.java

@@ -63,7 +63,8 @@ public class PersonalShrinkingModule extends PowerModuleBase implements IRightCl
     }
 
     @Override
-    public void onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+    public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+        return false;
     }
 
     @Override

src/main/java/net/machinemuse/powersuits/powermodule/tool/ShearsModule.java

@@ -94,7 +94,8 @@ public class ShearsModule extends PowerModuleBase implements IBlockBreakingModul
     }
 
     @Override
-    public void onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+    public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+        return false;
     }
 
     @Override

src/main/java/net/machinemuse/powersuits/powermodule/weapon/BladeLauncherModule.java

@@ -60,7 +60,8 @@ public class BladeLauncherModule extends PowerModuleBase implements IRightClickM
     }
 
     @Override
-    public void onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+    public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+        return false;
     }
 
     @Override

src/main/java/net/machinemuse/powersuits/powermodule/weapon/LightningModule.java

@@ -85,7 +85,8 @@ public class LightningModule extends PowerModuleBase implements IRightClickModul
     }
 
     @Override
-    public void onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+    public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+        return false;
     }
 
     @Override

src/main/java/net/machinemuse/powersuits/powermodule/weapon/PlasmaCannonModule.java

@@ -69,7 +69,8 @@ public class PlasmaCannonModule extends PowerModuleBase implements IRightClickMo
     }
 
     @Override
-    public void onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+    public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+        return false;
     }
 
     @Override

src/main/java/net/machinemuse/powersuits/powermodule/weapon/RailgunModule.java

@@ -134,8 +134,8 @@ public class RailgunModule extends PowerModuleBase implements IRightClickModule,
     }
 
     @Override
-    public void onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
-
+    public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+        return false;
     }
 
     @Override

src/main/java/net/machinemuse/powersuits/powermodule/weapon/SonicWeaponModule.java

@@ -47,7 +47,8 @@ public class SonicWeaponModule extends PowerModuleBase implements IRightClickMod
     }
 
     @Override
-    public void onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+    public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
+        return false;
     }
 
     @Override