PotatoCraft-Studio#330 Impl Deprecated event correctly

Author: sandtechnology

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

@@ -21,6 +21,7 @@
 
 import lombok.Getter;
 import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
 import org.jetbrains.annotations.NotNull;
 import org.maxgamer.quickshop.api.shop.Shop;
 
@@ -29,20 +30,44 @@
  * <p>
  * Since  5.1.2.0
  */
-public class PlayerShopClickEvent extends ShopClickEvent {
+public class PlayerShopClickEvent extends AbstractQSEvent implements Cancellable {
 
 
     @Getter
     private final Player player;
 
+    @NotNull
+    private final Shop shop;
+
+    private boolean cancelled;
+
     /**
      * 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.shop = shop;
         this.player = player;
     }
+
+    @Override
+    public boolean isCancelled() {
+        return this.cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean cancelled) {
+        this.cancelled = cancelled;
+    }
+
+    /**
+     * Getting the shops that clicked
+     *
+     * @return Clicked shop
+     */
+    public @NotNull Shop getShop() {
+        return this.shop;
+    }
 }

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

@@ -19,6 +19,7 @@
 
 package org.maxgamer.quickshop.api.event;
 
+import org.bukkit.Warning;
 import org.bukkit.event.Cancellable;
 import org.jetbrains.annotations.NotNull;
 import org.maxgamer.quickshop.api.shop.Shop;
@@ -29,6 +30,7 @@
  * Deprecated, use PlayerShopClickEvent instead
  */
 @Deprecated
+@Warning(reason = "Deprecated for improper api event design")
 public class ShopClickEvent extends AbstractQSEvent implements Cancellable {
 
     @NotNull

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

@@ -49,6 +49,7 @@
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.api.economy.AbstractEconomy;
 import org.maxgamer.quickshop.api.event.PlayerShopClickEvent;
+import org.maxgamer.quickshop.api.event.ShopClickEvent;
 import org.maxgamer.quickshop.api.shop.Info;
 import org.maxgamer.quickshop.api.shop.Shop;
 import org.maxgamer.quickshop.api.shop.ShopAction;
@@ -215,7 +216,9 @@ 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)) {
+            @SuppressWarnings("deprecation")
+            ShopClickEvent eventOld = new ShopClickEvent(shop);
+            if (Util.fireCancellableEvent(event) || Util.fireCancellableEvent(eventOld)) {
                 Util.debugLog("Ignore shop click, because some plugin cancel it.");
                 return;
             }