Some quality of life improvements (#60)

* Remove unused first-join-kit configuration from config.yml

* refactor(KitCommand): Refactor KitCommand to improve inventory handling

* refactor(PlayerConnectionListener): Simplify player join kit handling

* refactor(PlayerKitService): Enhance first join kit handling and inventory management

Author: theShadowsDust

src/main/java/net/onelitefeather/playerkits/command/KitCommand.java

@@ -40,7 +40,7 @@ private void helpCommand(CommandSender sender, final @Argument("query") @Greedy
     @Permission("playerkits.command.kits")
     @CommandDescription("Open the kits overview")
     public void execute(@NotNull Player player) {
-        player.openInventory(this.playerKitService.getKitInventory());
+        this.playerKitService.openKitsInventory(player);
     }
 
     @Command("kit give <player> <kit>")

src/main/java/net/onelitefeather/playerkits/listener/PlayerConnectionListener.java

@@ -1,9 +1,7 @@
 package net.onelitefeather.playerkits.listener;
 
 import net.onelitefeather.playerkits.PlayerKitsPlugin;
-import net.onelitefeather.playerkits.kit.KitClaimResult;
 import net.onelitefeather.playerkits.service.PlayerKitService;
-import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
@@ -14,10 +12,6 @@ public record PlayerConnectionListener(@NotNull PlayerKitsPlugin plugin,
 
     @EventHandler
     private void handlePlayerJoin(PlayerJoinEvent event) {
-        Player player = event.getPlayer();
-        var kit = this.kitService.getFirstJoinKit();
-        if (kit != null && this.plugin.getClaimedKitService().canClaim(player.getUniqueId(), kit.getName()) == KitClaimResult.SUCCESS) {
-            this.kitService.handleGrantKit(player, player, kit);
-        }
+        this.kitService.giveFirstJoinKits(event.getPlayer());
     }
 }

src/main/java/net/onelitefeather/playerkits/service/PlayerKitService.java

@@ -34,7 +34,7 @@ public final class PlayerKitService {
 
     private final LoadingCache<String, PlayerKit> kitCache = Caffeine.newBuilder()
             .maximumSize(1000)
-            .expireAfterWrite(5, TimeUnit.MINUTES)
+            .expireAfterAccess(5, TimeUnit.MINUTES)
             .build(this::getPlayerKit);
 
     private final PlayerKitsPlugin plugin;
@@ -46,7 +46,6 @@ public PlayerKitService(@NotNull PlayerKitsPlugin plugin) {
 
         this.plugin = plugin;
         buildInventories();
-        loadKits();
         this.kitItemDescription = new ArrayList<>();
         for (String description : plugin.getConfig().getStringList("gui.item-description")) {
             this.kitItemDescription.add(MiniMessage.miniMessage().deserialize(description));
@@ -66,7 +65,6 @@ public boolean deleteKit(@NotNull PlayerKit playerKit) {
             session.remove(playerKit.getProperties());
             session.remove(playerKit);
             transaction.commit();
-            removeKitFromInventory(playerKit);
             this.kitCache.invalidate(playerKit.getName());
             return true;
         } catch (HibernateException e) {
@@ -110,9 +108,11 @@ public void createKit(@NotNull PlayerKit playerKit) {
         }
     }
 
-    @Nullable
-    public PlayerKit getFirstJoinKit() {
-        return getPlayerKit(this.plugin.getConfig().getString("first-join-kit", "firstjoin"));
+    public List<PlayerKit> getFirstJoinKits() {
+        return this.plugin.getDatabaseService().getSessionFactory().map(SessionFactory::openSession).map(session -> {
+            var query = session.createQuery("SELECT pt FROM PlayerKit pt JOIN FETCH pt.properties p WHERE pt.firstJoin = true", PlayerKit.class);
+            return query.list();
+        }).orElse(Collections.emptyList());
     }
 
     @NotNull
@@ -241,27 +241,27 @@ public Inventory getKitPreviewInventory() {
         return kitPreviewInventory;
     }
 
-    private void removeKitFromInventory(@NotNull PlayerKit playerKit) {
-        this.kitInventory.remove(playerKit.getProperties().getDisplayItem());
-    }
 
     private void addKitToInventory(@NotNull PlayerKit playerKit) {
 
         if (!playerKit.isVisible()) return;
-        var slot = this.kitInventory.firstEmpty();
-        if (slot == -1L) return;
 
-        this.kitInventory.setItem(slot,
-                InventoryUtil.createItem(
-                        playerKit.getProperties().getDisplayItem(),
-                        MiniMessage.miniMessage().deserialize(playerKit.getDisplayName()), this.kitItemDescription));
+        var kitMaterial = playerKit.getProperties().getDisplayItem();
+        if (this.kitInventory.contains(kitMaterial)) return;
+
+        this.kitInventory.addItem(InventoryUtil.createItem(
+                playerKit.getProperties().getDisplayItem(),
+                MiniMessage.miniMessage().deserialize(playerKit.getDisplayName()), this.kitItemDescription));
+    }
+
+    public void giveFirstJoinKits(Player player) {
+        getFirstJoinKits().forEach(playerKit -> handleGrantKit(player, player, playerKit));
     }
 
-    private void loadKits() {
+    public void openKitsInventory(Player player) {
         var kits = getKits();
-        for (PlayerKit kit : kits) {
-            addKitToInventory(kit);
-        }
+        kits.forEach(this::addKitToInventory);
+        player.openInventory(this.getKitInventory());
     }
 
     public void kitGrantSuccess(@NotNull CommandSender commandSender,

src/main/resources/config.yml

@@ -1,4 +1,3 @@
-first-join-kit: 'firstjoin'
 items:
     open-last-inventory: '<red>Back</red>'
 gui: