Improved some performance

addon/squaremap/src/main/java/com/ghostchu/quickshop/addon/squaremap/ShopLayerProvider.java

@@ -2,9 +2,6 @@
 
 import com.ghostchu.quickshop.QuickShop;
 import com.ghostchu.quickshop.api.shop.Shop;
-import com.ghostchu.quickshop.api.shop.query.Filters;
-import com.ghostchu.quickshop.api.shop.query.ShopQuery;
-import com.ghostchu.quickshop.api.shop.query.filters.WorldUUIDFilter;
 import com.ghostchu.quickshop.menu.browse.MarketUtils;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;

quickshop-api/src/main/java/com/ghostchu/quickshop/api/shop/query/Filters.java

@@ -20,13 +20,13 @@
 
 import com.ghostchu.quickshop.api.obj.QUser;
 import com.ghostchu.quickshop.api.shop.IShopType;
-import com.ghostchu.quickshop.api.shop.query.filters.WorldUUIDFilter;
-import com.ghostchu.quickshop.api.shop.state.ShopState;
 import com.ghostchu.quickshop.api.shop.query.filters.MaterialFilter;
 import com.ghostchu.quickshop.api.shop.query.filters.OwnerUUIDFilter;
 import com.ghostchu.quickshop.api.shop.query.filters.QUserOwnerFilter;
 import com.ghostchu.quickshop.api.shop.query.filters.StateFilter;
 import com.ghostchu.quickshop.api.shop.query.filters.TypeFilter;
+import com.ghostchu.quickshop.api.shop.query.filters.WorldUUIDFilter;
+import com.ghostchu.quickshop.api.shop.state.ShopState;
 import org.bukkit.Material;
 
 import java.util.UUID;

quickshop-api/src/main/java/com/ghostchu/quickshop/api/shop/query/filters/MaterialFilter.java

@@ -20,7 +20,8 @@
 
 import com.ghostchu.quickshop.api.shop.Shop;
 import com.ghostchu.quickshop.api.shop.query.Filter;
-import org.bukkit.Material;import org.jetbrains.annotations.NotNull;
+import org.bukkit.Material;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * MaterialFilter

quickshop-api/src/main/java/com/ghostchu/quickshop/api/updater/UpdateMetadata.java

@@ -18,10 +18,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import java.util.Objects;
-
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Objects;
+
 /**
  * UpdateMetadata
  *

quickshop-bukkit/build.gradle.kts

@@ -1,5 +1,5 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import com.ghostchu.quickshop.buildlogic.GitInfoValueSource
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
     id("quickshop.core-conventions")

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

@@ -165,7 +165,6 @@
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 
-import java.awt.print.Paper;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -26,9 +26,7 @@
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.UUID;
 import java.util.logging.Level;
 
 public class QuickShopBukkit extends JavaPlugin {

quickshop-bukkit/src/main/java/com/ghostchu/quickshop/command/subcommand/SubCommand_Export.java

@@ -3,8 +3,6 @@
 import com.ghostchu.quickshop.QuickShop;
 import com.ghostchu.quickshop.api.command.CommandHandler;
 import com.ghostchu.quickshop.api.command.CommandParser;
-import com.ghostchu.quickshop.database.DatabaseIOUtil;
-import com.ghostchu.quickshop.database.SimpleDatabaseHelperV2;
 import com.ghostchu.quickshop.database.TableZipCsvBackup;
 import com.ghostchu.quickshop.util.Util;
 import org.bukkit.command.ConsoleCommandSender;

quickshop-bukkit/src/main/java/com/ghostchu/quickshop/listener/PlayerListener.java

@@ -17,7 +17,6 @@
 import com.ghostchu.simplereloadlib.ReloadResult;
 import com.ghostchu.simplereloadlib.ReloadStatus;
 import net.tnemc.menu.core.manager.MenuManager;
-import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -47,7 +46,6 @@
 import java.time.ZoneId;
 import java.util.AbstractMap;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;

quickshop-bukkit/src/main/java/com/ghostchu/quickshop/menu/staff/PlayerSelectionPage.java

@@ -18,12 +18,12 @@
  */
 
 import com.ghostchu.quickshop.QuickShop;
+import com.ghostchu.quickshop.api.inventory.SkullProvider;
 import com.ghostchu.quickshop.api.shop.Shop;
 import com.ghostchu.quickshop.api.shop.permission.BuiltInShopPermissionGroup;
 import com.ghostchu.quickshop.config.GuiConfig;
 import com.ghostchu.quickshop.menu.shared.ClearSearchAction;
 import com.ghostchu.quickshop.menu.shared.GuiChatAction;
-import com.ghostchu.quickshop.api.inventory.SkullProvider;
 import net.tnemc.item.providers.SkullProfile;
 import net.tnemc.menu.core.builder.IconBuilder;
 import net.tnemc.menu.core.callbacks.page.PageOpenCallback;

quickshop-bukkit/src/main/java/com/ghostchu/quickshop/shop/datatype/DisplayItemPersistentDataType.java

@@ -1,9 +1,6 @@
 package com.ghostchu.quickshop.shop.datatype;
 
 import com.ghostchu.quickshop.common.util.JsonUtil;
-import com.ghostchu.quickshop.util.Util;
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
 import org.bukkit.persistence.PersistentDataAdapterContext;
 import org.bukkit.persistence.PersistentDataType;
 import org.jetbrains.annotations.NotNull;

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

@@ -57,7 +57,7 @@ public abstract class AbstractDisplayItem implements Reloadable {
   protected AbstractDisplayItem(final Shop shop) {
 
     this.shop = shop;
-    this.originalItemStack = shop.getItem().clone();
+    this.originalItemStack = shop.getItem();
     PLUGIN.getReloadManager().register(this);
     init();
   }

quickshop-bukkit/src/main/java/com/ghostchu/quickshop/shop/interaction/behaviors/ControlPanel.java

@@ -17,7 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import com.ghostchu.quickshop.QuickShop;
 import com.ghostchu.quickshop.api.QuickShopAPI;
 import com.ghostchu.quickshop.api.shop.Shop;
 import com.ghostchu.quickshop.api.shop.interaction.InteractionBehavior;

quickshop-bukkit/src/main/java/com/ghostchu/quickshop/util/FastPlayerFinder.java

@@ -71,7 +71,7 @@ public FastPlayerFinder(final QuickShop plugin) {
       public void run() {
 
         nameCache.asMap().entrySet().removeIf(entry->entry.getValue().isEmpty());
-        handling.entrySet().removeIf(entry->entry.getKey().get() == null);
+        handling.entrySet().removeIf(entry->entry.getKey().get() == null || entry.getValue().isEmpty());
       }
     }, 0, 1000 * 60 * 60);
   }

quickshop-bukkit/src/main/java/com/ghostchu/quickshop/util/skin/PaperSkullProvider.java

@@ -20,10 +20,10 @@
 
 import com.destroystokyo.paper.profile.PlayerProfile;
 import com.destroystokyo.paper.profile.ProfileProperty;
+import com.ghostchu.quickshop.api.inventory.SkullProvider;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import net.tnemc.item.providers.SkullProfile;
-import com.ghostchu.quickshop.api.inventory.SkullProvider;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;