From 479bd03e83accbeda7e8fcc60156326ffedb73f4 Mon Sep 17 00:00:00 2001 From: alexcrea <42614139+alexcrea@users.noreply.github.com> Date: Mon, 8 Apr 2024 21:39:45 +0200 Subject: [PATCH 01/10] Moved some class. Abstracted gui list elements. --- .../config/{global => }/MainConfigGui.java | 3 +- .../gui/config/global/BasicConfigGui.java | 1 + .../config/global/CustomRecipeConfigGui.java | 3 +- .../gui/config/global/EnchantConflictGui.java | 3 +- .../ElementListConfigGui.java} | 7 ++-- .../config/list/ElementMappedToListGui.java | 16 ++++++++++ .../MappedElementListConfigGui.java | 32 +++++++++---------- .../subsetting/CustomRecipeSubSettingGui.java | 16 +++++----- .../EnchantConflictSubSettingGui.java | 26 +++++++-------- .../subsetting/MappedToListSubSettingGui.java | 12 ++++--- .../cuanvil/gui/util/GuiSharedConstant.java | 2 +- .../cuanvil/command/EditConfigExecutor.kt | 2 +- .../cuanvil/group/EnchantConflictGroup.kt | 5 ++- .../cuanvil/group/EnchantConflictManager.kt | 4 +-- .../xyz/alexcrea/cuanvil/interfaces/Named.kt | 7 ---- .../cuanvil/recipe/AnvilCustomRecipe.kt | 5 ++- 16 files changed, 79 insertions(+), 65 deletions(-) rename src/main/java/xyz/alexcrea/cuanvil/gui/config/{global => }/MainConfigGui.java (98%) rename src/main/java/xyz/alexcrea/cuanvil/gui/config/{global/ElementListGlobalConfigGui.java => list/ElementListConfigGui.java} (97%) create mode 100644 src/main/java/xyz/alexcrea/cuanvil/gui/config/list/ElementMappedToListGui.java rename src/main/java/xyz/alexcrea/cuanvil/gui/config/{global => list}/MappedElementListConfigGui.java (82%) delete mode 100644 src/main/kotlin/xyz/alexcrea/cuanvil/interfaces/Named.kt diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/MainConfigGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/MainConfigGui.java similarity index 98% rename from src/main/java/xyz/alexcrea/cuanvil/gui/config/global/MainConfigGui.java rename to src/main/java/xyz/alexcrea/cuanvil/gui/config/MainConfigGui.java index a69cc7a..07f8a1f 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/MainConfigGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/MainConfigGui.java @@ -1,4 +1,4 @@ -package xyz.alexcrea.cuanvil.gui.config.global; +package xyz.alexcrea.cuanvil.gui.config; import com.github.stefvanschie.inventoryframework.gui.GuiItem; import com.github.stefvanschie.inventoryframework.gui.type.ChestGui; @@ -8,6 +8,7 @@ import io.delilaheve.CustomAnvil; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; +import xyz.alexcrea.cuanvil.gui.config.global.*; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalItems; diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/BasicConfigGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/BasicConfigGui.java index 89c4c34..684e90f 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/BasicConfigGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/BasicConfigGui.java @@ -11,6 +11,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import xyz.alexcrea.cuanvil.config.ConfigHolder; import xyz.alexcrea.cuanvil.gui.ValueUpdatableGui; +import xyz.alexcrea.cuanvil.gui.config.MainConfigGui; import xyz.alexcrea.cuanvil.gui.config.settings.BoolSettingsGui; import xyz.alexcrea.cuanvil.gui.config.settings.IntSettingsGui; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions; diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/CustomRecipeConfigGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/CustomRecipeConfigGui.java index 11cbaed..edaef9b 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/CustomRecipeConfigGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/CustomRecipeConfigGui.java @@ -6,6 +6,7 @@ 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.gui.config.list.MappedElementListConfigGui; import xyz.alexcrea.cuanvil.gui.config.settings.subsetting.CustomRecipeSubSettingGui; import xyz.alexcrea.cuanvil.recipe.AnvilCustomRecipe; import xyz.alexcrea.cuanvil.util.CasedStringUtil; @@ -41,7 +42,7 @@ public class CustomRecipeConfigGui extends MappedElementListConfigGui extends ValueUpdatableGui { +public abstract class ElementListConfigGui< T > extends ValueUpdatableGui { private final String namePrefix; - public ElementListGlobalConfigGui(@NotNull String title) { + public ElementListConfigGui(@NotNull String title) { super(6, title, CustomAnvil.instance); this.namePrefix = title; } diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/ElementMappedToListGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/ElementMappedToListGui.java new file mode 100644 index 0000000..649bce2 --- /dev/null +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/ElementMappedToListGui.java @@ -0,0 +1,16 @@ +package xyz.alexcrea.cuanvil.gui.config.list; + +import com.github.stefvanschie.inventoryframework.gui.GuiItem; +import com.github.stefvanschie.inventoryframework.gui.type.util.Gui; + +public interface ElementMappedToListGui { + + GuiItem getParentItemForThisGui(); + + void updateLocal(); + + void cleanUnused(); + + Gui getMappedGui(); + +} diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/MappedElementListConfigGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedElementListConfigGui.java similarity index 82% rename from src/main/java/xyz/alexcrea/cuanvil/gui/config/global/MappedElementListConfigGui.java rename to src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedElementListConfigGui.java index 7349dca..cd04e17 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/MappedElementListConfigGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedElementListConfigGui.java @@ -1,4 +1,4 @@ -package xyz.alexcrea.cuanvil.gui.config.global; +package xyz.alexcrea.cuanvil.gui.config.list; import com.github.stefvanschie.inventoryframework.gui.GuiItem; import io.delilaheve.CustomAnvil; @@ -7,9 +7,7 @@ import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; -import xyz.alexcrea.cuanvil.gui.config.settings.subsetting.MappedToListSubSettingGui; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions; -import xyz.alexcrea.cuanvil.interfaces.Named; import java.util.Arrays; import java.util.HashMap; @@ -17,7 +15,7 @@ import java.util.Locale; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; -public abstract class MappedElementListConfigGui< T extends Named, S extends MappedToListSubSettingGui> extends ElementListGlobalConfigGui< T > { +public abstract class MappedElementListConfigGui< T, S extends ElementMappedToListGui> extends ElementListConfigGui< T > { protected final HashMap elementGuiMap; @@ -72,34 +70,34 @@ public abstract class MappedElementListConfigGui< T extends Named, S extends Map @Override protected void updateGeneric(T generic, ItemStack usedItem) { - S gui = this.elementGuiMap.get(generic); + S mapElement = this.elementGuiMap.get(generic); GuiItem guiItem; - if (gui == null) { - // Create new sub setting gui + if (mapElement == null) { + // Create new sub setting mapElement guiItem = new GuiItem(usedItem, CustomAnvil.instance); - gui = newInstanceOfGui(generic, guiItem); + mapElement = newInstanceOfGui(generic, guiItem); - guiItem.setAction(GuiGlobalActions.openGuiAction(gui)); + guiItem.setAction(GuiGlobalActions.openGuiAction(mapElement.getMappedGui())); - this.elementGuiMap.put(generic, gui); + this.elementGuiMap.put(generic, mapElement); addToPage(guiItem); } else { // Replace item with the updated one - guiItem = gui.getParentItemForThisGui(); + guiItem = mapElement.getParentItemForThisGui(); guiItem.setItem(usedItem); } - gui.updateLocal(); + mapElement.updateLocal(); } @Override protected GuiItem findGuiItemForRemoval(T generic) { - S gui = this.elementGuiMap.get(generic); - if (gui == null) return null; + S mapElement = this.elementGuiMap.get(generic); + if (mapElement == null) return null; this.elementGuiMap.remove(generic); - return gui.getParentItemForThisGui(); + return mapElement.getParentItemForThisGui(); } protected Consumer prepareCreateItemConsumer(HumanEntity player){ @@ -125,7 +123,7 @@ public abstract class MappedElementListConfigGui< T extends Named, S extends Map // Try to find if it already exists in a for loop // Not the most efficient on large number of conflict, but it should not run often. for (T generic : getEveryDisplayableInstanceOfGeneric()) { - if (generic.getName().equalsIgnoreCase(message)) { + if (generic.toString().equalsIgnoreCase(message)) { player.sendMessage("\u00A7cPlease enter a "+genericDisplayedName()+" name that do not already exist..."); // wait next message. CustomAnvil.Companion.getChatListener().setListenedCallback(player, selfRef.get()); @@ -138,7 +136,7 @@ public abstract class MappedElementListConfigGui< T extends Named, S extends Map updateValueForGeneric(generic, true); // show the new conflict config to the player - this.elementGuiMap.get(generic).show(player); + this.elementGuiMap.get(generic).getMappedGui().show(player); update(); }; diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/subsetting/CustomRecipeSubSettingGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/subsetting/CustomRecipeSubSettingGui.java index 148330c..c78ff9c 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/subsetting/CustomRecipeSubSettingGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/subsetting/CustomRecipeSubSettingGui.java @@ -37,7 +37,7 @@ public class CustomRecipeSubSettingGui extends MappedToListSubSettingGui { @NotNull CustomRecipeConfigGui parent, @NotNull AnvilCustomRecipe anvilRecipe, @NotNull GuiItem parentItemForThisGui) { - super(parentItemForThisGui, 3, "\u00A7e" + CasedStringUtil.snakeToUpperSpacedCase(anvilRecipe.getName()) + " \u00A78Config"); + super(parentItemForThisGui, 3, "\u00A7e" + CasedStringUtil.snakeToUpperSpacedCase(anvilRecipe.toString()) + " \u00A78Config"); this.parent = parent; this.anvilRecipe = anvilRecipe; @@ -77,24 +77,24 @@ public class CustomRecipeSubSettingGui extends MappedToListSubSettingGui { IntRange costRange = AnvilCustomRecipe.Companion.getXP_COST_CONFIG_RANGE(); this.exactCountFactory = BoolSettingsGui.boolFactory("\u00A78Exact count ?", this, - this.anvilRecipe.getName()+"."+AnvilCustomRecipe.EXACT_COUNT_CONFIG, ConfigHolder.CUSTOM_RECIPE_HOLDER, + this.anvilRecipe + "." + AnvilCustomRecipe.EXACT_COUNT_CONFIG, ConfigHolder.CUSTOM_RECIPE_HOLDER, AnvilCustomRecipe.Companion.getDEFAULT_EXACT_COUNT_CONFIG()); this.xpCostFactory = IntSettingsGui.intFactory("\u00A78Recipe Xp Cost", this, - this.anvilRecipe.getName()+"."+AnvilCustomRecipe.XP_COST_CONFIG, ConfigHolder.CUSTOM_RECIPE_HOLDER, + this.anvilRecipe +"."+AnvilCustomRecipe.XP_COST_CONFIG, ConfigHolder.CUSTOM_RECIPE_HOLDER, costRange.getFirst(), costRange.getLast(), AnvilCustomRecipe.Companion.getDEFAULT_XP_COST_CONFIG(), 1, 5, 10); this.leftItemFactory = ItemSettingGui.itemFactory("\u00A7eRecipe Left \u00A78Item", this, - this.anvilRecipe.getName()+"."+AnvilCustomRecipe.LEFT_ITEM_CONFIG, ConfigHolder.CUSTOM_RECIPE_HOLDER, + this.anvilRecipe + "." + AnvilCustomRecipe.LEFT_ITEM_CONFIG, ConfigHolder.CUSTOM_RECIPE_HOLDER, AnvilCustomRecipe.Companion.getDEFAULT_LEFT_ITEM_CONFIG()); this.rightItemFactory = ItemSettingGui.itemFactory("\u00A7eRecipe Right \u00A78Item", this, - this.anvilRecipe.getName()+"."+AnvilCustomRecipe.RIGHT_ITEM_CONFIG, ConfigHolder.CUSTOM_RECIPE_HOLDER, + this.anvilRecipe + "." + AnvilCustomRecipe.RIGHT_ITEM_CONFIG, ConfigHolder.CUSTOM_RECIPE_HOLDER, AnvilCustomRecipe.Companion.getDEFAULT_RIGHT_ITEM_CONFIG()); this.resultItemFactory = ItemSettingGui.itemFactory("\u00A7aRecipe Result \u00A78Item", this, - this.anvilRecipe.getName()+"."+AnvilCustomRecipe.RESULT_ITEM_CONFIG, ConfigHolder.CUSTOM_RECIPE_HOLDER, + this.anvilRecipe + "." + AnvilCustomRecipe.RESULT_ITEM_CONFIG, ConfigHolder.CUSTOM_RECIPE_HOLDER, AnvilCustomRecipe.Companion.getDEFAULT_RESULT_ITEM_CONFIG()); } @@ -112,7 +112,7 @@ public class CustomRecipeSubSettingGui extends MappedToListSubSettingGui { cleanUnused(); // Update config file storage - ConfigHolder.CUSTOM_RECIPE_HOLDER.getConfig().set(this.anvilRecipe.getName(), null); + ConfigHolder.CUSTOM_RECIPE_HOLDER.getConfig().set(this.anvilRecipe.toString(), null); // Save boolean success = true; @@ -123,7 +123,7 @@ public class CustomRecipeSubSettingGui extends MappedToListSubSettingGui { return success; }; - return new ConfirmActionGui("\u00A7cDelete \u00A7e" + CasedStringUtil.snakeToUpperSpacedCase(this.anvilRecipe.getName()) + "\u00A7c?", + return new ConfirmActionGui("\u00A7cDelete \u00A7e" + CasedStringUtil.snakeToUpperSpacedCase(this.anvilRecipe.toString()) + "\u00A7c?", "\u00A77Confirm that you want to delete this conflict.", this, this.parent, deleteSupplier ); diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/subsetting/EnchantConflictSubSettingGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/subsetting/EnchantConflictSubSettingGui.java index b9cfefa..abe93d0 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/subsetting/EnchantConflictSubSettingGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/subsetting/EnchantConflictSubSettingGui.java @@ -46,7 +46,7 @@ public class EnchantConflictSubSettingGui extends MappedToListSubSettingGui impl @NotNull GuiItem parentItemForThisGui) { super(parentItemForThisGui, 3, - "\u00A7e" + CasedStringUtil.snakeToUpperSpacedCase(enchantConflict.getName()) + " \u00A78Config"); + "\u00A7e" + CasedStringUtil.snakeToUpperSpacedCase(enchantConflict.toString()) + " \u00A78Config"); this.parent = parent; this.enchantConflict = enchantConflict; @@ -85,7 +85,7 @@ public class EnchantConflictSubSettingGui extends MappedToListSubSettingGui impl this.enchantSettingItem = new GuiItem(new ItemStack(Material.ENCHANTED_BOOK), (event) -> { event.setCancelled(true); EnchantSelectSettingGui enchantGui = new EnchantSelectSettingGui( - "\u00A7e" + CasedStringUtil.snakeToUpperSpacedCase(enchantConflict.getName()) + " \u00A75Enchantments", + "\u00A7e" + CasedStringUtil.snakeToUpperSpacedCase(enchantConflict.toString()) + " \u00A75Enchantments", this, this, 0); enchantGui.show(event.getWhoClicked()); }, CustomAnvil.instance); @@ -93,14 +93,14 @@ public class EnchantConflictSubSettingGui extends MappedToListSubSettingGui impl this.groupSettingItem = new GuiItem(new ItemStack(Material.PAPER), (event) -> { event.setCancelled(true); GroupSelectSettingGui enchantGui = new GroupSelectSettingGui( - "\u00A7e" + CasedStringUtil.snakeToUpperSpacedCase(this.enchantConflict.getName()) + " \u00A73Groups", + "\u00A7e" + CasedStringUtil.snakeToUpperSpacedCase(this.enchantConflict.toString()) + " \u00A73Groups", this, this, 0); enchantGui.show(event.getWhoClicked()); }, CustomAnvil.instance); this.minBeforeActiveSettingFactory = IntSettingsGui.intFactory( "\u00A78Minimum enchantment count", - this, this.enchantConflict.getName() + ".maxEnchantmentBeforeConflict", ConfigHolder.CONFLICT_HOLDER, + this, this.enchantConflict + ".maxEnchantmentBeforeConflict", ConfigHolder.CONFLICT_HOLDER, 0, 255, 0, 1 ); @@ -129,7 +129,7 @@ public class EnchantConflictSubSettingGui extends MappedToListSubSettingGui impl cleanUnused(); // Update config file storage - ConfigHolder.CONFLICT_HOLDER.getConfig().set(this.enchantConflict.getName(), null); + ConfigHolder.CONFLICT_HOLDER.getConfig().set(this.enchantConflict.toString(), null); // Save boolean success = true; @@ -140,7 +140,7 @@ public class EnchantConflictSubSettingGui extends MappedToListSubSettingGui impl return success; }; - return new ConfirmActionGui("\u00A7cDelete \u00A7e" + CasedStringUtil.snakeToUpperSpacedCase(this.enchantConflict.getName()) + "\u00A7c?", + return new ConfirmActionGui("\u00A7cDelete \u00A7e" + CasedStringUtil.snakeToUpperSpacedCase(this.enchantConflict.toString()) + "\u00A7c?", "\u00A77Confirm that you want to delete this conflict.", this, this.parent, deleteSupplier ); @@ -149,7 +149,7 @@ public class EnchantConflictSubSettingGui extends MappedToListSubSettingGui impl @Override public void updateGuiValues() { // update value from config to conflict - int minBeforeBlock = ConfigHolder.CONFLICT_HOLDER.getConfig().getInt(this.enchantConflict.getName()+'.'+EnchantConflictManager.ENCH_MAX_PATH, 0); + int minBeforeBlock = ConfigHolder.CONFLICT_HOLDER.getConfig().getInt(this.enchantConflict.toString()+'.'+EnchantConflictManager.ENCH_MAX_PATH, 0); this.enchantConflict.setMinBeforeBlock(minBeforeBlock); // Parent should call updateLocal with this call @@ -267,7 +267,7 @@ public class EnchantConflictSubSettingGui extends MappedToListSubSettingGui impl @Override public boolean setSelectedEnchantments(Set enchantments) { if (!this.shouldWork) { - CustomAnvil.instance.getLogger().info("Trying to save " + enchantConflict.getName() + " enchants but sub config is destroyed"); + CustomAnvil.instance.getLogger().info("Trying to save " + enchantConflict + " enchants but sub config is destroyed"); return false; } @@ -280,12 +280,12 @@ public class EnchantConflictSubSettingGui extends MappedToListSubSettingGui impl for (Enchantment enchantment : enchantments) { enchantKeys[index++] = enchantment.getKey().getKey(); } - ConfigHolder.CONFLICT_HOLDER.getConfig().set(enchantConflict.getName() + ".enchantments", enchantKeys); + ConfigHolder.CONFLICT_HOLDER.getConfig().set(enchantConflict + ".enchantments", enchantKeys); try { updateGuiValues(); } catch (Exception e) { - CustomAnvil.instance.getLogger().log(Level.WARNING, "An error occurred while updating enchants for " + this.enchantConflict.getName(), e); + CustomAnvil.instance.getLogger().log(Level.WARNING, "An error occurred while updating enchants for " + this.enchantConflict, e); } @@ -312,7 +312,7 @@ public class EnchantConflictSubSettingGui extends MappedToListSubSettingGui impl @Override public boolean setSelectedGroups(Set groups) { if (!this.shouldWork) { - CustomAnvil.instance.getLogger().info("Trying to save " + enchantConflict.getName() + " groups but sub config is destroyed"); + CustomAnvil.instance.getLogger().info("Trying to save " + enchantConflict.toString() + " groups but sub config is destroyed"); return false; } @@ -325,12 +325,12 @@ public class EnchantConflictSubSettingGui extends MappedToListSubSettingGui impl for (AbstractMaterialGroup group : groups) { groupsNames[index++] = group.getName(); } - ConfigHolder.CONFLICT_HOLDER.getConfig().set(this.enchantConflict.getName() + ".notAffectedGroups", groupsNames); + ConfigHolder.CONFLICT_HOLDER.getConfig().set(this.enchantConflict + ".notAffectedGroups", groupsNames); try { updateGuiValues(); } catch (Exception e) { - CustomAnvil.instance.getLogger().log(Level.WARNING, "An error occurred while updating group for " + this.enchantConflict.getName(), e); + CustomAnvil.instance.getLogger().log(Level.WARNING, "An error occurred while updating group for " + this.enchantConflict, e); } // Save file configuration to disk diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/subsetting/MappedToListSubSettingGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/subsetting/MappedToListSubSettingGui.java index bcadc73..eaa3591 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/subsetting/MappedToListSubSettingGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/subsetting/MappedToListSubSettingGui.java @@ -1,11 +1,13 @@ package xyz.alexcrea.cuanvil.gui.config.settings.subsetting; import com.github.stefvanschie.inventoryframework.gui.GuiItem; +import com.github.stefvanschie.inventoryframework.gui.type.util.Gui; import io.delilaheve.CustomAnvil; import org.jetbrains.annotations.NotNull; import xyz.alexcrea.cuanvil.gui.ValueUpdatableGui; +import xyz.alexcrea.cuanvil.gui.config.list.ElementMappedToListGui; -public abstract class MappedToListSubSettingGui extends ValueUpdatableGui { +public abstract class MappedToListSubSettingGui extends ValueUpdatableGui implements ElementMappedToListGui { private final GuiItem item; public MappedToListSubSettingGui( @@ -16,13 +18,15 @@ public abstract class MappedToListSubSettingGui extends ValueUpdatableGui { this.item = item; } - + @Override public GuiItem getParentItemForThisGui() { return item; } + @Override + public Gui getMappedGui() { + return this; + } - public abstract void updateLocal(); // TODO - public abstract void cleanUnused(); // TODO } diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/util/GuiSharedConstant.java b/src/main/java/xyz/alexcrea/cuanvil/gui/util/GuiSharedConstant.java index b52401b..731b775 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/util/GuiSharedConstant.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/util/GuiSharedConstant.java @@ -6,7 +6,7 @@ import com.github.stefvanschie.inventoryframework.pane.PatternPane; import com.github.stefvanschie.inventoryframework.pane.util.Pattern; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; -import xyz.alexcrea.cuanvil.gui.config.global.MainConfigGui; +import xyz.alexcrea.cuanvil.gui.config.MainConfigGui; import java.util.Arrays; import java.util.Comparator; diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/command/EditConfigExecutor.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/EditConfigExecutor.kt index c45da8c..8b188ab 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/command/EditConfigExecutor.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/EditConfigExecutor.kt @@ -5,7 +5,7 @@ import org.bukkit.command.Command import org.bukkit.command.CommandExecutor import org.bukkit.command.CommandSender import org.bukkit.entity.HumanEntity -import xyz.alexcrea.cuanvil.gui.config.global.MainConfigGui +import xyz.alexcrea.cuanvil.gui.config.MainConfigGui import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions class EditConfigExecutor : CommandExecutor { diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/group/EnchantConflictGroup.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/group/EnchantConflictGroup.kt index 44a4bef..76a07d8 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/group/EnchantConflictGroup.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/group/EnchantConflictGroup.kt @@ -3,13 +3,12 @@ package xyz.alexcrea.cuanvil.group import io.delilaheve.CustomAnvil import org.bukkit.Material import org.bukkit.enchantments.Enchantment -import xyz.alexcrea.cuanvil.interfaces.Named class EnchantConflictGroup( private val name: String, private val cantConflict: AbstractMaterialGroup, var minBeforeBlock: Int -): Named { +) { private val enchantments = HashSet() @@ -63,7 +62,7 @@ class EnchantConflictGroup( return Material.ENCHANTED_BOOK } - override fun getName(): String { + override fun toString(): String { return name } diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/group/EnchantConflictManager.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/group/EnchantConflictManager.kt index 45a9f36..e4ce6f8 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/group/EnchantConflictManager.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/group/EnchantConflictManager.kt @@ -139,9 +139,9 @@ class EnchantConflictManager { var result = ConflictType.NO_CONFLICT for (conflict in conflictList) { - CustomAnvil.verboseLog("Is against ${conflict.getName()}") + CustomAnvil.verboseLog("Is against $conflict") val conflicting = conflict.allowed(base, mat) - CustomAnvil.verboseLog("Was against ${conflict.getName()} and conflicting: $conflicting ") + CustomAnvil.verboseLog("Was against $conflict and conflicting: $conflicting ") if (!conflicting) { if (conflict.getEnchants().size <= 1) { result = ConflictType.SMALL_CONFLICT diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/interfaces/Named.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/interfaces/Named.kt deleted file mode 100644 index e3cd288..0000000 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/interfaces/Named.kt +++ /dev/null @@ -1,7 +0,0 @@ -package xyz.alexcrea.cuanvil.interfaces - -interface Named { - - fun getName(): String - -} \ No newline at end of file diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/recipe/AnvilCustomRecipe.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/recipe/AnvilCustomRecipe.kt index fbd2866..9be7c67 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/recipe/AnvilCustomRecipe.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/recipe/AnvilCustomRecipe.kt @@ -5,7 +5,6 @@ import org.bukkit.configuration.ConfigurationSection import org.bukkit.inventory.ItemStack import xyz.alexcrea.cuanvil.config.ConfigHolder import xyz.alexcrea.cuanvil.gui.util.GuiSharedConstant -import xyz.alexcrea.cuanvil.interfaces.Named class AnvilCustomRecipe( private val name: String, @@ -18,7 +17,7 @@ class AnvilCustomRecipe( var leftItem: ItemStack?, var rightItem: ItemStack?, var resultItem: ItemStack?, -): Named { +) { // Static config name companion object { @@ -162,7 +161,7 @@ class AnvilCustomRecipe( return true } - override fun getName(): String { + override fun toString(): String { return name } From 44b2ef74243a4a5a6484ba9ce5328aba930e0b46 Mon Sep 17 00:00:00 2001 From: alexcrea <42614139+alexcrea@users.noreply.github.com> Date: Tue, 9 Apr 2024 13:42:15 +0200 Subject: [PATCH 02/10] Add double setting gui. --- .../gui/config/settings/DoubleSettingGui.java | 353 ++++++++++++++++++ 1 file changed, 353 insertions(+) create mode 100644 src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/DoubleSettingGui.java diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/DoubleSettingGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/DoubleSettingGui.java new file mode 100644 index 0000000..94a6112 --- /dev/null +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/DoubleSettingGui.java @@ -0,0 +1,353 @@ +package xyz.alexcrea.cuanvil.gui.config.settings; + +import com.github.stefvanschie.inventoryframework.gui.GuiItem; +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.event.inventory.InventoryClickEvent; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.ItemMeta; +import org.jetbrains.annotations.NotNull; +import xyz.alexcrea.cuanvil.config.ConfigHolder; +import xyz.alexcrea.cuanvil.gui.ValueUpdatableGui; +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.util.MetricsUtil; + +import java.util.Collections; +import java.util.List; +import java.util.function.Consumer; + +public class DoubleSettingGui extends AbstractSettingGui { + + protected final DoubleSettingFactory holder; + protected final double before; + protected double now; + protected double step; + + /** + * Create a double setting config gui. + * + * @param holder Configuration factory of this setting. + * @param now The defined value of this setting. + */ + protected DoubleSettingGui(DoubleSettingFactory holder, double now) { + super(3, holder.getTitle(), holder.parent); + assert holder.steps.length > 0 && holder.steps.length <= 9; + this.holder = holder; + this.before = now; + this.now = now; + this.step = holder.steps[0]; + + initStepsValue(); + prepareReturnToDefault(); + updateValueDisplay(); + } + + + @Override + public Pattern getGuiPattern() { + return new Pattern( + "abcdefghi", + "D0-0v0+00", + "B0000000S" + ); + } + + protected GuiItem returnToDefault; + + /** + * Prepare "return to default value" gui item. + */ + protected void prepareReturnToDefault() { + ItemStack item = new ItemStack(Material.COMMAND_BLOCK); + ItemMeta meta = item.getItemMeta(); + + meta.setDisplayName("\u00A7eReset to default value"); + meta.setLore(Collections.singletonList("\u00A77Default value is: " + holder.defaultVal)); + item.setItemMeta(meta); + returnToDefault = new GuiItem(item, event -> { + event.setCancelled(true); + now = holder.defaultVal; + updateValueDisplay(); + update(); + }, CustomAnvil.instance); + } + + /** + * Update item using the setting value to match the new value. + */ + protected void updateValueDisplay() { + + PatternPane pane = getPane(); + + // minus item + GuiItem minusItem; + if (now > holder.min) { + double planned = Math.max(holder.min, now - step); + ItemStack item = new ItemStack(Material.RED_TERRACOTTA); + ItemMeta meta = item.getItemMeta(); + meta.setDisplayName("\u00A7e" + now + " -> " + planned + " \u00A7r(\u00A7c-" + (now - planned) + "\u00A7r)"); + meta.setLore(AbstractSettingGui.CLICK_LORE); + item.setItemMeta(meta); + + minusItem = new GuiItem(item, updateNowConsumer(planned), CustomAnvil.instance); + } else { + minusItem = GuiGlobalItems.backgroundItem(Material.BARRIER); + } + pane.bindItem('-', minusItem); + + //plus item + // may do a function to generalise ? + GuiItem plusItem; + if (now < holder.max) { + double planned = Math.min(holder.max, now + step); + ItemStack item = new ItemStack(Material.GREEN_TERRACOTTA); + ItemMeta meta = item.getItemMeta(); + meta.setDisplayName("\u00A7e" + now + " -> " + planned + " \u00A7r(\u00A7a+" + (planned - now) + "\u00A7r)"); + meta.setLore(AbstractSettingGui.CLICK_LORE); + item.setItemMeta(meta); + + plusItem = new GuiItem(item, updateNowConsumer(planned), CustomAnvil.instance); + } else { + plusItem = GuiGlobalItems.backgroundItem(Material.BARRIER); + } + pane.bindItem('+', plusItem); + + // "result" display + ItemStack resultPaper = new ItemStack(Material.PAPER); + ItemMeta resultMeta = resultPaper.getItemMeta(); + resultMeta.setDisplayName("\u00A7eValue: " + now); + resultPaper.setItemMeta(resultMeta); + GuiItem resultItem = new GuiItem(resultPaper, GuiGlobalActions.stayInPlace, CustomAnvil.instance); + + pane.bindItem('v', resultItem); + + // reset to default + GuiItem returnToDefault; + if (now != holder.defaultVal) { + returnToDefault = this.returnToDefault; + } else { + returnToDefault = GuiGlobalItems.backgroundItem(); + } + pane.bindItem('D', returnToDefault); + + + } + + /** + * @param planned Value to change current setting to. + * @return A consumer to update the current setting's value. + */ + protected Consumer updateNowConsumer(double planned) { + return event -> { + event.setCancelled(true); + now = planned; + updateValueDisplay(); + update(); + }; + } + + /** + * Initialise step items. + */ + protected void initStepsValue() { + // Put background glass on the background of 'a' to 'b' + GuiItem background = GuiGlobalItems.backgroundItem(); + PatternPane pane = getPane(); + + for (char i = 'a'; i < (getMidStepChar() - 'a') * 2 + 1; i++) { + pane.bindItem(i, background); + } + // Then update legit step values + updateStepValue(); + } + + /** + * Update steps items value. + */ + protected void updateStepValue() { + if (holder.steps.length <= 1) return; + // We assume steps have a length of 2k+1 cause its more pretty + char val = getMidStepChar(); + // Offset to start (not the best way to do it) + val -= (char) ((holder.steps.length - 1) / 2); + + // Then place items + PatternPane pane = getPane(); + for (int i = 0; i < holder.steps.length; i++) { + pane.bindItem(val + i, stepGuiItem(i)); + } + + } + + /** + * Step use lower case character from 'a' to a certain char. + * + * @return The middle value of the character set for steps. + */ + protected char getMidStepChar() { + return 'e'; + } + + /** + * Create a step item from a step value. + * + * @param stepIndex the index of the step item. + * @return A step item corresponding to its index value. + */ + protected GuiItem stepGuiItem(int stepIndex) { + double stepValue = holder.steps[stepIndex]; + + // Get material properties + Material stepMat; + StringBuilder stepName = new StringBuilder("\u00A7"); + List stepLore; + Consumer clickEvent; + if (stepValue == step) { + stepMat = Material.GREEN_STAINED_GLASS_PANE; + stepName.append('a'); + stepLore = Collections.singletonList("\u00A77Value is changing by " + stepValue); + clickEvent = GuiGlobalActions.stayInPlace; + } else { + stepMat = Material.RED_STAINED_GLASS_PANE; + stepName.append('c'); + stepLore = Collections.singletonList("\u00A77Click here to change the value by " + stepValue); + clickEvent = updateStepValue(stepValue); + } + stepName.append("Step of: ").append(stepValue); + + // Create item stack then gui item + ItemStack item = new ItemStack(stepMat); + ItemMeta meta = item.getItemMeta(); + + meta.setDisplayName(stepName.toString()); + meta.setLore(stepLore); + item.setItemMeta(meta); + + return new GuiItem(item, clickEvent, CustomAnvil.instance); + } + + /** + * @param stepValue Value to change current step to. + * @return A consumer to update the current step of this setting. + */ + protected Consumer updateStepValue(double stepValue) { + return event -> { + event.setCancelled(true); + this.step = stepValue; + updateStepValue(); + updateValueDisplay(); + update(); + }; + } + + @Override + public boolean onSave() { + holder.config.getConfig().set(holder.configPath, now); + + MetricsUtil.INSTANCE.notifyChange(this.holder.config, this.holder.configPath); + if (GuiSharedConstant.TEMPORARY_DO_SAVE_TO_DISK_EVERY_CHANGE) { + return holder.config.saveToDisk(GuiSharedConstant.TEMPORARY_DO_BACKUP_EVERY_SAVE); + } + return true; + } + + @Override + public boolean hadChange() { + return now != before; + } + + /** + * Create a double setting factory from setting's parameters. + * + * @param title The title of the gui. + * @param parent Parent gui to go back when completed. + * @param configPath Configuration path of this setting. + * @param config Configuration holder of this setting. + * @param min Minimum value of this setting. + * @param max Maximum value of this setting. + * @param defaultVal Default value if not found on the config. + * @param steps List of step the value can increment/decrement. + * List's size should be between 1 (included) and 5 (included). + * it is visually preferable to have an odd number of step. + * If step only contain 1 value, no step item should be displayed. + * @return A factory for a double setting gui. + */ + public static DoubleSettingFactory doubleFactory(@NotNull String title, ValueUpdatableGui parent, + String configPath, ConfigHolder config, + double min, double max, double defaultVal, double... steps) { + return new DoubleSettingFactory( + title, parent, + configPath, config, + min, max, defaultVal, steps); + } + + /** + * A factory for a double setting gui that hold setting's information. + */ + public static class DoubleSettingFactory extends SettingGuiFactory { + @NotNull + String title; + ValueUpdatableGui parent; + double min; + double max; + double defaultVal; + double[] steps; + + /** + * Constructor for a double setting gui factory. + * + * @param title The title of the gui. + * @param parent Parent gui to go back when completed. + * @param configPath Configuration path of this setting. + * @param config Configuration holder of this setting. + * @param min Minimum value of this setting. + * @param max Maximum value of this setting. + * @param defaultVal Default value if not found on the config. + * @param steps List of step the value can increment/decrement. + * List's size should be between 1 (included) and 5 (included). + * it is visually preferable to have an odd number of step. + * If step only contain 1 value, no step item should be displayed. + */ + protected DoubleSettingFactory( + @NotNull String title, ValueUpdatableGui parent, + String configPath, ConfigHolder config, + double min, double max, double defaultVal, double... steps) { + super(configPath, config); + this.title = title; + this.parent = parent; + this.min = min; + this.max = max; + this.defaultVal = defaultVal; + this.steps = steps; + } + + /** + * @return Get setting's gui title + */ + @NotNull + public String getTitle() { + return title; + } + + /** + * @return The configured value for the associated setting. + */ + public double getConfiguredValue() { + return this.config.getConfig().getDouble(this.configPath, this.defaultVal); + } + + @Override + public AbstractSettingGui create() { + // Get value or default + double now = getConfiguredValue(); + // create new gui + return new DoubleSettingGui(this, now); + } + + } + +} \ No newline at end of file From 52bb0785e776448eb70845678180c70652ba62c4 Mon Sep 17 00:00:00 2001 From: alexcrea <42614139+alexcrea@users.noreply.github.com> Date: Tue, 9 Apr 2024 14:12:00 +0200 Subject: [PATCH 03/10] Rework abstractions again and add SettingGuiListConfigGui --- .../config/global/CustomRecipeConfigGui.java | 6 +- .../gui/config/global/EnchantConflictGui.java | 6 +- .../config/list/ElementMappedToListGui.java | 2 +- .../list/MappedElementListConfigGui.java | 90 ++++----------- .../config/list/MappedGuiListConfigGui.java | 104 ++++++++++++++++++ .../config/list/SettingGuiListConfigGui.java | 95 ++++++++++++++++ .../elements}/CustomRecipeSubSettingGui.java | 6 +- .../EnchantConflictSubSettingGui.java | 6 +- .../elements}/MappedToListSubSettingGui.java | 2 +- 9 files changed, 233 insertions(+), 84 deletions(-) create mode 100644 src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedGuiListConfigGui.java create mode 100644 src/main/java/xyz/alexcrea/cuanvil/gui/config/list/SettingGuiListConfigGui.java rename src/main/java/xyz/alexcrea/cuanvil/gui/config/{settings/subsetting => list/elements}/CustomRecipeSubSettingGui.java (98%) rename src/main/java/xyz/alexcrea/cuanvil/gui/config/{settings/subsetting => list/elements}/EnchantConflictSubSettingGui.java (99%) rename src/main/java/xyz/alexcrea/cuanvil/gui/config/{settings/subsetting => list/elements}/MappedToListSubSettingGui.java (93%) diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/CustomRecipeConfigGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/CustomRecipeConfigGui.java index edaef9b..6aeb596 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/CustomRecipeConfigGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/CustomRecipeConfigGui.java @@ -6,15 +6,15 @@ 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.gui.config.list.MappedElementListConfigGui; -import xyz.alexcrea.cuanvil.gui.config.settings.subsetting.CustomRecipeSubSettingGui; +import xyz.alexcrea.cuanvil.gui.config.list.MappedGuiListConfigGui; +import xyz.alexcrea.cuanvil.gui.config.list.elements.CustomRecipeSubSettingGui; import xyz.alexcrea.cuanvil.recipe.AnvilCustomRecipe; import xyz.alexcrea.cuanvil.util.CasedStringUtil; import java.util.Arrays; import java.util.List; -public class CustomRecipeConfigGui extends MappedElementListConfigGui { +public class CustomRecipeConfigGui extends MappedGuiListConfigGui { public final static CustomRecipeConfigGui INSTANCE = new CustomRecipeConfigGui(); 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 5e7f3e8..499a8e4 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 @@ -7,15 +7,15 @@ import org.bukkit.inventory.meta.ItemMeta; import xyz.alexcrea.cuanvil.config.ConfigHolder; import xyz.alexcrea.cuanvil.group.EnchantConflictGroup; import xyz.alexcrea.cuanvil.group.IncludeGroup; -import xyz.alexcrea.cuanvil.gui.config.list.MappedElementListConfigGui; -import xyz.alexcrea.cuanvil.gui.config.settings.subsetting.EnchantConflictSubSettingGui; +import xyz.alexcrea.cuanvil.gui.config.list.MappedGuiListConfigGui; +import xyz.alexcrea.cuanvil.gui.config.list.elements.EnchantConflictSubSettingGui; import xyz.alexcrea.cuanvil.gui.util.GuiSharedConstant; import xyz.alexcrea.cuanvil.util.CasedStringUtil; import java.util.Arrays; import java.util.List; -public class EnchantConflictGui extends MappedElementListConfigGui { +public class EnchantConflictGui extends MappedGuiListConfigGui { public final static EnchantConflictGui INSTANCE = new EnchantConflictGui(); diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/ElementMappedToListGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/ElementMappedToListGui.java index 649bce2..11dad8d 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/ElementMappedToListGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/ElementMappedToListGui.java @@ -9,7 +9,7 @@ public interface ElementMappedToListGui { void updateLocal(); - void cleanUnused(); + void cleanAndBeUnusable(); Gui getMappedGui(); diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedElementListConfigGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedElementListConfigGui.java index cd04e17..9f5c2a5 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedElementListConfigGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedElementListConfigGui.java @@ -11,12 +11,9 @@ import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions; import java.util.Arrays; import java.util.HashMap; -import java.util.Locale; -import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; -public abstract class MappedElementListConfigGui< T, S extends ElementMappedToListGui> extends ElementListConfigGui< T > { - +public abstract class MappedElementListConfigGui< T, S > extends ElementListConfigGui< T > { protected final HashMap elementGuiMap; public MappedElementListConfigGui(@NotNull String title) { @@ -60,95 +57,48 @@ public abstract class MappedElementListConfigGui< T, S extends ElementMappedToLi }, CustomAnvil.instance); } - @Override - public void reloadValues() { - this.elementGuiMap.forEach((conflict, gui) -> gui.cleanUnused()); - this.elementGuiMap.clear(); - - super.reloadValues(); - } - @Override protected void updateGeneric(T generic, ItemStack usedItem) { - S mapElement = this.elementGuiMap.get(generic); + S element = this.elementGuiMap.get(generic); GuiItem guiItem; - if (mapElement == null) { - // Create new sub setting mapElement + if (element == null) { + // Create new sub setting element guiItem = new GuiItem(usedItem, CustomAnvil.instance); - mapElement = newInstanceOfGui(generic, guiItem); - guiItem.setAction(GuiGlobalActions.openGuiAction(mapElement.getMappedGui())); + element = newElementRequested(generic, guiItem); + + this.elementGuiMap.put(generic, element); - this.elementGuiMap.put(generic, mapElement); addToPage(guiItem); } else { // Replace item with the updated one - guiItem = mapElement.getParentItemForThisGui(); + guiItem = findItemFromElement(generic, element); guiItem.setItem(usedItem); } - mapElement.updateLocal(); + updateElement(generic, element); } + protected abstract void updateElement(T generic, S element); + + protected abstract S newElementRequested(T generic, GuiItem newItem); + + protected abstract GuiItem findItemFromElement(T generic, S element); + @Override protected GuiItem findGuiItemForRemoval(T generic) { - S mapElement = this.elementGuiMap.get(generic); - if (mapElement == null) return null; + S element = this.elementGuiMap.get(generic); + if (element == null) return null; this.elementGuiMap.remove(generic); - return mapElement.getParentItemForThisGui(); + return findGuiItemForRemoval(generic, element); } - protected Consumer prepareCreateItemConsumer(HumanEntity player){ - AtomicReference> selfRef = new AtomicReference<>(); - Consumer selfCallback = (message) -> { - if (message == null) return; + protected abstract GuiItem findGuiItemForRemoval(T generic, S element); - // check permission - if (!player.hasPermission(CustomAnvil.editConfigPermission)) { - player.sendMessage(GuiGlobalActions.NO_EDIT_PERM); - return; - } - - message = message.toLowerCase(Locale.ROOT); - if ("cancel".equalsIgnoreCase(message)) { - player.sendMessage(genericDisplayedName()+" creation cancelled..."); - show(player); - return; - } - - message = message.replace(' ', '_'); - - // Try to find if it already exists in a for loop - // Not the most efficient on large number of conflict, but it should not run often. - for (T generic : getEveryDisplayableInstanceOfGeneric()) { - if (generic.toString().equalsIgnoreCase(message)) { - player.sendMessage("\u00A7cPlease enter a "+genericDisplayedName()+" name that do not already exist..."); - // wait next message. - CustomAnvil.Companion.getChatListener().setListenedCallback(player, selfRef.get()); - return; - } - } - - T generic = createAndSaveNewEmptyGeneric(message); - - updateValueForGeneric(generic, true); - - // show the new conflict config to the player - this.elementGuiMap.get(generic).getMappedGui().show(player); - - update(); - }; - - selfRef.set(selfCallback); - return selfCallback; - } - - protected abstract S newInstanceOfGui(T generic, GuiItem item); + protected abstract Consumer prepareCreateItemConsumer(HumanEntity player); protected abstract String genericDisplayedName(); - protected abstract T createAndSaveNewEmptyGeneric(String 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 new file mode 100644 index 0000000..58dbf42 --- /dev/null +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedGuiListConfigGui.java @@ -0,0 +1,104 @@ +package xyz.alexcrea.cuanvil.gui.config.list; + +import com.github.stefvanschie.inventoryframework.gui.GuiItem; +import io.delilaheve.CustomAnvil; +import org.bukkit.entity.HumanEntity; +import org.jetbrains.annotations.NotNull; +import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions; + +import java.util.Locale; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Consumer; + +public abstract class MappedGuiListConfigGui< T, S extends ElementMappedToListGui> extends MappedElementListConfigGui< T, S > { + + + public MappedGuiListConfigGui(@NotNull String title) { + super(title); + + } + + @Override + public void reloadValues() { + this.elementGuiMap.forEach((conflict, gui) -> gui.cleanAndBeUnusable()); + this.elementGuiMap.clear(); + + super.reloadValues(); + } + + @Override + protected S newElementRequested(T generic, GuiItem newItem) { + S element = newInstanceOfGui(generic, newItem); + + newItem.setAction(GuiGlobalActions.openGuiAction(element.getMappedGui())); + return element; + } + + @Override + protected GuiItem findItemFromElement(T generic, S element) { + return element.getParentItemForThisGui(); + } + + @Override + protected void updateElement(T generic, S element) { + element.updateLocal(); + } + + @Override + protected GuiItem findGuiItemForRemoval(T generic, S element) { + return element.getParentItemForThisGui(); + } + + @Override + protected Consumer prepareCreateItemConsumer(HumanEntity player){ + AtomicReference> selfRef = new AtomicReference<>(); + Consumer selfCallback = (message) -> { + if (message == null) return; + + // check permission + if (!player.hasPermission(CustomAnvil.editConfigPermission)) { + player.sendMessage(GuiGlobalActions.NO_EDIT_PERM); + return; + } + + message = message.toLowerCase(Locale.ROOT); + if ("cancel".equalsIgnoreCase(message)) { + player.sendMessage(genericDisplayedName()+" creation cancelled..."); + show(player); + return; + } + + message = message.replace(' ', '_'); + + // Try to find if it already exists in a for loop + // Not the most efficient on large number of conflict, but it should not run often. + for (T generic : getEveryDisplayableInstanceOfGeneric()) { + if (generic.toString().equalsIgnoreCase(message)) { + player.sendMessage("\u00A7cPlease enter a "+genericDisplayedName()+" name that do not already exist..."); + // wait next message. + CustomAnvil.Companion.getChatListener().setListenedCallback(player, selfRef.get()); + return; + } + } + + T generic = createAndSaveNewEmptyGeneric(message); + + updateValueForGeneric(generic, true); + + // show the new conflict config to the player + this.elementGuiMap.get(generic).getMappedGui().show(player); + + update(); + }; + + selfRef.set(selfCallback); + return selfCallback; + } + + protected abstract S newInstanceOfGui(T generic, GuiItem item); + + protected abstract String genericDisplayedName(); + + protected abstract T createAndSaveNewEmptyGeneric(String name); + +} diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/SettingGuiListConfigGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/SettingGuiListConfigGui.java new file mode 100644 index 0000000..cd98f40 --- /dev/null +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/SettingGuiListConfigGui.java @@ -0,0 +1,95 @@ +package xyz.alexcrea.cuanvil.gui.config.list; + +import com.github.stefvanschie.inventoryframework.gui.GuiItem; +import io.delilaheve.CustomAnvil; +import org.bukkit.Material; +import org.bukkit.event.inventory.InventoryClickEvent; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.ItemMeta; +import org.jetbrains.annotations.NotNull; +import xyz.alexcrea.cuanvil.gui.config.settings.AbstractSettingGui; + +import java.util.HashMap; +import java.util.List; +import java.util.function.Consumer; + +public abstract class SettingGuiListConfigGui< T, S extends AbstractSettingGui.SettingGuiFactory> extends ElementListConfigGui< T >{ + + protected HashMap guiItemMap; + protected HashMap factoryMap; + public SettingGuiListConfigGui(@NotNull String title) { + super(title); + this.guiItemMap = new HashMap<>(); + this.factoryMap = new HashMap<>(); + } + + @Override + protected GuiItem prepareCreateNewItem() { + ItemStack createItem = new ItemStack(Material.PAPER); + ItemMeta createMeta = createItem.getItemMeta(); + + createMeta.setDisplayName("\u00A7aCreate new " + genericDisplayedName()); + createMeta.setLore(getCreateItemLore()); + + createItem.setItemMeta(createMeta); + return new GuiItem(createItem, getCreateClickConsumer(), CustomAnvil.instance); + } + + @Override + public void updateValueForGeneric(T generic, boolean shouldUpdate) { + S factory = this.factoryMap.get(generic); + if(factory == null){ + // Create new item & factory + factory = createFactory(generic); + GuiItem newItem = itemFromFactory(factory); + + addToPage(newItem); + this.guiItemMap.put(generic, newItem); + this.factoryMap.put(generic, factory); + }else{ + // Update old item + GuiItem oldItem = this.guiItemMap.get(generic); + + GuiItem newItem = itemFromFactory(factory); + updateGuiItem(oldItem, newItem); + } + + if(shouldUpdate){ + update(); + } + } + + @Override + protected void reloadValues() { + this.guiItemMap.clear(); + this.factoryMap.clear(); + + super.reloadValues(); + } + + private void updateGuiItem(GuiItem oldITem, GuiItem newItem){ + oldITem.setItem(newItem.getItem()); + oldITem.setProperties(newItem.getProperties()); + oldITem.setVisible(newItem.isVisible()); + } + @Override + protected GuiItem findGuiItemForRemoval(T generic) { + return this.guiItemMap.get(generic); + } + + @Override // Not used + protected void updateGeneric(T generic, ItemStack usedItem) {} + @Override // Not used + protected ItemStack createItemForGeneric(T generic) { + return null; + } + + protected abstract List getCreateItemLore(); + protected abstract Consumer getCreateClickConsumer(); + protected abstract String genericDisplayedName(); + + protected abstract S createFactory(T generic); + protected abstract GuiItem itemFromFactory(S factory); + + +} diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/subsetting/CustomRecipeSubSettingGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/CustomRecipeSubSettingGui.java similarity index 98% rename from src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/subsetting/CustomRecipeSubSettingGui.java rename to src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/CustomRecipeSubSettingGui.java index c78ff9c..80bd84a 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/subsetting/CustomRecipeSubSettingGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/CustomRecipeSubSettingGui.java @@ -1,4 +1,4 @@ -package xyz.alexcrea.cuanvil.gui.config.settings.subsetting; +package xyz.alexcrea.cuanvil.gui.config.list.elements; import com.github.stefvanschie.inventoryframework.gui.GuiItem; import com.github.stefvanschie.inventoryframework.pane.PatternPane; @@ -109,7 +109,7 @@ public class CustomRecipeSubSettingGui extends MappedToListSubSettingGui { this.parent.removeGeneric(this.anvilRecipe); // Remove self - cleanUnused(); + cleanAndBeUnusable(); // Update config file storage ConfigHolder.CUSTOM_RECIPE_HOLDER.getConfig().set(this.anvilRecipe.toString(), null); @@ -159,7 +159,7 @@ public class CustomRecipeSubSettingGui extends MappedToListSubSettingGui { update(); } - public void cleanUnused() { + public void cleanAndBeUnusable() { for (HumanEntity viewer : getViewers()) { this.parent.show(viewer); } diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/subsetting/EnchantConflictSubSettingGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/EnchantConflictSubSettingGui.java similarity index 99% rename from src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/subsetting/EnchantConflictSubSettingGui.java rename to src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/EnchantConflictSubSettingGui.java index abe93d0..9f239ab 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/subsetting/EnchantConflictSubSettingGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/EnchantConflictSubSettingGui.java @@ -1,4 +1,4 @@ -package xyz.alexcrea.cuanvil.gui.config.settings.subsetting; +package xyz.alexcrea.cuanvil.gui.config.list.elements; import com.github.stefvanschie.inventoryframework.gui.GuiItem; import com.github.stefvanschie.inventoryframework.pane.PatternPane; @@ -126,7 +126,7 @@ public class EnchantConflictSubSettingGui extends MappedToListSubSettingGui impl this.parent.removeGeneric(this.enchantConflict); // Remove self - cleanUnused(); + cleanAndBeUnusable(); // Update config file storage ConfigHolder.CONFLICT_HOLDER.getConfig().set(this.enchantConflict.toString(), null); @@ -234,7 +234,7 @@ public class EnchantConflictSubSettingGui extends MappedToListSubSettingGui impl } @Override - public void cleanUnused() { + public void cleanAndBeUnusable() { for (HumanEntity viewer : getViewers()) { this.parent.show(viewer); } diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/subsetting/MappedToListSubSettingGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/MappedToListSubSettingGui.java similarity index 93% rename from src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/subsetting/MappedToListSubSettingGui.java rename to src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/MappedToListSubSettingGui.java index eaa3591..08b4a2f 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/subsetting/MappedToListSubSettingGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/MappedToListSubSettingGui.java @@ -1,4 +1,4 @@ -package xyz.alexcrea.cuanvil.gui.config.settings.subsetting; +package xyz.alexcrea.cuanvil.gui.config.list.elements; import com.github.stefvanschie.inventoryframework.gui.GuiItem; import com.github.stefvanschie.inventoryframework.gui.type.util.Gui; From 6ea9494afdff4033746dd40fd3293a6bdef724e3 Mon Sep 17 00:00:00 2001 From: alexcrea <42614139+alexcrea@users.noreply.github.com> Date: Tue, 9 Apr 2024 17:53:27 +0200 Subject: [PATCH 04/10] progress on unit repair config. --- .../cuanvil/gui/config/MainConfigGui.java | 17 ++- .../config/global/UnitRepairConfigGui.java | 62 ++++++++++ .../config/list/MappedGuiListConfigGui.java | 1 - .../config/list/UnitRepairElementListGui.java | 107 ++++++++++++++++++ 4 files changed, 182 insertions(+), 5 deletions(-) create mode 100644 src/main/java/xyz/alexcrea/cuanvil/gui/config/global/UnitRepairConfigGui.java create mode 100644 src/main/java/xyz/alexcrea/cuanvil/gui/config/list/UnitRepairElementListGui.java 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 07f8a1f..d466a75 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/MainConfigGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/MainConfigGui.java @@ -88,11 +88,20 @@ public class MainConfigGui extends ChestGui { wipMeta.setDisplayName("\u00A7cWIP"); wipItemstack.setItemMeta(wipMeta); - GuiItem wip5 = new GuiItem(wipItemstack, GuiGlobalActions.stayInPlace, CustomAnvil.instance); - GuiItem wip6 = new GuiItem(wipItemstack, GuiGlobalActions.stayInPlace, CustomAnvil.instance); + GuiItem wip = new GuiItem(wipItemstack, GuiGlobalActions.stayInPlace, CustomAnvil.instance); - pane.bindItem('5', wip5); - pane.bindItem('6', wip6); + pane.bindItem('5', wip); + + // Unit repair item + ItemStack unirRepairItemstack = new ItemStack(Material.DIAMOND); + ItemMeta unitRepairMeta = unirRepairItemstack.getItemMeta(); + + unitRepairMeta.setDisplayName("\u00A7aUnit Repair"); + unitRepairMeta.setLore(Collections.singletonList("\u00A77Click here to open anvil custom recipe menu")); + unirRepairItemstack.setItemMeta(unitRepairMeta); + + GuiItem unitRepairItem = GuiGlobalItems.goToGuiItem(unirRepairItemstack, UnitRepairConfigGui.INSTANCE); + pane.bindItem('6', unitRepairItem); // Custom recipe item ItemStack customRecipeItemstack = new ItemStack(Material.CRAFTING_TABLE); diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/UnitRepairConfigGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/UnitRepairConfigGui.java new file mode 100644 index 0000000..5e2b2c8 --- /dev/null +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/UnitRepairConfigGui.java @@ -0,0 +1,62 @@ +package xyz.alexcrea.cuanvil.gui.config.global; + +import com.github.stefvanschie.inventoryframework.gui.GuiItem; +import jdk.nashorn.internal.runtime.regexp.joni.Config; +import org.bukkit.Material; +import org.bukkit.inventory.ItemStack; +import org.jetbrains.annotations.NotNull; +import xyz.alexcrea.cuanvil.config.ConfigHolder; +import xyz.alexcrea.cuanvil.gui.config.list.MappedGuiListConfigGui; +import xyz.alexcrea.cuanvil.gui.config.list.UnitRepairElementListGui; + +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; + +public class UnitRepairConfigGui extends MappedGuiListConfigGui { + + public final static UnitRepairConfigGui INSTANCE = new UnitRepairConfigGui(); + + static { + INSTANCE.init(); + } + + private UnitRepairConfigGui() { + super("Unit Repair Config"); + } + + @Override + protected UnitRepairElementListGui newInstanceOfGui(Material material, GuiItem item) { + return new UnitRepairElementListGui(material, item); + } + + @Override + protected String genericDisplayedName() { + return "item to be repaired"; + } + + @Override + protected Material createAndSaveNewEmptyGeneric(String name) { + return Material.getMaterial(name.toUpperCase()); + } + + @Override + protected ItemStack createItemForGeneric(Material material) { + return new ItemStack(material); //TODO proper item + } + + @Override + protected List getEveryDisplayableInstanceOfGeneric() { + ArrayList materials = new ArrayList<>(); + + for (String matName : ConfigHolder.UNIT_REPAIR_HOLDER.getConfig().getKeys(false)) { + Material mat = Material.getMaterial(matName.toUpperCase()); + if(mat != null){ + materials.add(mat); + } + } + return materials; + } + + +} 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 58dbf42..8b81fff 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 @@ -12,7 +12,6 @@ import java.util.function.Consumer; public abstract class MappedGuiListConfigGui< T, S extends ElementMappedToListGui> extends MappedElementListConfigGui< T, S > { - public MappedGuiListConfigGui(@NotNull String title) { super(title); diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/UnitRepairElementListGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/UnitRepairElementListGui.java new file mode 100644 index 0000000..8903c41 --- /dev/null +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/UnitRepairElementListGui.java @@ -0,0 +1,107 @@ +package xyz.alexcrea.cuanvil.gui.config.list; + +import com.github.stefvanschie.inventoryframework.gui.GuiItem; +import com.github.stefvanschie.inventoryframework.gui.type.util.Gui; +import io.delilaheve.CustomAnvil; +import org.bukkit.Material; +import org.bukkit.configuration.ConfigurationSection; +import org.bukkit.event.inventory.InventoryClickEvent; +import org.bukkit.inventory.ItemStack; +import org.jetbrains.annotations.NotNull; +import xyz.alexcrea.cuanvil.config.ConfigHolder; +import xyz.alexcrea.cuanvil.gui.config.global.EnchantCostConfigGui; +import xyz.alexcrea.cuanvil.gui.config.settings.DoubleSettingGui; +import xyz.alexcrea.cuanvil.util.CasedStringUtil; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Set; +import java.util.function.Consumer; + +public class UnitRepairElementListGui extends SettingGuiListConfigGui implements ElementMappedToListGui { + + + + + private final GuiItem parentItem; + private final Material material; + private final String materialName; + + public UnitRepairElementListGui(@NotNull Material material, GuiItem parentItem) { + super("\u00A7e" + CasedStringUtil.snakeToUpperSpacedCase(material.name().toLowerCase()) + " \u00A7rUnit repair config"); + this.parentItem = parentItem; + this.material = material; + this.materialName = CasedStringUtil.snakeToUpperSpacedCase(material.name().toLowerCase()); + + } + + // SettingGuiListConfigGui methods + + @Override + protected List getCreateItemLore() { + return Arrays.asList( + "a", + "b", + "c" + ); + } + + @Override + protected Consumer getCreateClickConsumer() { + return event -> { + event.setCancelled(true); + + event.getWhoClicked().sendMessage("todo"); + }; + } + + @Override + protected String genericDisplayedName() { + return this.materialName+"`s Unit Repair Item"; + } + + @Override + protected DoubleSettingGui.DoubleSettingFactory createFactory(String generic) { + return null; //TODO + } + + @Override + protected GuiItem itemFromFactory(DoubleSettingGui.DoubleSettingFactory factory) { + return new GuiItem(new ItemStack(Material.STONE), CustomAnvil.instance); //TODO correct item + } + + @Override + protected List getEveryDisplayableInstanceOfGeneric() { + ArrayList keys = new ArrayList<>(); + + ConfigurationSection materialSection = ConfigHolder.UNIT_REPAIR_HOLDER.getConfig().getConfigurationSection(material.name().toLowerCase()); + if(materialSection == null){ + return keys; + } + keys.addAll(materialSection.getKeys(false)); + return keys; + } + + // ElementMappedToListGui methods + + @Override + public GuiItem getParentItemForThisGui() { + return this.parentItem; + } + + @Override + public void updateLocal() { + + } + + @Override + public void cleanAndBeUnusable() { + + } + + @Override + public Gui getMappedGui() { + return this; + } +} From 050c40bd2a683a7df82eac899b21de35f63265a0 Mon Sep 17 00:00:00 2001 From: alexcrea <42614139+alexcrea@users.noreply.github.com> Date: Wed, 10 Apr 2024 17:39:47 +0200 Subject: [PATCH 05/10] Add select item gui & moved confirm gui. --- .../gui/config/ask/AbstractAskGui.java | 42 ++++++++ .../config/{ => ask}/ConfirmActionGui.java | 52 +++------- .../gui/config/ask/SelectItemTypeGui.java | 99 +++++++++++++++++++ .../elements/CustomRecipeSubSettingGui.java | 2 +- .../EnchantConflictSubSettingGui.java | 2 +- .../gui/config/settings/ItemSettingGui.java | 25 +---- .../cuanvil/gui/util/GuiGlobalItems.java | 26 +++++ .../cuanvil/gui/util/GuiSharedConstant.java | 22 +++++ 8 files changed, 208 insertions(+), 62 deletions(-) create mode 100644 src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/AbstractAskGui.java rename src/main/java/xyz/alexcrea/cuanvil/gui/config/{ => ask}/ConfirmActionGui.java (58%) create mode 100644 src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/SelectItemTypeGui.java diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/AbstractAskGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/AbstractAskGui.java new file mode 100644 index 0000000..66dd936 --- /dev/null +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/AbstractAskGui.java @@ -0,0 +1,42 @@ +package xyz.alexcrea.cuanvil.gui.config.ask; + +import com.github.stefvanschie.inventoryframework.gui.GuiItem; +import com.github.stefvanschie.inventoryframework.gui.type.ChestGui; +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; +import org.jetbrains.annotations.NotNull; +import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions; +import xyz.alexcrea.cuanvil.gui.util.GuiGlobalItems; +import xyz.alexcrea.cuanvil.gui.util.GuiSharedConstant; + +public abstract class AbstractAskGui extends ChestGui { + + protected PatternPane pane; + AbstractAskGui(int rows, @NotNull String name, + Gui backOnCancel){ + super(rows, name, CustomAnvil.instance); + + Pattern pattern = getGuiPattern(); + this.pane = new PatternPane(0, 0, pattern.getLength(), pattern.getHeight(), pattern); + addPane(this.pane); + + this.pane.bindItem('0', GuiGlobalItems.backgroundItem()); + this.pane.bindItem('B', new GuiItem(GuiSharedConstant.CANCEL_ITEM, GuiGlobalActions.openGuiAction(backOnCancel), CustomAnvil.instance)); + + } + + /** + * Used to get the gui pattern. + * Reserved character are: + *
    + *
  • B: "cancel" button.
    • + *
  • 0: default background item.
    • + *
+ * + * @return The gui's pattern. + */ + protected abstract Pattern getGuiPattern(); + +} diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/ConfirmActionGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/ConfirmActionGui.java similarity index 58% rename from src/main/java/xyz/alexcrea/cuanvil/gui/config/ConfirmActionGui.java rename to src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/ConfirmActionGui.java index 96f08c9..5b962ed 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/ConfirmActionGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/ConfirmActionGui.java @@ -1,9 +1,7 @@ -package xyz.alexcrea.cuanvil.gui.config; +package xyz.alexcrea.cuanvil.gui.config.ask; import com.github.stefvanschie.inventoryframework.gui.GuiItem; -import com.github.stefvanschie.inventoryframework.gui.type.ChestGui; 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; import org.bukkit.Material; @@ -12,50 +10,20 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions; -import xyz.alexcrea.cuanvil.gui.util.GuiGlobalItems; import xyz.alexcrea.cuanvil.gui.util.GuiSharedConstant; import java.util.Arrays; -import java.util.Collections; import java.util.function.Supplier; import java.util.logging.Level; -public class ConfirmActionGui extends ChestGui { - - private static final ItemStack CANCEL_ITEM; - private static final ItemStack CONFIRM_ITEM; - - static { - CANCEL_ITEM = new ItemStack(Material.RED_TERRACOTTA); - ItemMeta meta = CANCEL_ITEM.getItemMeta(); - meta.setDisplayName("\u00A7cCancel"); - meta.setLore(Collections.singletonList("\u00A77Cancel current action and return to previous menu.")); - CANCEL_ITEM.setItemMeta(meta); - - CONFIRM_ITEM = new ItemStack(Material.GREEN_TERRACOTTA); - meta = CONFIRM_ITEM.getItemMeta(); - meta.setDisplayName("\u00A7aConfirm"); - meta.setLore(Arrays.asList("\u00A77Confirm current action.", - "\u00A74Cation: This action can't be canceled.")); - CONFIRM_ITEM.setItemMeta(meta); - } +public class ConfirmActionGui extends AbstractAskGui { public ConfirmActionGui(@NotNull String title, String actionDescription, Gui backOnCancel, Gui backOnConfirm, Supplier onConfirm) { - super(3, title, CustomAnvil.instance); + super(3, title, backOnCancel); - Pattern pattern = new Pattern( - GuiSharedConstant.EMPTY_GUI_FULL_LINE, - "00B0I0S00", - GuiSharedConstant.EMPTY_GUI_FULL_LINE - ); - PatternPane pane = new PatternPane(0, 0, pattern.getLength(), pattern.getHeight(), pattern); - addPane(pane); - - pane.bindItem('0', GuiGlobalItems.backgroundItem()); - - pane.bindItem('B', new GuiItem(CANCEL_ITEM, GuiGlobalActions.openGuiAction(backOnCancel), CustomAnvil.instance)); - pane.bindItem('S', new GuiItem(CONFIRM_ITEM, event -> { + // Save item + this.pane.bindItem('S', new GuiItem(GuiSharedConstant.CONFIRM_ITEM, event -> { event.setCancelled(true); HumanEntity player = event.getWhoClicked(); @@ -80,6 +48,7 @@ public class ConfirmActionGui extends ChestGui { }, CustomAnvil.instance)); + // Info item ItemStack infoItem = new ItemStack(Material.PAPER); ItemMeta infoMeta = infoItem.getItemMeta(); @@ -91,4 +60,13 @@ public class ConfirmActionGui extends ChestGui { pane.bindItem('I', new GuiItem(infoItem, GuiGlobalActions.stayInPlace, CustomAnvil.instance)); } + @Override + protected Pattern getGuiPattern() { + return new Pattern( + GuiSharedConstant.EMPTY_GUI_FULL_LINE, + "00B0I0S00", + GuiSharedConstant.EMPTY_GUI_FULL_LINE + ); + } + } diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/SelectItemTypeGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/SelectItemTypeGui.java new file mode 100644 index 0000000..0ca2a38 --- /dev/null +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/SelectItemTypeGui.java @@ -0,0 +1,99 @@ +package xyz.alexcrea.cuanvil.gui.config.ask; + +import com.github.stefvanschie.inventoryframework.gui.GuiItem; +import com.github.stefvanschie.inventoryframework.gui.type.util.Gui; +import com.github.stefvanschie.inventoryframework.pane.util.Pattern; +import io.delilaheve.CustomAnvil; +import org.bukkit.Material; +import org.bukkit.entity.HumanEntity; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.ItemMeta; +import org.jetbrains.annotations.NotNull; +import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions; +import xyz.alexcrea.cuanvil.gui.util.GuiGlobalItems; +import xyz.alexcrea.cuanvil.gui.util.GuiSharedConstant; + +import java.util.Arrays; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.BiConsumer; +import java.util.function.Consumer; + +public class SelectItemTypeGui extends AbstractAskGui { + + private ItemStack selectedItem; + public SelectItemTypeGui(@NotNull String title, + @NotNull String actionDescription, + @NotNull Gui backOnCancel, + @NotNull BiConsumer onSave, + boolean materialOnly) { + super(3, title, backOnCancel); + this.selectedItem = null; + + // Save item + GuiItem confirmItem = new GuiItem(GuiSharedConstant.CONFIRM_ITEM, event -> { + event.setCancelled(true); + HumanEntity player = event.getWhoClicked(); + + if (!player.hasPermission(CustomAnvil.editConfigPermission)) { + player.closeInventory(); + player.sendMessage(GuiGlobalActions.NO_EDIT_PERM); + return; + } + + onSave.accept(this.selectedItem, player); + + }, CustomAnvil.instance); + this.pane.bindItem('S', GuiGlobalItems.backgroundItem()); + + // Select item + ItemStack selectItem = setDisplayMeta(new ItemStack(Material.BARRIER), actionDescription); + + AtomicReference selectGuiItem = new AtomicReference<>(); + selectGuiItem.set(new GuiItem(selectItem, event -> { + event.setCancelled(true); + + ItemStack cursor = event.getWhoClicked().getItemOnCursor(); + if(cursor.getType().isAir()) return; + + ItemStack finalItem; + if(materialOnly){ + finalItem = setDisplayMeta(new ItemStack(cursor.getType()), actionDescription); + }else{ + finalItem = cursor.clone(); + } + this.selectedItem = finalItem.clone(); + + selectGuiItem.get().setItem(finalItem); + this.pane.bindItem('S', confirmItem); + + update(); + }, CustomAnvil.instance)); + + this.pane.bindItem('V', selectGuiItem.get()); + + // Temporary leave item + GuiItem temporaryLeave = GuiGlobalItems.temporaryCloseGuiToSelectItem(Material.YELLOW_TERRACOTTA, this); + + this.pane.bindItem('s', temporaryLeave); + + } + + private ItemStack setDisplayMeta(ItemStack item, String actionDescription){ + ItemMeta meta = item.getItemMeta(); + + meta.setDisplayName("\u00A7ePlace an item here"); + meta.setLore(Arrays.asList(actionDescription.split("\n"))); + + item.setItemMeta(meta); + return item; + } + + @Override + protected Pattern getGuiPattern() { + return new Pattern( + GuiSharedConstant.EMPTY_GUI_FULL_LINE, + "0000V000s", + "B0000000S" + ); + } +} diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/CustomRecipeSubSettingGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/CustomRecipeSubSettingGui.java index 80bd84a..ff1249b 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/CustomRecipeSubSettingGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/CustomRecipeSubSettingGui.java @@ -11,7 +11,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; import xyz.alexcrea.cuanvil.config.ConfigHolder; -import xyz.alexcrea.cuanvil.gui.config.ConfirmActionGui; +import xyz.alexcrea.cuanvil.gui.config.ask.ConfirmActionGui; import xyz.alexcrea.cuanvil.gui.config.global.CustomRecipeConfigGui; import xyz.alexcrea.cuanvil.gui.config.settings.BoolSettingsGui; import xyz.alexcrea.cuanvil.gui.config.settings.IntSettingsGui; diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/EnchantConflictSubSettingGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/EnchantConflictSubSettingGui.java index 9f239ab..9a64977 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/EnchantConflictSubSettingGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/EnchantConflictSubSettingGui.java @@ -14,9 +14,9 @@ import xyz.alexcrea.cuanvil.config.ConfigHolder; import xyz.alexcrea.cuanvil.group.AbstractMaterialGroup; import xyz.alexcrea.cuanvil.group.EnchantConflictGroup; import xyz.alexcrea.cuanvil.group.EnchantConflictManager; -import xyz.alexcrea.cuanvil.gui.config.ConfirmActionGui; import xyz.alexcrea.cuanvil.gui.config.SelectEnchantmentContainer; import xyz.alexcrea.cuanvil.gui.config.SelectGroupContainer; +import xyz.alexcrea.cuanvil.gui.config.ask.ConfirmActionGui; import xyz.alexcrea.cuanvil.gui.config.global.EnchantConflictGui; import xyz.alexcrea.cuanvil.gui.config.settings.EnchantSelectSettingGui; import xyz.alexcrea.cuanvil.gui.config.settings.GroupSelectSettingGui; diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/ItemSettingGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/ItemSettingGui.java index 8f44e5e..d88452a 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/ItemSettingGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/ItemSettingGui.java @@ -58,29 +58,8 @@ public class ItemSettingGui extends AbstractSettingGui { public void prepareStaticItems(){ prepareReturnToDefault(); - ItemStack item = new ItemStack(Material.YELLOW_TERRACOTTA); - ItemMeta meta = item.getItemMeta(); - - meta.setDisplayName("\u00A7eTemporary close this menu"); - meta.setLore(Collections.singletonList("\u00A77Allow you to chose other item then return here.")); - item.setItemMeta(meta); - GuiItem guiItem = new GuiItem(item, event -> { - event.setCancelled(true); - - HumanEntity player = event.getWhoClicked(); - - CustomAnvil.Companion.getChatListener().setListenedCallback(player, (message) ->{ - - if(message == null) return; - show(player); - - }); - - player.sendMessage("\u00A7eWrite something in chat to return to the item config menu."); - player.closeInventory(); - }, CustomAnvil.instance); - - getPane().bindItem('s', guiItem); + GuiItem temporaryLeave = GuiGlobalItems.temporaryCloseGuiToSelectItem(Material.YELLOW_TERRACOTTA, this); + getPane().bindItem('s', temporaryLeave); } diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/util/GuiGlobalItems.java b/src/main/java/xyz/alexcrea/cuanvil/gui/util/GuiGlobalItems.java index f8b4656..89ed6b6 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/util/GuiGlobalItems.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/util/GuiGlobalItems.java @@ -5,6 +5,7 @@ import com.github.stefvanschie.inventoryframework.gui.type.util.Gui; import com.github.stefvanschie.inventoryframework.pane.PatternPane; import io.delilaheve.CustomAnvil; import org.bukkit.Material; +import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; @@ -350,4 +351,29 @@ public class GuiGlobalItems { return path.substring(indexOfDot + 1); } + public static GuiItem temporaryCloseGuiToSelectItem(Material itemMaterial, Gui openBack){ + ItemStack item = new ItemStack(itemMaterial); + ItemMeta meta = item.getItemMeta(); + + meta.setDisplayName("\u00A7eTemporary close this menu"); + meta.setLore(Collections.singletonList("\u00A77Allow you to chose other item then return here.")); + item.setItemMeta(meta); + + return new GuiItem(item, event -> { + event.setCancelled(true); + + HumanEntity player = event.getWhoClicked(); + + CustomAnvil.Companion.getChatListener().setListenedCallback(player, (message) ->{ + + if(message == null) return; + openBack.show(player); + + }); + + player.sendMessage("\u00A7eWrite something in chat to return to the item config menu."); + player.closeInventory(); + }, CustomAnvil.instance); + } + } diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/util/GuiSharedConstant.java b/src/main/java/xyz/alexcrea/cuanvil/gui/util/GuiSharedConstant.java index 731b775..0ad90a6 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/util/GuiSharedConstant.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/util/GuiSharedConstant.java @@ -6,9 +6,12 @@ import com.github.stefvanschie.inventoryframework.pane.PatternPane; import com.github.stefvanschie.inventoryframework.pane.util.Pattern; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.ItemMeta; import xyz.alexcrea.cuanvil.gui.config.MainConfigGui; import java.util.Arrays; +import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -50,4 +53,23 @@ public class GuiSharedConstant { } + public static final ItemStack CANCEL_ITEM; + public static final ItemStack CONFIRM_ITEM; + + static { + CANCEL_ITEM = new ItemStack(Material.RED_TERRACOTTA); + ItemMeta meta = CANCEL_ITEM.getItemMeta(); + meta.setDisplayName("\u00A7cCancel"); + meta.setLore(Collections.singletonList("\u00A77Cancel current action and return to previous menu.")); + CANCEL_ITEM.setItemMeta(meta); + + CONFIRM_ITEM = new ItemStack(Material.GREEN_TERRACOTTA); + meta = CONFIRM_ITEM.getItemMeta(); + meta.setDisplayName("\u00A7aConfirm"); + meta.setLore(Arrays.asList("\u00A77Confirm current action.", + "\u00A74Cation: This action can't be canceled.")); + CONFIRM_ITEM.setItemMeta(meta); + } + + } From 9ea7624bffac2d63d65ab4267399f542b6ea5dbc Mon Sep 17 00:00:00 2001 From: alexcrea <42614139+alexcrea@users.noreply.github.com> Date: Wed, 10 Apr 2024 19:56:31 +0200 Subject: [PATCH 06/10] Global unit repair config gui should be finished and work properly. --- .../config/global/UnitRepairConfigGui.java | 87 +++++++++++++++---- .../gui/config/list/ElementListConfigGui.java | 19 ++-- .../config/list/UnitRepairElementListGui.java | 9 +- .../cuanvil/command/ReloadExecutor.kt | 2 + 4 files changed, 90 insertions(+), 27 deletions(-) diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/UnitRepairConfigGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/UnitRepairConfigGui.java index 5e2b2c8..d872def 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/UnitRepairConfigGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/UnitRepairConfigGui.java @@ -1,17 +1,20 @@ package xyz.alexcrea.cuanvil.gui.config.global; import com.github.stefvanschie.inventoryframework.gui.GuiItem; -import jdk.nashorn.internal.runtime.regexp.joni.Config; +import io.delilaheve.CustomAnvil; import org.bukkit.Material; +import org.bukkit.configuration.ConfigurationSection; import org.bukkit.inventory.ItemStack; -import org.jetbrains.annotations.NotNull; +import org.bukkit.inventory.meta.ItemMeta; import xyz.alexcrea.cuanvil.config.ConfigHolder; +import xyz.alexcrea.cuanvil.gui.config.ask.SelectItemTypeGui; import xyz.alexcrea.cuanvil.gui.config.list.MappedGuiListConfigGui; import xyz.alexcrea.cuanvil.gui.config.list.UnitRepairElementListGui; +import xyz.alexcrea.cuanvil.util.CasedStringUtil; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; -import java.util.Locale; public class UnitRepairConfigGui extends MappedGuiListConfigGui { @@ -27,22 +30,34 @@ public class UnitRepairConfigGui extends MappedGuiListConfigGui { + clickEvent.setCancelled(true); + + new SelectItemTypeGui( + "Select unit repair item.", + "\u00A77Click here with an item to set the item\n" + + "\u00A77You like to be an unit repair item", + this, + (itemStack, player) -> { + Material type = itemStack.getType(); + // Add new material + updateValueForGeneric(type, true); + + // Display material edit setting + this.elementGuiMap.get(type).getMappedGui().show(player); + }, + true + ).show(clickEvent.getWhoClicked()); + }, CustomAnvil.instance); + } + + @Override // Not used in this implementation. + protected String genericDisplayedName() { + return "this function Should not be used."; + } + @Override // Not used in this implementation. + protected Material createAndSaveNewEmptyGeneric(String name) { + return null; + } } diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/ElementListConfigGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/ElementListConfigGui.java index 2fa3a29..cb2ccf5 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/ElementListConfigGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/ElementListConfigGui.java @@ -27,18 +27,12 @@ public abstract class ElementListConfigGui< T > extends ValueUpdatableGui { private final String namePrefix; + protected PatternPane backgroundPane; + public ElementListConfigGui(@NotNull String title) { super(6, title, CustomAnvil.instance); this.namePrefix = title; - } - - protected OutlinePane firstPage; - protected ArrayList pages; - protected HashMap pageMap; - protected PatternPane backgroundPane; - - public void init() { // Back item panel Pattern pattern = new Pattern( GuiSharedConstant.EMPTY_GUI_FULL_LINE, @@ -49,9 +43,16 @@ public abstract class ElementListConfigGui< T > extends ValueUpdatableGui { "B11L1R11C" ); this.backgroundPane = new PatternPane(0, 0, 9, 6, Pane.Priority.LOW, pattern); - GuiGlobalItems.addBackItem(this.backgroundPane, MainConfigGui.INSTANCE); + } + + + protected OutlinePane firstPage; + protected ArrayList pages; + protected HashMap pageMap; + + public void init() { // Why I'm using an init function ? GuiGlobalItems.addBackgroundItem(this.backgroundPane); this.backgroundPane.bindItem('1', GuiSharedConstant.SECONDARY_BACKGROUND_ITEM); addPane(this.backgroundPane); diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/UnitRepairElementListGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/UnitRepairElementListGui.java index 8903c41..2a417c2 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/UnitRepairElementListGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/UnitRepairElementListGui.java @@ -9,14 +9,14 @@ import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; import xyz.alexcrea.cuanvil.config.ConfigHolder; -import xyz.alexcrea.cuanvil.gui.config.global.EnchantCostConfigGui; +import xyz.alexcrea.cuanvil.gui.config.MainConfigGui; import xyz.alexcrea.cuanvil.gui.config.settings.DoubleSettingGui; +import xyz.alexcrea.cuanvil.gui.util.GuiGlobalItems; import xyz.alexcrea.cuanvil.util.CasedStringUtil; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Set; import java.util.function.Consumer; public class UnitRepairElementListGui extends SettingGuiListConfigGui implements ElementMappedToListGui { @@ -28,12 +28,15 @@ public class UnitRepairElementListGui extends SettingGuiListConfigGui Date: Wed, 10 Apr 2024 21:54:20 +0200 Subject: [PATCH 07/10] Edit DoubleSettingGui to use BigDecimal. --- .../gui/config/settings/DoubleSettingGui.java | 199 ++++++++++++------ .../cuanvil/gui/util/GuiGlobalItems.java | 2 +- 2 files changed, 130 insertions(+), 71 deletions(-) diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/DoubleSettingGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/DoubleSettingGui.java index 94a6112..3857922 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/DoubleSettingGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/DoubleSettingGui.java @@ -5,6 +5,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.configuration.ConfigurationSection; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; @@ -14,18 +15,25 @@ import xyz.alexcrea.cuanvil.gui.ValueUpdatableGui; 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.util.CasedStringUtil; import xyz.alexcrea.cuanvil.util.MetricsUtil; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.Collections; import java.util.List; +import java.util.Objects; import java.util.function.Consumer; public class DoubleSettingGui extends AbstractSettingGui { protected final DoubleSettingFactory holder; - protected final double before; - protected double now; - protected double step; + protected final boolean asPercentage; + @NotNull + protected final BigDecimal before; + @NotNull + protected BigDecimal now; + protected BigDecimal step; /** * Create a double setting config gui. @@ -33,10 +41,12 @@ public class DoubleSettingGui extends AbstractSettingGui { * @param holder Configuration factory of this setting. * @param now The defined value of this setting. */ - protected DoubleSettingGui(DoubleSettingFactory holder, double now) { + protected DoubleSettingGui(DoubleSettingFactory holder, @NotNull BigDecimal now, boolean asPercentage) { super(3, holder.getTitle(), holder.parent); assert holder.steps.length > 0 && holder.steps.length <= 9; this.holder = holder; + this.asPercentage = asPercentage; + this.before = now; this.now = now; this.step = holder.steps[0]; @@ -66,7 +76,7 @@ public class DoubleSettingGui extends AbstractSettingGui { ItemMeta meta = item.getItemMeta(); meta.setDisplayName("\u00A7eReset to default value"); - meta.setLore(Collections.singletonList("\u00A77Default value is: " + holder.defaultVal)); + meta.setLore(Collections.singletonList("\u00A77Default value is: " + displayValue(holder.defaultVal))); item.setItemMeta(meta); returnToDefault = new GuiItem(item, event -> { event.setCancelled(true); @@ -83,34 +93,24 @@ public class DoubleSettingGui extends AbstractSettingGui { PatternPane pane = getPane(); - // minus item - GuiItem minusItem; - if (now > holder.min) { - double planned = Math.max(holder.min, now - step); - ItemStack item = new ItemStack(Material.RED_TERRACOTTA); - ItemMeta meta = item.getItemMeta(); - meta.setDisplayName("\u00A7e" + now + " -> " + planned + " \u00A7r(\u00A7c-" + (now - planned) + "\u00A7r)"); - meta.setLore(AbstractSettingGui.CLICK_LORE); - item.setItemMeta(meta); - minusItem = new GuiItem(item, updateNowConsumer(planned), CustomAnvil.instance); + //minus item + GuiItem minusItem; + if (now.compareTo(holder.min) > 0) { + BigDecimal planned = holder.min.max(now.subtract(step)); + + minusItem = getSetValueItem(Material.RED_TERRACOTTA, planned, "\u00A7c-"); } else { minusItem = GuiGlobalItems.backgroundItem(Material.BARRIER); } pane.bindItem('-', minusItem); //plus item - // may do a function to generalise ? GuiItem plusItem; - if (now < holder.max) { - double planned = Math.min(holder.max, now + step); - ItemStack item = new ItemStack(Material.GREEN_TERRACOTTA); - ItemMeta meta = item.getItemMeta(); - meta.setDisplayName("\u00A7e" + now + " -> " + planned + " \u00A7r(\u00A7a+" + (planned - now) + "\u00A7r)"); - meta.setLore(AbstractSettingGui.CLICK_LORE); - item.setItemMeta(meta); + if (now.compareTo(holder.max) < 0) { + BigDecimal planned = holder.max.min(now.add(step)); - plusItem = new GuiItem(item, updateNowConsumer(planned), CustomAnvil.instance); + plusItem = getSetValueItem(Material.GREEN_TERRACOTTA, planned, "\u00A7a+"); } else { plusItem = GuiGlobalItems.backgroundItem(Material.BARRIER); } @@ -119,7 +119,7 @@ public class DoubleSettingGui extends AbstractSettingGui { // "result" display ItemStack resultPaper = new ItemStack(Material.PAPER); ItemMeta resultMeta = resultPaper.getItemMeta(); - resultMeta.setDisplayName("\u00A7eValue: " + now); + resultMeta.setDisplayName("\u00A7eValue: " + displayValue(now)); resultPaper.setItemMeta(resultMeta); GuiItem resultItem = new GuiItem(resultPaper, GuiGlobalActions.stayInPlace, CustomAnvil.instance); @@ -127,7 +127,7 @@ public class DoubleSettingGui extends AbstractSettingGui { // reset to default GuiItem returnToDefault; - if (now != holder.defaultVal) { + if (!now.equals(holder.defaultVal)) { returnToDefault = this.returnToDefault; } else { returnToDefault = GuiGlobalItems.backgroundItem(); @@ -137,11 +137,22 @@ public class DoubleSettingGui extends AbstractSettingGui { } + private GuiItem getSetValueItem(Material mat, BigDecimal planned, String numberPrefix){ + ItemStack item = new ItemStack(mat); + ItemMeta meta = item.getItemMeta(); + meta.setDisplayName("\u00A7e" + displayValue(now) + " -> " + displayValue(planned) + + " \u00A7r(" + numberPrefix + (displayValue(planned.subtract(now).abs()) + "\u00A7r)")); + meta.setLore(AbstractSettingGui.CLICK_LORE); + item.setItemMeta(meta); + + return new GuiItem(item, updateNowConsumer(planned), CustomAnvil.instance); + } + /** * @param planned Value to change current setting to. * @return A consumer to update the current setting's value. */ - protected Consumer updateNowConsumer(double planned) { + protected Consumer updateNowConsumer(BigDecimal planned) { return event -> { event.setCancelled(true); now = planned; @@ -199,25 +210,25 @@ public class DoubleSettingGui extends AbstractSettingGui { * @return A step item corresponding to its index value. */ protected GuiItem stepGuiItem(int stepIndex) { - double stepValue = holder.steps[stepIndex]; + BigDecimal stepValue = holder.steps[stepIndex]; // Get material properties Material stepMat; StringBuilder stepName = new StringBuilder("\u00A7"); List stepLore; Consumer clickEvent; - if (stepValue == step) { + if (Objects.equals(stepValue, step)) { stepMat = Material.GREEN_STAINED_GLASS_PANE; stepName.append('a'); - stepLore = Collections.singletonList("\u00A77Value is changing by " + stepValue); + stepLore = Collections.singletonList("\u00A77Value is changing by " + displayValue(stepValue)); clickEvent = GuiGlobalActions.stayInPlace; } else { stepMat = Material.RED_STAINED_GLASS_PANE; stepName.append('c'); - stepLore = Collections.singletonList("\u00A77Click here to change the value by " + stepValue); + stepLore = Collections.singletonList("\u00A77Click here to change the value by " + displayValue(stepValue)); clickEvent = updateStepValue(stepValue); } - stepName.append("Step of: ").append(stepValue); + stepName.append("Step of ").append(displayValue(stepValue)); // Create item stack then gui item ItemStack item = new ItemStack(stepMat); @@ -234,7 +245,7 @@ public class DoubleSettingGui extends AbstractSettingGui { * @param stepValue Value to change current step to. * @return A consumer to update the current step of this setting. */ - protected Consumer updateStepValue(double stepValue) { + protected Consumer updateStepValue(BigDecimal stepValue) { return event -> { event.setCancelled(true); this.step = stepValue; @@ -246,7 +257,7 @@ public class DoubleSettingGui extends AbstractSettingGui { @Override public boolean onSave() { - holder.config.getConfig().set(holder.configPath, now); + holder.config.getConfig().set(holder.configPath, now.doubleValue()); MetricsUtil.INSTANCE.notifyChange(this.holder.config, this.holder.configPath); if (GuiSharedConstant.TEMPORARY_DO_SAVE_TO_DISK_EVERY_CHANGE) { @@ -257,31 +268,47 @@ public class DoubleSettingGui extends AbstractSettingGui { @Override public boolean hadChange() { - return now != before; + return !now.equals(before); + } + + private static final BigDecimal PERCENTAGE_OFFSET = BigDecimal.valueOf(100); + public String displayValue(BigDecimal value){ + return displayValue(value, this.asPercentage); + } + + public static String displayValue(BigDecimal value, boolean isAsPercentage){ + if(isAsPercentage){ + return value.multiply(PERCENTAGE_OFFSET).setScale(value.scale()-2, RoundingMode.HALF_UP) + "%"; + } + return value.toString(); } /** * Create a double setting factory from setting's parameters. * - * @param title The title of the gui. - * @param parent Parent gui to go back when completed. - * @param configPath Configuration path of this setting. - * @param config Configuration holder of this setting. - * @param min Minimum value of this setting. - * @param max Maximum value of this setting. - * @param defaultVal Default value if not found on the config. - * @param steps List of step the value can increment/decrement. - * List's size should be between 1 (included) and 5 (included). - * it is visually preferable to have an odd number of step. - * If step only contain 1 value, no step item should be displayed. + * @param title The title of the gui. + * @param parent Parent gui to go back when completed. + * @param configPath Configuration path of this setting. + * @param config Configuration holder of this setting. + * @param scale The scale of the decimal. + * @param asPercentage If we should display the value as a %. + * @param min Minimum value of this setting. + * @param max Maximum value of this setting. + * @param defaultVal Default value if not found on the config. + * @param steps List of step the value can increment/decrement. + * List's size should be between 1 (included) and 5 (included). + * it is visually preferable to have an odd number of step. + * If step only contain 1 value, no step item should be displayed. * @return A factory for a double setting gui. */ public static DoubleSettingFactory doubleFactory(@NotNull String title, ValueUpdatableGui parent, - String configPath, ConfigHolder config, + String configPath, ConfigHolder config, + int scale, boolean asPercentage, double min, double max, double defaultVal, double... steps) { return new DoubleSettingFactory( title, parent, configPath, config, + scale, asPercentage, min, max, defaultVal, steps); } @@ -292,37 +319,49 @@ public class DoubleSettingGui extends AbstractSettingGui { @NotNull String title; ValueUpdatableGui parent; - double min; - double max; - double defaultVal; - double[] steps; + + int scale; + boolean asPercentage; + BigDecimal min; + BigDecimal max; + BigDecimal defaultVal; + BigDecimal[] steps; /** * Constructor for a double setting gui factory. * - * @param title The title of the gui. - * @param parent Parent gui to go back when completed. - * @param configPath Configuration path of this setting. - * @param config Configuration holder of this setting. - * @param min Minimum value of this setting. - * @param max Maximum value of this setting. - * @param defaultVal Default value if not found on the config. - * @param steps List of step the value can increment/decrement. - * List's size should be between 1 (included) and 5 (included). - * it is visually preferable to have an odd number of step. - * If step only contain 1 value, no step item should be displayed. + * @param title The title of the gui. + * @param parent Parent gui to go back when completed. + * @param configPath Configuration path of this setting. + * @param config Configuration holder of this setting. + * @param scale The scale of the decimal. + * @param asPercentage If we should display the value as a %. + * @param min Minimum value of this setting. + * @param max Maximum value of this setting. + * @param defaultVal Default value if not found on the config. + * @param steps List of step the value can increment/decrement. + * List's size should be between 1 (included) and 5 (included). + * it is visually preferable to have an odd number of step. + * If step only contain 1 value, no step item should be displayed. */ protected DoubleSettingFactory( @NotNull String title, ValueUpdatableGui parent, String configPath, ConfigHolder config, + int scale, boolean asPercentage, double min, double max, double defaultVal, double... steps) { super(configPath, config); this.title = title; this.parent = parent; - this.min = min; - this.max = max; - this.defaultVal = defaultVal; - this.steps = steps; + this.scale = scale; + this.asPercentage = asPercentage; + this.min = BigDecimal.valueOf(min).setScale(scale, RoundingMode.HALF_UP); + this.max = BigDecimal.valueOf(max).setScale(scale, RoundingMode.HALF_UP); + this.defaultVal = BigDecimal.valueOf(defaultVal).setScale(scale, RoundingMode.HALF_UP); + + this.steps = new BigDecimal[steps.length]; + for (int i = 0; i < steps.length; i++) { + this.steps[i] = BigDecimal.valueOf(steps[i]).setScale(scale, RoundingMode.HALF_UP); + } } /** @@ -336,16 +375,36 @@ public class DoubleSettingGui extends AbstractSettingGui { /** * @return The configured value for the associated setting. */ - public double getConfiguredValue() { - return this.config.getConfig().getDouble(this.configPath, this.defaultVal); + public BigDecimal getConfiguredValue() { + ConfigurationSection section = this.config.getConfig(); + if(section.isDouble(this.configPath)){ + return BigDecimal.valueOf(section.getDouble(this.configPath)).setScale(2, RoundingMode.HALF_UP); + } + return this.defaultVal; } @Override public AbstractSettingGui create() { // Get value or default - double now = getConfiguredValue(); + BigDecimal now = getConfiguredValue(); // create new gui - return new DoubleSettingGui(this, now); + return new DoubleSettingGui(this, now, this.asPercentage); + } + + + public GuiItem getItem(Material itemMat, String name){ + // Get item properties + BigDecimal value = getConfiguredValue(); + StringBuilder itemName = new StringBuilder("\u00A7a").append(name); + + return GuiGlobalItems.createGuiItemFromProperties(this, itemMat, itemName, displayValue(value, this.asPercentage)); + } + + public GuiItem getItem(Material itemMat){ + // Get item properties + String configPath = GuiGlobalItems.getConfigNameFromPath(getConfigPath()); + + return getItem(itemMat, CasedStringUtil.detectToUpperSpacedCase(configPath)); } } diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/util/GuiGlobalItems.java b/src/main/java/xyz/alexcrea/cuanvil/gui/util/GuiGlobalItems.java index 89ed6b6..4812d43 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/util/GuiGlobalItems.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/util/GuiGlobalItems.java @@ -319,7 +319,7 @@ public class GuiGlobalItems { * Will not update automatically, if the setting's value change, the item need to be created again. * @return A formatted GuiItem that will create and open a GUI for the setting. */ - private static GuiItem createGuiItemFromProperties( + public static GuiItem createGuiItemFromProperties( @NotNull AbstractSettingGui.SettingGuiFactory factory, @NotNull Material itemMat, @NotNull StringBuilder itemName, From cb934e8a89ad1e72878931f8b9cbd37862d8abe8 Mon Sep 17 00:00:00 2001 From: alexcrea <42614139+alexcrea@users.noreply.github.com> Date: Thu, 11 Apr 2024 00:39:25 +0200 Subject: [PATCH 08/10] Progress on unit repair list gui. --- .../config/list/SettingGuiListConfigGui.java | 10 ++-- .../config/list/UnitRepairElementListGui.java | 49 ++++++++++++------- .../cuanvil/gui/util/GuiGlobalItems.java | 3 +- 3 files changed, 37 insertions(+), 25 deletions(-) diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/SettingGuiListConfigGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/SettingGuiListConfigGui.java index cd98f40..328743c 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/SettingGuiListConfigGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/SettingGuiListConfigGui.java @@ -28,7 +28,7 @@ public abstract class SettingGuiListConfigGui< T, S extends AbstractSettingGui.S ItemStack createItem = new ItemStack(Material.PAPER); ItemMeta createMeta = createItem.getItemMeta(); - createMeta.setDisplayName("\u00A7aCreate new " + genericDisplayedName()); + createMeta.setDisplayName(createItemName()); createMeta.setLore(getCreateItemLore()); createItem.setItemMeta(createMeta); @@ -41,7 +41,7 @@ public abstract class SettingGuiListConfigGui< T, S extends AbstractSettingGui.S if(factory == null){ // Create new item & factory factory = createFactory(generic); - GuiItem newItem = itemFromFactory(factory); + GuiItem newItem = itemFromFactory(generic, factory); addToPage(newItem); this.guiItemMap.put(generic, newItem); @@ -50,7 +50,7 @@ public abstract class SettingGuiListConfigGui< T, S extends AbstractSettingGui.S // Update old item GuiItem oldItem = this.guiItemMap.get(generic); - GuiItem newItem = itemFromFactory(factory); + GuiItem newItem = itemFromFactory(generic, factory); updateGuiItem(oldItem, newItem); } @@ -86,10 +86,10 @@ public abstract class SettingGuiListConfigGui< T, S extends AbstractSettingGui.S protected abstract List getCreateItemLore(); protected abstract Consumer getCreateClickConsumer(); - protected abstract String genericDisplayedName(); + protected abstract String createItemName(); protected abstract S createFactory(T generic); - protected abstract GuiItem itemFromFactory(S factory); + protected abstract GuiItem itemFromFactory(T generic, S factory); } diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/UnitRepairElementListGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/UnitRepairElementListGui.java index 2a417c2..fe02496 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/UnitRepairElementListGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/UnitRepairElementListGui.java @@ -2,14 +2,11 @@ package xyz.alexcrea.cuanvil.gui.config.list; import com.github.stefvanschie.inventoryframework.gui.GuiItem; import com.github.stefvanschie.inventoryframework.gui.type.util.Gui; -import io.delilaheve.CustomAnvil; import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.event.inventory.InventoryClickEvent; -import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; import xyz.alexcrea.cuanvil.config.ConfigHolder; -import xyz.alexcrea.cuanvil.gui.config.MainConfigGui; import xyz.alexcrea.cuanvil.gui.config.settings.DoubleSettingGui; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalItems; import xyz.alexcrea.cuanvil.util.CasedStringUtil; @@ -21,9 +18,6 @@ import java.util.function.Consumer; public class UnitRepairElementListGui extends SettingGuiListConfigGui implements ElementMappedToListGui { - - - private final GuiItem parentItem; private final Material material; private final String materialName; @@ -31,7 +25,7 @@ public class UnitRepairElementListGui extends SettingGuiListConfigGui getCreateItemLore() { return Arrays.asList( @@ -60,18 +53,31 @@ public class UnitRepairElementListGui extends SettingGuiListConfigGui Date: Thu, 11 Apr 2024 01:53:37 +0200 Subject: [PATCH 09/10] Add null on zero for DoubleSettingGui --- .../config/list/UnitRepairElementListGui.java | 2 +- .../gui/config/settings/DoubleSettingGui.java | 35 +++++++++++++------ 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/UnitRepairElementListGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/UnitRepairElementListGui.java index fe02496..e5c8242 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/UnitRepairElementListGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/UnitRepairElementListGui.java @@ -65,7 +65,7 @@ public class UnitRepairElementListGui extends SettingGuiListConfigGui 0 && holder.steps.length <= 9; this.holder = holder; this.asPercentage = asPercentage; + this.nullOnZero = nullOnZero; this.before = now; this.now = now; @@ -127,7 +132,7 @@ public class DoubleSettingGui extends AbstractSettingGui { // reset to default GuiItem returnToDefault; - if (!now.equals(holder.defaultVal)) { + if (now.compareTo(holder.defaultVal) != 0) { returnToDefault = this.returnToDefault; } else { returnToDefault = GuiGlobalItems.backgroundItem(); @@ -217,7 +222,7 @@ public class DoubleSettingGui extends AbstractSettingGui { StringBuilder stepName = new StringBuilder("\u00A7"); List stepLore; Consumer clickEvent; - if (Objects.equals(stepValue, step)) { + if (stepValue.compareTo(step) == 0) { stepMat = Material.GREEN_STAINED_GLASS_PANE; stepName.append('a'); stepLore = Collections.singletonList("\u00A77Value is changing by " + displayValue(stepValue)); @@ -257,7 +262,11 @@ public class DoubleSettingGui extends AbstractSettingGui { @Override public boolean onSave() { - holder.config.getConfig().set(holder.configPath, now.doubleValue()); + if(this.nullOnZero && (this.now.compareTo(BigDecimal.ZERO) == 0)){ + this.holder.config.getConfig().set(this.holder.configPath, null); + }else{ + this.holder.config.getConfig().set(this.holder.configPath, now.doubleValue()); + } MetricsUtil.INSTANCE.notifyChange(this.holder.config, this.holder.configPath); if (GuiSharedConstant.TEMPORARY_DO_SAVE_TO_DISK_EVERY_CHANGE) { @@ -268,7 +277,7 @@ public class DoubleSettingGui extends AbstractSettingGui { @Override public boolean hadChange() { - return !now.equals(before); + return now.compareTo(before) != 0; } private static final BigDecimal PERCENTAGE_OFFSET = BigDecimal.valueOf(100); @@ -292,6 +301,7 @@ public class DoubleSettingGui extends AbstractSettingGui { * @param config Configuration holder of this setting. * @param scale The scale of the decimal. * @param asPercentage If we should display the value as a %. + * @param nullOnZero Set the value as null (deleting it) when equal to 0 * @param min Minimum value of this setting. * @param max Maximum value of this setting. * @param defaultVal Default value if not found on the config. @@ -303,12 +313,12 @@ public class DoubleSettingGui extends AbstractSettingGui { */ public static DoubleSettingFactory doubleFactory(@NotNull String title, ValueUpdatableGui parent, String configPath, ConfigHolder config, - int scale, boolean asPercentage, + int scale, boolean asPercentage, boolean nullOnZero, double min, double max, double defaultVal, double... steps) { return new DoubleSettingFactory( title, parent, configPath, config, - scale, asPercentage, + scale, asPercentage, nullOnZero, min, max, defaultVal, steps); } @@ -322,6 +332,7 @@ public class DoubleSettingGui extends AbstractSettingGui { int scale; boolean asPercentage; + boolean nullOnZero; BigDecimal min; BigDecimal max; BigDecimal defaultVal; @@ -336,6 +347,7 @@ public class DoubleSettingGui extends AbstractSettingGui { * @param config Configuration holder of this setting. * @param scale The scale of the decimal. * @param asPercentage If we should display the value as a %. + * @param nullOnZero Set the value as null (deleting it) when equal to 0 * @param min Minimum value of this setting. * @param max Maximum value of this setting. * @param defaultVal Default value if not found on the config. @@ -347,13 +359,14 @@ public class DoubleSettingGui extends AbstractSettingGui { protected DoubleSettingFactory( @NotNull String title, ValueUpdatableGui parent, String configPath, ConfigHolder config, - int scale, boolean asPercentage, + int scale, boolean asPercentage, boolean nullOnZero, double min, double max, double defaultVal, double... steps) { super(configPath, config); this.title = title; this.parent = parent; this.scale = scale; this.asPercentage = asPercentage; + this.nullOnZero = nullOnZero; this.min = BigDecimal.valueOf(min).setScale(scale, RoundingMode.HALF_UP); this.max = BigDecimal.valueOf(max).setScale(scale, RoundingMode.HALF_UP); this.defaultVal = BigDecimal.valueOf(defaultVal).setScale(scale, RoundingMode.HALF_UP); @@ -388,7 +401,7 @@ public class DoubleSettingGui extends AbstractSettingGui { // Get value or default BigDecimal now = getConfiguredValue(); // create new gui - return new DoubleSettingGui(this, now, this.asPercentage); + return new DoubleSettingGui(this, now, this.asPercentage, this.nullOnZero); } From dee7862e82fa7b82ad67d51a4f730cc25f7b5d7f Mon Sep 17 00:00:00 2001 From: alexcrea <42614139+alexcrea@users.noreply.github.com> Date: Thu, 11 Apr 2024 19:31:43 +0200 Subject: [PATCH 10/10] Finished unit repair config gui. --- .../config/list/UnitRepairElementListGui.java | 92 +++++++++++++++++-- .../config/settings/AbstractSettingGui.java | 2 +- .../gui/config/settings/DoubleSettingGui.java | 49 +++++++++- .../xyz/alexcrea/cuanvil/util/MetricsUtil.kt | 3 + 4 files changed, 132 insertions(+), 14 deletions(-) diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/UnitRepairElementListGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/UnitRepairElementListGui.java index e5c8242..fdbc7d8 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/UnitRepairElementListGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/UnitRepairElementListGui.java @@ -4,12 +4,19 @@ import com.github.stefvanschie.inventoryframework.gui.GuiItem; import com.github.stefvanschie.inventoryframework.gui.type.util.Gui; import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; +import org.bukkit.entity.HumanEntity; import org.bukkit.event.inventory.InventoryClickEvent; +import org.bukkit.inventory.meta.Damageable; +import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; import xyz.alexcrea.cuanvil.config.ConfigHolder; +import xyz.alexcrea.cuanvil.gui.config.ask.SelectItemTypeGui; +import xyz.alexcrea.cuanvil.gui.config.global.UnitRepairConfigGui; import xyz.alexcrea.cuanvil.gui.config.settings.DoubleSettingGui; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalItems; +import xyz.alexcrea.cuanvil.gui.util.GuiSharedConstant; import xyz.alexcrea.cuanvil.util.CasedStringUtil; +import xyz.alexcrea.cuanvil.util.MetricsUtil; import java.util.ArrayList; import java.util.Arrays; @@ -20,14 +27,17 @@ public class UnitRepairElementListGui extends SettingGuiListConfigGui getCreateItemLore() { return Arrays.asList( - "a", - "b", - "c" + "\u00A77Select a new item to be repairable.", + "\u00A77You will be asked the material to use." ); } @@ -47,8 +56,50 @@ public class UnitRepairElementListGui extends SettingGuiListConfigGui getCreateClickConsumer() { return event -> { event.setCancelled(true); + if(!this.shouldWork){ + return; + } + event.setCancelled(true); + + new SelectItemTypeGui( + "Select item to be repaired.", + "\u00A77Click here with an item to set the item\n" + + "\u00A77You like to be repaired by " + this.materialName, + this, + (itemStack, player) -> { + ItemMeta meta = itemStack.getItemMeta(); + Material type = itemStack.getType(); + + if(!(meta instanceof Damageable) || (type.getMaxDurability() <= 0)) { + player.sendMessage("\u00A7cThis item can't be damaged, so it can't be repaired."); + return; + } + if(type == this.material){ + player.sendMessage("\u00A7cItem can't repair something of the same type."); + return; + } + + String materialName = type.name().toLowerCase(); + + // Add new material + ConfigHolder.UNIT_REPAIR_HOLDER.getConfig().set(material.name().toLowerCase()+"."+materialName,0.25); + + MetricsUtil.INSTANCE.notifyChange(ConfigHolder.UNIT_REPAIR_HOLDER, ""); + if (GuiSharedConstant.TEMPORARY_DO_SAVE_TO_DISK_EVERY_CHANGE) { + ConfigHolder.UNIT_REPAIR_HOLDER.saveToDisk(GuiSharedConstant.TEMPORARY_DO_BACKUP_EVERY_SAVE); + } + + // Update gui + updateValueForGeneric(materialName, true); + this.parentGui.updateValueForGeneric(this.material, true); + + + // Display material edit setting + this.factoryMap.get(materialName).create().show(player); + }, + true + ).show(event.getWhoClicked()); - event.getWhoClicked().sendMessage("todo"); }; } @@ -62,7 +113,7 @@ public class UnitRepairElementListGui extends SettingGuiListConfigGui getEveryDisplayableInstanceOfGeneric() { ArrayList keys = new ArrayList<>(); + if(!this.shouldWork){ + return keys; + } ConfigurationSection materialSection = ConfigHolder.UNIT_REPAIR_HOLDER.getConfig().getConfigurationSection(material.name().toLowerCase()); if(materialSection == null){ @@ -98,6 +151,12 @@ public class UnitRepairElementListGui extends SettingGuiListConfigGui { event.setCancelled(true); @@ -98,7 +135,6 @@ public class DoubleSettingGui extends AbstractSettingGui { PatternPane pane = getPane(); - //minus item GuiItem minusItem; if (now.compareTo(holder.min) > 0) { @@ -139,7 +175,6 @@ public class DoubleSettingGui extends AbstractSettingGui { } pane.bindItem('D', returnToDefault); - } private GuiItem getSetValueItem(Material mat, BigDecimal planned, String numberPrefix){ @@ -262,7 +297,7 @@ public class DoubleSettingGui extends AbstractSettingGui { @Override public boolean onSave() { - if(this.nullOnZero && (this.now.compareTo(BigDecimal.ZERO) == 0)){ + if(isNull()){ this.holder.config.getConfig().set(this.holder.configPath, null); }else{ this.holder.config.getConfig().set(this.holder.configPath, now.doubleValue()); @@ -280,6 +315,10 @@ public class DoubleSettingGui extends AbstractSettingGui { return now.compareTo(before) != 0; } + public boolean isNull(){ + return this.nullOnZero && (this.now.compareTo(BigDecimal.ZERO) == 0); + } + private static final BigDecimal PERCENTAGE_OFFSET = BigDecimal.valueOf(100); public String displayValue(BigDecimal value){ return displayValue(value, this.asPercentage); diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/util/MetricsUtil.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/util/MetricsUtil.kt index 614116d..6e0e270 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/util/MetricsUtil.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/util/MetricsUtil.kt @@ -127,7 +127,10 @@ object MetricsUtil { isDefaultItemGroupsConfig = false } else if (ConfigHolder.UNIT_REPAIR_HOLDER.equals(holder)) { isDefaultUnitRepairItemConfig = false + } else if (ConfigHolder.CUSTOM_RECIPE_HOLDER.equals(holder)) { + isDefaultCustomAnvilCraftConfig = false } + } fun addCustomMetric(metric: Metrics) {