Add PlayerShopClickEvent and Deprecated ShopClickEvent

Author: sandtechnology

src/main/java/org/maxgamer/quickshop/api/event/PlayerShopClickEvent.java

@@ -0,0 +1,48 @@
+/*
+ * This file is a part of project QuickShop, the name is PlayerShopClickEvent.java
+ *  Copyright (C) PotatoCraft Studio and contributors
+ *
+ *  This program is free software: you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the
+ *  Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ *  for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package org.maxgamer.quickshop.api.event;
+
+import lombok.Getter;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.maxgamer.quickshop.api.shop.Shop;
+
+/**
+ * A click event which have player variable
+ * <p>
+ * Since  5.1.1.3
+ */
+public class PlayerShopClickEvent extends ShopClickEvent {
+
+
+    @Getter
+    private final Player player;
+
+    /**
+     * Call when shop was clicked.
+     *
+     * @param shop   The shop bought from
+     * @param player the player clicking shop
+     */
+    public PlayerShopClickEvent(@NotNull Shop shop, Player player) {
+        super(shop);
+        this.player = player;
+    }
+}

src/main/java/org/maxgamer/quickshop/api/event/ShopClickEvent.java

@@ -25,7 +25,10 @@
 
 /**
  * Calling when shop clicked
+ * <p>
+ * Deprecated, use PlayerShopClickEvent instead
  */
+@Deprecated
 public class ShopClickEvent extends AbstractQSEvent implements Cancellable {
 
     @NotNull

src/main/java/org/maxgamer/quickshop/listener/PlayerListener.java

@@ -48,6 +48,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.api.economy.AbstractEconomy;
+import org.maxgamer.quickshop.api.event.PlayerShopClickEvent;
 import org.maxgamer.quickshop.api.shop.Info;
 import org.maxgamer.quickshop.api.shop.Shop;
 import org.maxgamer.quickshop.api.shop.ShopAction;
@@ -213,6 +214,11 @@ private void postTrade(PlayerInteractEvent e) {
             }
             //Prevent use item by ancient
             e.setUseItemInHand(Event.Result.DENY);
+            PlayerShopClickEvent event = new PlayerShopClickEvent(shop, p);
+            if (Util.fireCancellableEvent(event)) {
+                Util.debugLog("Ignore shop click, because some plugin cancel it.");
+                return;
+            }
             shop.onClick();
             this.playClickSound(e.getPlayer());
             // Text menu

src/main/java/org/maxgamer/quickshop/shop/ContainerShop.java

@@ -50,7 +50,6 @@
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.api.chat.ComponentPackage;
 import org.maxgamer.quickshop.api.economy.EconomyCore;
-import org.maxgamer.quickshop.api.event.ShopClickEvent;
 import org.maxgamer.quickshop.api.event.ShopDeleteEvent;
 import org.maxgamer.quickshop.api.event.ShopInventoryCalculateEvent;
 import org.maxgamer.quickshop.api.event.ShopInventoryEvent;
@@ -578,11 +577,6 @@ public boolean matches(@Nullable ItemStack item) {
     @Override
     public void onClick() {
         Util.ensureThread(false);
-        ShopClickEvent event = new ShopClickEvent(this);
-        if (Util.fireCancellableEvent(event)) {
-            Util.debugLog("Ignore shop click, because some plugin cancel it.");
-            return;
-        }
         refresh();
         setSignText();
     }