From 2e0c034224731b46752069e1b0f50c7588e9e2bc Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 17 May 2017 00:45:18 -0400
Subject: [PATCH] Move core code into a core folder in prep for bukkit
 extraction

---
 .idea/compiler.xml                            |  3 ++
 .idea/encodings.xml                           |  1 +
 .idea/modules.xml                             |  2 +-
 .idea/runConfigurations/acf_core.xml          | 27 +++++++++++++++++
 .idea/runConfigurations/acf_example.xml       | 29 +++++++++++++++++++
 acf.iml => core/acf-core.iml                  |  0
 pom.xml => core/pom.xml                       |  0
 .../src}/main/java/co/aikar/commands/ACF.java |  0
 .../main/java/co/aikar/commands/ACFLog.java   |  0
 .../java/co/aikar/commands/ACFPatterns.java   |  0
 .../main/java/co/aikar/commands/ACFUtil.java  |  0
 .../java/co/aikar/commands/BaseCommand.java   |  0
 .../co/aikar/commands/BaseSubCommand.java     |  0
 .../commands/BukkitCommandCompletions.java    |  0
 .../aikar/commands/BukkitCommandContexts.java |  0
 .../commands/BukkitCommandContexts_1_12.java  |  0
 .../aikar/commands/BukkitCommandManager.java  |  0
 .../co/aikar/commands/CommandCompletions.java |  0
 .../co/aikar/commands/CommandContexts.java    |  0
 .../commands/CommandExecutionContext.java     |  0
 .../co/aikar/commands/CommandManager.java     |  0
 .../aikar/commands/CommandReplacements.java   |  0
 .../co/aikar/commands/ForwardingCommand.java  |  0
 .../commands/InvalidCommandArgument.java      |  0
 .../commands/PaperCommandCompletions.java     |  0
 .../aikar/commands/PaperCommandContexts.java  |  0
 .../aikar/commands/PaperCommandManager.java   |  0
 .../co/aikar/commands/RegisteredCommand.java  |  0
 .../java/co/aikar/commands/RootCommand.java   |  0
 .../commands/annotation/CommandAlias.java     |  0
 .../annotation/CommandCompletion.java         |  0
 .../annotation/CommandPermission.java         |  0
 .../co/aikar/commands/annotation/Default.java |  0
 .../co/aikar/commands/annotation/Flags.java   |  0
 .../aikar/commands/annotation/Optional.java   |  0
 .../co/aikar/commands/annotation/Single.java  |  0
 .../co/aikar/commands/annotation/Split.java   |  0
 .../aikar/commands/annotation/Subcommand.java |  0
 .../co/aikar/commands/annotation/Syntax.java  |  0
 .../commands/annotation/UnknownHandler.java   |  0
 .../co/aikar/commands/annotation/Values.java  |  0
 .../commands/contexts/ContextResolver.java    |  0
 .../aikar/commands/contexts/OnlinePlayer.java |  0
 .../contexts/SenderAwareContextResolver.java  |  0
 example/acf-example.iml                       |  2 +-
 45 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 .idea/runConfigurations/acf_core.xml
 create mode 100644 .idea/runConfigurations/acf_example.xml
 rename acf.iml => core/acf-core.iml (100%)
 rename pom.xml => core/pom.xml (100%)
 rename {src => core/src}/main/java/co/aikar/commands/ACF.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/ACFLog.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/ACFPatterns.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/ACFUtil.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/BaseCommand.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/BaseSubCommand.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/BukkitCommandCompletions.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/BukkitCommandContexts.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/BukkitCommandContexts_1_12.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/BukkitCommandManager.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/CommandCompletions.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/CommandContexts.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/CommandExecutionContext.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/CommandManager.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/CommandReplacements.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/ForwardingCommand.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/InvalidCommandArgument.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/PaperCommandCompletions.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/PaperCommandContexts.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/PaperCommandManager.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/RegisteredCommand.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/RootCommand.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/annotation/CommandAlias.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/annotation/CommandCompletion.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/annotation/CommandPermission.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/annotation/Default.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/annotation/Flags.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/annotation/Optional.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/annotation/Single.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/annotation/Split.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/annotation/Subcommand.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/annotation/Syntax.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/annotation/UnknownHandler.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/annotation/Values.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/contexts/ContextResolver.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/contexts/OnlinePlayer.java (100%)
 rename {src => core/src}/main/java/co/aikar/commands/contexts/SenderAwareContextResolver.java (100%)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 79d41fb2..f2a31b86 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -2,17 +2,20 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
         <module name="acf" />
