move parent menu logic to MenuManager

Author: HSGamer

src/main/java/me/hsgamer/bettergui/action/type/BackAction.java

@@ -1,7 +1,9 @@
 package me.hsgamer.bettergui.action.type;
 
+import me.hsgamer.bettergui.BetterGUI;
 import me.hsgamer.bettergui.api.menu.Menu;
 import me.hsgamer.bettergui.builder.ActionBuilder;
+import me.hsgamer.bettergui.manager.MenuManager;
 import me.hsgamer.bettergui.util.SchedulerUtil;
 import me.hsgamer.hscore.action.common.Action;
 import me.hsgamer.hscore.common.StringReplacer;
@@ -34,7 +36,7 @@ public void apply(UUID uuid, TaskProcess process, StringReplacer stringReplacer)
       ? stringReplacer.replaceOrOriginal(value, uuid).split(" ")
       : new String[0];
 
-    Runnable runnable = menu.getParentMenu(uuid)
+    Runnable runnable = BetterGUI.getInstance().get(MenuManager.class).getParentMenu(uuid, menu)
       .<Runnable>map(parentMenu -> () -> parentMenu.create(player, args, bypass))
       .orElse(player::closeInventory);
     SchedulerUtil.entity(player)

src/main/java/me/hsgamer/bettergui/api/menu/Menu.java

@@ -1,6 +1,8 @@
 package me.hsgamer.bettergui.api.menu;
 
+import me.hsgamer.bettergui.BetterGUI;
 import me.hsgamer.bettergui.api.element.MenuElement;
+import me.hsgamer.bettergui.manager.MenuManager;
 import me.hsgamer.hscore.common.StringReplacer;
 import me.hsgamer.hscore.config.Config;
 import org.bukkit.entity.Player;
@@ -19,7 +21,6 @@ public abstract class Menu implements MenuElement {
   public static final String MENU_SETTINGS_PATH = "menu-settings";
 
   protected final Config config;
-  private final Map<UUID, Menu> parentMenu = new HashMap<>();
 
   /**
    * Create a new menu
@@ -63,7 +64,7 @@ public StringReplacer getStringReplacer() {
       @Override
       public @Nullable String replace(@NotNull String original, @NotNull UUID uuid) {
         if (original.equalsIgnoreCase("parent-menu")) {
-          return getParentMenu(uuid).map(Menu::getName).orElse(null);
+          return BetterGUI.getInstance().get(MenuManager.class).getParentMenu(uuid, Menu.this).map(Menu::getName).orElse(null);
         }
         return replace(original);
       }
@@ -116,29 +117,4 @@ public List<String> tabComplete(Player player, String[] args) {
    * Close/Clear all inventories of the type
    */
   public abstract void closeAll();
-
-  /**
-   * Get the former menu that opened this menu
-   *
-   * @param uuid the unique id
-   *
-   * @return the former menu
-   */
-  public Optional<Menu> getParentMenu(UUID uuid) {
-    return Optional.ofNullable(parentMenu.get(uuid));
-  }
-
-  /**
-   * Set the former menu
-   *
-   * @param uuid the unique id
-   * @param menu the former menu
-   */
-  public void setParentMenu(UUID uuid, Menu menu) {
-    if (menu == null) {
-      parentMenu.remove(uuid);
-    } else {
-      parentMenu.put(uuid, menu);
-    }
-  }
 }

src/main/java/me/hsgamer/bettergui/manager/MenuManager.java

@@ -11,6 +11,7 @@
 
 import java.io.File;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 
 /**
@@ -19,6 +20,7 @@
 public final class MenuManager implements Loadable, PostEnable {
 
   private final Map<String, Menu> menuMap = new HashMap<>();
+  private final Map<UUID, Map<Menu, Menu>> parentMenuMap = new ConcurrentHashMap<>();
   private final BetterGUI plugin;
   private final File menusFolder;
 
@@ -128,10 +130,22 @@ public void openMenu(String name, Player player, String[] args, boolean bypass)
    */
   public void openMenu(String name, Player player, String[] args, Menu parentMenu, boolean bypass) {
     Menu menu = menuMap.get(name);
-    menu.setParentMenu(player.getUniqueId(), parentMenu);
+    parentMenuMap.computeIfAbsent(player.getUniqueId(), k -> new ConcurrentHashMap<>()).put(menu, parentMenu);
     menu.create(player, args, bypass);
   }
 
+  /**
+   * Get the parent menu of the menu
+   *
+   * @param uuid the unique id
+   * @param menu the menu
+   *
+   * @return the parent menu
+   */
+  public Optional<Menu> getParentMenu(UUID uuid, Menu menu) {
+    return Optional.ofNullable(parentMenuMap.get(uuid)).map(map -> map.get(menu));
+  }
+
   /**
    * Get the list of the tab complete
    *

src/main/java/me/hsgamer/bettergui/menu/PredicateMenu.java

@@ -101,7 +101,8 @@ public boolean create(Player player, String[] args, boolean bypass) {
       if (result.isSuccess) {
         MenuProcess menuProcess = pair.getValue();
         String[] finalArgs = StringReplacerApplier.replace(menuProcess.args, uuid, this).split("\\s+");
-        BetterGUI.getInstance().get(MenuManager.class).openMenu(menuProcess.menu, player, finalArgs, getParentMenu(uuid).orElse(null), bypass);
+        MenuManager menuManager = BetterGUI.getInstance().get(MenuManager.class);
+        menuManager.openMenu(menuProcess.menu, player, finalArgs, menuManager.getParentMenu(uuid, this).orElse(null), bypass);
         isSuccessful = true;
         break;
       }