Kit editing

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

@@ -18,13 +18,16 @@
 
 package plugily.projects.minigamesbox.classic.kits;
 
-import org.bukkit.configuration.file.FileConfiguration;
+import com.cryptomorin.xseries.XItemStack;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.inventory.ItemStack;
 import plugily.projects.minigamesbox.classic.PluginMain;
 import plugily.projects.minigamesbox.classic.kits.basekits.Kit;
 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;
 
 /**
  * @author Tigerpanzer_02
@@ -37,7 +40,6 @@ public class KitRegistry {
   private Kit defaultKit;
   private final PluginMain plugin;
 
-  //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;
   }
@@ -48,6 +50,7 @@ public KitRegistry(PluginMain plugin) {
    * @param kit Kit to register
    */
   public void registerKit(Kit kit) {
+    ConfigurationSection configurationSection = kit.getKitsConfig().createSection(kit.getKey());
     if(!plugin.getConfigPreferences().getOption("KITS")) {
       plugin.getDebugger().debug("Kit " + kit.getKey() + " can't be added as kits are disabled");
       return;
@@ -56,15 +59,59 @@ 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)) {
+
+    initializeKitConfig(kit);
+    kit.saveKitsConfig();
+    plugin.getDebugger().debug("Kit " + kit.getKey() + "'s config files have been initialized");
+
+    if(!configurationSection.getBoolean("enabled", false)) {
       plugin.getDebugger().debug("Kit " + kit.getKey() + " is disabled by kits.yml");
       return;
     }
+
+    loadKitConfig(kit);
+    plugin.getDebugger().debug("Kit " + kit.getKey() + "'s config files have been loaded");
+
     plugin.getDebugger().debug("Registered {0} kit", kit.getKey());
     kits.add(kit);
   }
 
+  public void initializeKitConfig(Kit kit) {
+    ConfigurationSection configurationSection = kit.getKitsConfig().getConfigurationSection(kit.getKey());
+    if (configurationSection == null) {
+      configurationSection = kit.getKitsConfig().createSection(kit.getKey());
+    }
+    configurationSection.set("name", kit.getName());
+    if (!configurationSection.contains("enabled")) {
+      configurationSection.set("enabled", true);
+    }
+    int currentItem = 0;
+    if (!configurationSection.contains("items")) {
+      ConfigurationSection finalConfigurationSection = configurationSection;
+      kit.getKitItems().forEach((item, indexes) -> {
+        ConfigurationSection itemConfigurationSection = finalConfigurationSection.createSection(String.valueOf(currentItem));
+        XItemStack.serialize(item, itemConfigurationSection.createSection("item"));
+        itemConfigurationSection.set("slots", indexes);
+      });
+    }
+  }
+
+  public void loadKitConfig(Kit kit) {
+    ConfigurationSection configurationSection = kit.getKitsConfig().getConfigurationSection(kit.getKey());
+    assert configurationSection != null;
+    kit.setName(configurationSection.getString("name"));
+
+    kit.getKitItems().clear();
+    HashMap<ItemStack, List<Integer>> kitItems = new HashMap<>();
+
+    Objects.requireNonNull(configurationSection.getConfigurationSection("items"), "Items for kit " + kit.getKey() + " is null").getKeys(false).forEach((k) -> {
+      ItemStack item = XItemStack.deserialize(Objects.requireNonNull(configurationSection.getConfigurationSection("items." + k + ".item"), "An itemstack in " + kit.getKey() + " is null"));
+      List<Integer> indexes = configurationSection.getIntegerList("items." + k + ".slots");
+      kitItems.put(item, indexes);
+    });
+    kit.setKitItems(kitItems);
+  }
+
   /**
    * Return default game kit
    *

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

@@ -18,14 +18,15 @@
 
 package plugily.projects.minigamesbox.classic.kits.basekits;
 
-import org.bukkit.ChatColor;
+import com.cryptomorin.xseries.XItemStack;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.java.JavaPlugin;
 import plugily.projects.minigamesbox.classic.PluginMain;
 import plugily.projects.minigamesbox.classic.utils.configuration.ConfigUtils;
 
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -37,14 +38,22 @@ public abstract class Kit {
 
   private static final PluginMain plugin = JavaPlugin.getPlugin(PluginMain.class);
 
-  private final FileConfiguration kitsConfig = ConfigUtils.getConfig(plugin, "kits");
+  private FileConfiguration kitsConfig = ConfigUtils.getConfig(plugin, "kits");
 
   private String name = "";
 
   private String key = "";
+
   private boolean unlockedOnDefault = false;
   private String[] description = new String[0];
 
+  // Item index -5: Helmet
+  // Item index -4: Chestplate
+  // Item index -3: Leggings
+  // Item index -2: Boots
+  // Item index -1: Next available slot
+  private HashMap<ItemStack, List<Integer>> kitItems = new HashMap<>();
+
   protected Kit() {
   }
 
@@ -68,6 +77,22 @@ public void setUnlockedOnDefault(boolean unlockedOnDefault) {
     this.unlockedOnDefault = unlockedOnDefault;
   }
 
+  public void addKitItem(ItemStack item, List<Integer> slots) {
+    kitItems.put(item, slots);
+  }
+
+  public void addKitItem(ItemStack item, Integer slot) {
+    kitItems.put(item, List.of(slot));
+  }
+
+  public HashMap<ItemStack, List<Integer>> getKitItems() {
+    return kitItems;
+  }
+
+  public void setKitItems(HashMap<ItemStack, List<Integer>> kitItems) {
+    this.kitItems = kitItems;
+  }
+
   /**
    * @return main plugin
    */
