bugfix

If you didn't have the permission to see an item, you could still click on it and get the message that you don't have the permission. This has now been changed so that you only get the message if you can see the item.

CommandGUI V2/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>net.t2code</groupId>
     <artifactId>CommandGUI_V2</artifactId>
-    <version>2.5.21</version>
+    <version>2.6.2_Snapshot-2</version>
     <packaging>jar</packaging>
 
     <name>CommandGUI</name>
@@ -53,6 +53,10 @@
     </build>
 
     <repositories>
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
         <repository>
             <id>Builders-Paradise</id>
             <url>https://repo.t2code.net/repository/Builders-Paradise/</url>
@@ -61,10 +65,7 @@
             <id>T2Code</id>
             <url>https://repo.t2code.net/repository/T2Code/</url>
         </repository>
-        <repository>
+
-            <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
-        </repository>
     </repositories>
 
     <dependencies>
@@ -81,12 +82,17 @@
         <dependency>
             <groupId>net.t2code</groupId>
             <artifactId>T2CodeLib</artifactId>
-            <version>10.3</version>
+            <version>11.2</version>
         </dependency>
         <dependency>
             <groupId>net.t2code</groupId>
             <artifactId>LuckyBox-API</artifactId>
-            <version>4.2.0</version>
+            <version>4.2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>net.t2code.minecraft.1_18.r2</groupId>
+            <artifactId>spigot</artifactId>
+            <version>1.18r2</version>
         </dependency>
         <dependency>
             <groupId>net.t2code.minecraft.1_18.r1</groupId>
@@ -173,5 +179,10 @@
             <artifactId>spigot</artifactId>
             <version>1.8r1</version>
         </dependency>
+        <dependency>
+            <groupId>com.zaxxer</groupId>
+            <artifactId>HikariCP</artifactId>
+            <version>3.4.5</version>
+        </dependency>
     </dependencies>
 </project>

CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Bungee/BListener.java

@@ -1,6 +1,7 @@
 package de.jatitv.commandguiv2.Bungee;
 
 import net.md_5.bungee.BungeeCord;
+import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.PlayerDisconnectEvent;
 import net.md_5.bungee.api.event.PluginMessageEvent;
@@ -16,13 +17,20 @@ public class BListener implements Listener {
     @EventHandler
     public void onPluginmessage(PluginMessageEvent event) {
         if (event.getTag().equalsIgnoreCase("cgui:bungee")) {
+
             DataInputStream stream = new DataInputStream(new ByteArrayInputStream(event.getData()));
             try {
                 String channel = stream.readUTF();
                 String input = stream.readUTF();
-                ProxiedPlayer player = BungeeCord.getInstance().getPlayer(channel);
+                if (channel.equals("cgui-Console")) {
+                    ProxyServer.getInstance().getConsole().sendMessage("Command Console: "+ input);
+                    ProxyServer.getInstance().getPluginManager().dispatchCommand(ProxyServer.getInstance().getConsole(), input);
+                } else {
+                    ProxiedPlayer player = ProxyServer.getInstance().getPlayer(channel);
                     if (player != null) {
-                    BungeeCord.getInstance().getPluginManager().dispatchCommand(player, input);
+                        ProxyServer.getInstance().getConsole().sendMessage("Command " + player +": "+ input);
+                        ProxyServer.getInstance().getPluginManager().dispatchCommand(player, input);
+                    }
                 }
             } catch (IOException e) {
                 e.printStackTrace();

CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/GUI_Listener.java

@@ -22,6 +22,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitRunnable;
 
 import java.io.File;
@@ -36,66 +37,93 @@ public class GUI_Listener implements Listener {
     @EventHandler
     public void onInventoryClick(InventoryClickEvent e) {
         Player player = (Player) e.getWhoClicked();
-        if (e.getInventory() != null && e.getCurrentItem() != null) {
+        JavaPlugin plugin = Main.plugin;
+        if (e.getInventory() == null) return;
+        if (e.getCurrentItem() == null) return;
         for (Object gui : Main.guiHashMap.values()) {
             if (player.getOpenInventory().getTitle().equals(Replace.replace(prefix, GUICode + gui.GUI_Name))
                     || (Main.PaPi && player.getOpenInventory().getTitle().equals(Replace.replace(prefix, player, GUICode + gui.GUI_Name)))) {
                 e.setCancelled(true);
                 for (Slot slot : gui.GUI_Slots) {
-                       /* if (!slot.ItemsRemovable) {
+                    if (e.getSlot() != slot.Slot) continue;
-                            e.setCancelled(true);
-                        }
-                        */
-
-                        if (e.getSlot() == slot.Slot) {
-
-                            if (!slot.Perm || player.hasPermission("commandgui.gui." + gui.Command_Command + ".slot." + (slot.Slot + 1))
-                                    || player.hasPermission("commandgui.admin")) {
-
-                                if (slot.Enable) {
-                                    if (e.getCurrentItem().getItemMeta().getDisplayName().equals(Replace.replace(prefix, slot.Name))) {
                     if (e.getCurrentItem().getType() == ItemVersion.getHead() || e.getCurrentItem().getType() == Material.valueOf(slot.Item.toUpperCase().replace(".", "_"))) {
+                        if (!slot.Perm
+                                || player.hasPermission("commandgui.gui." + gui.Command_Command + ".slot." + (slot.Slot + 1))
+                                || player.hasPermission("commandgui.gui." + gui.Command_Command + ".slot." + (slot.Slot + 1) + ".use")
+                                || player.hasPermission("commandgui.admin")) {
+                            if (!slot.Enable) continue;
+                            if (!e.getCurrentItem().getItemMeta().getDisplayName().equals(Replace.replace(prefix, slot.Name))) continue;
                             if (slot.Cost_Enable) {
                                 if (slot.Command_Enable || slot.Message_Enable || slot.OpenGUI_Enable || slot.ServerChange) {
-                                                    if (Vault.buy(prefix, player, slot.Price)) {
+                                    if (!Vault.buy(prefix, player, slot.Price)) {
-                                                        player.sendMessage(SelectMessages.Buy_msg.replace("[itemname]", Replace.replace(prefix, slot.Name))
-                                                                .replace("[price]", slot.Price + " " + SelectConfig.Currency));
-                                                        if (slot.Command_Enable) {
-
                                         new BukkitRunnable() {
                                             @Override
                                             public void run() {
                                                 player.closeInventory();
                                             }
                                         }.runTaskLater(plugin, 1L);
+                                        player.sendMessage(SelectMessages.No_money);
+                                        if (SelectConfig.Sound_NoMoney_Enable && SelectConfig.Sound_Enable)
+                                            player.playSound(player.getLocation(), SelectConfig.Sound_NoMoney, 3, 1);
+                                    } else {
+                                        player.sendMessage(SelectMessages.Buy_msg.replace("[itemname]", Replace.replace(prefix, slot.Name))
+                                                .replace("[price]", slot.Price + " " + SelectConfig.Currency));
+                                        execute(slot, player, e, gui);
+                                    }
+                                }
+                            } else execute(slot, player, e, gui);
+                        } else player.sendMessage(SelectMessages.NoPermissionForItem.replace("[item]", Replace.replace(prefix, slot.Name))
+                                .replace("[perm]", "commandgui.gui." + gui.Command_Command + ".slot." + (slot.Slot + 1)));
+                    }
+                }
+            }
+        }
+    }
 
+    private static void execute(Slot slot, Player player, InventoryClickEvent e, Object gui) {
+        if (slot.Command_Enable) command(slot, player);
+        if (slot.OpenGUI_Enable) openGUI(slot, player);
+        if (slot.Message_Enable) message(slot, player);
+        if (slot.ServerChange) serverChange(slot, player);
+        if (slot.SetConfigEnable) setConfig(slot, player, e);
+        if (SelectConfig.Sound_Enable && SelectConfig.Sound_Click_Enable) sound(slot, player, gui);
+    }
+
+    private static void command(Slot slot, Player player) {
         new BukkitRunnable() {
             @Override
             public void run() {
-                                                                    if (slot.Command_BungeeCommand && SelectConfig.Bungee) {
+                player.closeInventory();
+            }
+        }.runTaskLater(plugin, 1L);
+        new BukkitRunnable() {
+            @Override
+            public void run() {
+                if (slot.Command_BungeeCommand) {
+                    if (SelectConfig.Bungee) {
                         for (String cmd : slot.Command) {
-                                                                            Bungee_Sender_Reciver.sendToBungee(player, player.getName(), cmd.replace("[player]", player.getName()));
+                            Bungee_Sender_Reciver.sendToBungee(player, cmd.replace("[player]", player.getName()), slot.CommandAsConsole);
                         }
                     } else {
+                        send.console(prefix + " §4To use bungee commands, enable the Bungee option in the config.");
+                        send.player(player, prefix + " §4To use bungee commands, enable the Bungee option in the config.");
+                    }
+                } else {
+                    for (String cmd : slot.Command) {
                         if (slot.CommandAsConsole) {
-                                                                            for (String cmd : slot.Command) {
                             Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), cmd.replace("[player]", player.getName()));
-                                                                            }
+                        } else player.chat("/" + cmd.replace("[player]", player.getName()));
-                                                                        } else {
-                                                                            for (String cmd : slot.Command) {
-                                                                                player.chat("/" + cmd.replace("[player]", player.getName()));
-                                                                            }
                     }
                 }
             }
         }.runTaskLater(plugin, 2L);
     }
-                                                        if (slot.OpenGUI_Enable) {
+
+    private static void openGUI(Slot slot, Player player) {
         new BukkitRunnable() {
             @Override
             public void run() {
                 player.closeInventory();
-
             }
         }.runTaskLater(plugin, 1L);
         new BukkitRunnable() {
@@ -105,29 +133,34 @@ public class GUI_Listener implements Listener {
             }
         }.runTaskLater(plugin, 2L);
     }
-                                                        if (slot.Message_Enable) {
+
+    private static void message(Slot slot, Player player) {
         new BukkitRunnable() {
             @Override
             public void run() {
                 player.closeInventory();
             }
         }.runTaskLater(plugin, 1L);
-
         for (String msg : slot.Message) {
             if (Main.PaPi) {
+                if (slot.Cost_Enable) {
                     player.sendMessage(Replace.replacePrice(prefix, player, msg, slot.Price + " " + SelectConfig.Currency));
-                                                                } else
+                } else player.sendMessage(Replace.replace(prefix, player, msg.replace("[prefix]", prefix)));
+            } else {
+                if (slot.Cost_Enable) {
                     player.sendMessage(Replace.replacePrice(prefix, msg, slot.Price + " " + SelectConfig.Currency));
+                } else player.sendMessage(Replace.replace(prefix, msg.replace("[prefix]", prefix)));
             }
         }
-                                                        if (slot.ServerChange) {
+    }
+
+    private static void serverChange(Slot slot, Player player) {
         new BukkitRunnable() {
             @Override
             public void run() {
                 player.closeInventory();
             }
         }.runTaskLater(plugin, 1L);
-
         send.player(player, SelectMessages.onServerChange.replace("[server]", slot.ServerChangeServer));
         new BukkitRunnable() {
             @Override
@@ -136,7 +169,8 @@ public class GUI_Listener implements Listener {
             }
         }.runTaskLater(Main.plugin, 20L);
     }
-                                                        if (slot.SetConfigEnable) {
+
+    private static void setConfig(Slot slot, Player player, InventoryClickEvent e) {
         File config = new File(slot.ConfigFilePath);
         YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
                                                             /*if (slot.ConfigChatInput){
@@ -192,7 +226,7 @@ public class GUI_Listener implements Listener {
         }.runTaskLater(plugin, 1L);
     }
 
-                                                        if (SelectConfig.Sound_Enable && SelectConfig.Sound_Click_Enable) {
+    private static void sound(Slot slot, Player player, Object gui) {
         if (slot.CustomSound_Enable) {
             if (!slot.CustomSound_NoSound) {
                 try {
@@ -204,193 +238,7 @@ public class GUI_Listener implements Listener {
                     player.playSound(player.getLocation(), SelectConfig.Sound_Click, 3, 1);
                 }
             }
-                                                            } else
+        } else player.playSound(player.getLocation(), SelectConfig.Sound_Click, 3, 1);
-                                                                player.playSound(player.getLocation(), SelectConfig.Sound_Click, 3, 1);
-                                                        }
-
-                                                    } else {
-
-                                                        new BukkitRunnable() {
-                                                            @Override
-                                                            public void run() {
-                                                                player.closeInventory();
-                                                            }
-                                                        }.runTaskLater(plugin, 1L);
-
-                                                        player.sendMessage(SelectMessages.No_money);
-                                                        if (SelectConfig.Sound_NoMoney_Enable && SelectConfig.Sound_Enable) {
-                                                            player.playSound(player.getLocation(), SelectConfig.Sound_NoMoney, 3, 1);
-                                                        }
-                                                    }
-                                                }
-                                            } else {
-                                                if (slot.Command_Enable) {
-                                                    new BukkitRunnable() {
-                                                        @Override
-                                                        public void run() {
-                                                            player.closeInventory();
-                                                        }
-                                                    }.runTaskLater(plugin, 1L);
-
-                                                    new BukkitRunnable() {
-                                                        @Override
-                                                        public void run() {
-                                                            if (slot.Command_BungeeCommand) {
-                                                                if (SelectConfig.Bungee) {
-                                                                    for (String cmd : slot.Command) {
-                                                                        Bungee_Sender_Reciver.sendToBungee(player, player.getName(), cmd.replace("[player]", player.getName()));
-                                                                    }
-                                                                } else {
-                                                                    send.console(prefix + " §4To use bungee commands, enable the Bungee option in the config.");
-                                                                    send.player(player, prefix + " §4To use bungee commands, enable the Bungee option in the config.");
-                                                                }
-
-                                                            } else {
-                                                                if (slot.CommandAsConsole) {
-                                                                    for (String cmd : slot.Command) {
-                                                                        Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), cmd.replace("[player]", player.getName()));
-                                                                    }
-                                                                } else {
-                                                                    for (String cmd : slot.Command) {
-                                                                        player.chat("/" + cmd);
-                                                                    }
-                                                                }
-                                                            }
-                                                        }
-                                                    }.runTaskLater(plugin, 2L);
-                                                }
-                                                if (slot.OpenGUI_Enable) {
-                                                    new BukkitRunnable() {
-                                                        @Override
-                                                        public void run() {
-                                                            player.closeInventory();
-                                                        }
-                                                    }.runTaskLater(plugin, 1L);
-                                                    new BukkitRunnable() {
-                                                        @Override
-                                                        public void run() {
-
-                                                            OpenGUI.openGUI(player, Main.guiHashMap.get(slot.OpenGUI), slot.OpenGUI);
-                                                        }
-                                                    }.runTaskLater(plugin, 2L);
-                                                }
-                                                if (slot.Message_Enable) {
-                                                    new BukkitRunnable() {
-                                                        @Override
-                                                        public void run() {
-                                                            player.closeInventory();
-                                                        }
-                                                    }.runTaskLater(plugin, 1L);
-
-
-                                                    for (String msg : slot.Message) {
-                                                        if (Main.PaPi) {
-                                                            player.sendMessage(Replace.replace(prefix, player, msg.replace("[prefix]", prefix)));
-                                                        } else
-                                                            player.sendMessage(Replace.replace(prefix, msg.replace("[prefix]", prefix)));
-                                                    }
-                                                }
-                                                if (slot.ServerChange) {
-                                                    new BukkitRunnable() {
-                                                        @Override
-                                                        public void run() {
-                                                            player.closeInventory();
-                                                        }
-                                                    }.runTaskLater(plugin, 1L);
-
-                                                    send.player(player, SelectMessages.onServerChange.replace("[server]", slot.ServerChangeServer));
-
-
-                                                    new BukkitRunnable() {
-                                                        @Override
-                                                        public void run() {
-                                                            ServerChange.send(player, slot.ServerChangeServer);
-                                                        }
-                                                    }.runTaskLater(Main.plugin, 20L);
-                                                }
-                                                if (slot.SetConfigEnable) {
-                                                    File config = new File(slot.ConfigFilePath);
-                                                    YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
-                                                            /*if (slot.ConfigChatInput){
-                                                                ConfigChat.EditChat.put(player, slot.ConfigOptionPath);
-                                                                player.sendMessage(DefaultValue.SettingsGUIchatSet.replace("[setting]", "Shop Name Chest small"));
-                                                                player.sendMessage(DefaultValue.SettingsGUIchatCancel);
-                                                            } else
-                                                            {
-                                                             */
-                                                    if (e.isLeftClick()) {
-                                                        if (slot.ConfigOptionPremat.equals("String")) {
-                                                            yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigStringValueLeft);
-                                                        } else if (slot.ConfigOptionPremat.equals("Boolean")) {
-                                                            yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigBooleanValueLeft);
-                                                        } else if (slot.ConfigOptionPremat.equals("Integer")) {
-                                                            yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigIntegerValueLeft);
-                                                        } else if (slot.ConfigOptionPremat.equals("Double")) {
-                                                            yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigDoubleValueLeft);
-                                                        } else if (slot.ConfigOptionPremat.equals("List")) {
-                                                            yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigListValueLeft);
-                                                        } else {
-                                                            player.sendMessage("§cCheck the Option §6SetConfig/Option/Premat"); //todo
-                                                        }
-                                                    }
-                                                    if (e.isRightClick()) {
-                                                        if (slot.ConfigOptionPremat.equals("String")) {
-                                                            yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigStringValueRight);
-                                                        } else if (slot.ConfigOptionPremat.equals("Boolean")) {
-                                                            yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigBooleanValueRight);
-                                                        } else if (slot.ConfigOptionPremat.equals("Integer")) {
-                                                            yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigIntegerValueRight);
-                                                        } else if (slot.ConfigOptionPremat.equals("Double")) {
-                                                            yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigDoubleValueRight);
-                                                        } else if (slot.ConfigOptionPremat.equals("List")) {
-                                                            yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigListValueRight);
-                                                        } else {
-                                                            player.sendMessage("§cCheck the Option §6SetConfig/Option/Premat"); //todo
-                                                        }
-                                                    }
-                                                    try {
-                                                        yamlConfiguration.save(config);
-                                                    } catch (IOException tac) {
-                                                        tac.printStackTrace();
-                                                    }
-                                                    if (slot.PluginReloadEnable) {
-                                                        Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), slot.PluginReloadCommand);
-                                                    }
-                                                    new BukkitRunnable() {
-                                                        @Override
-                                                        public void run() {
-                                                            player.closeInventory();
-                                                        }
-                                                    }.runTaskLater(plugin, 1L);
-                                                }
-                                                if (SelectConfig.Sound_Enable && SelectConfig.Sound_Click_Enable) {
-                                                    if (slot.CustomSound_Enable) {
-                                                        if (!slot.CustomSound_NoSound) {
-                                                            try {
-                                                                player.playSound(player.getLocation(), Sound.valueOf(slot.CustomSound_Sound.toUpperCase().replace(".", "_")), 3, 1);
-
-                                                            } catch (Exception e1) {
-                                                                send.console("§4\n§4\n§4\n" + SelectMessages.SoundNotFound.replace("[prefix]", prefix)
-                                                                        .replace("[sound]", "§6GUI: §e" + Replace.replace(prefix, gui.GUI_Name) + "§r §6Slot: §e" + slot.Slot + " §6CustomSound: §9" + slot.CustomSound_Sound));
-                                                                player.playSound(player.getLocation(), SelectConfig.Sound_Click, 3, 1);
-                                                            }
-                                                        }
-                                                    } else
-                                                        player.playSound(player.getLocation(), SelectConfig.Sound_Click, 3, 1);
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            } else {
-                                player.sendMessage(SelectMessages.NoPermissionForItem.replace("[item]", Replace.replace(prefix, slot.Name))
-                                        .replace("[perm]", "commandgui.gui." + gui.Command_Command + ".slot." + (slot.Slot + 1)));
-                            }
-                        }
-                    }
-                }
-            }
-        }
     }
 }
 

CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/ItemChange.java

@@ -23,27 +23,30 @@ public class ItemChange {
                 slot = Select_Database.selectSlot(player);
             }
         }
-
         if (!SelectConfig.UseItem_Enable) {
             return;
         }
         if (SelectConfig.UseItemGameModeProtection) {
             if (SelectConfig.UseItemGameModeMode.equalsIgnoreCase("blacklist") && SelectConfig.UseItemGameModeList.contains(player.getGameMode().toString())) {
                if (SelectConfig.UseItemGameModeRemoveItemWhenItIsDisabled) removeItem(player);
+               send.debug(Main.plugin,"GameMode disabled: " +player.getName() +" " +player.getGameMode().toString());
                 return;
             }
             if (SelectConfig.UseItemGameModeMode.equalsIgnoreCase("whitelist") && !SelectConfig.UseItemGameModeList.contains(player.getGameMode().toString())) {
                 if (SelectConfig.UseItemGameModeRemoveItemWhenItIsDisabled) removeItem(player);
+                send.debug(Main.plugin,"GameMode disabled: " +player.getName() +" " +player.getGameMode().toString());
                 return;
             }
         }
         if (SelectConfig.UseItemWorldProtection) {
             if (SelectConfig.UseItemWorldMode.equalsIgnoreCase("blacklist") && SelectConfig.UseItemWorldList.contains(player.getWorld().getName())) {
                 if (SelectConfig.UseItemWorldRemoveItemWhenItIsDisabled)removeItem(player);
+                send.debug(Main.plugin,"World disabled: " +player.getName() +" " +player.getWorld().toString());
                 return;
             }
             if (SelectConfig.UseItemWorldMode.equalsIgnoreCase("whitelist") && !SelectConfig.UseItemWorldList.contains(player.getWorld().getName())) {
                 if (SelectConfig.UseItemWorldRemoveItemWhenItIsDisabled)removeItem(player);
+                send.debug(Main.plugin,"World disabled: " +player.getName() +" " +player.getWorld().toString());
                 return;
             }
         }
