made it so you have to pass the plugin instance when opening a menu so you can obtain it later on

Author: KodySimpson

pom.xml

@@ -6,13 +6,13 @@
 
     <groupId>me.kodysimpson</groupId>
     <artifactId>SimpAPI</artifactId>
-    <version>4.4.0</version>
+    <version>4.5.0</version>
     <packaging>jar</packaging>
 
     <name>SimpAPI</name>
 
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>17</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

src/main/java/me/kodysimpson/simpapi/menu/Menu.java

@@ -11,6 +11,7 @@
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Arrays;
@@ -26,11 +27,13 @@ public abstract class Menu implements InventoryHolder {
     protected Player p;
     protected Inventory inventory;
     protected ItemStack FILLER_GLASS = makeItem(Material.GRAY_STAINED_GLASS_PANE, " ");
+    protected Plugin plugin;
 
     //Constructor for Menu. Pass in a PlayerMenuUtility so that
     // we have information on who's menu this is and
     // what info is to be transferred
-    public Menu(PlayerMenuUtility playerMenuUtility) {
+    public Menu(Plugin plugin, PlayerMenuUtility playerMenuUtility) {
+        this.plugin = plugin;
         this.playerMenuUtility = playerMenuUtility;
         this.p = playerMenuUtility.getOwner();
     }
@@ -65,7 +68,7 @@ public void open() {
     }
 
     public void back() throws MenuManagerException, MenuManagerNotSetupException {
-        MenuManager.openMenu(playerMenuUtility.lastMenu().getClass(), playerMenuUtility.getOwner());
+        MenuManager.openMenu(playerMenuUtility.lastMenu().getClass(), plugin, playerMenuUtility.getOwner());
     }
 
     protected void reloadItems() {
@@ -77,7 +80,7 @@ protected void reloadItems() {
 
     protected void reload() throws MenuManagerException, MenuManagerNotSetupException {
         p.closeInventory();
-        MenuManager.openMenu(this.getClass(), p);
+        MenuManager.openMenu(this.getClass(), plugin, p);
     }
 
     //Overridden method from the InventoryHolder interface

src/main/java/me/kodysimpson/simpapi/menu/MenuManager.java

@@ -18,12 +18,9 @@ public class MenuManager {
 
     //each player will be assigned their own PlayerMenuUtility object
     private static final HashMap<Player, PlayerMenuUtility> playerMenuUtilityMap = new HashMap<>();
-    //private static Class<? extends PlayerMenuUtility> pmuClass;
     private static boolean isSetup = false;
-    //private static Class<? extends Menu>[] menus;
 
     private static void registerMenuListener(Server server, Plugin plugin) {
-
         boolean isAlreadyRegistered = false;
         for (RegisteredListener rl : InventoryClickEvent.getHandlerList().getRegisteredListeners()) {
             System.out.println(rl.getListener().getClass().getSimpleName());
@@ -33,73 +30,36 @@ private static void registerMenuListener(Server server, Plugin plugin) {
             }
         }
 
-//Dont touch this code -- kody
-//        HandlerList.getHandlerLists().stream()
-//                .forEach(handler -> {
-//
-//
-//
-//                    System.out.println(handler.toString());
-////                    System.out.println(Modifier.toString(field.getModifiers()) + " " + field.getName());
-//                });
-
-        //System.out.println("erwiwjriwer: " + isAlreadyRegistered);
         if (!isAlreadyRegistered) {
             server.getPluginManager().registerEvents(new MenuListener(), plugin);
         }
-
     }
 
-//    private static void registerPlayerMenuUtility(Class<? extends PlayerMenuUtility> playerMenuUtilityClass) {
-//
-//        MenuManager.pmuClass = playerMenuUtilityClass;
-//
-//    }
-
     /**
      * @param server The instance of your server. Provide by calling getServer()
      * @param plugin The instance of the plugin using this API. Can provide in plugin class by passing this keyword
      */
     public static void setup(Server server, Plugin plugin) {
-
         System.out.println("MENU MANAGER HAS BEEN SETUP");
 
         registerMenuListener(server, plugin);
-        //registerPlayerMenuUtility(playerMenuUtilityClass);
         isSetup = true;
-
     }
 
     /**
      * @param menuClass The class reference of the Menu you want to open for a player
      * @param player    The player to open the menu for
      * @throws MenuManagerNotSetupException Thrown if the setup() method has not been called and used properly
      */
-    public static void openMenu(Class<? extends Menu> menuClass, Player player) throws MenuManagerException, MenuManagerNotSetupException {
+    public static void openMenu(Class<? extends Menu> menuClass, Plugin plugin, Player player) throws MenuManagerException, MenuManagerNotSetupException {
         try {
-            menuClass.getConstructor(PlayerMenuUtility.class).newInstance(getPlayerMenuUtility(player)).open();
+            menuClass.getConstructor(Plugin.class, PlayerMenuUtility.class).newInstance(plugin, getPlayerMenuUtility(player)).open();
         } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
-            e.printStackTrace();
             throw new MenuManagerException();
         }
     }
 
-//    /**
-//     * @param menuClass The class reference of the Menu you want to open for a player
-//     * @param abstractPlayerMenuUtility Usually used to pass in a custom PlayerMenuUtility, for data transfer
-//     */
-//    public static void openMenu(Class<? extends Menu> menuClass, PlayerMenuUtility pmc) throws MenuManagerException {
-//
-//        try {
-//            menuClass.getConstructor(PlayerMenuUtility.class).newInstance(pmc).open();
-//        } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
-//            throw new MenuManagerException();
-//        }
-//
-//    }
-
-    public static PlayerMenuUtility getPlayerMenuUtility(Player p) throws MenuManagerException, MenuManagerNotSetupException {
-
+    public static PlayerMenuUtility getPlayerMenuUtility(Player p) throws MenuManagerNotSetupException {
         if (!isSetup) {
             throw new MenuManagerNotSetupException();
         }
@@ -117,32 +77,4 @@ public static PlayerMenuUtility getPlayerMenuUtility(Player p) throws MenuManage
         }
     }
 
-
-//    /**
-//     * @param p The player to get the custom PlayerMenuUtility from
-//     * @param t The class reference of your custom PlayerMenuUtility
-//     * @param <T> The custom PlayerMenuUtility Type
-//     * @return The PlayerMenuUtility for that player
-//     */
-//    public static <T> T getPlayerMenuUtility(Player p, Class<T> t) throws MenuManagerException {
-//
-//        PlayerMenuUtility playerMenuUtility;
-//        if (!(playerMenuUtilityMap.containsKey(p))) { //See if the player has a PMU "saved" for them
-//
-//            try{
-//                //Construct PMU using reflection
-//                Constructor<? extends PlayerMenuUtility> constructor = pmuClass.getConstructor(Player.class);
-//
-//                playerMenuUtility = constructor.newInstance(p);
-//                playerMenuUtilityMap.put(p, playerMenuUtility);
-//            } catch (InstantiationException | InvocationTargetException | NoSuchMethodException | IllegalAccessException e) {
-//                throw new MenuManagerException();
-//            }
-//
-//            return t.cast(playerMenuUtility);
-//        } else {
-//            return t.cast(playerMenuUtilityMap.get(p)); //Return the object by using the provided player
-//        }
-//
-//    }
 }