Merge pull request #40 from AutoPluginsDev/rt_add_reopen_editor

re opening inventory after entering value in chat

Author: lumi-git

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>fr</groupId>
     <artifactId>AutoCommand</artifactId>
-    <version>1.5.9</version>
+    <version>1.5.10</version>
     <packaging>jar</packaging>
 
     <repositories>

src/main/java/fr/lumi/CommandPatternObject/ACMDRelatedCommand.java

@@ -1,6 +1,7 @@
 package fr.lumi.CommandPatternObject;
 
 import fr.lumi.Main;
+import fr.lumi.Util.autocommand;
 import fr.lumi.Util.autocommandDataPattern;
 
 public abstract class ACMDRelatedCommand extends autocommandDataPattern implements Command{
@@ -10,5 +11,12 @@ public ACMDRelatedCommand(Main plg) {
     }
 
     public abstract void execute();
-
+    protected void setID(autocommand acmd) {
+        acmd.setID(ID);
+        int index = 0;
+        while (plugin.acmdIdExist(acmd.getID())) {
+            acmd.setID("acmd" + index);
+            index++;
+        }
+    }
 }

src/main/java/fr/lumi/CommandPatternObject/CreateACMDCommand.java

@@ -58,14 +58,7 @@ public void execute() {
 
     }
 
-    private void setID(autocommand acmd) {
-        acmd.setID(ID);
-        int index = 0;
-        while (plugin.acmdIdExist(acmd.getID())) {
-            acmd.setID("acmd" + index);
-            index++;
-        }
-    }
+
 
 
 }

src/main/java/fr/lumi/Commandes/CommandRunnerCommand.java

@@ -197,7 +197,8 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 
             if (args.length == 2) {
                 plugin.getModificationLock().lock(((Player)player).getUniqueId().toString());
-                plugin.getAcmdGUIEditor().openACMDEditor((Player) sender, acmd, plugin.getcommandList().indexOf(acmd));
+                plugin.getAcmdGUIEditor().openACMDEditor((Player) sender, plugin.getcommandList().indexOf(acmd));
+
                 return true;
             }
 

src/main/java/fr/lumi/Commandes/CommandRunnerReload.java

@@ -18,6 +18,7 @@ public CommandRunnerReload(Main plg) {
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        plugin.getAcmdGUIEditor().closeLastTennantInventory();
         plugin.onEnable();
         Bukkit.getConsoleSender().sendMessage(plugin.getUt().replacePlaceHoldersForConsolePlgVar(plugin.getLangConfig().getString("OnReload")));
         sender.sendMessage(plugin.getUt().replacePlaceHoldersForPlayerPlgVar(plugin.getLangConfig().getString("OnReload")));

src/main/java/fr/lumi/Util/CommandEditor.java

@@ -16,6 +16,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 
 
 public class CommandEditor implements Listener {
@@ -74,7 +75,25 @@ public void closeInventory(Player p) {
         clearLock(p);
     }
 
-    public void openACMDEditor(Player p, autocommand acmd, int nb) {
+    public void closeLastTennantInventory() {
+        // get player by uuid and not by name
+        Player p = Bukkit.getPlayer(UUID.fromString(plugin.getModificationLock().getLastTennant()));
+
+
+        if (p != null) {
+
+            if (p.getOpenInventory().equals(GUI_ChooseACMD)) {
+                closeInventory(p);
+            }
+            if (editorsListe.contains(p.getOpenInventory())) {
+                closeInventory(p);
+            }
+
+
+        }
+    }
+
+    public void openACMDEditor(Player p,int nb) {
         //createGUI_EditACMD(acmd);
 
         p.openInventory(editorsListe.get(nb));
@@ -98,7 +117,7 @@ public void GuiClickEvent(InventoryClickEvent e) {
             e.setCancelled(true);
             if (slot < plugin.getcommandList().size()) {
                 closeInventory(p);
-                openACMDEditor(p, plugin.getcommandList().get(slot), slot);
+                openACMDEditor(p, slot);
             } else if (slot == 53) {
 
                 // Creating a new acmd using the CreateCommand.
@@ -218,6 +237,12 @@ public void onChat(AsyncPlayerChatEvent e) {
             waitForChat = "";
             reloadAllEditGUI();
             reloadGUI_ChoosingACMD();
+
+
+            plugin.getServer().getScheduler().callSyncMethod(plugin, () -> {
+                openACMDEditor(e.getPlayer(), LastOpened);
+                return null;
+            });
         }
     }
 
@@ -440,7 +465,7 @@ public Inventory fillGUI_EditACMD(autocommand acmd, Inventory gui) {
     }
 
     public Inventory createGUI_EditACMD(autocommand acmd) {
-        Inventory gui = Bukkit.createInventory(null, 54, "§8§oEditing " + acmd.getName());
+        Inventory gui = Bukkit.createInventory(null, 54, "§8§oEditing " + acmd.getID());
         return fillGUI_EditACMD(acmd, gui);
     }
 

src/main/resources/plugin.yml

@@ -1,11 +1,11 @@
 name: AutoCommands
-version: 1.5.9
+version: 1.5.10
 main: fr.lumi.Main
 api-version: 1.15
 authors:
   - Lumi_
   - Adi_
-prefix: AutoCommands 1.5.9
+prefix: AutoCommands 1.5.10
 depends: [PlaceholderAPI]
 permissions:
   acmd.*: