remove config poll

Reviewed-on: JaTiTV/CommandGUI#7

CommandGUI V2/pom.xml

@@ -6,9 +6,10 @@
 
     <groupId>net.t2code</groupId>
     <artifactId>CommandGUI_V2</artifactId>
-    <version>2.6.2_Snapshop-1</version>
+    <version>2.6.2_Snapshot-2</version>
     <packaging>jar</packaging>
 
+    
     <name>CommandGUI</name>
 
     <properties>
@@ -82,7 +83,7 @@
         <dependency>
             <groupId>net.t2code</groupId>
             <artifactId>T2CodeLib</artifactId>
-            <version>11.2</version>
+            <version>11.4</version>
         </dependency>
         <dependency>
             <groupId>net.t2code</groupId>

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

@@ -46,13 +46,13 @@ public class GUI_Listener implements Listener {
                 e.setCancelled(true);
                 for (Slot slot : gui.GUI_Slots) {
                     if (e.getSlot() != slot.Slot) continue;
+                    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 (e.getCurrentItem().getType() == ItemVersion.getHead() || e.getCurrentItem().getType() == Material.valueOf(slot.Item.toUpperCase().replace(".", "_"))) {
                             if (slot.Cost_Enable) {
                                 if (slot.Command_Enable || slot.Message_Enable || slot.OpenGUI_Enable || slot.ServerChange) {
                                     if (!Vault.buy(prefix, player, slot.Price)) {
@@ -63,7 +63,8 @@ public class GUI_Listener implements Listener {
                                             }
                                         }.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);
+                                        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));
@@ -71,13 +72,13 @@ public class GUI_Listener implements Listener {
                                     }
                                 }
                             } 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);

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

@@ -69,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"));
         }

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!'