From d5b7e5dbfd95f11f1659b41426f9bee34a909e39 Mon Sep 17 00:00:00 2001
From: alexcrea <42614139+alexcrea@users.noreply.github.com>
Date: Thu, 18 Apr 2024 16:59:11 +0200
Subject: [PATCH] Finish global gui for group config.

---
 .../cuanvil/gui/config/MainConfigGui.java     | 13 ++++----
 .../gui/config/global/EnchantConflictGui.java |  2 ++
 .../gui/config/global/GroupConfigGui.java     | 30 ++++++++++++++-----
 .../config/list/MappedGuiListConfigGui.java   |  5 +++-
 ...Gui.java => GroupConfigSubSettingGui.java} |  6 ++--
 .../cuanvil/command/ReloadExecutor.kt         |  8 ++---
 .../cuanvil/group/ItemGroupManager.kt         | 19 ++++++++----
 7 files changed, 56 insertions(+), 27 deletions(-)
 rename src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/{ConflictSubSettingGui.java => GroupConfigSubSettingGui.java} (94%)

diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/MainConfigGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/MainConfigGui.java
index 891eb03..61307db 100644
--- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/MainConfigGui.java
+++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/MainConfigGui.java
@@ -6,6 +6,7 @@ import com.github.stefvanschie.inventoryframework.pane.PatternPane;
 import com.github.stefvanschie.inventoryframework.pane.util.Pattern;
 import io.delilaheve.CustomAnvil;
 import org.bukkit.Material;
