diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/MainConfigGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/MainConfigGui.java index 3e17b56..1b8cc54 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/MainConfigGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/MainConfigGui.java @@ -8,9 +8,9 @@ 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.BasicConfigGui; -import xyz.alexcrea.cuanvil.gui.config.EnchantCostConfigGui; -import xyz.alexcrea.cuanvil.gui.config.EnchantLimitConfigGui; +import xyz.alexcrea.cuanvil.gui.config.openable.BasicConfigGui; +import xyz.alexcrea.cuanvil.gui.config.openable.EnchantCostConfigGui; +import xyz.alexcrea.cuanvil.gui.config.openable.EnchantLimitConfigGui; 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/SelectEnchantmentContainer.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/SelectEnchantmentContainer.java new file mode 100644 index 0000000..9a468de --- /dev/null +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/SelectEnchantmentContainer.java @@ -0,0 +1,16 @@ +package xyz.alexcrea.cuanvil.gui.config; + +import org.bukkit.enchantments.Enchantment; +import xyz.alexcrea.cuanvil.group.AbstractMaterialGroup; + +import java.util.List; +import java.util.Set; + +public interface SelectEnchantmentContainer { + + List getSelectedEnchantments(); + void setSelectedEnchantments(List enchantments); + + Set illegalEnchantments(); + +} diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/SelectGroupContainer.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/SelectGroupContainer.java new file mode 100644 index 0000000..7574f85 --- /dev/null +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/SelectGroupContainer.java @@ -0,0 +1,15 @@ +package xyz.alexcrea.cuanvil.gui.config; + +import xyz.alexcrea.cuanvil.group.AbstractMaterialGroup; + +import java.util.List; +import java.util.Set; + +public interface SelectGroupContainer { + + List getSelectedGroups(); + void setSelectedGroups(List groups); + + Set illegalGroups(); + +} diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/SelectMaterialContainer.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/SelectMaterialContainer.java new file mode 100644 index 0000000..a510371 --- /dev/null +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/SelectMaterialContainer.java @@ -0,0 +1,16 @@ +package xyz.alexcrea.cuanvil.gui.config; + +import javafx.scene.paint.Material; +import xyz.alexcrea.cuanvil.group.AbstractMaterialGroup; + +import java.util.List; +import java.util.Set; + +public interface SelectMaterialContainer { + + List getSelectedMaterials(); + void setSelectedMaterials(List materials); + + Set illegalMaterials(); + +} diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/BasicConfigGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/openable/BasicConfigGui.java similarity index 99% rename from src/main/java/xyz/alexcrea/cuanvil/gui/config/BasicConfigGui.java rename to src/main/java/xyz/alexcrea/cuanvil/gui/config/openable/BasicConfigGui.java index 7b39d8f..3e86948 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/BasicConfigGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/openable/BasicConfigGui.java @@ -1,4 +1,4 @@ -package xyz.alexcrea.cuanvil.gui.config; +package xyz.alexcrea.cuanvil.gui.config.openable; import com.github.stefvanschie.inventoryframework.gui.GuiItem; import com.github.stefvanschie.inventoryframework.pane.PatternPane; diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/EnchantCostConfigGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/openable/EnchantCostConfigGui.java similarity index 96% rename from src/main/java/xyz/alexcrea/cuanvil/gui/config/EnchantCostConfigGui.java rename to src/main/java/xyz/alexcrea/cuanvil/gui/config/openable/EnchantCostConfigGui.java index b5a2a50..7ecd771 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/EnchantCostConfigGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/openable/EnchantCostConfigGui.java @@ -1,4 +1,4 @@ -package xyz.alexcrea.cuanvil.gui.config; +package xyz.alexcrea.cuanvil.gui.config.openable; import com.github.stefvanschie.inventoryframework.gui.GuiItem; import org.bukkit.Material; @@ -8,6 +8,7 @@ import org.bukkit.inventory.meta.ItemMeta; import xyz.alexcrea.cuanvil.config.ConfigHolder; import xyz.alexcrea.cuanvil.enchant.EnchantmentProperties; import xyz.alexcrea.cuanvil.enchant.EnchantmentRarity; +import xyz.alexcrea.cuanvil.gui.config.AbstractEnchantConfigGui; import xyz.alexcrea.cuanvil.gui.config.settings.EnchantCostSettingsGui; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalItems; import xyz.alexcrea.cuanvil.util.CasedStringUtil; diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/EnchantLimitConfigGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/openable/EnchantLimitConfigGui.java similarity index 93% rename from src/main/java/xyz/alexcrea/cuanvil/gui/config/EnchantLimitConfigGui.java rename to src/main/java/xyz/alexcrea/cuanvil/gui/config/openable/EnchantLimitConfigGui.java index fa63937..92b7833 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/EnchantLimitConfigGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/openable/EnchantLimitConfigGui.java @@ -1,9 +1,10 @@ -package xyz.alexcrea.cuanvil.gui.config; +package xyz.alexcrea.cuanvil.gui.config.openable; import com.github.stefvanschie.inventoryframework.gui.GuiItem; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import xyz.alexcrea.cuanvil.config.ConfigHolder; +import xyz.alexcrea.cuanvil.gui.config.AbstractEnchantConfigGui; import xyz.alexcrea.cuanvil.gui.config.settings.IntSettingsGui; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalItems; import xyz.alexcrea.cuanvil.util.CasedStringUtil; diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt index fdcae7d..e8d201d 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt @@ -5,9 +5,9 @@ import org.bukkit.command.Command import org.bukkit.command.CommandExecutor import org.bukkit.command.CommandSender import xyz.alexcrea.cuanvil.config.ConfigHolder -import xyz.alexcrea.cuanvil.gui.config.BasicConfigGui -import xyz.alexcrea.cuanvil.gui.config.EnchantCostConfigGui -import xyz.alexcrea.cuanvil.gui.config.EnchantLimitConfigGui +import xyz.alexcrea.cuanvil.gui.config.openable.BasicConfigGui +import xyz.alexcrea.cuanvil.gui.config.openable.EnchantCostConfigGui +import xyz.alexcrea.cuanvil.gui.config.openable.EnchantLimitConfigGui import xyz.alexcrea.cuanvil.util.MetricsUtil class ReloadExecutor : CommandExecutor {