+        <module name="acf-core" />
         <module name="acf-example" />
         <module name="commands" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
       <module name="acf" target="1.8" />
+      <module name="acf-core" target="1.8" />
       <module name="acf-example" target="1.8" />
       <module name="commands" target="1.8" />
     </bytecodeTargetLevel>
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index de3187bd..c41f8423 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -2,6 +2,7 @@
 <project version="4">
   <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/core" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/example" charset="UTF-8" />
     <file url="PROJECT" charset="UTF-8" />
   </component>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 78462726..704caab6 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/acf.iml" filepath="$PROJECT_DIR$/acf.iml" />
+      <module fileurl="file://$PROJECT_DIR$/core/acf-core.iml" filepath="$PROJECT_DIR$/core/acf-core.iml" />
       <module fileurl="file://$PROJECT_DIR$/example/acf-example.iml" filepath="$PROJECT_DIR$/example/acf-example.iml" />
     </modules>
   </component>
diff --git a/.idea/runConfigurations/acf_core.xml b/.idea/runConfigurations/acf_core.xml
new file mode 100644
index 00000000..a76039d9
--- /dev/null
+++ b/.idea/runConfigurations/acf_core.xml
@@ -0,0 +1,27 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="acf-core" type="MavenRunConfiguration" factoryName="Maven" singleton="true">
+    <MavenSettings>
+      <option name="myGeneralSettings" />
+      <option name="myRunnerSettings" />
+      <option name="myRunnerParameters">
+        <MavenRunnerParameters>
+          <option name="profiles">
+            <set />
+          </option>
+          <option name="goals">
+            <list>
+              <option value="clean" />
+              <option value="install" />
+            </list>
+          </option>
+          <option name="profilesMap">
+            <map />
+          </option>
+          <option name="resolveToWorkspace" value="false" />
+          <option name="workingDirPath" value="$PROJECT_DIR$/core" />
+        </MavenRunnerParameters>
+      </option>
+    </MavenSettings>
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/acf_example.xml b/.idea/runConfigurations/acf_example.xml
new file mode 100644
index 00000000..f3c5e198
--- /dev/null
+++ b/.idea/runConfigurations/acf_example.xml
@@ -0,0 +1,29 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="acf-example" type="MavenRunConfiguration" factoryName="Maven" singleton="true">
+    <MavenSettings>
+      <option name="myGeneralSettings" />
+      <option name="myRunnerSettings" />
+      <option name="myRunnerParameters">
+        <MavenRunnerParameters>
+          <option name="profiles">
+            <set />
+          </option>
+          <option name="goals">
+            <list>
+              <option value="clean" />
+              <option value="package" />
+            </list>
+          </option>
+          <option name="profilesMap">
+            <map />
+          </option>
+          <option name="resolveToWorkspace" value="false" />
+          <option name="workingDirPath" value="$PROJECT_DIR$/example" />
+        </MavenRunnerParameters>
+      </option>
+    </MavenSettings>
+    <method>
+      <option name="Maven.BeforeRunTask" enabled="true" file="$PROJECT_DIR$/core/pom.xml" goal="clean install" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/acf.iml b/core/acf-core.iml
similarity index 100%
rename from acf.iml
rename to core/acf-core.iml
diff --git a/pom.xml b/core/pom.xml
similarity index 100%
rename from pom.xml
rename to core/pom.xml
diff --git a/src/main/java/co/aikar/commands/ACF.java b/core/src/main/java/co/aikar/commands/ACF.java
similarity index 100%
rename from src/main/java/co/aikar/commands/ACF.java
rename to core/src/main/java/co/aikar/commands/ACF.java
diff --git a/src/main/java/co/aikar/commands/ACFLog.java b/core/src/main/java/co/aikar/commands/ACFLog.java
similarity index 100%
rename from src/main/java/co/aikar/commands/ACFLog.java
rename to core/src/main/java/co/aikar/commands/ACFLog.java
diff --git a/src/main/java/co/aikar/commands/ACFPatterns.java b/core/src/main/java/co/aikar/commands/ACFPatterns.java
similarity index 100%
rename from src/main/java/co/aikar/commands/ACFPatterns.java
rename to core/src/main/java/co/aikar/commands/ACFPatterns.java
diff --git a/src/main/java/co/aikar/commands/ACFUtil.java b/core/src/main/java/co/aikar/commands/ACFUtil.java
similarity index 100%
rename from src/main/java/co/aikar/commands/ACFUtil.java
rename to core/src/main/java/co/aikar/commands/ACFUtil.java
diff --git a/src/main/java/co/aikar/commands/BaseCommand.java b/core/src/main/java/co/aikar/commands/BaseCommand.java
similarity index 100%
rename from src/main/java/co/aikar/commands/BaseCommand.java
rename to core/src/main/java/co/aikar/commands/BaseCommand.java
diff --git a/src/main/java/co/aikar/commands/BaseSubCommand.java b/core/src/main/java/co/aikar/commands/BaseSubCommand.java
similarity index 100%
rename from src/main/java/co/aikar/commands/BaseSubCommand.java
rename to core/src/main/java/co/aikar/commands/BaseSubCommand.java
diff --git a/src/main/java/co/aikar/commands/BukkitCommandCompletions.java b/core/src/main/java/co/aikar/commands/BukkitCommandCompletions.java
similarity index 100%
rename from src/main/java/co/aikar/commands/BukkitCommandCompletions.java
rename to core/src/main/java/co/aikar/commands/BukkitCommandCompletions.java
diff --git a/src/main/java/co/aikar/commands/BukkitCommandContexts.java b/core/src/main/java/co/aikar/commands/BukkitCommandContexts.java
similarity index 100%
rename from src/main/java/co/aikar/commands/BukkitCommandContexts.java
rename to core/src/main/java/co/aikar/commands/BukkitCommandContexts.java
diff --git a/src/main/java/co/aikar/commands/BukkitCommandContexts_1_12.java b/core/src/main/java/co/aikar/commands/BukkitCommandContexts_1_12.java
similarity index 100%
rename from src/main/java/co/aikar/commands/BukkitCommandContexts_1_12.java
rename to core/src/main/java/co/aikar/commands/BukkitCommandContexts_1_12.java
diff --git a/src/main/java/co/aikar/commands/BukkitCommandManager.java b/core/src/main/java/co/aikar/commands/BukkitCommandManager.java
similarity index 100%
rename from src/main/java/co/aikar/commands/BukkitCommandManager.java
rename to core/src/main/java/co/aikar/commands/BukkitCommandManager.java
diff --git a/src/main/java/co/aikar/commands/CommandCompletions.java b/core/src/main/java/co/aikar/commands/CommandCompletions.java
similarity index 100%
rename from src/main/java/co/aikar/commands/CommandCompletions.java
rename to core/src/main/java/co/aikar/commands/CommandCompletions.java
diff --git a/src/main/java/co/aikar/commands/CommandContexts.java b/core/src/main/java/co/aikar/commands/CommandContexts.java
similarity index 100%
rename from src/main/java/co/aikar/commands/CommandContexts.java
rename to core/src/main/java/co/aikar/commands/CommandContexts.java
diff --git a/src/main/java/co/aikar/commands/CommandExecutionContext.java b/core/src/main/java/co/aikar/commands/CommandExecutionContext.java
similarity index 100%
rename from src/main/java/co/aikar/commands/CommandExecutionContext.java
rename to core/src/main/java/co/aikar/commands/CommandExecutionContext.java
diff --git a/src/main/java/co/aikar/commands/CommandManager.java b/core/src/main/java/co/aikar/commands/CommandManager.java
similarity index 100%
rename from src/main/java/co/aikar/commands/CommandManager.java
rename to core/src/main/java/co/aikar/commands/CommandManager.java
diff --git a/src/main/java/co/aikar/commands/CommandReplacements.java b/core/src/main/java/co/aikar/commands/CommandReplacements.java
similarity index 100%
rename from src/main/java/co/aikar/commands/CommandReplacements.java
rename to core/src/main/java/co/aikar/commands/CommandReplacements.java
diff --git a/src/main/java/co/aikar/commands/ForwardingCommand.java b/core/src/main/java/co/aikar/commands/ForwardingCommand.java
similarity index 100%
rename from src/main/java/co/aikar/commands/ForwardingCommand.java
rename to core/src/main/java/co/aikar/commands/ForwardingCommand.java
diff --git a/src/main/java/co/aikar/commands/InvalidCommandArgument.java b/core/src/main/java/co/aikar/commands/InvalidCommandArgument.java
similarity index 100%
rename from src/main/java/co/aikar/commands/InvalidCommandArgument.java
rename to core/src/main/java/co/aikar/commands/InvalidCommandArgument.java
diff --git a/src/main/java/co/aikar/commands/PaperCommandCompletions.java b/core/src/main/java/co/aikar/commands/PaperCommandCompletions.java
similarity index 100%
rename from src/main/java/co/aikar/commands/PaperCommandCompletions.java
rename to core/src/main/java/co/aikar/commands/PaperCommandCompletions.java
diff --git a/src/main/java/co/aikar/commands/PaperCommandContexts.java b/core/src/main/java/co/aikar/commands/PaperCommandContexts.java
similarity index 100%
rename from src/main/java/co/aikar/commands/PaperCommandContexts.java
rename to core/src/main/java/co/aikar/commands/PaperCommandContexts.java
diff --git a/src/main/java/co/aikar/commands/PaperCommandManager.java b/core/src/main/java/co/aikar/commands/PaperCommandManager.java
similarity index 100%
rename from src/main/java/co/aikar/commands/PaperCommandManager.java
rename to core/src/main/java/co/aikar/commands/PaperCommandManager.java
diff --git a/src/main/java/co/aikar/commands/RegisteredCommand.java b/core/src/main/java/co/aikar/commands/RegisteredCommand.java
similarity index 100%
rename from src/main/java/co/aikar/commands/RegisteredCommand.java
rename to core/src/main/java/co/aikar/commands/RegisteredCommand.java
diff --git a/src/main/java/co/aikar/commands/RootCommand.java b/core/src/main/java/co/aikar/commands/RootCommand.java
similarity index 100%
rename from src/main/java/co/aikar/commands/RootCommand.java
rename to core/src/main/java/co/aikar/commands/RootCommand.java
diff --git a/src/main/java/co/aikar/commands/annotation/CommandAlias.java b/core/src/main/java/co/aikar/commands/annotation/CommandAlias.java
similarity index 100%
rename from src/main/java/co/aikar/commands/annotation/CommandAlias.java
rename to core/src/main/java/co/aikar/commands/annotation/CommandAlias.java
diff --git a/src/main/java/co/aikar/commands/annotation/CommandCompletion.java b/core/src/main/java/co/aikar/commands/annotation/CommandCompletion.java
similarity index 100%
rename from src/main/java/co/aikar/commands/annotation/CommandCompletion.java
rename to core/src/main/java/co/aikar/commands/annotation/CommandCompletion.java
diff --git a/src/main/java/co/aikar/commands/annotation/CommandPermission.java b/core/src/main/java/co/aikar/commands/annotation/CommandPermission.java
similarity index 100%
rename from src/main/java/co/aikar/commands/annotation/CommandPermission.java
rename to core/src/main/java/co/aikar/commands/annotation/CommandPermission.java
diff --git a/src/main/java/co/aikar/commands/annotation/Default.java b/core/src/main/java/co/aikar/commands/annotation/Default.java
similarity index 100%
rename from src/main/java/co/aikar/commands/annotation/Default.java
rename to core/src/main/java/co/aikar/commands/annotation/Default.java
diff --git a/src/main/java/co/aikar/commands/annotation/Flags.java b/core/src/main/java/co/aikar/commands/annotation/Flags.java
similarity index 100%
rename from src/main/java/co/aikar/commands/annotation/Flags.java
rename to core/src/main/java/co/aikar/commands/annotation/Flags.java
diff --git a/src/main/java/co/aikar/commands/annotation/Optional.java b/core/src/main/java/co/aikar/commands/annotation/Optional.java
similarity index 100%
rename from src/main/java/co/aikar/commands/annotation/Optional.java
rename to core/src/main/java/co/aikar/commands/annotation/Optional.java
diff --git a/src/main/java/co/aikar/commands/annotation/Single.java b/core/src/main/java/co/aikar/commands/annotation/Single.java
similarity index 100%
rename from src/main/java/co/aikar/commands/annotation/Single.java
rename to core/src/main/java/co/aikar/commands/annotation/Single.java
diff --git a/src/main/java/co/aikar/commands/annotation/Split.java b/core/src/main/java/co/aikar/commands/annotation/Split.java
similarity index 100%
rename from src/main/java/co/aikar/commands/annotation/Split.java
rename to core/src/main/java/co/aikar/commands/annotation/Split.java
diff --git a/src/main/java/co/aikar/commands/annotation/Subcommand.java b/core/src/main/java/co/aikar/commands/annotation/Subcommand.java
similarity index 100%
rename from src/main/java/co/aikar/commands/annotation/Subcommand.java
rename to core/src/main/java/co/aikar/commands/annotation/Subcommand.java
diff --git a/src/main/java/co/aikar/commands/annotation/Syntax.java b/core/src/main/java/co/aikar/commands/annotation/Syntax.java
similarity index 100%
rename from src/main/java/co/aikar/commands/annotation/Syntax.java
rename to core/src/main/java/co/aikar/commands/annotation/Syntax.java
diff --git a/src/main/java/co/aikar/commands/annotation/UnknownHandler.java b/core/src/main/java/co/aikar/commands/annotation/UnknownHandler.java
similarity index 100%
rename from src/main/java/co/aikar/commands/annotation/UnknownHandler.java
rename to core/src/main/java/co/aikar/commands/annotation/UnknownHandler.java
diff --git a/src/main/java/co/aikar/commands/annotation/Values.java b/core/src/main/java/co/aikar/commands/annotation/Values.java
similarity index 100%
rename from src/main/java/co/aikar/commands/annotation/Values.java
rename to core/src/main/java/co/aikar/commands/annotation/Values.java
diff --git a/src/main/java/co/aikar/commands/contexts/ContextResolver.java b/core/src/main/java/co/aikar/commands/contexts/ContextResolver.java
similarity index 100%
rename from src/main/java/co/aikar/commands/contexts/ContextResolver.java
rename to core/src/main/java/co/aikar/commands/contexts/ContextResolver.java
diff --git a/src/main/java/co/aikar/commands/contexts/OnlinePlayer.java b/core/src/main/java/co/aikar/commands/contexts/OnlinePlayer.java
similarity index 100%
rename from src/main/java/co/aikar/commands/contexts/OnlinePlayer.java
rename to core/src/main/java/co/aikar/commands/contexts/OnlinePlayer.java
diff --git a/src/main/java/co/aikar/commands/contexts/SenderAwareContextResolver.java b/core/src/main/java/co/aikar/commands/contexts/SenderAwareContextResolver.java
similarity index 100%
rename from src/main/java/co/aikar/commands/contexts/SenderAwareContextResolver.java
rename to core/src/main/java/co/aikar/commands/contexts/SenderAwareContextResolver.java
diff --git a/example/acf-example.iml b/example/acf-example.iml
index e51fb445..3ff642d6 100644
--- a/example/acf-example.iml
+++ b/example/acf-example.iml
@@ -34,7 +34,7 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.10-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-all:5.0.4" level="project" />
-    <orderEntry type="module" module-name="acf" />
+    <orderEntry type="module" module-name="acf-core" />
     <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
     <orderEntry type="library" name="Maven: co.aikar:minecraft-timings:1.0.3" level="project" />
   </component>