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.1</version>
+    <version>2.7.2</version>
     <packaging>jar</packaging>
 
     <name>CommandGUI</name>

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,8 +54,7 @@ public class ItemChange {
         new BukkitRunnable() {
             @Override
             public void run() {
-                if (player == null) return;
+                if (!SelectConfig.UseItem_AllowToggle || Events.useItemHashMap.get(player.getName())) {
-                if (!SelectConfig.UseItem_AllowToggle || Events.useItemHashMap.get(player)) {
                     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,16 +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");
@@ -62,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)
@@ -136,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()) {

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

@@ -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));
@@ -175,8 +175,8 @@ public class Commands {
             return;
         }
 
-        if (Events.useItemHashMap.get(player)) {
+        if (Events.useItemHashMap.get(player.getName())) {
-            if (Objects.equals(Events.useItemSlotHashMap.get(player), setSlot)) {
+            if (Objects.equals(Events.useItemSlotHashMap.get(player.getName()), setSlot)) {
                 player.sendMessage(SelectMessages.ItemSlotAlreadySet.replace("[slot]", setSlot.toString()));
                 return;
             }
@@ -189,9 +189,9 @@ public class Commands {
 
         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);
         }
 

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()) {
@@ -99,6 +103,33 @@ 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);

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;
@@ -57,6 +55,7 @@ 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;
 
@@ -189,10 +188,13 @@ public class SelectConfig {
         UseItemWorldMode = yamlConfiguration.getString("Advanced.UseItem.World.Protection.Mode");
         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");

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/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) {