@@ -82,6 +107,11 @@ public FileConfiguration getKitsConfig() {
     return kitsConfig;
   }
 
+  public void saveKitsConfig() {
+    ConfigUtils.saveConfig(plugin, kitsConfig, "kits");
+    kitsConfig = ConfigUtils.getConfig(plugin, "kits");
+  }
+
   public String getName() {
     return name;
   }
@@ -96,6 +126,7 @@ public void setKey(String key) {
     this.key = key;
   }
 
+  public abstract void setupKitItems();
 
   public String getKey() {
     if (key.equalsIgnoreCase("")) {
@@ -122,8 +153,37 @@ public void setDescription(List<String> description) {
 
   public abstract ItemStack getItemStack();
 
-  public abstract void giveKitItems(Player player);
+  public void giveKitItems(Player player) {
+    player.getInventory().clear();
+    kitItems.forEach((item, slots) -> {
+      for (Integer slot : slots) {
+        switch (slot) {
+          case (-5) -> {
+            player.getInventory().setHelmet(item);
+          }
+          case (-4) -> {
+            player.getInventory().setChestplate(item);
+          }
+          case (-3) -> {
+            player.getInventory().setLeggings(item);
+          }
+          case (-2) -> {
+            player.getInventory().setBoots(item);
+          }
+          case (-1) -> {
+            player.getInventory().setItem(XItemStack.firstEmpty(player.getInventory(), 0), item);
+          }
+          default -> {
+            player.getInventory().setItem(slot, item);
+          }
+        }
+      }
+    });
+  };
 
   public abstract void reStock(Player player);
 
+  public String getKitConfigPath() {
+    return"kit." + key + ".";
+  }
 }

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

@@ -24,7 +24,6 @@
 import org.bukkit.inventory.ItemStack;
 import plugily.projects.minigamesbox.classic.handlers.language.MessageBuilder;
 import plugily.projects.minigamesbox.classic.kits.basekits.FreeKit;
-import plugily.projects.minigamesbox.classic.utils.helper.ArmorHelper;
 import plugily.projects.minigamesbox.classic.utils.helper.WeaponHelper;
 
 import java.util.List;
@@ -50,11 +49,14 @@ public boolean isUnlockedByPlayer(Player player) {
   }
 
   @Override
-  public void giveKitItems(Player player) {
-    player.getInventory().addItem(WeaponHelper.getUnBreakingSword(WeaponHelper.ResourceType.WOOD, 10));
-    ArmorHelper.setArmor(player, ArmorHelper.ArmorType.LEATHER);
-    player.getInventory().addItem(new ItemStack(XMaterial.COOKED_PORKCHOP.parseMaterial(), 8));
+  public void setupKitItems() {
+    addKitItem(WeaponHelper.getUnBreakingSword(WeaponHelper.ResourceType.WOOD, 10), 0);
+    addKitItem(new ItemStack(XMaterial.COOKED_PORKCHOP.parseMaterial()), 8);
 
+    addKitItem(new ItemStack(Material.LEATHER_BOOTS), -2);
+    addKitItem(new ItemStack(Material.LEATHER_LEGGINGS), -3);
+    addKitItem(new ItemStack(Material.LEATHER_CHESTPLATE), -4);
+    addKitItem(new ItemStack(Material.LEATHER_HELMET), -5);
   }
 
   @Override

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

@@ -45,6 +45,11 @@ public boolean isUnlockedByPlayer(Player player) {
     return true;
   }
 
+  @Override
+  public void setupKitItems() {
+
+  }
+
   @Override
   public void giveKitItems(Player player) {
   }

MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/utils/configuration/ConfigUtils.java

@@ -93,4 +93,20 @@ public static void saveConfig(JavaPlugin plugin, FileConfiguration config, Strin
     }
   }
 
+  /**
+   * Sets the data into the config file if it is absent
+   *
+   * @param config FileConfiguration to use
+   * @param key    Key of the data value to set
+   * @param data   The data to be set
+   *
+   * @return       Return value is true if the data value was not set and has now been set.
+   */
+  public static boolean setIfAbsent(FileConfiguration config, String key, Object data) {
+    if (!config.isSet(key) || !config.contains(key) || config.get(key) == null) {
+      config.set(key, data);
+      return true;
+    }
+    return false;
+  }
 }

MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/utils/helper/ArmorHelper.java

@@ -36,33 +36,33 @@ private ArmorHelper() {
 
   public static void setArmor(Player player, ArmorType type) {
     PlayerInventory inv = player.getInventory();
-    switch(type) {
-      case LEATHER:
+    switch (type) {
+      case LEATHER -> {
         inv.setBoots(new ItemStack(Material.LEATHER_BOOTS));
         inv.setLeggings(new ItemStack(Material.LEATHER_LEGGINGS));
         inv.setChestplate(new ItemStack(Material.LEATHER_CHESTPLATE));
         inv.setHelmet(new ItemStack(Material.LEATHER_HELMET));
-        break;
-      case IRON:
+      }
+      case IRON -> {
         inv.setBoots(new ItemStack(Material.IRON_BOOTS));
         inv.setLeggings(new ItemStack(Material.IRON_LEGGINGS));
         inv.setChestplate(new ItemStack(Material.IRON_CHESTPLATE));
         inv.setHelmet(new ItemStack(Material.IRON_HELMET));
-        break;
-      case GOLD:
+      }
+      case GOLD -> {
         inv.setBoots(XMaterial.GOLDEN_BOOTS.parseItem());
         inv.setLeggings(XMaterial.GOLDEN_LEGGINGS.parseItem());
         inv.setChestplate(XMaterial.GOLDEN_CHESTPLATE.parseItem());
         inv.setHelmet(XMaterial.GOLDEN_HELMET.parseItem());
-        break;
-      case DIAMOND:
+      }
+      case DIAMOND -> {
         inv.setBoots(new ItemStack(Material.DIAMOND_BOOTS));
         inv.setLeggings(new ItemStack(Material.DIAMOND_LEGGINGS));
         inv.setChestplate(new ItemStack(Material.DIAMOND_CHESTPLATE));
         inv.setHelmet(new ItemStack(Material.DIAMOND_HELMET));
-        break;
-      default:
-        break; //o.o
+      }
+      default -> {
+      } //o.o
     }
   }