Merge pull request #156 from BTEUK/Version-1.1.0-Beta-11

Version 1.1.0 beta 11.1

Author: george112n

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.bteuk</groupId>
     <artifactId>TeachingTutorials</artifactId>
-    <version>1.1.0-Beta11.0.2</version>
+    <version>1.1.0-Beta11.1</version>
     <packaging>jar</packaging>
 
     <name>TeachingTutorials</name>

src/main/java/teachingtutorials/guis/CreatorTutorialsMenu.java

@@ -40,120 +40,51 @@ public class CreatorTutorialsMenu extends Gui
      */
     public CreatorTutorialsMenu(TeachingTutorials plugin, User user, Tutorial[] tutorials)
     {
-        //Sets up the menu with the icons already in place
-        super(getGUI(tutorials));
+        super(calculateNumRows(tutorials.length)*9, inventoryName);
         this.plugin = plugin;
         this.user = user;
         this.tutorials = tutorials;
 
-        //Adds the click actions
-        setActions();
+        //Adds the items
+        addItems();
     }
 
     /**
-     * Creates an inventory design for the current status of a creator's tutorials
-     * @param allTutorials A list of tutorials to include in the menu
-     * @return An inventory filled with icons, informing the user of the current state of their tutorials, including which
-     * ones are in use
+     * Populates the menu with icons and actions
      */
-    private static Inventory getGUI (Tutorial[] allTutorials)
+    private void addItems()
     {
-        //Declare variables
-        int i;
-        int iTutorials;
-        int iDiv;
-        int iMod;
-        int iRows;
-
-        Inventory inventory;
-
-        //Works out how many rows in the inventory are needed
-        iTutorials = allTutorials.length;
-        iDiv = iTutorials/9;
-        iMod = iTutorials%9;
-
-        if (iMod != 0 || iDiv == 0)
-        {
-            iDiv = iDiv + 1;
-        }
-
-        //Enables an empty row and then a row for the back button
-        iRows = iDiv+2;
-
-        //------------------------------
-
-        //Create inventories
-        inventory = Bukkit.createInventory(null, iRows * 9);
-        inventory.clear();
-
-        Inventory toReturn = Bukkit.createInventory(null, iRows * 9, inventoryName);
-
-        //Inv slot 0 = the first one
-
-        //Indicates that the creator has no tutorials if they don't own any
-        if (allTutorials.length == 0)
+        //Indicates that the creator has no tutorials
+        if (tutorials.length == 0)
+            setItem(5-1, Utils.createItem(Material.BARRIER, 1, TutorialGUIUtils.optionTitle("You have no tutorials")));
+
+        //Adds the tutorial icons
+        int iNumTutorials = tutorials.length;
+        if (iNumTutorials > 45)
+            iNumTutorials = 45;
+        for (int i = 0 ; i < iNumTutorials ; i++)
         {
-            ItemStack noTutorials = Utils.createItem(Material.BARRIER, 1, TutorialGUIUtils.optionTitle("You have no tutorials"));
-            inventory.setItem(5-1, noTutorials);
+            int finalI = i;
+            setItem(i, Utils.createItem(Material.WRITTEN_BOOK, 1,
+                            TutorialGUIUtils.optionTitle(tutorials[i].getTutorialName()),
+                            TutorialGUIUtils.optionLore("Click to manage Tutorial")),
+                    new guiAction() {
+                        @Override
+                        public void rightClick(User u) {
+                            leftClick(u);
+                        }
+
+                        @Override
+                        public void leftClick(User u) {
+                            u.mainGui = new TutorialManageMenu(plugin, user, tutorials[finalI], CreatorTutorialsMenu.this);
+                            u.mainGui.open(u);
+                        }
+                    });
         }
 
         //Adds back button
         ItemStack back = Utils.createItem(Material.SPRUCE_DOOR, 1, TutorialGUIUtils.backButton("Back to creator menu"));
-        inventory.setItem((iRows * 9)-1, back);
-
-        //Creates the menu options
-        for (i = 0 ; i < allTutorials.length ; i++)
-        {
-            ItemStack tutorial;
-            //Sets tutorial name bold for tutorials in use
-            if (allTutorials[i].isInUse())
-                tutorial = Utils.createItem(Material.WRITTEN_BOOK, 1,
-                        TutorialGUIUtils.optionTitle(allTutorials[i].getTutorialName()).decoration(TextDecoration.BOLD, true),
-                        TutorialGUIUtils.optionLore("In Use - Left click to remove from use"),
-                        TutorialGUIUtils.optionLore("Right click to add a new location"));
-            else
-                tutorial = Utils.createItem(Material.BOOK, 1,
-                        TutorialGUIUtils.optionTitle(allTutorials[i].getTutorialName()),
-                        TutorialGUIUtils.optionLore("Not in Use - Left click to set in use"),
-                        TutorialGUIUtils.optionLore("Right click to add a new location"));
-            inventory.setItem(i, tutorial);
-        }
-
-        toReturn.setContents(inventory.getContents());
-        return toReturn;
-    }
-
-    /**
-     * Sets the click actions for each slot of the menu
-     */
-    private void setActions()
-    {
-        //Declare variables
-        int i;
-        int iTutorials;
-        int iDiv;
-        int iMod;
-        int iRows;
-
-        //Works out how many rows in the inventory are needed
-        iTutorials = tutorials.length;
-        iDiv = iTutorials/9;
-        iMod = iTutorials%9;
-
-        if (iMod != 0 || iDiv == 0)
-        {
-            iDiv = iDiv + 1;
-        }
-
-        //Enables an empty row and then a row for the back button
-        iRows = iDiv+2;
-
-        //------------------------------
-
-        //Inv slot 0 = the first one
-
-        //Adds back button
-        setAction((iRows * 9) - 1, new guiAction() {
+        setItem((calculateNumRows(tutorials.length) * 9) - 1, back, new guiAction() {
             @Override
             public void rightClick(User u) {
                 leftClick(u);
@@ -166,75 +97,76 @@ public void leftClick(User u) {
                 u.mainGui.open(u);
             }
         });
+    }
 
-        //Creates the actions for clicking on the tutorials
-        for (i = 0 ; i < tutorials.length ; i++)
-        {
-            int iSlot = i;
-
-            setAction(i, new guiAction() {
-                @Override
-                public void rightClick(User u) {
-                    rightClicked(u, iSlot);
-                }
-
-                @Override
-                public void leftClick(User u) {
-                    leftClicked(u, iSlot);
-                }
-            });
-        }
+    /**
+     * Clears items from the GUI, recreates the items and then opens the menu
+     */
+    @Override
+    public void refresh() {
+        //Clears items from the gui
+        this.clearGui();
+
+        //Adds the items back
+        this.addItems();
+
+        //Opens the gui
+        this.open(user);
     }
 
-    //Left click is for toggling whether a tutorial is in use or not
-    private void leftClicked(User u, int iSlot)
+    /**
+     * Refreshes the name on the tutorial icons
+     */
+    public void refreshTutorialIcons()
     {
-        if (tutorials[iSlot].toggleInUse(plugin))
-        {
-            this.refresh();
-        }
-        else
+        //Adds the tutorial icons
+        int iNumTutorials = tutorials.length;
+        if (iNumTutorials > 45)
+            iNumTutorials = 45;
+        for (int i = 0 ; i < iNumTutorials ; i++)
         {
-            u.player.sendMessage(Display.errorText("There are no locations for this tutorial"));
+            setItem(i, Utils.createItem(Material.WRITTEN_BOOK, 1,
+                            TutorialGUIUtils.optionTitle(tutorials[i].getTutorialName()),
+                            TutorialGUIUtils.optionLore("Click to manage Tutorial")));
         }
     }
 
-    //Right click is for creating a new location
-    private void rightClicked(User u, int iSlot)
+    /**
+     * Calculates the number of rows needed to form an inventory for a given number of tutorials
+     * @param iNumTutorials The number of tutorials
+     * @return The number of rows needed to form an inventory
+     */
+    public static int calculateNumRows(int iNumTutorials)
     {
-        //Only starts the new location process if the creator is idle
-        if (user.getCurrentMode().equals(Mode.Idle))
-        {
-            delete();
-            u.mainGui = null;
+        int iDiv;
+        int iMod;
 
-            //Creates a NewLocation object
-            NewLocation newLocation = new NewLocation(user, tutorials[iSlot], plugin);
+        //Works out how many rows in the inventory are needed
+        iDiv = iNumTutorials/9;
+        iMod = iNumTutorials%9;
 
-            //Launches them into the new location adding process
-            newLocation.launchNewLocationAdding();
-        }
-        else
+        if (iMod != 0 || iDiv == 0)
         {
-            user.player.sendMessage(Display.errorText("Complete or pause your current tutorial or location creation first"));
+            iDiv = iDiv + 1;
         }
-    }
 
-    /**
-     * Clears items from the GUI, recreates the items and then opens the menu
-     */
-    @Override
-    public void refresh() {
-        //Clears items from the gui
-        this.clearGui();
+        //Add row for the back button
+        int iRows = iDiv+1;
 
-        //Adds icons to the gui
-        this.getInventory().setContents(getGUI(tutorials).getContents());
+        //Add an extra for pleasure
+        if (iRows < 6)
+            iRows++;
 
-        //Adds click actions to the gui
-        this.setActions();
+        else if (iRows == 6)
+        {
+            // Do nothing
+        }
+        else
+        {
+            iRows = 6;
+        }
 
-        //Opens the gui
-        this.open(user);
+        //Enables an empty row and then a row for the back button
+        return iRows;
     }
 }

src/main/java/teachingtutorials/guis/Gui.java

@@ -18,7 +18,7 @@ public abstract class Gui implements GuiInterface {
 
     //Information about the gui.
     private final UUID uuid;
-    private final Inventory inv;
+    private Inventory inv;
     private final Map<Integer, guiAction> actions;
 
     public Gui(int invSize, Component invName) {
@@ -83,6 +83,30 @@ public void open(User u) {
 
     }
 
+    /**
+     * Creates a new inventory with the new name, copies the inventory items from the old inventory to the new inventory,
+     * then opens the new inventory.
+     * @param newName The new name for the menu
+     */
+    public void editName(Component newName, User user)
+    {
+        //Create new inventory with new name
+        Inventory newInventory = Bukkit.createInventory(null, inv.getSize(), newName);
+
+        //Copy old inventory items to new inventory
+        int iSize = inv.getSize();
+        for (int i = 0 ; i < iSize ; i++)
+        {
+            newInventory.setItem(i, inv.getItem(i));
+        }
+
+        //Set the inventory of this GUI to the new inventory
+        inv = newInventory;
+
+        //Reopen the gui
+        this.open(user);
+    }
+
     public void delete() {
         for (Player p : Bukkit.getOnlinePlayers()) {
             openInventories.remove(p.getUniqueId(), getUuid());