Added NONE option to click type

Author: tastybento

src/main/java/world/bentobox/aoneblock/Settings.java

@@ -13,7 +13,6 @@
 import org.bukkit.GameMode;
 import org.bukkit.block.Biome;
 import org.bukkit.entity.EntityType;
-import org.bukkit.event.inventory.ClickType;
 
 import com.google.common.base.Enums;
 
@@ -120,9 +119,9 @@ public class Settings implements WorldSettings {
 
     @ConfigComment("Block identification appearance.")
     @ConfigComment("Click type that will make particles appear. Options are:")
-    @ConfigComment("LEFT (default) or RIGHT")
+    @ConfigComment("LEFT (default), RIGHT, or NONE")
     @ConfigEntry(path = "world.block-id.click-type")
-    private String clickType = ClickType.LEFT.name();
+    private String clickType = "LEFT";
 
     @ConfigComment("Size of particles. Default is 0.5. Must be greater than 0.")
     @ConfigEntry(path = "world.block-id.particle-size")
@@ -2165,7 +2164,8 @@ public void setParticleDensity(Double particleDensity) {
      * @return the clickType
      */
     public String getClickType() {
-        if (clickType == null || (!clickType.equalsIgnoreCase("LEFT") && !clickType.equalsIgnoreCase("RIGHT"))) {
+        if (clickType == null || (!clickType.equalsIgnoreCase("LEFT") && !clickType.equalsIgnoreCase("RIGHT")
+                && !clickType.equalsIgnoreCase("NONE"))) {
             clickType = "LEFT";
         }
         return clickType;

src/main/java/world/bentobox/aoneblock/listeners/BlockProtect.java

@@ -47,12 +47,14 @@ public BlockProtect(AOneBlock addon) {
      */
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
     public void onBlockDamage(PlayerInteractEvent e) {
-        if (!addon.inWorld(e.getPlayer().getWorld()) || e.getClickedBlock() == null) {
+        Action action = e.getAction();
+        String clickType = addon.getSettings().getClickType();
+
+        if (clickType.equalsIgnoreCase("NONE") || !addon.inWorld(e.getPlayer().getWorld())
+                || e.getClickedBlock() == null) {
             return;
         }
 
-        Action action = e.getAction();
-        String clickType = addon.getSettings().getClickType();
         if ((action == Action.LEFT_CLICK_BLOCK && clickType.equalsIgnoreCase("LEFT"))
                 || (action == Action.RIGHT_CLICK_BLOCK && clickType.equalsIgnoreCase("RIGHT"))) {
 

src/main/resources/config.yml

@@ -64,7 +64,7 @@ world:
   block-id:
     # Block identification appearance.
     # Click type that will make particles appear. Options are:
-    # LEFT (default) or RIGHT
+    # LEFT (default), RIGHT, or NONE
     click-type: RIGHT
     # Size of particles. Default is 0.7. Must be greater than 0.
     particle-size: 0.5