From aec9682b2a82a46ab69ae4ab28a2b5e50a158329 Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Mon, 15 Apr 2019 15:37:40 +0200
Subject: [PATCH] Subcommand perm group

---
 BuildConfigUpdater/BuildConfigUpdater.iml                  | 1 -
 .../ButtonCore (1) (com.github.TBMCPlugins.ButtonCore).iml | 2 +-
 .../src/main/java/buttondevteam/lib/chat/Command2.java     | 7 +++++++
 .../src/main/java/buttondevteam/lib/chat/ICommand2MC.java  | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/BuildConfigUpdater/BuildConfigUpdater.iml b/BuildConfigUpdater/BuildConfigUpdater.iml
index f14440c..274b3de 100644
--- a/BuildConfigUpdater/BuildConfigUpdater.iml
+++ b/BuildConfigUpdater/BuildConfigUpdater.iml
@@ -12,7 +12,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="ButtonCore (1) (com.github.TBMCPlugins.ButtonCore)" />
-    <orderEntry type="module" module-name="ButtonCore (1) (com.github.TBMCPlugins.ButtonCore)" />
     <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.10" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
diff --git a/ButtonCore/ButtonCore (1) (com.github.TBMCPlugins.ButtonCore).iml b/ButtonCore/ButtonCore (1) (com.github.TBMCPlugins.ButtonCore).iml
index 3c34336..77fac1e 100644
--- a/ButtonCore/ButtonCore (1) (com.github.TBMCPlugins.ButtonCore).iml	
+++ b/ButtonCore/ButtonCore (1) (com.github.TBMCPlugins.ButtonCore).iml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" version="4">
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
diff --git a/ButtonCore/src/main/java/buttondevteam/lib/chat/Command2.java b/ButtonCore/src/main/java/buttondevteam/lib/chat/Command2.java
index bc10fc7..79c8556 100644
--- a/ButtonCore/src/main/java/buttondevteam/lib/chat/Command2.java
+++ b/ButtonCore/src/main/java/buttondevteam/lib/chat/Command2.java
@@ -46,10 +46,17 @@ public abstract class Command2<TC extends ICommand2, TP extends Command2Sender>
 	@Target(ElementType.METHOD)
 	@Retention(RetentionPolicy.RUNTIME)
 	public @interface Subcommand {
+		String MOD_GROUP = "mod";
 		/**
 		 * Help text to show players. A usage message will be also shown below it.
 		 */
 		String[] helpText() default {};
+
+		/**
+		 * The main permission which allows using this command (individual access can be still granted with "thorpe.command.X").
+		 * Used to be "tbmc.admin"
+		 */
+		String permGroup() default ""; //TODO
 	}
 
 	@Target(ElementType.PARAMETER)
diff --git a/ButtonCore/src/main/java/buttondevteam/lib/chat/ICommand2MC.java b/ButtonCore/src/main/java/buttondevteam/lib/chat/ICommand2MC.java
index 4ad997b..566285d 100644
--- a/ButtonCore/src/main/java/buttondevteam/lib/chat/ICommand2MC.java
+++ b/ButtonCore/src/main/java/buttondevteam/lib/chat/ICommand2MC.java
@@ -2,7 +2,7 @@ package buttondevteam.lib.chat;
 
 import buttondevteam.lib.architecture.ButtonPlugin;
 
-public class ICommand2MC extends ICommand2<Command2MCSender> {
+public abstract class ICommand2MC extends ICommand2<Command2MCSender> {
 	public ICommand2MC() {
 		super(ButtonPlugin.getCommand2MC());
 	}