Merge pull request #3 from true-og/agent/add-gmic-command

Add /gmic creative mode toggle

src/main/java/me/eccentric_nz/gamemodeinventories/GameModeInventoriesCommands.java

@@ -7,6 +7,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.*;
+import org.bukkit.GameMode;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -65,6 +66,29 @@ public class GameModeInventoriesCommands implements CommandExecutor, TabComplete
 
         if (cmd.getName().equalsIgnoreCase("gmi")) {
 
+            if (label.equalsIgnoreCase("gmic")) {
+
+                if (!(sender instanceof Player player)) {
+
+                    sender.sendMessage(plugin.MY_PLUGIN_NAME + "This command can only be used by a player.");
+                    return true;
+
+                }
+
+                if (!player.hasPermission("gamemodeinventories.toggle")) {
+
+                    player.sendMessage(plugin.MY_PLUGIN_NAME + plugin.getM().getMessage().get("NO_PERMISSION"));
+                    return true;
+
+                }
+
+                GameMode target = player.getGameMode().equals(GameMode.CREATIVE) ? GameMode.SURVIVAL
+                        : GameMode.CREATIVE;
+                player.setGameMode(target);
+                return true;
+
+            }
+
             if (args.length == 0) {
 
                 sender.sendMessage(plugin.MY_PLUGIN_NAME + plugin.getM().getMessage().get("HELP"));
@@ -128,9 +152,7 @@ public class GameModeInventoriesCommands implements CommandExecutor, TabComplete
                                     }
 
                                 }
-
                                 p.sendMessage(plugin.MY_PLUGIN_NAME + "Kit inventory saved.");
-
                             }
 
                         } else {
@@ -160,7 +182,6 @@ public class GameModeInventoriesCommands implements CommandExecutor, TabComplete
                                                 i = GameModeInventoriesBukkitSerialization.fromDatabase(savedinventory);
 
                                             }
-
                                             p.getInventory().setContents(i);
 
                                         } catch (IOException e) {
@@ -170,25 +191,19 @@ public class GameModeInventoriesCommands implements CommandExecutor, TabComplete
                                         }
 
                                     }
-
                                     p.sendMessage(plugin.MY_PLUGIN_NAME + "Kit inventory loaded.");
-
                                 }
 
                             }
 
                         }
-
                     } catch (SQLException e) {
 
                         plugin.debug("Could not " + args[1].toLowerCase() + " inventory for kit, " + e);
-
                     }
-
                     return true;
 
                 }
-
             } else {
 
                 sender.sendMessage(plugin.MY_PLUGIN_NAME + plugin.getM().getMessage().get("NO_PERMISSION"));
@@ -197,14 +212,18 @@ public class GameModeInventoriesCommands implements CommandExecutor, TabComplete
             }
 
         }
-
         return false;
-
     }
 
     @Override
     public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
 
+        if (label.equalsIgnoreCase("gmic")) {
+
+            return ImmutableList.of();
+
+        }
+
         if (args.length <= 1) {
 
             return partial(args[0], ROOT_SUBS);
@@ -212,13 +231,10 @@ public class GameModeInventoriesCommands implements CommandExecutor, TabComplete
         }
 
         return ImmutableList.of();
-
     }
 
     private List<String> partial(String token, Collection<String> from) {
 
         return StringUtil.copyPartialMatches(token, from, new ArrayList<>(from.size()));
-
     }
-
-}
+}

src/main/resources/plugin.yml

@@ -24,8 +24,11 @@ permissions:
   gamemodeinventories.admin:
     default: op
     description: Allow players to change config options.
+  gamemodeinventories.toggle:
+    default: op
+    description: Allow players to toggle between CREATIVE and SURVIVAL with /gmic.
 commands:
   gmi:
-    permissions: gamemodeinventories.admin
-    description: Allow players to change config options.
+    aliases: [ gmic ]
+    description: Allow players to change config options or toggle CREATIVE mode.
     usage: /<command> [config option]