@@ -64,9 +67,11 @@ public class ItemChange {
                     }
                 }
             }
+            send.debug(Main.plugin,"GiveOnlyOnFirstJoin: " +player.getName());
             return;
         }
         if (!SelectConfig.UseItem_GiveOnEveryJoin) {
+            send.debug(Main.plugin,"!GiveOnEveryJoin: " +player.getName());
             return;
         }
         new BukkitRunnable() {
@@ -75,6 +80,7 @@ public class ItemChange {
                 removeItem(player);
                 if (!SelectConfig.UseItem_AllowToggle || Select_Database.selectItemStatus(player)) {
                     if (SelectConfig.UseItem_InventorySlotEnforce || player.getInventory().getItem(slot - 1) == null) {
+                        send.debug(Main.plugin,"Give: " +player.getName());
                         Give_UseItem.onGive(player);
                         if (setCursor) {
                             setCursor(player, slot);
@@ -94,7 +100,6 @@ public class ItemChange {
                 }
             }
         }.runTaskLater(Main.plugin, 1L * 1);
-
     }
 
     private static void setCursor(Player player, int slot) {
@@ -146,6 +151,5 @@ public class ItemChange {
                 }
             }
         }
-
     }
 }

CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/PluginEvent.java

@@ -26,7 +26,6 @@ public class PluginEvent implements Listener {
         UpdateAPI.join(Main.plugin, prefix, "commandgui.updatemsg", event.getPlayer(), Util.getSpigot(), Util.getDiscord());
     }
 
