Merge remote-tracking branch 'origin/development' into development

.gitignore

@@ -115,3 +115,7 @@ run/
 # gradle
 .gradle
 buildSrc/build
+MiniGamesBox Classic/build
+MiniGamesBox Database/build
+MiniGamesBox Inventory/build
+MiniGamesBox Utils/build

MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/kits/HandleItem.java

@@ -0,0 +1,8 @@
+package plugily.projects.minigamesbox.classic.kits;
+
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+public interface HandleItem {
+    ItemStack apply(Player player, ItemStack itemStack);
+}

MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/kits/KitMenuHandler.java

@@ -66,7 +66,7 @@ public void createMenu(Player player) {
 
       gui.addItem(new SimpleClickableItem(itemStack, event -> {
         event.setCancelled(true);
-        if(!(event.isLeftClick() || event.isRightClick()) || !(event.getWhoClicked() instanceof Player) || !ItemUtils.isItemStackNamed(event.getCurrentItem())) {
+        if(!(event.isLeftClick() || event.isRightClick()) || !(event.getWhoClicked() instanceof Player)) {
           return;
         }
         PluginArena arena = plugin.getArenaRegistry().getArena(player);

MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/kits/KitRegistry.java

@@ -18,13 +18,24 @@
 
 package plugily.projects.minigamesbox.classic.kits;
 
+import com.cryptomorin.xseries.XItemStack;
+import org.bukkit.Material;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.inventory.ItemStack;
 import plugily.projects.minigamesbox.classic.PluginMain;
+import plugily.projects.minigamesbox.classic.kits.basekits.FreeKit;
 import plugily.projects.minigamesbox.classic.kits.basekits.Kit;
+import plugily.projects.minigamesbox.classic.kits.basekits.LevelKit;
+import plugily.projects.minigamesbox.classic.kits.basekits.PremiumKit;
 import plugily.projects.minigamesbox.classic.kits.free.EmptyKit;
 import plugily.projects.minigamesbox.classic.utils.configuration.ConfigUtils;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.logging.Level;
 
 /**
  * @author Tigerpanzer_02
@@ -33,17 +44,19 @@
  */
 public class KitRegistry {
 
-  private final List<Kit> kits = new java.util.ArrayList<>();
+  public final List<Kit> kits = new java.util.ArrayList<>();
   private Kit defaultKit;
-  private final PluginMain plugin;
+  public final PluginMain plugin;
+  public FileConfiguration kitsConfig;
+  private static HandleItem handleItem;
 
-  //todo default kits - kit loading - possibility to edit kits with files - patreon will be ingame gui - kits.yml
   public KitRegistry(PluginMain plugin) {
     this.plugin = plugin;
+    kitsConfig = ConfigUtils.getConfig(plugin, "kits");
   }
 
   /**
-   * Method for registering new kit
+   * Method for registering clone and empty kit
    *
    * @param kit Kit to register
    */
@@ -56,23 +69,172 @@ public void registerKit(Kit kit) {
       plugin.getDebugger().debug("Kit " + kit.getKey() + " can't be added as its already registered");
       return;
     }
-    FileConfiguration config = ConfigUtils.getConfig(plugin, "kits");
-    if(!config.getBoolean("Enabled-Game-Kits." + kit.getKey(), false)) {
+
+    ConfigurationSection configurationSection = kit.getKitConfigSection();
+    if(configurationSection != null && !configurationSection.getBoolean("enabled", false)) {
       plugin.getDebugger().debug("Kit " + kit.getKey() + " is disabled by kits.yml");
       return;
     }
+
     plugin.getDebugger().debug("Registered {0} kit", kit.getKey());
     kits.add(kit);
   }
 
+  /**
+   * Registers the kits by loading their configurations.
+   */
+  public void registerKits(List<String> optionalConfigurations) {
+
+    for (String key : kitsConfig.getKeys(false)) {
+      if (!Objects.equals(key, "Do-Not-Edit")) {
+        loadKitConfig(key, optionalConfigurations);
+      }
+    }
+  }
+
+  /**
+   * Loads the configuration for a kit.
+   *
+   * @param  kit_key  the key of the kit to load the configuration for
+   */
+  public void loadKitConfig(String kit_key, List<String> optionalConfigurations) {
+    ConfigurationSection configurationSection = kitsConfig.getConfigurationSection(kit_key);
+
+    if (configurationSection == null) {
+      plugin.getDebugger().debug(Level.SEVERE, "Kit " + kit_key + " does not have any configuration.");
+      plugin.getDebugger().debug(Level.SEVERE, "Kit" + kit_key + " will not be loaded.");
+      return;
+    }
+
+    String kit_name = configurationSection.getString("name", kit_key);
+
+    if (configurationSection.getConfigurationSection("display_item") == null) {
+      configurationSection.set("display_item", XItemStack.serialize(new ItemStack(Material.BEDROCK)));
+    }
+
+    ItemStack itemStack = XItemStack.deserialize(Objects.requireNonNull(configurationSection.getConfigurationSection("display_item")));
+
+    if(!configurationSection.getBoolean("enabled", false)) {
+      plugin.getDebugger().debug("Kit " + kit_key + " is disabled by kits.yml");
+      return;
+    }
+
+    String kitType = configurationSection.getString("kit_type");
+
+    if (kitType == null) {
+      plugin.getDebugger().debug(Level.SEVERE, "Kit " + kit_key + " kit_type is null.");
+      plugin.getDebugger().debug(Level.SEVERE, "Kit" + kit_key + " will not be loaded.");
+      return;
+    }
+
+    Kit kit;
+
+    switch (kitType) {
+      case "free": {
+        kit = new FreeKit(kit_key, kit_name, itemStack);
+        break;
+      }
+      case "level": {
+        kit = new LevelKit(kit_key, kit_name, itemStack);
+        ((LevelKit) kit).setLevel(configurationSection.getInt("required-level"));
+        break;
+      }
+      case "premium": {
+        kit = new PremiumKit(kit_key, kit_name, itemStack);
+        break;
+      }
+      default: {
+        plugin.getDebugger().debug(Level.SEVERE, "Kit " + kit_key + " kit_type is not recognised.");
+        plugin.getDebugger().debug(Level.SEVERE, "Kit" + kit_key + " will not be loaded.");
+        return;
+      }
+    }
+
+    if (configurationSection.getString("unlockedOnDefault") == null) {
+      plugin.getDebugger().debug(Level.SEVERE, "Kit " + kit_key + " does not have an unlockedOnDefault configuration.");
+      plugin.getDebugger().debug(Level.SEVERE, "Kit" + kit_key + " will not be loaded.");
+      return;
+    }
+    kit.setUnlockedOnDefault(configurationSection.getBoolean("unlockedOnDefault"));
+
+    HashMap<ItemStack, Integer> kitItems = new HashMap<>();
+
+    ConfigurationSection inventoryConfigurationSection = configurationSection.getConfigurationSection("inventory");
+    if (inventoryConfigurationSection != null) {
+      inventoryConfigurationSection.getKeys(false).forEach((k) -> {
+
+        ConfigurationSection itemConfigurationSection = inventoryConfigurationSection.getConfigurationSection(k);
+        assert itemConfigurationSection != null;
+
+        ConfigurationSection itemStackConfigurationSection = itemConfigurationSection.getConfigurationSection("item");
+        assert itemStackConfigurationSection != null;
+        ItemStack item = XItemStack.deserialize(itemStackConfigurationSection);
+        Integer slot = itemConfigurationSection.getInt("slot");
+
+        kitItems.put(item, slot);
+      });
+      kit.setKitItems(kitItems);
+    }
+    else {
+      plugin.getDebugger().debug(Level.SEVERE, "The kit " + kit.getKey() + " does not have an inventory configuration section.");
+      plugin.getDebugger().debug(Level.SEVERE, "The kit " + kit.getKey() + " will not give any inventory items.");
+    }
+
+
+    ConfigurationSection armourConfigurationSection = configurationSection.getConfigurationSection("armour");
+    if (armourConfigurationSection != null) {
+
+      ConfigurationSection helmetConfigurationSection = armourConfigurationSection.getConfigurationSection("helmet");
+      if (helmetConfigurationSection != null) {
+        kit.setKitHelmet(XItemStack.deserialize(helmetConfigurationSection));
+      }
+
+      ConfigurationSection chestplateConfigurationSection = armourConfigurationSection.getConfigurationSection("chestplate");
+      if (chestplateConfigurationSection != null) {
+        kit.setKitChestplate(XItemStack.deserialize(chestplateConfigurationSection));
+      }
+
+      ConfigurationSection leggingsConfigurationSection = armourConfigurationSection.getConfigurationSection("leggings");
+      if (leggingsConfigurationSection != null) {
+        kit.setKitLeggings(XItemStack.deserialize(leggingsConfigurationSection));
+      }
+
+      ConfigurationSection bootsConfigurationSection = armourConfigurationSection.getConfigurationSection("boots");
+      if (bootsConfigurationSection != null) {
+        kit.setKitBoots(XItemStack.deserialize(bootsConfigurationSection));
+      }
+    }
+    else {
+      plugin.getDebugger().debug(Level.SEVERE, "The kit " + kit.getKey() + " does not have an armour configuration section.");
+      plugin.getDebugger().debug(Level.SEVERE, "The kit " + kit.getKey() + " will not give any armour items.");
+    }
+
+    if (configurationSection.getString("default_kit") != null) {
+      this.setDefaultKit(kit);
+      plugin.getDebugger().debug("Default kit set to " + kit.getKey());
+    }
+
+    if (optionalConfigurations != null) {
+      optionalConfigurations.forEach((k) -> {
+        if (configurationSection.contains(k)) {
+          kit.addOptionalConfiguration(k, configurationSection.get(k));
+          plugin.getDebugger().debug("Kit " + kit.getKey() + " has optional configuration " + k);
+        }
+      });
+    }
+
+    plugin.getDebugger().debug("Kit " + kit.getKey() + " loaded.");
+    kits.add(kit);
+  }
+
   /**
    * Return default game kit
    *
    * @return default game kit
    */
   public Kit getDefaultKit() {
     if(defaultKit == null) {
-      setDefaultKit(new EmptyKit());
+      setDefaultKit(new EmptyKit("default", "default"));
     }
     plugin.getDebugger().debug("getDefaultKit is {0}", defaultKit.getName());
     return defaultKit;
@@ -97,4 +259,12 @@ public List<Kit> getKits() {
     return kits;
   }
 
+  public static HandleItem getHandleItem() {
+    return handleItem;
+  }
+
+  public static void setHandleItem(HandleItem handleItem) {
+    KitRegistry.handleItem = handleItem;
+  }
+
 }

MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/kits/basekits/FreeKit.java

@@ -18,24 +18,26 @@
 
 package plugily.projects.minigamesbox.classic.kits.basekits;
 
-import org.bukkit.Material;
+import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
-import plugily.projects.minigamesbox.classic.utils.helper.ItemBuilder;
+import plugily.projects.minigamesbox.classic.kits.KitRegistry;
 
 /**
  * @author Tigerpanzer_02
  * <p>
  * Created at 21.09.2021
  */
-public abstract class FreeKit extends Kit {
+public class FreeKit extends Kit {
 
-  public abstract Material getMaterial();
+  public FreeKit(String key, String name, ItemStack itemStack) {
+    super(key, name, itemStack);
+  }
 
+  /**
+   * @return true
+   */
   @Override
-  public ItemStack getItemStack() {
-    return new ItemBuilder(getMaterial())
-        .name(getName())
-        .lore(getDescription())
-        .build();
+  public boolean isUnlockedByPlayer(Player p) {
+    return true;
   }
 }