From 9464adee21947f40faa9cb43415ce454891478fc Mon Sep 17 00:00:00 2001 From: ASangarin Date: Wed, 28 Aug 2019 12:50:13 +0100 Subject: [PATCH] Added back button to ItemEdition (Also configured pom.xml to encode AltChar.java properly) --- pom.xml | 7 +++++++ .../java/net/Indyuce/mmoitems/gui/edition/ItemEdition.java | 2 +- .../net/Indyuce/mmoitems/gui/listener/GuiListener.java | 7 +++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 08f055af..e85ba028 100644 --- a/pom.xml +++ b/pom.xml @@ -11,6 +11,11 @@ 1.8 1.8 + junit:junit + UTF-8 + UTF-8 + UTF-8 + -ea -Dfile.encoding=UTF-8 @@ -218,5 +223,7 @@ false false + UTF-8 + UTF-8 \ No newline at end of file diff --git a/src/main/java/net/Indyuce/mmoitems/gui/edition/ItemEdition.java b/src/main/java/net/Indyuce/mmoitems/gui/edition/ItemEdition.java index c7f48ba9..39a01238 100644 --- a/src/main/java/net/Indyuce/mmoitems/gui/edition/ItemEdition.java +++ b/src/main/java/net/Indyuce/mmoitems/gui/edition/ItemEdition.java @@ -83,7 +83,7 @@ public class ItemEdition extends EditionInventory { previousMeta.setDisplayName(ChatColor.GREEN + "Previous Page"); previous.setItemMeta(previousMeta); - addEditionInventoryItems(inv, false); + addEditionInventoryItems(inv, true); while (n < slots.length) inv.setItem(slots[n++], glass); diff --git a/src/main/java/net/Indyuce/mmoitems/gui/listener/GuiListener.java b/src/main/java/net/Indyuce/mmoitems/gui/listener/GuiListener.java index 2e348b3e..1a063a5d 100644 --- a/src/main/java/net/Indyuce/mmoitems/gui/listener/GuiListener.java +++ b/src/main/java/net/Indyuce/mmoitems/gui/listener/GuiListener.java @@ -11,6 +11,7 @@ import org.bukkit.inventory.ItemStack; import net.Indyuce.mmoitems.MMOUtils; import net.Indyuce.mmoitems.api.Type; import net.Indyuce.mmoitems.api.util.AltChar; +import net.Indyuce.mmoitems.gui.ItemBrowser; import net.Indyuce.mmoitems.gui.PluginInventory; import net.Indyuce.mmoitems.gui.edition.AdvancedRecipeEdition; import net.Indyuce.mmoitems.gui.edition.EditionInventory; @@ -43,8 +44,10 @@ public class GuiListener implements Listener { Type type = ((EditionInventory) inventory).getItemType(); String id = ((EditionInventory) inventory).getItemId(); - if (item.getItemMeta().getDisplayName().equals(ChatColor.GREEN + AltChar.rightArrow + " Back")) - new ItemEdition(player, type, id).open(); + if (item.getItemMeta().getDisplayName().equals(ChatColor.GREEN + AltChar.rightArrow + " Back")) { + if(inventory instanceof ItemEdition) new ItemBrowser(player, type).open(); + else new ItemEdition(player, type, id).open(); + } } }