Merge pull request '2.7.0' (#8) from 2.7.0 into main

Reviewed-on: JaTiTV/CommandGUI#8

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.0</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/UseItem_Listener/Events.java

@@ -36,23 +36,24 @@ public class Events implements Listener {
 
     public static HashMap<Player, Boolean> useItemHashMap = new HashMap<>();
     public static HashMap<Player, Integer> useItemSlotHashMap = new HashMap<>();
+
     @EventHandler
     public void onJoin(PlayerJoinEvent e) {
-        if (SelectDatabase.selectItemStatus(e.getPlayer())){
+        if (SelectDatabase.selectItemStatus(e.getPlayer())) {
             useItemHashMap.put(e.getPlayer(), true);
         } else useItemHashMap.put(e.getPlayer(), false);
 
         useItemSlotHashMap.put(e.getPlayer(), SelectDatabase.selectSlot(e.getPlayer()));
 
         if (CGuiAPI.JoinDisable) {
-            send.debug(Main.plugin,"JoinDisable");
+            send.debug(Main.plugin, "JoinDisable");
             return;
         }
         if (e.getPlayer().hasPermission("commandgui.get.guiitem.at.login")) {
             new BukkitRunnable() {
                 @Override
                 public void run() {
-                    send.debug(Main.plugin,"itemChange: " + e.getPlayer().getName());
+                    send.debug(Main.plugin, "itemChange: " + e.getPlayer().getName());
                     ItemChange.itemChange(e.getPlayer(), true);
                 }
             }.runTaskLater(Main.plugin, 20L * 1);
@@ -159,14 +160,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 +183,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 +196,7 @@ public class Events implements Listener {
                 return;
             }
         }
+
         if (!SelectConfig.UseItem_Permission || player.hasPermission("commandgui.useitem")) {
             OpenGUI.openGUI(player, SelectConfig.UseItem_OpenGUI, true);
         } else {
@@ -213,6 +219,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 +241,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 +250,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 +269,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 +279,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()
@@ -282,7 +290,7 @@ public class Events implements Listener {
     }
 
     private static boolean legacy() {
-        if (MCVersion.minecraft1_8 || MCVersion.minecraft1_9 || MCVersion.minecraft1_10 || MCVersion.minecraft1_11 || MCVersion.minecraft1_12 || MCVersion.minecraft1_13 || MCVersion.minecraft1_14 || MCVersion.minecraft1_15|| NMSVersion.v1_16_R1) {
+        if (MCVersion.minecraft1_8 || MCVersion.minecraft1_9 || MCVersion.minecraft1_10 || MCVersion.minecraft1_11 || MCVersion.minecraft1_12 || MCVersion.minecraft1_13 || MCVersion.minecraft1_14 || MCVersion.minecraft1_15 || NMSVersion.v1_16_R1) {
             return true;
         } else return false;
     }

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

@@ -26,8 +26,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);
@@ -102,7 +100,6 @@ public class ConfigCreate {
         Config.set("Advanced.UseItem.World.Protection.Mode", "blacklist", yamlConfiguration);
         Config.set("Advanced.UseItem.World.Protection.List", Arrays.asList("World1", "World2"), 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

@@ -22,9 +22,6 @@ 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;
@@ -64,6 +61,8 @@ public class SelectConfig {
     public static String UseItemWorldMode;
     public static List<String> UseItemWorldList;
 
+    public static Boolean disableInfoBySneak;
+
     public static Boolean UseItem_InventorySlot_FreeSlot;
     public static Integer UseItem_InventorySlot;
     public static Boolean UseItem_InventorySlotEnforce;
@@ -129,10 +128,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");
@@ -194,6 +189,9 @@ 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");
+        }
 
         toggleItemOnOrYesBase64 = yamlConfiguration.getBoolean("Toggle.Items.OnOrYes.Item.Base64.Enable");
         toggleItemOnOrYesBase64Value = yamlConfiguration.getString("Toggle.Items.OnOrYes.Item.Base64.Base64Value");

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();

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:
-    Slot: 5
-    Enable: true
+  Function:
     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'
-    Permission:
-      Required: false
+      - '&6You can find more information on Discord: &ehttp://dc.t2code.net'
+    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/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
-        OnOnlyFirstLogin: true
-        EXPERIMENTELL_ServerChhange: false
+        OnLogin:
+          Enable: true
+        Spigot:
+          OnOnlyFirstLogin: true
+        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,12 +42,13 @@ 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/commandguiadmin give &7<player>&8'''' &eGive a player the GUI item.'
-  CreateDefaultGUI: '&8''''&b/commandguiadmin createdefaultgui&8'''' &eCreate a default
+  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
     GUI &7([directory])&e.'
-  Reload: '&8''''&b/commandguiadmin reload&8'''' &eReload the plugin.'
+  Reload: '&8''''&b/commandgui admin reload&8'''' &eReload the plugin.'
   UseItem_On: '&8''''&b/gui-item on&8'''' &eActivate the GUIItem for you.'
   UseItem_Off: '&8''''&b/gui-item off&8'''' &eDisable the GUIItem for yourself.'
   UseItem_Slot: '&8''''&b/gui-item slot [slot]&8'''' &eSet the slot for GUIItem for

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,12 +44,14 @@ 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.'
-  CreateDefaultGUI: '&8''''&b/commandguiadmin createdefaultgui&8'''' &eLasse eine
+  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/commandguiadmin reload&8'''' &eLade das Plugin neu.'
+  Reload: '&8''''&b/commandgui admin reload&8'''' &eLade das Plugin neu.'
   UseItem_On: '&8''''&b/gui-item on&8'''' &eAktiviere f[ue]r dich das GUIItem.'
   UseItem_Off: '&8''''&b/gui-item off&8'''' &eDeaktiviere f[ue]r dich das GUIItem.'
   UseItem_Slot: '&8''''&b/gui-item slot [slot]&8'''' &eSetze den Slot für GUIItem

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!'
@@ -42,12 +42,12 @@ Player:
 Help:
   CGUI: '&8''''&b/commandgui &8| &b/cgui&8'''' &eÅpne default GUIen &7(&r[gui]&7)&e.'
   Help: '&8''''&b/commandguihelp&8'''' &eSender denne hjelpe meldingen.'
-  Info: '&8''''&b/commandguiadmin info&8'''' &eKall informasjon fra &4Command&9GUI&e.'
+  Info: '&8''''&b/commandgui admin info&8'''' &eKall informasjon fra &4Command&9GUI&e.'
   Open: '&8''''&b/commandgui [gui]&8'''' &eÅpne GUIen: &6[guiname]&e.'
-  Give: '&8''''&b/commandguiadmin give &7<player>&8'''' &eGi en spiller GUI gjenstanden.'
-  CreateDefaultGUI: '&8''''&b/commandguiadmin createdefaultgui&8'''' &eLag en normalverdi
+  Give: '&8''''&b/commandgui admin give &7<player>&8'''' &eGi en spiller GUI gjenstanden.'
+  CreateDefaultGUI: '&8''''&b/commandgui admin createdefaultgui&8'''' &eLag en normalverdi
     GUI &7([directory])&e.'
-  Reload: '&8''''&b/commandguiadmin reload&8'''' &eLast inn pluginet på nytt.'
+  Reload: '&8''''&b/commandgui admin reload&8'''' &eLast inn pluginet på nytt.'
   UseItem_On: '&8''''&b/gui-item on&8'''' &eAktiverer en GUI gjenstand for deg.'
   UseItem_Off: '&8''''&b/gui-item off&8'''' &eDeaktiverer en GUI gjenstand for deg.'
   UseItem_Slot: '&8''''&b/gui-item slot [slot]&8'''' &eSett sporet for GUIItem for