4.1.4

Author: KodySimpson

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.kodysimpson</groupId>
     <artifactId>SimpAPI</artifactId>
-    <version>4.1.3</version>
+    <version>4.1.4</version>
     <packaging>jar</packaging>
 
     <name>SimpAPI</name>

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

@@ -8,7 +8,6 @@
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.RegisteredListener;
 
-import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
 
@@ -19,7 +18,7 @@ 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 Class<? extends PlayerMenuUtility> pmuClass;
     private static boolean isSetup = false;
     //private static Class<? extends Menu>[] menus;
 
@@ -51,24 +50,22 @@ private static void registerMenuListener(Server server, Plugin plugin) {
 
     }
 
-    private static void registerPlayerMenuUtility(Class<? extends PlayerMenuUtility> playerMenuUtilityClass) {
-
-        MenuManager.pmuClass = playerMenuUtilityClass;
-
-    }
+//    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
-     * @param playerMenuUtilityClass The class reference of your concrete defined PlayerMenuUtility subclass of AbstractPlayerMenuUtility
      */
-    public static void setup(Server server, Plugin plugin, Class<? extends PlayerMenuUtility> playerMenuUtilityClass) {
+    public static void setup(Server server, Plugin plugin) {
 
         System.out.println("MENU MANAGER HAS BEEN SETUP");
 
         registerMenuListener(server, plugin);
-        registerPlayerMenuUtility(playerMenuUtilityClass);
-
+        //registerPlayerMenuUtility(playerMenuUtilityClass);
         isSetup = true;
 
     }
@@ -79,23 +76,27 @@ public static void setup(Server server, Plugin plugin, Class<? extends PlayerMen
      * @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 {
-        openMenu(menuClass, getPlayerMenuUtility(player));
-    }
-
-    /**
-     * @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 abstractPlayerMenuUtility) throws MenuManagerException {
-
         try {
-            menuClass.getConstructor(PlayerMenuUtility.class).newInstance(abstractPlayerMenuUtility).open();
+            menuClass.getConstructor(PlayerMenuUtility.class).newInstance(getPlayerMenuUtility(player)).open();
         } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
             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 {
 
         if (!isSetup){
@@ -105,16 +106,9 @@ public static PlayerMenuUtility getPlayerMenuUtility(Player p) throws MenuManage
         PlayerMenuUtility playerMenuUtility;
         if (!(playerMenuUtilityMap.containsKey(p))) { //See if the player has a pmu "saved" for them
 
-            //Construct PMU using reflection
-            Constructor<? extends PlayerMenuUtility> constructor;
-            try {
-                constructor = pmuClass.getConstructor(Player.class);
-
-                playerMenuUtility = constructor.newInstance(p);
-                playerMenuUtilityMap.put(p, playerMenuUtility);
-            } catch (NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException e) {
-                throw new MenuManagerException();
-            }
+            //Construct PMU
+            playerMenuUtility = new PlayerMenuUtility(p);
+            playerMenuUtilityMap.put(p, playerMenuUtility);
 
             return playerMenuUtility;
         } else {
@@ -123,31 +117,31 @@ 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
-        }
-
-    }
+//    /**
+//     * @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
+//        }
+//
+//    }
 }