* Added the "toJSON" method to the "SerializeUtil" interface and used…

… it as a replacement for the entire packet setup.

* Added the "isBeingEdited" and "setBeingEdited" methods to the "Shop" interface. This value is now used for the shops during the editing process.
* Added the "ShopEditEvent" event which is fired whenever a player opens the edit menu. It is also used by the plugin on the LOWEST priority so it can set the new shop editing value and perform actions.

Signed-off-by: XZot1K <[email protected]>

API Version.txt

@@ -1 +1 @@
-## API-VERSION 1.1.6 ##
+## API-VERSION 1.1.7 ##

src/xzot1k/plugins/ds/DisplayShops.java

@@ -23,17 +23,13 @@ public class DisplayShops extends JavaPlugin implements DisplayShopsAPI {
     private static DisplayShops pluginInstance;
 
     public DisplayShops() {
-        setPluginInstance(this);
+        DisplayShops.pluginInstance = this;
     }
 
     public static DisplayShops getPluginInstance() {
         return pluginInstance;
     }
 
-    private static void setPluginInstance(DisplayShops pluginInstance) {
-        DisplayShops.pluginInstance = pluginInstance;
-    }
-
     @Override
     public void onEnable() {}
 

src/xzot1k/plugins/ds/api/Manager.java

@@ -18,7 +18,6 @@
 import xzot1k.plugins.ds.api.events.EconomyCallEvent;
 import xzot1k.plugins.ds.api.events.EconomyCallType;
 import xzot1k.plugins.ds.api.handlers.ActionBarHandler;
-import xzot1k.plugins.ds.api.handlers.JItemHandler;
 import xzot1k.plugins.ds.api.handlers.ParticleHandler;
 import xzot1k.plugins.ds.api.handlers.SerializeUtil;
 import xzot1k.plugins.ds.api.objects.DataPack;
@@ -444,8 +443,6 @@ public interface Manager {
 
     ParticleHandler getParticleHandler();
 
-    JItemHandler getJItemHandler();
-
     ActionBarHandler getActionBarHandler();
 
     SerializeUtil getSerializeUtil();

src/xzot1k/plugins/ds/api/events/ShopEditEvent.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2020 XZot1K, All rights reserved.
+ */
+
+package xzot1k.plugins.ds.api.events;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import xzot1k.plugins.ds.api.objects.Shop;
+
+public class ShopEditEvent extends Event implements Cancellable {
+    private static final HandlerList handlers = new HandlerList();
+    private final Player player;
+    private final Shop shop;
+    private boolean cancelled;
+
+    public ShopEditEvent(Player player, Shop shop) {
+        this.player = player;
+        this.shop = shop;
+    }
+
+    // getters & setters
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+
+    @Override
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean cancelled) {
+        this.cancelled = cancelled;
+    }
+
+    public Player getPlayer() {
+        return player;
+    }
+
+    public Shop getShop() {
+        return shop;
+    }
+
+}

src/xzot1k/plugins/ds/api/handlers/SerializeUtil.java

@@ -24,4 +24,12 @@ public interface SerializeUtil {
      */
     ItemStack toItem(String itemString);
 
+    /**
+     * Convert an item to a JSON string format for in-game messages.
+     *
+     * @param itemStack The item to convert.
+     * @return The JSON string (can return 'NULL').
+     */
+    String toJSON(ItemStack itemStack);
+
 }

src/xzot1k/plugins/ds/api/objects/Shop.java

@@ -270,4 +270,33 @@ public interface Shop {
     int getDynamicSellCounter();
 
     void setDynamicSellCounter(int dynamicPriceCounter);
+
+    /**
+     * Checks if the shop is being edited.
+     *
+     * @return Whether shop is undergoing edits.
+     */
+    boolean isBeingEdited();
+
+    /**
+     * Sets whether shop is being edited.
+     *
+     * @param beingEdited Whether the shop is being edited.
+     */
+    void setBeingEdited(boolean beingEdited);
+
+    /**
+     * Gets the current editor.
+     *
+     * @return The editor UUID.
+     */
+    UUID getCurrentEditor();
+
+    /**
+     * Sets the current editor.
+     *
+     * @param currentEditor The current editor UUID.
+     */
+    void setCurrentEditor(UUID currentEditor);
+
 }