Add way to invert mouse buttons

Closes #35

src/main/java/de/epiceric/shopchest/config/Config.java

@@ -117,6 +117,15 @@ public class Config {
     /** Whether the item amount should be calculated to fit the available money or inventory space **/
     public boolean auto_calculate_item_amount;
 
+    /**
+     * <p>Whether the mouse buttons are inverted</p>
+     *
+     * <b>Default:</b><br>
+     * Right-Click: Buy<br>
+     * Left-Click: Sell
+     **/
+    public boolean invert_mouse_buttons;
+
     /** Amount the hologram should be lifted **/
     public double two_line_hologram_lift;
 
@@ -313,6 +322,7 @@ public class Config {
         append_potion_level_to_item_name = plugin.getConfig().getBoolean("append-potion-level-to-item-name");
         show_shop_items = plugin.getConfig().getBoolean("show-shop-items");
         remove_shop_on_error = plugin.getConfig().getBoolean("remove-shop-on-error");
+        invert_mouse_buttons = plugin.getConfig().getBoolean("invert-mouse-buttons");
         two_line_hologram_lift = plugin.getConfig().getDouble("two-line-hologram-lift");
         maximal_distance = plugin.getConfig().getDouble("maximal-distance");
         maximal_item_distance = plugin.getConfig().getDouble("maximal-item-distance");

src/main/java/de/epiceric/shopchest/listeners/ShopInteractListener.java

@@ -153,14 +153,12 @@ public class ShopInteractListener implements Listener {
     private void handleInteractEvent(PlayerInteractEvent e, boolean calledFromInteractEvent) {
         Block b = e.getClickedBlock();
         Player p = e.getPlayer();
+        boolean inverted = config.invert_mouse_buttons;
 
         if (e.getAction() == Action.RIGHT_CLICK_BLOCK || e.getAction() == Action.LEFT_CLICK_BLOCK) {
-
             if (b.getType().equals(Material.CHEST) || b.getType().equals(Material.TRAPPED_CHEST)) {
-
-                if (e.getAction() == Action.RIGHT_CLICK_BLOCK) {
-
                 if (ClickType.getPlayerClickType(p) != null) {
+                    if (e.getAction() == Action.RIGHT_CLICK_BLOCK) {
 
                         switch (ClickType.getPlayerClickType(p).getClickType()) {
                             case INFO:
@@ -199,13 +197,19 @@ public class ShopInteractListener implements Listener {
                                 break;
 
                         }
-
+                    }
                 } else {
-
                     if (shopUtils.isShop(b.getLocation())) {
                         Shop shop = shopUtils.getShop(b.getLocation());
 
+                        if (e.getAction() == Action.LEFT_CLICK_BLOCK) {
                             if (p.isSneaking()) {
+                                return;
+                            }
+                        }
+
+                        if (e.getAction() == Action.RIGHT_CLICK_BLOCK) {
+                            if (p.isSneaking() || (shop.getShopType() != ShopType.ADMIN && shop.getVendor().getUniqueId().equals(p.getUniqueId()))) {
                                 if (Utils.getPreferredItemInHand(p) == null) {
                                     e.setCancelled(true);
                                     if (!shop.getVendor().getUniqueId().equals(p.getUniqueId())) {
@@ -228,10 +232,17 @@ public class ShopInteractListener implements Listener {
                                         }
                                     }
                                 }
-                            } else {
+
+                                return;
+                            }
+                        }
+
+                        if ((e.getAction() == Action.RIGHT_CLICK_BLOCK && !inverted) || (e.getAction() == Action.LEFT_CLICK_BLOCK && inverted)) {
                             e.setCancelled(true);
+
                             if (shop.getShopType() == ShopType.ADMIN || !shop.getVendor().getUniqueId().equals(p.getUniqueId())) {
                                 plugin.debug(p.getName() + " wants to buy");
+
                                 if (shop.getBuyPrice() > 0) {
                                     if (p.hasPermission(Permissions.BUY)) {
                                         boolean worldGuardAllowed = true;
@@ -281,28 +292,14 @@ public class ShopInteractListener implements Listener {
                                     p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.BUYING_DISABLED));
                                     plugin.debug("Buying is disabled");
                                 }
-                                } else {
-                                    e.setCancelled(false);
-                                    if (!calledFromInteractEvent) {
-                                        p.openInventory(shop.getInventoryHolder().getInventory());
-                                    }
-                                }
-                            }
-                        }
                             }
 
-
+                        } else if ((e.getAction() == Action.LEFT_CLICK_BLOCK && !inverted) || (e.getAction() == Action.RIGHT_CLICK_BLOCK && inverted)) {
-                } else if (e.getAction() == Action.LEFT_CLICK_BLOCK) {
-
-                    if (shopUtils.isShop(b.getLocation())) {
-                        if (p.isSneaking())
-                            return;
-
                             e.setCancelled(true);
-                        Shop shop = shopUtils.getShop(b.getLocation());
 
                             if ((shop.getShopType() == ShopType.ADMIN) || (!shop.getVendor().getUniqueId().equals(p.getUniqueId()))) {
                                 plugin.debug(p.getName() + " wants to sell");
+
                                 if (shop.getSellPrice() > 0) {
                                     if (p.hasPermission(Permissions.SELL)) {
                                         boolean worldGuardAllowed = true;
@@ -342,13 +339,9 @@ public class ShopInteractListener implements Listener {
                                 e.setCancelled(false);
                             }
                         }
-
                     }
-
                 }
-
+            }
-        } else {
-            ClickType.removePlayerClickType(p);
         }
     }
 

src/main/resources/config.yml

@@ -82,10 +82,16 @@ append-potion-level-to-item-name: false
 # This might be useful if you're removing shop chests with WorldEdit, resetting plots, or similar
 remove-shop-on-error: false
 
+# Set whether the mouse buttons should be inverted.
+# Default:
+# Right-Click -> Buy
+# Left-Click  -> Sell
+invert-mouse-buttons: false
+
 # Set the maximal distance (in blocks) to the shop where the player can see the hologram.
 maximal-distance: 2
 
-# Set the maximal distance (in blocks) to the shop where the player can see the floatig shop item.
+# Set the maximal distance (in blocks) to the shop where the player can see the floating shop item.
 maximal-item-distance: 40
 
 # Set the time in seconds between automatic shop reloads.