feat(navigator): ✨ enhance warp menu functionality by allowing custom back menu navigation

Author: Zoriot

src/main/java/net/buildtheearth/modules/navigation/components/warps/WarpsComponent.java

@@ -15,10 +15,10 @@
 import net.buildtheearth.modules.network.NetworkModule;
 import net.buildtheearth.modules.network.api.OpenStreetMapAPI;
 import net.buildtheearth.modules.network.model.BuildTeam;
-import net.buildtheearth.modules.network.model.Continent;
 import net.buildtheearth.utils.ChatHelper;
 import net.buildtheearth.utils.GeometricUtils;
 import net.buildtheearth.utils.geo.CoordinateConversion;
+import net.buildtheearth.utils.menus.AbstractMenu;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.NamespacedKey;
@@ -230,13 +230,13 @@ public static void openWarpMenu(@NotNull Player player) {
         openWarpMenu(player, NetworkModule.getInstance().getBuildTeam(), null);
     }
 
-    public static void openWarpMenu(@NotNull Player player, @NotNull BuildTeam buildTeam, @Nullable Continent continent) {
+    public static void openWarpMenu(@NotNull Player player, @NotNull BuildTeam buildTeam, @Nullable AbstractMenu menu) {
         int warpGroupCount = buildTeam.getWarpGroups().size();
 
         switch (warpGroupCount) {
             case 0 -> player.sendMessage(ChatHelper.getErrorString("This server does not have any warps yet!"));
             case 1 -> new WarpMenu(player, buildTeam.getWarpGroups().getFirst(), false, true);
-            default -> new WarpGroupMenu(player, buildTeam, continent != null, true, continent);
+            default -> new WarpGroupMenu(player, buildTeam, menu != null, true, menu);
         }
     }
 }

src/main/java/net/buildtheearth/modules/navigation/components/warps/menu/WarpGroupMenu.java

@@ -4,10 +4,8 @@
 import net.buildtheearth.BuildTeamTools;
 import net.buildtheearth.modules.navigation.NavigationModule;
 import net.buildtheearth.modules.navigation.components.warps.model.WarpGroup;
-import net.buildtheearth.modules.navigation.menu.CountrySelectorMenu;
 import net.buildtheearth.modules.network.NetworkModule;
 import net.buildtheearth.modules.network.model.BuildTeam;
-import net.buildtheearth.modules.network.model.Continent;
 import net.buildtheearth.modules.network.model.Permissions;
 import net.buildtheearth.utils.ChatHelper;
 import net.buildtheearth.utils.CustomHeads;
@@ -16,6 +14,7 @@
 import net.buildtheearth.utils.MenuItems;
 import net.buildtheearth.utils.io.ConfigPaths;
 import net.buildtheearth.utils.io.ConfigUtil;
+import net.buildtheearth.utils.menus.AbstractMenu;
 import net.buildtheearth.utils.menus.AbstractPaginatedMenu;
 import org.bukkit.entity.Player;
 import org.ipvp.canvas.mask.BinaryMask;
@@ -36,7 +35,7 @@ public class WarpGroupMenu extends AbstractPaginatedMenu {
     private final boolean hasBackItem;
     private final BuildTeam buildTeam;
     private int plusSlot = ALTERNATE_PLUS_SLOT;
-    private Continent continent;
+    private AbstractMenu backMenue;
 
     /** In this menu the player can select a warp group to view the warps in each warp group.
      *
@@ -50,16 +49,16 @@ public WarpGroupMenu(Player menuPlayer, BuildTeam buildTeam, boolean hasBackItem
         this.buildTeam = buildTeam;
     }
 
-    public WarpGroupMenu(Player menuPlayer, BuildTeam buildTeam, boolean hasBackItem, boolean autoLoad, Continent continent) {
+    public WarpGroupMenu(Player menuPlayer, BuildTeam buildTeam, boolean hasBackItem, boolean autoLoad, AbstractMenu menu) {
         this(menuPlayer, buildTeam, hasBackItem, autoLoad);
-        this.continent = continent;
+        this.backMenue = menu;
     }
 
     @Override
     protected void setMenuItemsAsync() {
         if (hasBackItem) {
             ChatHelper.logDebug("Setting back item for warp group menu");
-            setBackItem(BACK_ITEM_SLOT, new CountrySelectorMenu(getMenuPlayer(), continent, false));
+            setBackItem(BACK_ITEM_SLOT, backMenue);
         }
     }
 

src/main/java/net/buildtheearth/modules/navigation/menu/CountrySelectorMenu.java

@@ -123,7 +123,7 @@ protected void setPaginatedItemClickEventsAsync(@NotNull List<?> source) {
                 if (clickInformation.getClickType().isRightClick() &&
                         clickPlayer.hasPermission(Permissions.WARP_USE) &&
                         !clickedRegion.getBuildTeam().getWarpGroups().isEmpty()) {
-                    WarpsComponent.openWarpMenu(clickPlayer, clickedRegion.getBuildTeam(), clickedRegion.getContinent());
+                    WarpsComponent.openWarpMenu(clickPlayer, clickedRegion.getBuildTeam(), this);
                 } else {
                     NavUtils.switchToTeam(clickedRegion.getBuildTeam(), clickPlayer);
                 }

src/main/java/net/buildtheearth/modules/navigation/menu/MainMenu.java

@@ -4,6 +4,7 @@
 import net.buildtheearth.BuildTeamTools;
 import net.buildtheearth.modules.navigation.NavUtils;
 import net.buildtheearth.modules.navigation.components.warps.WarpsComponent;
+import net.buildtheearth.modules.network.NetworkModule;
 import net.buildtheearth.utils.ChatHelper;
 import net.buildtheearth.utils.Item;
 import net.buildtheearth.utils.MenuItems;
@@ -116,7 +117,7 @@ protected void setItemClickEventsAsync() {
                 if (clickInformation.getClickType().isRightClick()) {
                     new ExploreMenu(clickPlayer, true);
                 } else {
-                    WarpsComponent.openWarpMenu(clickPlayer);
+                    WarpsComponent.openWarpMenu(clickPlayer, NetworkModule.getInstance().getBuildTeam(), this);
                 }
             });
         }