2.7.2

ADD: Added a UseItem Item/Block Blacklist so that when you look at one of these blocks, the GUI does not open but the block (for example: CHEST, CRAFTING_TABLE, or buttons).

CommandGUI V2/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>net.t2code</groupId>
     <artifactId>CommandGUI_V2</artifactId>
-    <version>2.7.0_Snapshot-6</version>
+    <version>2.7.2</version>
     <packaging>jar</packaging>
 
     <name>CommandGUI</name>
@@ -67,7 +67,7 @@
         </repository>
         <repository>
             <id>placeholderapi</id>
-            <url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
+            <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
         </repository>
     </repositories>
 
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>net.t2code</groupId>
             <artifactId>T2CodeLib</artifactId>
-            <version>11.4</version>
+            <version>11.6</version>
         </dependency>
         <dependency>
             <groupId>net.t2code</groupId>

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

@@ -261,7 +261,7 @@ public class GUIListener implements Listener {
     }
 
     private static void toggleUseItem(Player player, Gui gui) {
-        if (Events.useItemHashMap.get(player)) {
+        if (Events.useItemHashMap.get(player.getName())) {
             Commands.itemOff(player);
         } else {
             Commands.itemOn(player);

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

@@ -4,6 +4,7 @@ import de.jatitv.commandguiv2.Spigot.Listener.UseItem_Listener.Events;
 import de.jatitv.commandguiv2.Spigot.Main;
 import de.jatitv.commandguiv2.Spigot.system.UseItem;
 import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
+import de.jatitv.commandguiv2.Spigot.system.database.SelectDatabase;
 import net.t2code.lib.Spigot.Lib.messages.send;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
@@ -14,10 +15,10 @@ public class ItemChange {
         if (SelectConfig.UseItem_InventorySlotEnforce) {
             slot = SelectConfig.UseItem_InventorySlot;
         } else {
-            if (Events.useItemSlotHashMap.get(player) == null) {
+            if (Events.useItemSlotHashMap.get(player.getName()) == null) {
                 slot = SelectConfig.UseItem_InventorySlot;
             } else {
-                slot = Events.useItemSlotHashMap.get(player);
+                slot = Events.useItemSlotHashMap.get(player.getName());
             }
         }
 
@@ -27,7 +28,7 @@ public class ItemChange {
         UseItem.removeItem(player);
         if (UseItem.protection(player, false)) return;
         if (SelectConfig.UseItem_GiveOnlyOnFirstJoin) {
-            if (!SelectConfig.UseItem_AllowToggle || Events.useItemHashMap.get(player)) {
+            if (!SelectConfig.UseItem_AllowToggle || Events.useItemHashMap.get(player.getName())) {
                 if (!player.hasPlayedBefore()) {
                     new BukkitRunnable() {
                         @Override
@@ -53,7 +54,7 @@ public class ItemChange {
         new BukkitRunnable() {
             @Override
             public void run() {
-                if (!SelectConfig.UseItem_AllowToggle || Events.useItemHashMap.get(player)) {
+                if (!SelectConfig.UseItem_AllowToggle || Events.useItemHashMap.get(player.getName())) {
                     if (SelectConfig.UseItem_InventorySlotEnforce || player.getInventory().getItem(slot - 1) == null) {
                         send.debug(Main.plugin, "Give: " + player.getName());
                         UseItem.giveUseItem(player);

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

@@ -34,15 +34,13 @@ import java.util.Iterator;
 
 public class Events implements Listener {
 
-    public static HashMap<Player, Boolean> useItemHashMap = new HashMap<>();
+    public static HashMap<String, Boolean> useItemHashMap = new HashMap<>();
-    public static HashMap<Player, Integer> useItemSlotHashMap = new HashMap<>();
+    public static HashMap<String, Integer> useItemSlotHashMap = new HashMap<>();
+
     @EventHandler
     public void onJoin(PlayerJoinEvent e) {
-        if (SelectDatabase.selectItemStatus(e.getPlayer())){
+        useItemHashMap.put(e.getPlayer().getName(), SelectDatabase.selectItemStatus(e.getPlayer()));
-            useItemHashMap.put(e.getPlayer(), true);
+        useItemSlotHashMap.put(e.getPlayer().getName(), SelectDatabase.selectSlot(e.getPlayer()));
-        } else useItemHashMap.put(e.getPlayer(), false);
-
-        useItemSlotHashMap.put(e.getPlayer(), SelectDatabase.selectSlot(e.getPlayer()));
 
         if (CGuiAPI.JoinDisable) {
             send.debug(Main.plugin, "JoinDisable");
@@ -61,7 +59,7 @@ public class Events implements Listener {
 
     @EventHandler
     public void onJoin(PlayerQuitEvent e) {
-        useItemHashMap.remove(e.getPlayer());
+        useItemHashMap.remove(e.getPlayer().getName());
     }
 
     @EventHandler(priority = EventPriority.HIGHEST)
@@ -135,10 +133,17 @@ public class Events implements Listener {
         }.runTaskLater(Main.plugin, SelectConfig.UseItemWorldChangeDelayInTicks * 1L);
     }
 
-
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onInteract(PlayerInteractEvent e) {
         Player p = e.getPlayer();
+        if (!p.isSneaking()) {
+            for (String material : SelectConfig.UseItemItemBlockBlacklist) {
+                if (e.getClickedBlock() != null) {
+                    if (e.getClickedBlock().getType() == Material.valueOf(material)) return;
+                }
+            }
+        }
+
         if (SelectConfig.UseItem_Enable) {
             if (SelectConfig.UseItem_PlayerHead_Enable) {
                 if (e.getItem() != null && p.getItemInHand().getType() == ItemVersion.getHead()) {
@@ -159,14 +164,17 @@ public class Events implements Listener {
     private static void openGUI(PlayerInteractEvent e, Player player) {
         e.setCancelled(true);
 
-        if (player.isSneaking()) {
+        if ((!SelectConfig.disableInfoBySneak) && player.isSneaking()) {
             Commands.info(player);
             return;
         }
+
         if (!legacy()) {
             if (!topInventoryIsEmpty(player)) return;
         }
+
         if (UseItem.protection(player, true)) return;
+
         if (SelectConfig.UseItemGameModeProtection) {
             if (SelectConfig.UseItemGameModeMode.equalsIgnoreCase("blacklist") && SelectConfig.UseItemGameModeList.contains(player.getGameMode().toString())) {
                 e.setCancelled(true);
@@ -179,6 +187,7 @@ public class Events implements Listener {
                 return;
             }
         }
+
         if (SelectConfig.UseItemWorldProtection) {
             if (SelectConfig.UseItemWorldMode.equalsIgnoreCase("blacklist") && SelectConfig.UseItemWorldList.contains(player.getWorld().getName())) {
                 e.setCancelled(true);
@@ -191,6 +200,7 @@ public class Events implements Listener {
                 return;
             }
         }
+
         if (!SelectConfig.UseItem_Permission || player.hasPermission("commandgui.useitem")) {
             OpenGUI.openGUI(player, SelectConfig.UseItem_OpenGUI, true);
         } else {
@@ -205,7 +215,6 @@ public class Events implements Listener {
         if (e.getItem() != null && e.getItem().hasItemMeta() && e.getItem().getItemMeta().hasDisplayName()
                 && e.getItem().getItemMeta().getDisplayName().equals(SelectConfig.UseItem_Name)) {
             e.setCancelled(true);
-
         }
     }
 
@@ -213,6 +222,7 @@ public class Events implements Listener {
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onItemMove(InventoryDragEvent e) {
         if (!SelectConfig.UseItem_BlockMoveAndDrop || !SelectConfig.UseItem_Enable) return;
+
         if (e.getWhoClicked() instanceof Player) {
             Player p = (Player) e.getWhoClicked();
             if (e.getCursor() != null && e.getCursor().hasItemMeta() && e.getCursor().getItemMeta().hasDisplayName()
@@ -234,7 +244,6 @@ public class Events implements Listener {
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onItemMove(InventoryClickEvent e) {
         if (!SelectConfig.UseItem_BlockMoveAndDrop || !SelectConfig.UseItem_Enable) return;
-        Player player = (Player) e.getWhoClicked();
 
         if (e.getCursor() != null && e.getCursor().hasItemMeta() && e.getCursor().getItemMeta().hasDisplayName()
                 && e.getCursor().getItemMeta().getDisplayName().equals(SelectConfig.UseItem_Name)) {
@@ -244,13 +253,13 @@ public class Events implements Listener {
                 && e.getCurrentItem().getItemMeta().getDisplayName().equals(SelectConfig.UseItem_Name)) {
 
             e.setCancelled(true);
-
         }
     }
 
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onItemMove(InventoryPickupItemEvent e) {
         if (!SelectConfig.UseItem_BlockMoveAndDrop || !SelectConfig.UseItem_Enable) return;
+
         if (e.getItem() != null && e.getItem().getItemStack() != null) {
             ItemStack item = e.getItem().getItemStack();
             if (item.hasItemMeta() && item.getItemMeta().hasDisplayName()
@@ -263,6 +272,7 @@ public class Events implements Listener {
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onPlace(BlockPlaceEvent e) {
         if (!SelectConfig.UseItem_BlockMoveAndDrop || !SelectConfig.UseItem_Enable) return;
+
         if (e.getItemInHand() != null && e.getItemInHand().hasItemMeta() && e.getItemInHand().getItemMeta().hasDisplayName()
                 && e.getItemInHand().getItemMeta().getDisplayName().equals(SelectConfig.UseItem_Name)) {
             e.setCancelled(true);
@@ -272,6 +282,7 @@ public class Events implements Listener {
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onDrop(PlayerDropItemEvent e) {
         if (!SelectConfig.UseItem_BlockMoveAndDrop || !SelectConfig.UseItem_Enable) return;
+
         if (e.getItemDrop() != null && e.getItemDrop().getItemStack() != null) {
             ItemStack item = e.getItemDrop().getItemStack();
             if (item.hasItemMeta() && item.getItemMeta().hasDisplayName()

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

@@ -65,14 +65,14 @@ public class Commands {
 
         CmdExecuter_GUITab.arg1.clear();
         CmdExecuter_GUITab.arg1.put("admin", "commandgui.admin;commandgui.giveitem.other;commandgui.command.info");
-        ConfigCreate.configCreate();
-        SelectConfig.onSelect();
 
+        SelectConfig.onSelect();
         Main.plugin.reloadConfig();
         if (!Objects.equals(SelectDatabase.getStorage().toString(), SelectConfig.storage)) {
             if (sender instanceof Player) send.sender(sender, "You have changed the storage medium! To apply this change, you must restart the server!");
             send.console("You have changed the storage medium! To apply this change, you must restart the server!");
         }
+
         LanguagesCreate.langCreate();
 
         Obj_Select.onSelect();
@@ -124,10 +124,10 @@ public class Commands {
         if (SelectConfig.UseItem_InventorySlotEnforce) {
             slot = SelectConfig.UseItem_InventorySlot;
         } else {
-            if (Events.useItemSlotHashMap.get(player) == null) {
+            if (Events.useItemSlotHashMap.get(player.getName()) == null) {
                 slot = SelectConfig.UseItem_InventorySlot;
             } else {
-                slot = Events.useItemSlotHashMap.get(player);
+                slot = Events.useItemSlotHashMap.get(player.getName());
             }
         }
         send.debug(Main.plugin, String.valueOf(slot));
@@ -161,7 +161,11 @@ public class Commands {
     }
 
     public static void onSetSlot(Player player, Integer setSlot) {
-        if (SelectConfig.UseItem_AllowSetSlot) {
+        if (!SelectConfig.UseItem_AllowSetSlot) {
+            player.sendMessage(Util.getPrefix() + " §4Function disabled");
+            return;
+        }
+
         if (setSlot < 1) {
             send.player(player, SelectMessages.ItemSlot_wrongValue);
             return;
@@ -170,27 +174,28 @@ public class Commands {
             send.player(player, SelectMessages.ItemSlot_wrongValue);
             return;
         }
-            ItemStack itm1 = player.getInventory().getItem(setSlot + 1);
+
-            if (itm1 != null) {
+        if (Events.useItemHashMap.get(player.getName())) {
-                if (itm1.getType() == Material.valueOf(SelectConfig.UseItem_Material) || itm1.getType() == ItemVersion.getHead()) {
+            if (Objects.equals(Events.useItemSlotHashMap.get(player.getName()), setSlot)) {
-                    if (itm1.getItemMeta().getDisplayName().equals(SelectConfig.UseItem_Name)) {
                 player.sendMessage(SelectMessages.ItemSlotAlreadySet.replace("[slot]", setSlot.toString()));
                 return;
             }
         }
-            }
+
         if (SelectConfig.UseItem_InventorySlotEnforce || player.getInventory().getItem(setSlot - 1) != null) {
             send.player(player, SelectMessages.ItemSlotNotEmpty.replace("[slot]", setSlot.toString()));
             return;
         }
+
         UseItem.removeItem(player);
         SelectDatabase.setSlot(player, setSlot);
-            Events.useItemSlotHashMap.replace(player, setSlot);
+        Events.useItemSlotHashMap.replace(player.getName(), setSlot);
-            if (Events.useItemHashMap.get(player)) {
+
+        if (Events.useItemHashMap.get(player.getName())) {
             UseItem.giveUseItem(player);
         }
+
         send.player(player, SelectMessages.ItemSlot.replace("[slot]", setSlot.toString()));
-        } else player.sendMessage(Util.getPrefix() + " §4Function disabled");
     }
 
     public static void gui(Player player) {

CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/config/ConfigCreate.java

@@ -6,15 +6,19 @@ 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.yamlConfiguration.Config;
+import org.bukkit.Material;
 import org.bukkit.configuration.file.YamlConfiguration;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 
 public class ConfigCreate {
 
+
     public static void configCreate() {
         long long_ = System.currentTimeMillis();
         if (new File(Main.getPath(), "config.yml").exists()) {
@@ -26,8 +30,6 @@ public class ConfigCreate {
 
         if (!config.exists()) Config.set("ConfigVersion", Util.getConfigVersion(), yamlConfiguration);
 
-
-        Config.set("Plugin.UpdateCheckOnJoin", true, yamlConfiguration);
         Config.set("Plugin.Debug", false, yamlConfiguration);
         Config.set("Plugin.HelpAlias", true, yamlConfiguration);
         Config.set("Plugin.language", "english", yamlConfiguration);
@@ -101,8 +103,34 @@ public class ConfigCreate {
         Config.set("Advanced.UseItem.World.Protection.RemoveItemWhenItIsDisabled", false, yamlConfiguration);
         Config.set("Advanced.UseItem.World.Protection.Mode", "blacklist", yamlConfiguration);
         Config.set("Advanced.UseItem.World.Protection.List", Arrays.asList("World1", "World2"), yamlConfiguration);
+        /*
+        Config.set("Advanced.UseItem.ItemBlockBlacklist", Arrays.asList("CHEST", "TRAPPED_CHEST", "FURNACE", "NOTE_BLOCK",
+                "CRAFTING_TABLE", "ENDER_CHEST", "ANVIL", "LOOM", "COMPOSTER", "BARREL", "SMOKER",
+                "BLAST_FURNACE", "CARTOGRAPHY_TABLE", "FLETCHING_TABLE", "GRINDSTONE", "SMITHING_TABLE", "STONECUTTER",
+                "HOPPER", "DISPENSER", "DROPPER", "REPEATER", "COMPARATOR", "LEVER", "DAYLIGHT_DETECTOR",
+                "STONE_BUTTON", "OAK_BUTTON", "SPRUCE_BUTTON", "BIRCH_BUTTON", "JUNGLE_BUTTON", "ACACIA_BUTTON", "DARK_OAK_BUTTON", "CRIMSON_BUTTON",
+                "IRON_DOOR", "OAK_DOOR", "SPRUCE_DOOR", "BIRCH_DOOR", "JUNGLE_DOOR", "ACACIA_DOOR", "DARK_OAK_DOOR", "CRIMSON_DOOR", "WARPED_DOOR",
+                "OAK_FENCE", "SPRUCE_FENCE", "BIRCH_FENCE", "JUNGLE_FENCE", "ACACIA_FENCE", "DARK_OAK_FENCE", "CRIMSON_FENCE", "WARPED_FENCE", "NETHER_BRICK_FENCE"), yamlConfiguration);
+         */
 
 
+        if (!yamlConfiguration.contains("Advanced.UseItem.ItemBlockBlacklist")) {
+            List<String> materialList = Arrays.asList("BUTTON", "DOOR", "FENCE", "CHEST", "FURNACE", "NOTE_BLOCK", "CRAFTING_TABLE", "WORKBENCH",
+                    "ANVIL", "LOOM", "COMPOSTER", "BARREL", "SMOKER", "BLAST_FURNACE", "CARTOGRAPHY_TABLE", "FLETCHING_TABLE", "GRINDSTONE",
+                    "SMITHING_TABLE", "STONECUTTER", "HOPPER", "DISPENSER", "DROPPER", "REPEATER", "COMPARATOR", "LEVER", "DAYLIGHT_DETECTOR", "BREWING_STAND", "TRAPDOOR", "BEACON"
+            );
+
+            List<String> materialBlacklist = new ArrayList<>();
+
+            for (Material material : Material.values()) {
+                for (String target : materialList) {
+                    if (material.toString().contains(target)) materialBlacklist.add(material.toString());
+                }
+            }
+
+            Config.set("Advanced.UseItem.ItemBlockBlacklist", materialBlacklist, yamlConfiguration);
+        }
+
         Config.set("Toggle.Items.OnOrYes.Item.Base64.Enable", false, yamlConfiguration);
         Config.set("Toggle.Items.OnOrYes.Item.Base64.Base64Value", "", yamlConfiguration);
         Config.set("Toggle.Items.OnOrYes.Item.Material", ItemVersion.getGreenWool().getType().toString(), yamlConfiguration);

CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/config/SelectConfig.java

@@ -4,8 +4,6 @@ import de.jatitv.commandguiv2.Spigot.Main;
 import de.jatitv.commandguiv2.Spigot.config.configConverter.ConfigConverterUnderV5;
 import de.jatitv.commandguiv2.Spigot.config.languages.SelectMessages;
 import de.jatitv.commandguiv2.Spigot.system.database.MySQL;
-import de.jatitv.commandguiv2.Spigot.system.database.SelectDatabase;
-import de.jatitv.commandguiv2.Spigot.system.database.StorageType;
 import de.jatitv.commandguiv2.Util;
 import net.t2code.lib.Spigot.Lib.messages.send;
 import net.t2code.lib.Spigot.Lib.minecraftVersion.MCVersion;
@@ -19,12 +17,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class SelectConfig {
-
-    private static final File config = new File(Main.getPath(), "config.yml");
-    private static final YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
-
-    public static Boolean DisableUpdateChecker;
-    public static Boolean UpdateCheckOnJoin;
     public static Boolean Debug;
     public static Boolean HelpAlias;
     public static String language;
@@ -63,6 +55,9 @@ public class SelectConfig {
     public static Boolean UseItemWorldRemoveItemWhenItIsDisabled;
     public static String UseItemWorldMode;
     public static List<String> UseItemWorldList;
+    public static List<String> UseItemItemBlockBlacklist;
+
+    public static Boolean disableInfoBySneak = false;
 
     public static Boolean UseItem_InventorySlot_FreeSlot;
     public static Integer UseItem_InventorySlot;
@@ -118,6 +113,9 @@ public class SelectConfig {
 
 
     public static void onSelect() {
+        File config = new File(Main.getPath(), "config.yml");
+        YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
+
         if (yamlConfiguration.getInt("ConfigVersion") < Util.getConfigVersion() && new File(Main.getPath(), "config.yml").exists()) {
             send.console(Util.getPrefix() + " §4----------------------");
             send.console(Util.getPrefix() + " ");
@@ -129,10 +127,6 @@ public class SelectConfig {
             }
         }
 
-        if (yamlConfiguration.get("Plugin.DisableUpdateChecker") == null) {
-            DisableUpdateChecker = false;
-        } else DisableUpdateChecker = yamlConfiguration.getBoolean("Plugin.DisableUpdateChecker");
-        UpdateCheckOnJoin = yamlConfiguration.getBoolean("Plugin.UpdateCheckOnJoin");
         Debug = yamlConfiguration.getBoolean("Plugin.Debug");
         HelpAlias = yamlConfiguration.getBoolean("Plugin.HelpAlias");
         language = yamlConfiguration.getString("Plugin.language");
@@ -195,6 +189,12 @@ public class SelectConfig {
         UseItemWorldList = yamlConfiguration.getStringList("Advanced.UseItem.World.Protection.List");
 
 
+        if (yamlConfiguration.get("Advanced.UseItem.DisableInfoBySneak") != null) {
+            disableInfoBySneak = yamlConfiguration.getBoolean("Advanced.UseItem.DisableInfoBySneak");
+        }
+
+        UseItemItemBlockBlacklist = yamlConfiguration.getStringList("Advanced.UseItem.ItemBlockBlacklist");
+
         toggleItemOnOrYesBase64 = yamlConfiguration.getBoolean("Toggle.Items.OnOrYes.Item.Base64.Enable");
         toggleItemOnOrYesBase64Value = yamlConfiguration.getString("Toggle.Items.OnOrYes.Item.Base64.Base64Value");
         toggleItemOnOrYesMaterial = yamlConfiguration.getString("Toggle.Items.OnOrYes.Item.Material");
@@ -223,7 +223,6 @@ public class SelectConfig {
         Sound_Give_input = (yamlConfiguration.getString("Sound.Give.Sound").toUpperCase().replace(".", "_"));
         Sound_PlayerNotFound_Enable = yamlConfiguration.getBoolean("Sound.PlayerNotFound.Enable");
         Sound_PlayerNotFound_input = (yamlConfiguration.getString("Sound.PlayerNotFound.Sound").toUpperCase().replace(".", "_"));
-        setConfigVersion();
     }
 
 
@@ -347,7 +346,9 @@ public class SelectConfig {
 
     }
 
-    private static void setConfigVersion() {
+    public static void setConfigVersion() {
+        File config = new File(Main.getPath(), "config.yml");
+        YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
         yamlConfiguration.set("ConfigVersion", Util.getConfigVersion());
         try {
             yamlConfiguration.save(config);

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

@@ -95,7 +95,7 @@ public class OpenGUI {
                                 toggleOff(function, slot.slot, player, inventory);
                             }
                         } else if (function.toggleUseItem) {
-                            if (Events.useItemHashMap.get(player)) {
+                            if (Events.useItemHashMap.get(player.getName())) {
                                 toggleOn(function, slot.slot, player, inventory);
                             } else {
                                 toggleOff(function, slot.slot, player, inventory);

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

@@ -69,6 +69,8 @@ public class Load {
             e.printStackTrace();
         }
 
+        SelectConfig.setConfigVersion();
+
         if (SelectConfig.Bungee) {
             if (!Bukkit.getMessenger().isOutgoingChannelRegistered(plugin, "cgui:bungee")) {
                 send.debug(plugin, "registerOutgoingPluginChannel §ecgui:bungee");

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

@@ -36,7 +36,6 @@ public class Metrics {
     public static void Bstats() {
         int pluginId = Util.getBstatsID(); // <-- Replace with the id of your plugin!
         Metrics metrics = new Metrics(Main.plugin, pluginId);
-        metrics.addCustomChart(new Metrics.SimplePie("updatecheckonjoin", () -> String.valueOf(SelectConfig.UpdateCheckOnJoin)));
         metrics.addCustomChart(new DrilldownPie("storage_type_mysql", () -> {
             Map<String, Map<String, Integer>> map = new HashMap<>();
             String storage = SelectDatabase.getStorage().toString();

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

@@ -38,17 +38,17 @@ public class Placeholder extends PlaceholderExpansion {
     @Override
     public String onPlaceholderRequest(Player p, String params) {
         if (params.contains("useitem_boolean")) {
-            return Events.useItemHashMap.get(p).toString();
+            return Events.useItemHashMap.get(p.getName()).toString();
         }
 
         if (params.contains("useitem")) {
-            if (Events.useItemHashMap.get(p)) {
+            if (Events.useItemHashMap.get(p.getName())) {
                 return SelectConfig.placeholderTrue;
             } else return SelectConfig.placeholderFalse;
         }
 
         if (params.contains("slot")){
-            return Events.useItemSlotHashMap.get(p).toString();
+            return Events.useItemSlotHashMap.get(p.getName()).toString();
         }
 
         return null;

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

@@ -29,10 +29,10 @@ public class UseItem {
         if (SelectConfig.UseItem_InventorySlotEnforce) {
             slot = SelectConfig.UseItem_InventorySlot;
         } else {
-            if (Events.useItemSlotHashMap.get(player) == null) {
+            if (Events.useItemSlotHashMap.get(player.getName()) == null) {
                 slot = SelectConfig.UseItem_InventorySlot;
             } else {
-                slot = Events.useItemSlotHashMap.get(player);
+                slot = Events.useItemSlotHashMap.get(player.getName());
             }
         }
         if (SelectConfig.UseItem_InventorySlot_FreeSlot) {

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

@@ -49,7 +49,7 @@ public class SelectDatabase {
     }
 
     public static void setItemStatusTrue(Player player) {
-        Events.useItemHashMap.replace(player, true);
+        Events.useItemHashMap.replace(player.getName(), true);
         switch (Storage) {
             case MYSQL:
                 MySQL.query("INSERT INTO `gui-item` (`UUID`, `Name`) VALUES ('" + player.getUniqueId() + "', '" + player.getName()
@@ -67,7 +67,7 @@ public class SelectDatabase {
     }
 
     public static void setItemStatusFalse(Player player) {
-        Events.useItemHashMap.replace(player, false);
+        Events.useItemHashMap.replace(player.getName(), false);
         switch (Storage) {
             case MYSQL:
                 MySQL.query("INSERT INTO `gui-item` (`UUID`, `Name`, `Status`) VALUES ('" + player.getUniqueId() + "', '" + player.getName()

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

@@ -44,11 +44,11 @@ public class CGuiAPI {
     }
 
     public static Boolean selectPlayerItemEnable(Player player) {
-        return Events.useItemHashMap.get(player);
+        return Events.useItemHashMap.get(player.getName());
     }
 
     public static Integer selectPlayerItemSlot(Player player) {
-        return Events.useItemSlotHashMap.get(player);
+        return Events.useItemSlotHashMap.get(player.getName());
     }
 
     public static void setPlayerItemEnable(Player player, Boolean value) {

Defaultconfig/Functions/SupportDiscord.yml

@@ -1,19 +1,8 @@
-GUI:
-  Enable: true
-  Lines: 1
-  Name: '&5default &9GUI'
-  FillItem:
-    Enable: true
-    Item: BLACK_STAINED_GLASS_PANE
-Command:
-  Alias: true
-  Permission:
-    Required: true
 Slots:
-  Example:
+  Function:
-    Slot: 5
-    Enable: true
     Item:
+      Empty: false
+      Amount: 1
       PlayerHead:
         Enable: true
         Base64:
@@ -31,9 +20,10 @@ Slots:
       - '&eIf you find any errors or bugs,'
       - '&eplease contact me so I can fix them.'
       - '&8-----------------'
-      - '&5Discord: §7https://discord.gg/vRyXFFterJ'
+      - '&5Discord: §7http://dc.t2code.net'
     CustomSound:
       Enable: false
+      NoSound: false
       Sound: ''
     Cost:
       Enable: false
@@ -42,17 +32,43 @@ Slots:
       Enable: false
       BungeeCommand: false
       CommandAsConsole: false
-      Command:
+      Command: []
-      - ''
     ServerChange:
       Enable: false
       Server: ''
     OpenGUI:
       Enable: false
       GUI: ''
+    Toggle:
+      Permission:
+        Enable: false
+        Permission: ''
+      UseItem:
+        Enable: false
     Message:
       Enable: true
       Message:
-      - '&6You can find more information on Discord: &ehttps://discord.gg/vRyXFFterJ'
+      - '&6You can find more information on Discord: &ehttp://dc.t2code.net'
-    Permission:
+    SetConfig:
-      Required: false
+      Enable: false
+      File:
+        Path: ''
+      Option:
+        Path: ''
+        Premat: String
+      Value:
+        LeftClick:
+          String: ''
+          Boolean: false
+          Integer: 0
+          Double: 0.0
+          List: []
+        RightClick:
+          String: ''
+          Boolean: false
+          Integer: 0
+          Double: 0.0
+          List: []
+      PluginReload:
+        Enable: false
+        Command: ''

Defaultconfig/Functions/UseItem.yml

@@ -0,0 +1,67 @@
+Slots:
+  Function:
+    Item:
+      Empty: false
+      Amount: 1
+      PlayerHead:
+        Enable: false
+        Base64:
+          Enable: false
+          Base64Value: ''
+        PlayerWhoHasOpenedTheGUI: false
+        PlayerName: ''
+      Material: ''
+      Name: '&6Toggle UseItem'
+      Lore:
+      - '&bYou currently have the UseItem set to: %commandgui_useitem%'
+    CustomSound:
+      Enable: false
+      NoSound: false
+      Sound: ''
+    Cost:
+      Enable: false
+      Price: 0.0
+    Command:
+      Enable: false
+      BungeeCommand: false
+      CommandAsConsole: false
+      Command: []
+    ServerChange:
+      Enable: false
+      Server: ''
+    OpenGUI:
+      Enable: false
+      GUI: ''
+    Toggle:
+      Permission:
+        Enable: false
+        Permission: ''
+      UseItem:
+        Enable: true
+    Message:
+      Enable: true
+      Message:
+      - '&bYour UseItem was set to: %commandgui_useitem%&b.'
+    SetConfig:
+      Enable: false
+      File:
+        Path: ''
+      Option:
+        Path: ''
+        Premat: String
+      Value:
+        LeftClick:
+          String: ''
+          Boolean: false
+          Integer: 0
+          Double: 0.0
+          List: []
+        RightClick:
+          String: ''
+          Boolean: false
+          Integer: 0
+          Double: 0.0
+          List: []
+      PluginReload:
+        Enable: false
+        Command: ''

Defaultconfig/GUIs/default.yml

@@ -0,0 +1,28 @@
+GUI:
+  Enable: true
+  Lines: 1
+  Name: '&5default &9GUI'
+  FillItem:
+    Enable: true
+    Item: BLACK_STAINED_GLASS_PANE
+Command:
+  Alias: true
+  Permission:
+    Required: true
+Slots:
+  SupportDiscord:
+    Slot: 4
+    Enable: true
+    Function: SupportDiscord
+    Permission:
+      Required: false
+      See: commandgui.gui.[guiname].slot.[slot].see
+      Use: commandgui.gui.[guiname].slot.[slot].use
+  UseItem:
+    Slot: 6
+    Enable: true
+    Function: UseItem
+    Permission:
+      Required: false
+      See: commandgui.gui.[guiname].slot.[slot].see
+      Use: commandgui.gui.[guiname].slot.[slot].use

Defaultconfig/config.yml

@@ -1,3 +1,4 @@
+ConfigVersion: 5
 Plugin:
   UpdateCheckOnJoin: true
   Debug: false
@@ -25,6 +26,7 @@ UseItem:
   OpenGUI: default
   Permission:
     NeededToUse: true
+  KeepAtCommandClear: true
   InventorySlot:
     Slot: 1
     SlotEnforce: false
@@ -46,9 +48,57 @@ UseItem:
     GiveOnlyOnFirstJoin: false
     Cursor:
       ToGUIItem:
-        OnEveryLogin: true
+        OnLogin:
+          Enable: true
+        Spigot:
           OnOnlyFirstLogin: true
-        EXPERIMENTELL_ServerChhange: false
+        Bungee:
+          OnServerChange: false
+Advanced:
+  UseItem:
+    GameMode:
+      Change:
+        Enable: true
+        DelayInTicks: 1
+      Protection:
+        Enable: false
+        RemoveItemWhenItIsDisabled: false
+        Mode: blacklist
+        List:
+        - CREATIVE
+        - Spectator
+    World:
+      Change:
+        Enable: true
+        DelayInTicks: 1
+      Protection:
+        Enable: false
+        RemoveItemWhenItIsDisabled: false
+        Mode: blacklist
+        List:
+        - World1
+        - World2
+Toggle:
+  Items:
+    OnOrYes:
+      Item:
+        Base64:
+          Enable: false
+          Base64Value: ''
+        Material: GREEN_WOOL
+    OffOrNo:
+      Item:
+        Base64:
+          Enable: false
+          Base64Value: ''
+        Material: RED_WOOL
+  Permission:
+    Commands:
+      'True': luckperms user [player] permission set [perm] true
+      'False': luckperms user [player] permission set [perm] false
+Placeholder:
+  'True': '&2true'
+  'False': '&4false'
 Sound:
   Enable: true
   OpenInventory:

Defaultconfig/languages/english_messages.yml

@@ -4,13 +4,11 @@ Plugin:
     settings.'
   OnlyForPlayer: '[prefix] &cThis command is for players only!'
   DefaultGUI:
-    create: '[prefix] &2DefaultGUI was created. You can find it in the directory::
+    create: '[prefix] &2DefaultGUI was created. You can find it in the directory:
       &e[directory]&2!'
   Reload:
     Start: '[prefix] &6Plugin is reloaded...'
     End: '[prefix] &2Plugin was successfully reloaded.'
-    Warning: '[prefix] &6To enable / disable alias commands, reload / restart the
-      server!'
 NoPermission:
   ForCommandGUI: '[prefix] &cYou do not have permission for &4Command&9GUI&c!'
   ForCommand: '[prefix] &cFor &b[cmd] &cyou lack the permission &6[perm]&c!'
@@ -24,6 +22,8 @@ UseItem:
   SlotNotEmpty: '[prefix] &6The slot &e[slot] &6is currently occupied!'
   SlotAlreadySet: '[prefix] &6The slot §e[slot] §6is already set!'
   ItemSlot_wrongValue: '[prefix] &cThe specified slot must be between 1 and 9!'
+  DisabledInGameMode: '[prefix] &cThe UseItem is disabled in this GameMode!'
+  DisabledInWorld: '[prefix] &cThe UseItem is disabled in this World!'
 Cost:
   Buy_msg: '[prefix] &2You bought [itemname] &2for &6[price]&2.'
   No_money: '[prefix] &cYou don''t have enough money!'
@@ -42,7 +42,8 @@ Player:
 Help:
   CGUI: '&8''''&b/commandgui &8| &b/cgui&8'''' &eOpen the default GUI &7(&r[gui]&7)&e.'
   Help: '&8''''&b/commandguihelp&8'''' &eOpen this help.'
-  Info: '&8''''&b/commandguiadmin info&8'''' &eCall the info from &4Command&9GUI &e.'
+  Info: '&8''''&b/commandgui admin info&8'''' &eCall the info from &4Command&9GUI
+    &e.'
   Open: '&8''''&b/commandgui [gui]&8'''' &eOpen the GUI: &6[guiname]&e.'
   Give: '&8''''&b/commandgui admin give &7<player>&8'''' &eGive a player the GUI item.'
   CreateDefaultGUI: '&8''''&b/commandgui admin createdefaultgui&8'''' &eCreate a default

Defaultconfig/languages/german_messages.yml

@@ -8,8 +8,6 @@ Plugin:
   Reload:
     Start: '[prefix] &6Plugin wird neu geladen...'
     End: '[prefix] &2Plugin wurde erfolgreich neu geladen.'
-    Warning: '[prefix] &6Um Alias-Befehle zu aktivieren / deaktivieren, lade / starte
-      den Server neu!!'
 NoPermission:
   ForCommandGUI: '[prefix] &cDu hast keine Permission f[ue]r &4Command&9GUI&c!'
   ForCommand: '[prefix] &cF[ue]r &b[cmd] &cfehlt dir die Permission &6[perm]&c!'
@@ -24,6 +22,8 @@ UseItem:
   SlotAlreadySet: '[prefix] &6Der Slot §e[slot] §6ist bereits eingestellt!'
   ItemSlot_wrongValue: '[prefix] &cDer angegebene Slot muss sich zwischen 1 und 9
     befinden!'
+  DisabledInGameMode: '[prefix] &cDas UseItem ist in diesem GameMode deaktiviert!'
+  DisabledInWorld: '[prefix] &cDas UseItem ist in dieser Welt deaktiviert!'
 Cost:
   Buy_msg: '[prefix] &2Du hast dir [itemname] &2f[ue]r &6[price] &2gekauft.'
   No_money: '[prefix] &cDu hast nicht gen[ue]gend Geld!'
@@ -44,9 +44,11 @@ Player:
 Help:
   CGUI: '&8''''&b/commandgui &8| &b/cgui&8'''' &e[OE]ffne die default GUI &7(&r[gui]&7)&e.'
   Help: '&8''''&b/commandguihelp&8'''' &e[OE]ffne diese help.'
-  Info: '&8''''&b/commandguiadmin info&8'''' &eRufe die Infos von &4Command&9GUI &eauf.'
+  Info: '&8''''&b/commandgui admin info&8'''' &eRufe die Infos von &4Command&9GUI
+    &eauf.'
   Open: '&8''''&b/commandgui [gui]&8'''' &e[OE]ffne die GUI: &6[guiname]&e.'
-  Give: '&8''''&b/commandguiadmin give &7<player>&8'''' &eGebe einem Spieler das GUI-Item.'
+  Give: '&8''''&b/commandgui admin give &7<player>&8'''' &eGebe einem Spieler das
+    GUI-Item.'
   CreateDefaultGUI: '&8''''&b/commandgui admin createdefaultgui&8'''' &eLasse eine
     default GUI erstellen &7([directory])&e.'
   Reload: '&8''''&b/commandgui admin reload&8'''' &eLade das Plugin neu.'

Defaultconfig/languages/norwegian_messages.yml

@@ -8,8 +8,6 @@ Plugin:
   Reload:
     Start: '[prefix] &6Pluginet blir relastet...'
     End: '[prefix] &2Pluginet har blitt lastet inn på nytt.'
-    Warning: '[prefix] &6For å skru på / skru av alias kommandoer, relast / restart
-      serveren!'
 NoPermission:
   ForCommandGUI: '[prefix] &cDu har ikke tilgang til &4Command&9GUI&c!'
   ForCommand: '[prefix] &cFor &b[cmd] &cmangler du tillatelsen &6[perm]&c!'
@@ -23,6 +21,8 @@ UseItem:
   SlotNotEmpty: '[prefix] &6Plassen &e[slot] &6er opptatt for øyeblikket!'
   SlotAlreadySet: '[prefix] &6Plassen §e[slot] §6er allerede satt!'
   ItemSlot_wrongValue: '[prefix] &cDen spesifiserte plassen må være mellom 1 og 9!'
+  DisabledInGameMode: '[prefix] &cBrukselementet er deaktivert i denne spillmodusen!!'
+  DisabledInWorld: '[prefix] &cUseItem er deaktivert i denne verden!'
 Cost:
   Buy_msg: '[prefix] &2Du kjøpte [itemname] &2for &6[price]&2.'
   No_money: '[prefix] &cDu har ikke nok penger!'