Rewrite VirtualDisplayItem

Author: Ghost-chu

quickshop-bukkit/src/main/java/com/ghostchu/quickshop/QuickShop.java

@@ -43,7 +43,7 @@
 import com.ghostchu.quickshop.shop.controlpanel.SimpleShopControlPanel;
 import com.ghostchu.quickshop.shop.controlpanel.SimpleShopControlPanelManager;
 import com.ghostchu.quickshop.shop.display.AbstractDisplayItem;
-import com.ghostchu.quickshop.shop.display.VirtualDisplayItem;
+import com.ghostchu.quickshop.shop.display.virtual.VirtualDisplayItemManager;
 import com.ghostchu.quickshop.shop.inventory.BukkitInventoryWrapperManager;
 import com.ghostchu.quickshop.shop.signhooker.SignHooker;
 import com.ghostchu.quickshop.util.*;
@@ -238,6 +238,9 @@ public class QuickShop implements QuickShopAPI, Reloadable {
     @Getter
     private BungeeListener bungeeListener;
     private RankLimiter rankLimiter;
+    @Nullable
+    @Getter
+    private VirtualDisplayItemManager virtualDisplayItemManager;
 
     public QuickShop(QuickShopBukkit javaPlugin, Logger logger, Platform platform) {
         this.javaPlugin = javaPlugin;
@@ -626,7 +629,11 @@ public final void onEnable() {
         registerCommunicationChannels();
         new QSConfigurationReloadEvent(javaPlugin).callEvent();
         load3rdParty();
+        try (PerfMonitor ignored = new PerfMonitor("Self Test")) {
+            runtimeCheck(EnvCheckEntry.Stage.AFTER_ON_ENABLE);
+        }
         logger.info("QuickShop Loaded! " + enableTimer.stopAndGetTimePassed() + " ms.");
+
     }
 
     private void loadErrorReporter() {
@@ -660,6 +667,7 @@ private void loadVirtualDisplayItem() {
                 Plugin protocolLibPlugin = Bukkit.getPluginManager().getPlugin("ProtocolLib");
                 if (protocolLibPlugin != null && protocolLibPlugin.isEnabled()) {
                     logger.info("Successfully loaded ProtocolLib support!");
+                    virtualDisplayItemManager = new VirtualDisplayItemManager(this);
                     if (getConfig().getBoolean("shop.per-player-shop-sign")) {
                         signHooker = new SignHooker(this);
                         logger.info("Successfully registered per-player shop sign!");
@@ -957,9 +965,9 @@ public final void onDisable() {
             logger.info("Cleaning up shop manager...");
             shopManager.clear();
         }
-        if (AbstractDisplayItem.getNowUsing() == DisplayType.VIRTUALITEM) {
+        if (AbstractDisplayItem.getNowUsing() == DisplayType.VIRTUALITEM && virtualDisplayItemManager != null) {
             logger.info("Cleaning up display manager...");
-            VirtualDisplayItem.VirtualDisplayItemManager.unload();
+            virtualDisplayItemManager.unload();
         }
         if (logWatcher != null) {
             logger.info("Stopping log watcher...");

quickshop-bukkit/src/main/java/com/ghostchu/quickshop/shop/ContainerShop.java

@@ -22,7 +22,6 @@
 import com.ghostchu.quickshop.shop.datatype.ShopSignPersistentDataType;
 import com.ghostchu.quickshop.shop.display.AbstractDisplayItem;
 import com.ghostchu.quickshop.shop.display.RealDisplayItem;
-import com.ghostchu.quickshop.shop.display.VirtualDisplayItem;
 import com.ghostchu.quickshop.util.MsgUtil;
 import com.ghostchu.quickshop.util.Util;
 import com.ghostchu.quickshop.util.logger.Log;
@@ -357,7 +356,7 @@ public void checkDisplay() {
                 } else {
                     this.displayItem = switch (AbstractDisplayItem.getNowUsing()) {
                         case REALITEM -> new RealDisplayItem(this);
-                        default -> new VirtualDisplayItem(this);
+                        default -> plugin.getVirtualDisplayItemManager().createVirtualDisplayItem(this);
                     };
                 }
             } catch (Error anyError) {

quickshop-bukkit/src/main/java/com/ghostchu/quickshop/shop/display/AbstractDisplayItem.java

@@ -13,8 +13,6 @@
 import com.ghostchu.simplereloadlib.Reloadable;
 import com.google.common.collect.Lists;
 import com.google.gson.JsonSyntaxException;
-import lombok.Getter;
-import lombok.Setter;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
@@ -31,9 +29,6 @@
 public abstract class AbstractDisplayItem implements Reloadable {
 
     protected static final QuickShop PLUGIN = QuickShop.getInstance();
-    @Setter
-    @Getter
-    private static volatile boolean isNotSupportVirtualItem = false;
     protected final ItemStack originalItemStack;
     protected final Shop shop;
     @Nullable
@@ -54,15 +49,7 @@ protected AbstractDisplayItem(Shop shop) {
      */
     @NotNull
     public static DisplayType getNowUsing() {
-        DisplayType displayType = DisplayType.fromID(PLUGIN.getConfig().getInt("shop.display-type"));
-        //Falling back to RealDisplayItem when VirtualDisplayItem is unsupported
-        if (isNotSupportVirtualItem && displayType == DisplayType.VIRTUALITEM) {
-            PLUGIN.getConfig().set("shop.display-type", 0);
-            PLUGIN.getJavaPlugin().saveConfig();
-            PLUGIN.logger().warn("Falling back to RealDisplayItem because {} type is unsupported.", displayType.name());
-            return DisplayType.REALITEM;
-        }
-        return displayType;
+        return DisplayType.fromID(PLUGIN.getConfig().getInt("shop.display-type"));
     }
 
     /**
@@ -332,4 +319,13 @@ public ReloadResult reloadModule() {
      */
     public abstract void spawn();
 
+    /**
+     * Gets the shop that display holding
+     *
+     * @return The shop that display holding
+     */
+    @NotNull
+    public Shop getShop() {
+        return shop;
+    }
 }