+import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import xyz.alexcrea.cuanvil.gui.config.global.*;
@@ -83,12 +84,14 @@ public class MainConfigGui extends ChestGui {
         pane.bindItem('4', enchantConflictItem);
 
         // Group config items
-        ItemStack wipItemstack = new ItemStack(Material.BARRIER);
-        ItemMeta wipMeta = wipItemstack.getItemMeta();
-        wipMeta.setDisplayName("\u00A7cWIP");
-        wipItemstack.setItemMeta(wipMeta);
+        ItemStack groupItemstack = new ItemStack(Material.CHEST);
 
-        GuiItem groupConfigItem = GuiGlobalItems.goToGuiItem(wipItemstack, GroupConfigGui.INSTANCE);
+        ItemMeta groupMeta = groupItemstack.getItemMeta();
+        groupMeta.setDisplayName("\u00A7aMaterial Groups");
+        groupMeta.setLore(Collections.singletonList("\u00A77Click here to open material group menu"));
+        groupItemstack.setItemMeta(groupMeta);
+
+        GuiItem groupConfigItem = GuiGlobalItems.goToGuiItem(groupItemstack, GroupConfigGui.INSTANCE);
 
         pane.bindItem('5', groupConfigItem);
 
diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/EnchantConflictGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/EnchantConflictGui.java
index 499a8e4..5593cf3 100644
--- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/EnchantConflictGui.java
+++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/EnchantConflictGui.java
@@ -2,6 +2,7 @@ package xyz.alexcrea.cuanvil.gui.config.global;
 
 import com.github.stefvanschie.inventoryframework.gui.GuiItem;
 import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import xyz.alexcrea.cuanvil.config.ConfigHolder;
@@ -58,6 +59,7 @@ public class EnchantConflictGui extends MappedGuiListConfigGui<EnchantConflictGr
 
         ItemMeta meta = item.getItemMeta();
 
+        meta.addItemFlags(ItemFlag.values());
         meta.setDisplayName("\u00A7e" + CasedStringUtil.snakeToUpperSpacedCase(conflict.toString()) + " \u00A7fConflict");
         meta.setLore(Arrays.asList(
                 "\u00A77Enchantment count:      \u00A7e" + conflict.getEnchants().size(),
diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/GroupConfigGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/GroupConfigGui.java
index da854d0..5d5f89b 100644
--- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/GroupConfigGui.java
+++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/GroupConfigGui.java
@@ -1,19 +1,24 @@
 package xyz.alexcrea.cuanvil.gui.config.global;
 
 import com.github.stefvanschie.inventoryframework.gui.GuiItem;
-import org.bukkit.Material;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import xyz.alexcrea.cuanvil.config.ConfigHolder;
 import xyz.alexcrea.cuanvil.group.AbstractMaterialGroup;
+import xyz.alexcrea.cuanvil.group.GroupType;
 import xyz.alexcrea.cuanvil.group.IncludeGroup;
+import xyz.alexcrea.cuanvil.group.ItemGroupManager;
 import xyz.alexcrea.cuanvil.gui.config.list.MappedGuiListConfigGui;
-import xyz.alexcrea.cuanvil.gui.config.list.elements.ConflictSubSettingGui;
+import xyz.alexcrea.cuanvil.gui.config.list.elements.GroupConfigSubSettingGui;
+import xyz.alexcrea.cuanvil.util.CasedStringUtil;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
-public class GroupConfigGui extends MappedGuiListConfigGui<AbstractMaterialGroup, ConflictSubSettingGui> {
+public class GroupConfigGui extends MappedGuiListConfigGui<AbstractMaterialGroup, GroupConfigSubSettingGui> {
 
     public final static GroupConfigGui INSTANCE = new GroupConfigGui();
 
@@ -30,7 +35,13 @@ public class GroupConfigGui extends MappedGuiListConfigGui<AbstractMaterialGroup
         ItemStack item = new ItemStack(group.getRepresentativeMaterial());
         ItemMeta meta = item.getItemMeta();
 
-        meta.setDisplayName(group.getName());
+        meta.addItemFlags(ItemFlag.values());
+        meta.setDisplayName("\u00A7e" + CasedStringUtil.snakeToUpperSpacedCase(group.getName())+ " \u00A7rGroup");
+        meta.setLore(Arrays.asList(
+                "\u00A77Number of selected groups : " + group.getGroups().size(),
+                "\u00A77Number of selected material: " + group.getNonGroupInheritedMaterials().size(),
+                "",
+                "\u00A77Total number of included material "+group.getMaterials().size()));
 
         item.setItemMeta(meta);
         return item;
@@ -49,8 +60,8 @@ public class GroupConfigGui extends MappedGuiListConfigGui<AbstractMaterialGroup
     }
 
     @Override
-    protected ConflictSubSettingGui newInstanceOfGui(AbstractMaterialGroup group, GuiItem item) {
-        return new ConflictSubSettingGui(this, group, item);
+    protected GroupConfigSubSettingGui newInstanceOfGui(AbstractMaterialGroup group, GuiItem item) {
+        return new GroupConfigSubSettingGui(this, group, item);
     }
 
     @Override
@@ -60,8 +71,13 @@ public class GroupConfigGui extends MappedGuiListConfigGui<AbstractMaterialGroup
 
     @Override
     protected AbstractMaterialGroup createAndSaveNewEmptyGeneric(String name) {
+        ItemGroupManager manager = ConfigHolder.ITEM_GROUP_HOLDER.getItemGroupsManager();
+        if(manager.getGroupMap().containsKey(name)) return null;
 
-        return null;
+        ConfigurationSection config = ConfigHolder.ITEM_GROUP_HOLDER.getConfig();
+        config.set(name+"."+ItemGroupManager.GROUP_TYPE_PATH, GroupType.INCLUDE.getGroupID());
+
+        return manager.createGroup(config, name);
     }
 
 }
diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedGuiListConfigGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedGuiListConfigGui.java
index b183571..4a4baeb 100644
--- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedGuiListConfigGui.java
+++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedGuiListConfigGui.java
@@ -81,7 +81,10 @@ public abstract class MappedGuiListConfigGui< T, S extends ElementMappedToListGu
             }
 
             T generic = createAndSaveNewEmptyGeneric(message);
-            if(generic == null) return;// we don't know what to do
+            if(generic == null) {// we don't know what to do. so we back up by opening this gui.
+                this.show(player);
+                return;
+            }
 
             updateValueForGeneric(generic, true);
 
diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/ConflictSubSettingGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/GroupConfigSubSettingGui.java
similarity index 94%
rename from src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/ConflictSubSettingGui.java
rename to src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/GroupConfigSubSettingGui.java
index 9b423ff..4ccf7d8 100644
--- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/ConflictSubSettingGui.java
+++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/GroupConfigSubSettingGui.java
@@ -1,7 +1,6 @@
 package xyz.alexcrea.cuanvil.gui.config.list.elements;
 
 import com.github.stefvanschie.inventoryframework.gui.GuiItem;
-import com.github.stefvanschie.inventoryframework.gui.type.util.Gui;
 import com.github.stefvanschie.inventoryframework.pane.PatternPane;
 import com.github.stefvanschie.inventoryframework.pane.util.Pattern;
 import io.delilaheve.CustomAnvil;
@@ -20,20 +19,19 @@ import xyz.alexcrea.cuanvil.gui.config.global.GroupConfigGui;
 import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions;
 import xyz.alexcrea.cuanvil.gui.util.GuiGlobalItems;
 import xyz.alexcrea.cuanvil.gui.util.GuiSharedConstant;
-import xyz.alexcrea.cuanvil.recipe.CustomAnvilRecipeManager;
 import xyz.alexcrea.cuanvil.util.CasedStringUtil;
 
 import java.util.Collections;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
-public class ConflictSubSettingGui extends MappedToListSubSettingGui {
+public class GroupConfigSubSettingGui extends MappedToListSubSettingGui {
 
     private final GroupConfigGui parent;
     private final AbstractMaterialGroup group;
     private final PatternPane pane;
 
-    public ConflictSubSettingGui(
+    public GroupConfigSubSettingGui(
             @NotNull GroupConfigGui parent,
             @NotNull AbstractMaterialGroup group,
             @NotNull GuiItem item) {
diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt
index c9db197..5119a47 100644
--- a/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt
@@ -5,11 +5,7 @@ import org.bukkit.command.Command
 import org.bukkit.command.CommandExecutor
 import org.bukkit.command.CommandSender
 import xyz.alexcrea.cuanvil.config.ConfigHolder
-import xyz.alexcrea.cuanvil.gui.config.global.BasicConfigGui
-import xyz.alexcrea.cuanvil.gui.config.global.EnchantConflictGui
-import xyz.alexcrea.cuanvil.gui.config.global.EnchantCostConfigGui
-import xyz.alexcrea.cuanvil.gui.config.global.EnchantLimitConfigGui
-import xyz.alexcrea.cuanvil.gui.config.global.UnitRepairConfigGui
+import xyz.alexcrea.cuanvil.gui.config.global.*
 import xyz.alexcrea.cuanvil.util.MetricsUtil
 
 class ReloadExecutor : CommandExecutor {
@@ -43,7 +39,9 @@ class ReloadExecutor : CommandExecutor {
             BasicConfigGui.INSTANCE.updateGuiValues()
             EnchantCostConfigGui.INSTANCE.updateGuiValues()
             EnchantLimitConfigGui.INSTANCE.updateGuiValues()
+
             EnchantConflictGui.INSTANCE.reloadValues()
+            GroupConfigGui.INSTANCE.reloadValues()
             UnitRepairConfigGui.INSTANCE.reloadValues()
 
             // & update metric
diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/group/ItemGroupManager.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/group/ItemGroupManager.kt
index e1fb59b..65eef34 100644
--- a/src/main/kotlin/xyz/alexcrea/cuanvil/group/ItemGroupManager.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/group/ItemGroupManager.kt
@@ -9,13 +9,13 @@ class ItemGroupManager {
 
     companion object {
         // Path for group type
-        private const val GROUP_TYPE_PATH = "type"
+        const val GROUP_TYPE_PATH = "type"
 
         // Path for included items list
-        private const val MATERIAL_LIST_PATH = "items"
+        const val MATERIAL_LIST_PATH = "items"
 
         // Path for included groups list
-        private const val GROUP_LIST_PATH = "groups"
+        const val GROUP_LIST_PATH = "groups"
 
         // Temporary list of elements in default config that are use in future
         private val FUTURE_MATERIAL = setOf("PIGLIN_HEAD", "BRUSH")
@@ -35,6 +35,15 @@ class ItemGroupManager {
         }
     }
 
+    // Create group with existing groups
+    fun createGroup(
+        config: ConfigurationSection,
+        name: String
+    ): AbstractMaterialGroup{
+        return createGroup(config, groupMap.keys, name)
+    }
+
+
     // Create group by key
     private fun createGroup(
         config: ConfigurationSection,
@@ -46,7 +55,7 @@ class ItemGroupManager {
 
         // Create Material group according to the group type
         val group: AbstractMaterialGroup
-        if (GroupType.EXCLUDE.equal(groupType)) {
+        if (groupType != null && GroupType.EXCLUDE.equal(groupType)) {
             group = ExcludeGroup(key)
         } else {
             group = IncludeGroup(key)
@@ -124,7 +133,7 @@ class ItemGroupManager {
 
 }
 
-enum class GroupType(private val groupID: String) {
+enum class GroupType(val groupID: String) {
 
     INCLUDE("include"),
     EXCLUDE("exclude")