-
     @EventHandler
     public void onClearServer(ServerCommandEvent event) {
         if (SelectConfig.UseItem_KeepAtCommandClear) {
@@ -50,7 +49,6 @@ public class PluginEvent implements Listener {
         }
     }
 
-
     @EventHandler
     public void onClearPlayer(PlayerCommandPreprocessEvent event) {
         if (SelectConfig.UseItem_KeepAtCommandClear) {

CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/UseItem_Listener/Events.java

@@ -80,25 +80,6 @@ public class Events implements Listener {
         Player player = e.getPlayer();
         if (SelectConfig.UseItem_Enable) {
             ItemChange.itemChange(player, false);
-            //if (!SelectConfig.UseItem_AllowToggle || Select_Database.selectItemStatus(player)) {
-            //    if (SelectConfig.UseItem_GiveOnlyOnFirstJoin) {
-            //        if (!player.hasPlayedBefore()) {
-            //            new BukkitRunnable() {
-            //                @Override
-            //                public void run() {
-            //                    Give_UseItem.onGive(player);
-            //                }
-            //            }.runTaskLater(Main.plugin, 20L * 1);
-            //        }
-            //    } else {
-            //        new BukkitRunnable() {
-            //            @Override
-            //            public void run() {
-            //                Give_UseItem.onGive(player);
-            //            }
-            //        }.runTaskLater(Main.plugin, 20L * 1);
-            //    }
-            //}
         }
     }
 
@@ -130,7 +111,6 @@ public class Events implements Listener {
         }.runTaskLater(Main.plugin, SelectConfig.UseItemWorldChangeDelayInTicks * 1L);
     }
 
-
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onInteract(PlayerInteractEvent e) {
         Player p = e.getPlayer();
@@ -206,7 +186,6 @@ public class Events implements Listener {
         }
     }
 
-
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onItemMove(InventoryDragEvent e) {
         if (!SelectConfig.UseItem_BlockMoveAndDrop || !SelectConfig.UseItem_Enable) return;

CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Main.java

@@ -1,8 +1,10 @@
 package de.jatitv.commandguiv2.Spigot;
 //s<ds
 
+import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
 import de.jatitv.commandguiv2.Spigot.system.Load;
 import de.jatitv.commandguiv2.Spigot.Objekte.Object;
+import de.jatitv.commandguiv2.Spigot.system.database.MySQL;
 import de.jatitv.commandguiv2.Util;
 import net.t2code.lib.Spigot.Lib.messages.T2CodeTemplate;
 import net.t2code.lib.Spigot.Lib.messages.send;
@@ -67,7 +69,8 @@ public final class Main extends JavaPlugin {
         if (PluginCheck.plotSquaredGUI()) {
             PlotSquaredGUI = true;
             addonEnable(Bukkit.getPluginManager().getPlugin("PlotSquaredGUI"));
-        }if (PluginCheck.luckyBox()) {
+        }
+        if (PluginCheck.luckyBox()) {
             LuckyBox = true;
             addonEnable(Bukkit.getPluginManager().getPlugin("T2C-LuckyBox"));
         }
@@ -113,5 +116,6 @@ public final class Main extends JavaPlugin {
     public void onDisable() {
         // Plugin shutdown logic
         if (enable) T2CodeTemplate.onDisable(prefix, autor, version, Util.getSpigot(), Util.getDiscord());
+        MySQL.close();
     }
 }

CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Objekte/Obj_Select.java

@@ -93,7 +93,6 @@ public class Obj_Select {
                             yamlConfiguration_gui.getBoolean("Slots." + key + ".SetConfig.PluginReload.Enable"),
                             yamlConfiguration_gui.getString("Slots." + key + ".SetConfig.PluginReload.Command"));
                     slots.add(slot);
-
                 }
                 Object objekt = new Object(GUI_Enable, GUI_Lines, GUI_Name, GUI_FillItem_Enable, GUI_FillItem_Item,
                         config_gui.getName().replace(".yml", ""), Command_Alias_Enable, Command_Permission, slots);
@@ -107,7 +106,6 @@ public class Obj_Select {
                     e.printStackTrace();
                 }
             }
-
         }
     }
 }

CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/Commands.java

@@ -26,7 +26,7 @@ public class Commands {
         if (sender instanceof Player) {
             Player player = (Player) sender;
             send.player(player, Util.getPrefix() + "§4======= §8[§4Command§9GUI§8] §4=======");
-            send.player(player, Util.getPrefix() + " §2String.valueOf(Main.autor): §6" + String.valueOf(String.valueOf(Main.autor)).replace("[", "").replace("]", ""));
+            send.player(player, Util.getPrefix() + " §2Autor: §6" + String.valueOf(Main.autor).replace("[", "").replace("]", ""));
 
             if (UpdateAPI.PluginVersionen.get(Main.plugin.getName()).publicVersion.equalsIgnoreCase(Main.version)) {
                 send.player(player, Util.getPrefix() + " §2Version: §6" + Main.version);

CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/register/AliasRegister.java

@@ -7,6 +7,7 @@ import net.t2code.lib.Spigot.Lib.messages.send;
 import net.t2code.lib.Spigot.Lib.minecraftVersion.NMSVersion;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.Plugin;
+import org.eclipse.sisu.space.ClassFinder;
 
 import java.io.File;
 
@@ -110,6 +111,11 @@ public class AliasRegister {
                         org.bukkit.craftbukkit.v1_18_R1.CraftServer craftServer = (org.bukkit.craftbukkit.v1_18_R1.CraftServer) plugin.getServer();
                         craftServer.getCommandMap().register(alias, new RegisterCommand(alias));
                     }
+                    if (NMSVersion.v1_18_R2) {
+                        send.debug(plugin, "Alias register 1.18_R2");
+                        org.bukkit.craftbukkit.v1_18_R2.CraftServer craftServer = (org.bukkit.craftbukkit.v1_18_R2.CraftServer) plugin.getServer();
+                        craftServer.getCommandMap().register(alias, new RegisterCommand(alias));
+                    }
                 }
             }
         }

CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/gui/OpenGUI.java

@@ -14,7 +14,7 @@ import net.t2code.lib.Spigot.Lib.items.ItemVersion;
 import net.t2code.lib.Spigot.Lib.messages.send;
 import net.t2code.lib.Spigot.Lib.minecraftVersion.MCVersion;
 import net.t2code.lib.Spigot.Lib.replace.Replace;
-import net.t2code.luckybox.api.LuckyBoxAPI;
+import net.t2code.luckyBox.api.LuckyBoxAPI;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -90,6 +90,10 @@ public class OpenGUI {
                 }
             }
             for (Slot slot : gui.GUI_Slots) {
+                if (!slot.Perm
+                        || player.hasPermission("commandgui.gui." + gui.Command_Command + ".slot." + (slot.Slot + 1))
+                        || player.hasPermission("commandgui.gui." + gui.Command_Command + ".slot." + (slot.Slot + 1)+".see")
+                        || player.hasPermission("commandgui.admin")) {
                     if (slot.Enable) {
                         if (slot.Empty) {
                             ItemStack air = new ItemStack(Material.AIR);
@@ -186,7 +190,7 @@ public class OpenGUI {
                         }
                     }
                 }
-
+            }
             player.openInventory(inventory);
             send.debug(plugin, "§6" + player.getName() + " §5Open §6" + Replace.replace(prefix, gui.GUI_Name) + " §5" + " §7- §e" + (System.currentTimeMillis() - long_.longValue()) + "ms");
         } else player.sendMessage(SelectMessages.GUIIsDisabled.replace("[gui]", Replace.replace(prefix, gui.GUI_Name)));

CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Bungee_Sender_Reciver.java

@@ -2,6 +2,8 @@ package de.jatitv.commandguiv2.Spigot.system;
 
 import de.jatitv.commandguiv2.Spigot.Main;
 import net.t2code.lib.Spigot.Lib.messages.send;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.messaging.PluginMessageListener;
 
