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 index 246f2eb..b2d6afe 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/SelectItemTypeGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/SelectItemTypeGui.java @@ -71,7 +71,7 @@ public class SelectItemTypeGui extends AbstractAskGui { this.pane.bindItem('V', selectGuiItem.get()); // Temporary leave item - GuiItem temporaryLeave = GuiGlobalItems.temporaryCloseGuiToSelectItem(Material.YELLOW_TERRACOTTA, this); + GuiItem temporaryLeave = GuiGlobalItems.temporaryCloseGuiToSelectItem(Material.YELLOW_STAINED_GLASS_PANE, this); this.pane.bindItem('s', temporaryLeave); diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/AbstractEnchantConfigGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/AbstractEnchantConfigGui.java index f9e2903..a65b54b 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/AbstractEnchantConfigGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/AbstractEnchantConfigGui.java @@ -44,11 +44,11 @@ public abstract class AbstractEnchantConfigGui extends ChestGui implements Valu protected PatternPane backgroundPane; + public static final int LIST_FILLER_START_X = 1; + public static final int LIST_FILLER_START_Y = 1; + public static final int LIST_FILLER_LENGTH = 7; + public static final int LIST_FILLER_HEIGHT = 4; + protected ElementListConfigGui(@NotNull String title, Gui parent) { super(6, title, CustomAnvil.instance); this.namePrefix = title; @@ -43,11 +48,11 @@ public abstract class ElementListConfigGui< T > extends ChestGui implements Valu protected Pattern getBackgroundPattern(){ return new Pattern( - GuiSharedConstant.EMPTY_GUI_FULL_LINE, - GuiSharedConstant.EMPTY_GUI_FULL_LINE, - GuiSharedConstant.EMPTY_GUI_FULL_LINE, - GuiSharedConstant.EMPTY_GUI_FULL_LINE, - GuiSharedConstant.EMPTY_GUI_FULL_LINE, + GuiSharedConstant.UPPER_FILLER_FULL_PLANE, + GuiSharedConstant.EMPTY_FILLER_FULL_LINE, + GuiSharedConstant.EMPTY_FILLER_FULL_LINE, + GuiSharedConstant.EMPTY_FILLER_FULL_LINE, + GuiSharedConstant.EMPTY_FILLER_FULL_LINE, "B11L1R11C" ); } @@ -78,7 +83,7 @@ public abstract class ElementListConfigGui< T > extends ChestGui implements Valu protected void prepareStaticValues(){ // Left item creation for consumer & bind - this.goLeftItem = new GuiItem(new ItemStack(Material.RED_TERRACOTTA), event -> { + this.goLeftItem = new GuiItem(new ItemStack(Material.RED_STAINED_GLASS_PANE), event -> { HumanEntity viewer = event.getWhoClicked(); UUID playerUUID = viewer.getUniqueId(); int page = this.pageMap.getOrDefault(playerUUID, 0); @@ -93,7 +98,7 @@ public abstract class ElementListConfigGui< T > extends ChestGui implements Valu }, CustomAnvil.instance); // Right item creation for consumer & bind - this.goRightItem = new GuiItem(new ItemStack(Material.GREEN_TERRACOTTA), event -> { + this.goRightItem = new GuiItem(new ItemStack(Material.LIME_STAINED_GLASS_PANE), event -> { HumanEntity viewer = event.getWhoClicked(); UUID playerUUID = viewer.getUniqueId(); int page = pageMap.getOrDefault(playerUUID, 0); @@ -127,7 +132,7 @@ public abstract class ElementListConfigGui< T > extends ChestGui implements Valu protected abstract GuiItem prepareCreateNewItem(); protected OutlinePane createEmptyPage() { - OutlinePane page = new OutlinePane(0, 0, 9, 5); + OutlinePane page = new OutlinePane(LIST_FILLER_START_X, LIST_FILLER_START_Y, LIST_FILLER_LENGTH, LIST_FILLER_HEIGHT); page.align(OutlinePane.Alignment.BEGIN); page.setOrientation(Orientable.Orientation.HORIZONTAL); @@ -145,7 +150,7 @@ public abstract class ElementListConfigGui< T > extends ChestGui implements Valu protected void addToPage(GuiItem guiItem) { // Get first available page or create one OutlinePane page = this.pages.get(this.pages.size() - 1); - if (page.getItems().size() >= 5 * 9) { + if (page.getItems().size() >= LIST_FILLER_LENGTH * LIST_FILLER_HEIGHT) { page = createEmptyPage(); this.pages.add(page); } diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/EnchantSelectSettingGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/EnchantSelectSettingGui.java index efe6cb7..176da55 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/EnchantSelectSettingGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/EnchantSelectSettingGui.java @@ -53,11 +53,11 @@ public class EnchantSelectSettingGui extends SettingGuiListConfigGui