From 03f0e1446f6d6fb21aa7d28ea45167504a4576e8 Mon Sep 17 00:00:00 2001
From: Ajneb97 <ajneb97@gmail.com>
Date: Tue, 19 Sep 2023 18:00:08 -0300
Subject: [PATCH] 1.3.1

---
 .../java/pk/ajneb97/configs/KitsConfigManager.java   |  6 ++++--
 src/main/java/pk/ajneb97/managers/KitsManager.java   |  6 ++++++
 .../managers/edit/InventoryEditActionsManager.java   |  2 +-
 src/main/java/pk/ajneb97/model/KitAction.java        | 12 +++++++++++-
 src/main/resources/plugin.yml                        |  2 +-
 5 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/main/java/pk/ajneb97/configs/KitsConfigManager.java b/src/main/java/pk/ajneb97/configs/KitsConfigManager.java
index a0080b0..7189c73 100644
--- a/src/main/java/pk/ajneb97/configs/KitsConfigManager.java
+++ b/src/main/java/pk/ajneb97/configs/KitsConfigManager.java
@@ -203,6 +203,7 @@ public class KitsConfigManager {
             String path = "actions."+actionType+"."+currentPos;
             config.set(path+".action",kitAction.getAction());
             config.set(path+".execute_before_items",kitAction.isExecuteBeforeItems());
+            config.set(path+".count_as_item",kitAction.isCountAsItem());
             if(kitAction.getDisplayItem() != null){
                 kitItemManager.saveKitItemOnConfig(kitAction.getDisplayItem(),config,path+".display_item");
             }
@@ -287,10 +288,11 @@ public class KitsConfigManager {
             for(String key : config.getConfigurationSection(mainPath+"actions."+actionType).getKeys(false)){
                 String path = mainPath+"actions."+actionType+"."+key;
                 String action = config.getString(path+".action");
-                boolean executeBeforeItem = config.contains("execute_before_items") ? config.getBoolean("execute_before_items") : false;
+                boolean executeBeforeItem = config.contains(path+".execute_before_items") ? config.getBoolean(path+".execute_before_items") : false;
+                boolean countAsItem = config.contains(path+".count_as_item") ? config.getBoolean(path+".count_as_item") : false;
                 KitItem item = config.contains(path+".display_item") ? kitItemManager.getKitItemFromConfig(config,path+".display_item") : null;
 
-                actions.add(new KitAction(action,item,executeBeforeItem));
+                actions.add(new KitAction(action,item,executeBeforeItem,countAsItem));
             }
         }
         return actions;
diff --git a/src/main/java/pk/ajneb97/managers/KitsManager.java b/src/main/java/pk/ajneb97/managers/KitsManager.java
index 1d6db8f..619ad3c 100644
--- a/src/main/java/pk/ajneb97/managers/KitsManager.java
+++ b/src/main/java/pk/ajneb97/managers/KitsManager.java
@@ -266,6 +266,12 @@ public class KitsManager {
 
             inventoryKitItems++;
         }
+        ArrayList<KitAction> claimActions = kit.getClaimActions();
+        for(KitAction action : claimActions){
+            if(action.isCountAsItem()){
+                inventoryKitItems++;
+            }
+        }
 
 
         boolean enoughSpace = freeSlots < inventoryKitItems;
diff --git a/src/main/java/pk/ajneb97/managers/edit/InventoryEditActionsManager.java b/src/main/java/pk/ajneb97/managers/edit/InventoryEditActionsManager.java
index d5b6a24..94ae527 100644
--- a/src/main/java/pk/ajneb97/managers/edit/InventoryEditActionsManager.java
+++ b/src/main/java/pk/ajneb97/managers/edit/InventoryEditActionsManager.java
@@ -132,7 +132,7 @@ public class InventoryEditActionsManager {
         Kit kit = plugin.getKitsManager().getKitByName(inventoryPlayer.getKitName());
         String type = inventoryPlayer.getInventoryName().replace("edit_chat_add_action_","");
         ArrayList<KitAction> actions = getKitActionsFromType(kit,type);
-        actions.add(new KitAction(message,null,false));
+        actions.add(new KitAction(message,null,false,false));
 
         inventoryEditManager.removeInventoryPlayer(inventoryPlayer.getPlayer());
         openInventory(inventoryPlayer,type);
diff --git a/src/main/java/pk/ajneb97/model/KitAction.java b/src/main/java/pk/ajneb97/model/KitAction.java
index 1639f68..b607719 100644
--- a/src/main/java/pk/ajneb97/model/KitAction.java
+++ b/src/main/java/pk/ajneb97/model/KitAction.java
@@ -6,11 +6,13 @@ public class KitAction {
     private String action;
     private KitItem displayItem;
     private boolean executeBeforeItems;
+    private boolean countAsItem;
 
-    public KitAction(String action, KitItem displayItem, boolean executeBeforeItems) {
+    public KitAction(String action, KitItem displayItem, boolean executeBeforeItems, boolean countAsItem) {
         this.action = action;
         this.displayItem = displayItem;
         this.executeBeforeItems = executeBeforeItems;
+        this.countAsItem = countAsItem;
     }
 
     public String getAction() {
@@ -36,4 +38,12 @@ public class KitAction {
     public void setExecuteBeforeItems(boolean executeBeforeItems) {
         this.executeBeforeItems = executeBeforeItems;
     }
+
+    public boolean isCountAsItem() {
+        return countAsItem;
+    }
+
+    public void setCountAsItem(boolean countAsItem) {
+        this.countAsItem = countAsItem;
+    }
 }
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index aac68b9..d436825 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 main: pk.ajneb97.PlayerKits2
-version: 1.2.2
+version: 1.3.1
 name: PlayerKits2
 api-version: 1.13
 softdepend: [Vault,PlaceholderAPI]