@@ -9,16 +11,32 @@ import java.io.*;
 
 public class Bungee_Sender_Reciver implements PluginMessageListener {
 
-    public static void sendToBungee(Player player,String channel, String information) {
+    public static void sendToBungee(CommandSender sender, String information, Boolean console) {
         ByteArrayOutputStream stream = new ByteArrayOutputStream();
         DataOutputStream output = new DataOutputStream(stream);
         try {
-            output.writeUTF(channel);
+            if (console) {
+                output.writeUTF("cgui-Console");
+            } else {
+                if (sender instanceof Player) {
+                    output.writeUTF(sender.getName());
+                } else {
+                    output.writeUTF("cgui-Console");
+                }
+            }
             output.writeUTF(information);
         } catch (IOException e) {
             e.printStackTrace();
         }
+        if (sender instanceof Player) {
+            Player player = (Player) sender;
             player.sendPluginMessage(Main.plugin, "cgui:bungee", stream.toByteArray());
+        }else {
+            for(Player player : Bukkit.getOnlinePlayers()){
+                player.sendPluginMessage(Main.plugin, "cgui:bungee", stream.toByteArray());
+                return;
+            }
+        }
     }
 
     @Override

CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/database/MySQL.java

@@ -1,5 +1,7 @@
 package de.jatitv.commandguiv2.Spigot.system.database;
 
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
 import de.jatitv.commandguiv2.Spigot.Main;
 import net.t2code.lib.Spigot.Lib.messages.send;
 import org.bukkit.plugin.Plugin;
@@ -8,57 +10,84 @@ import java.sql.*;
 import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.HashMap;
 
 public class MySQL {
-    private static Plugin plugin = Main.plugin;
     public static String ip = "localhost";
     public static Integer port = 3306;
     public static String database;
     public static String user = "root";
     public static String password = "";
-    public static String url;
+    protected static String url;
     public static Boolean SSL;
+    private static final HikariConfig config = new HikariConfig();
+    private static HikariDataSource ds;
 
     public static void main() {
-        Long long_ = Long.valueOf(System.currentTimeMillis());
+        long long_ = System.currentTimeMillis();
         Calendar now = Calendar.getInstance();
         ZoneId timeZone = now.getTimeZone().toZoneId();
-        send.debug(plugin, "Server TimeZone is : " + timeZone);
+        send.debug(Main.plugin, "Server TimeZone is : " + timeZone);
-        url = "jdbc:mysql://" + ip + ":" + port + "/" + database + "?useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=" + timeZone;
+        try {
-        // Europe/Berlin
+            config.setJdbcUrl("jdbc:mysql://" + ip + ":" + port + "/" + database + "?useJDBCCompliantTimezoneShift=true&allowMultiQueries=true&useLegacyDatetimeCode=false&autoReconnect=true&serverTimezone=" + timeZone + "&useSSL=" + SSL);
-        if (SSL) {
+            config.setUsername(user);
-            url = url + "&useSSL=true";
+            config.setPassword(password);
-        } else url = url + "&useSSL=false";
+            config.addDataSourceProperty("cachePrepStmts", "true");
-        send.debug(plugin, url);
+            config.addDataSourceProperty("prepStmtCacheSize", "250");
-        try (Connection con = DriverManager.getConnection(url, user, password)) {
+            config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
-            Statement stmt = con.createStatement();
+            ds = new HikariDataSource(config);
-            stmt.close();
+            send.console(Main.prefix + " §2MySQL successfully connected." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms");
-            send.console(Main.prefix + " §2MySQL successfully connected." + " §7- §e" + (System.currentTimeMillis() - long_.longValue()) + "ms");
+        } catch (Exception ex) {
-        } catch (SQLException ex) {
+            send.console(Main.prefix + " §4MySQL not connected." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms");
-            send.console(Main.prefix + " §4MySQL not connected." + " §7- §e" + (System.currentTimeMillis() - long_.longValue()) + "ms");
+            send.error(Main.plugin, ex.getMessage() + " --- " + (System.currentTimeMillis() - long_) + "ms");
-            send.error(plugin, ex.getMessage() + " --- " + (System.currentTimeMillis() - long_.longValue()) + "ms");
         }
+        //Bukkit.getConsoleSender().sendMessage((System.currentTimeMillis() - long_) + "ms");
     }
 
+
     public static void query(String query) {
-        try (Connection con = DriverManager.getConnection(url, user, password)) {
+
+        if (ds == null){
+            return;
+        }
+        send.debug(Main.plugin, query);
+        try (Connection con = ds.getConnection()) {
             Statement stmt = con.createStatement();
             stmt.execute(query);
             stmt.close();
-        } catch (SQLException ex) {
+        } catch (SQLException e) {
-            System.err.println(ex.getMessage());
+            System.err.println(e.getMessage());
+        }
+    }
+
+    public static void query(ArrayList<String> queryList) {
+        try (Connection con = ds.getConnection()) {
+            Statement stmt = con.createStatement();
+            for (String query : queryList) {
+                send.debug(Main.plugin, query);
+                stmt.addBatch(query);
+            }
+            stmt.executeBatch();
+            stmt.close();
+        } catch (SQLException e) {
+            System.err.println(e.getMessage());
         }
     }
 
 
-    public static ArrayList<String> selectAll(String query) {
+    public static HashMap<String, ArrayList<String>> selectAll(String query) {
-        ArrayList<String> Result = new ArrayList<>();
+        send.debug(Main.plugin, query);
-        try (Connection con = DriverManager.getConnection(url, user, password)) {
+        HashMap<String, ArrayList<String>> Result = new HashMap<>();
+        try (Connection con = ds.getConnection()) {
             Statement stmt = con.createStatement();
             ResultSet rs = stmt.executeQuery(query);
             int columns = rs.getMetaData().getColumnCount();
             while (rs.next()) {
-                Result.add(rs.getString(1));
+                ArrayList<String> columnList = new ArrayList<>();
+                for (int i = 1; i <= columns; i++) {
+                    columnList.add(rs.getString(i));
+                }
+                Result.put(rs.getString(1), columnList);
             }
             rs.close();
             stmt.close();
@@ -69,11 +98,11 @@ public class MySQL {
     }
 
     public static String select(String query) {
+        send.debug(Main.plugin, query);
         String Ausgabe = "";
-        try (Connection con = DriverManager.getConnection(url, user, password)) {
+        try (Connection con = ds.getConnection()) {
             Statement stmt = con.createStatement();
             ResultSet rs = stmt.executeQuery(query);
-            int columns = rs.getMetaData().getColumnCount();
             while (rs.next()) {
                 Ausgabe = String.valueOf(rs.getString(1));
             }
@@ -86,11 +115,11 @@ public class MySQL {
     }
 
     public static int count(String query) {
-        Integer count = 0;
+        send.debug(Main.plugin, query);
-        try (Connection con = DriverManager.getConnection(url, user, password)) {
+        int count = 0;
+        try (Connection con = ds.getConnection()) {
             Statement stmt = con.createStatement();
             ResultSet rs = stmt.executeQuery(query);
-            int columns = rs.getMetaData().getColumnCount();
             while (rs.next()) {
                 count++;
             }
@@ -101,4 +130,28 @@ public class MySQL {
         }
         return count;
     }
+
+    public static ArrayList<String> selectRow(String query) {
+        send.debug(Main.plugin, query);
+        ArrayList<String> Result = new ArrayList<>();
+        try (Connection con = ds.getConnection()) {
+            Statement stmt = con.createStatement();
+            ResultSet rs = stmt.executeQuery(query);
+            int columns = rs.getMetaData().getColumnCount();
+            while (rs.next()) {
+                for (int i = 1; i <= columns; i++) {
+                    Result.add(rs.getString(i));
+                }
+            }
+            rs.close();
+            stmt.close();
+        } catch (SQLException ex) {
+            System.err.println(ex.getMessage());
+        }
+        return Result;
+    }
+
+    public static void close() {
+        ds.close();
+    }
 }

CommandGUI V2/src/main/java/de/jatitv/commandguiv2/api/CGuiAPI.java

@@ -5,11 +5,13 @@ import de.jatitv.commandguiv2.Spigot.Main;
 import de.jatitv.commandguiv2.Spigot.cmdManagement.Commands;
 import de.jatitv.commandguiv2.Spigot.cmdManagement.Help;
 import de.jatitv.commandguiv2.Spigot.config.DefaultGUICreate;
+import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
 import de.jatitv.commandguiv2.Spigot.config.languages.SelectMessages;
 import de.jatitv.commandguiv2.Spigot.system.database.Select_Database;
 import net.t2code.lib.Spigot.Lib.messages.send;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
 
 public class CGuiAPI {
     public static Boolean JoinDisable = false;
@@ -17,6 +19,19 @@ public class CGuiAPI {
     public static void onItemChange(Player player) {
         ItemChange.itemChange(player, false);
     }
+
+    public static boolean hasUseItemInMainHand(Player player) {
+        ItemStack item = player.getInventory().getItemInMainHand();
+        return item.hasItemMeta() && item.getItemMeta().hasDisplayName()
+                && item.getItemMeta().getDisplayName().equals(SelectConfig.UseItem_Name);
+    }
+
+    public static boolean hasUseItemInOffHand(Player player) {
+        ItemStack item = player.getInventory().getItemInOffHand();
+        return item.hasItemMeta() && item.getItemMeta().hasDisplayName()
+                && item.getItemMeta().getDisplayName().equals(SelectConfig.UseItem_Name);
+    }
+
     public static void onItemChange(Player player, Boolean setCursor) {
         ItemChange.itemChange(player, setCursor);
     }

CommandGUI V2/src/main/resources/META-INF/MANIFEST.MF

@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Main-Class: 
+Class-Path: PlugmanGUI-3.0.jar spigot-1.8r3.jar spigot-1.9r1.jar spigot-
+ 1.15r1.jar T2CodeLib-10.3.jar spigot-1.18r1.jar bungee-1615.jar spigot-
+ 1.9r2.jar spigot-1.16r3.jar spigot-1.14r1.jar slf4j-api-1.7.25.jar Luck
+ yBox-API-4.2.2.jar spigot-1.10r1.jar spigot-1.16r1.jar spigot-1.13r2.ja
+ r HikariCP-3.4.5.jar spigot-1.11r1.jar spigot-1.13r1.jar spigot-1.8r2.j
+ ar spigot-1.17r1.jar spigot-1.12r1.jar spigot-1.16r2.jar spigot-1.8r1.j
+ ar
+