From 1b9b4f6dc8acc7c222fdaf21e32c234d50f00110 Mon Sep 17 00:00:00 2001
From: 502647092 <jtb1@163.com>
Date: Mon, 24 Aug 2015 10:55:40 +0800
Subject: [PATCH] move file use maven...

Signed-off-by: 502647092 <jtb1@163.com>
---
 .classpath                                      |  8 ++------
 pom.xml                                         | 17 +++++++----------
 .../SimpleEssential/SimpleEssential.java        |  0
 .../SimpleEssential/command/BaseCommand.java    |  0
 .../SimpleEssential/command/CommandBack.java    |  0
 .../command/CommandEnchantBench.java            |  0
 .../SimpleEssential/command/CommandHat.java     |  0
 .../SimpleEssential/command/CommandHome.java    |  0
 .../SimpleEssential/command/CommandSetHome.java |  0
 .../command/CommandSetSpawn.java                |  0
 .../SimpleEssential/command/CommandSpawn.java   |  0
 .../SimpleEssential/command/CommandSuicide.java |  0
 .../SimpleEssential/command/CommandTop.java     |  0
 .../SimpleEssential/command/CommandTpa.java     |  0
 .../command/CommandTpaccept.java                |  0
 .../SimpleEssential/command/CommandTpdeny.java  |  0
 .../SimpleEssential/command/CommandTphere.java  |  0
 .../command/CommandWorkBench.java               |  0
 .../SimpleEssential/config/Config.java          |  0
 .../SimpleEssential/config/ConfigLoader.java    |  0
 .../SimpleEssential/config/FileConfig.java      |  0
 .../SimpleEssential/config/Language.java        |  0
 .../SimpleEssential/config/PlayerConfig.java    |  0
 .../inventory/InventoryControl.java             |  0
 .../listen/PlayerInventoryViewListen.java       |  0
 .../listen/PlayerLocationListen.java            |  0
 .../teleport/TeleportControl.java               |  0
 .../SimpleEssential/teleport/TeleportInfo.java  |  0
 .../SimpleEssential/teleport/TeleportType.java  |  0
 .../SimpleEssential/utils/EffectUtil.java       |  0
 .../SimpleEssential/utils/VersionChecker.java   |  0
 src/{ => main/resources}/config.yml             |  0
 src/{ => main/resources}/language.yml           |  0
 src/{ => main/resources}/plugin.yml             |  8 ++++----
 34 files changed, 13 insertions(+), 20 deletions(-)
 rename src/{ => main/java}/cn/citycraft/SimpleEssential/SimpleEssential.java (100%)
 rename src/{ => main/java}/cn/citycraft/SimpleEssential/command/BaseCommand.java (100%)
 rename src/{ => main/java}/cn/citycraft/SimpleEssential/command/CommandBack.java (100%)
 rename src/{ => main/java}/cn/citycraft/SimpleEssential/command/CommandEnchantBench.java (100%)
 rename src/{ => main/java}/cn/citycraft/SimpleEssential/command/CommandHat.java (100%)
 rename src/{ => main/java}/cn/citycraft/SimpleEssential/command/CommandHome.java (100%)
 rename src/{ => main/java}/cn/citycraft/SimpleEssential/command/CommandSetHome.java (100%)
 rename src/{ => main/java}/cn/citycraft/SimpleEssential/command/CommandSetSpawn.java (100%)
 rename src/{ => main/java}/cn/citycraft/SimpleEssential/command/CommandSpawn.java (100%)
 rename src/{ => main/java}/cn/citycraft/SimpleEssential/command/CommandSuicide.java (100%)
 rename src/{ => main/java}/cn/citycraft/SimpleEssential/command/CommandTop.java (100%)
 rename src/{ => main/java}/cn/citycraft/SimpleEssential/command/CommandTpa.java (100%)
 rename src/{ => main/java}/cn/citycraft/SimpleEssential/command/CommandTpaccept.java (100%)
 rename src/{ => main/java}/cn/citycraft/SimpleEssential/command/CommandTpdeny.java (100%)
 rename src/{ => main/java}/cn/citycraft/SimpleEssential/command/CommandTphere.java (100%)
 rename src/{ => main/java}/cn/citycraft/SimpleEssential/command/CommandWorkBench.java (100%)
 rename src/{ => main/java}/cn/citycraft/SimpleEssential/config/Config.java (100%)
 rename src/{ => main/java}/cn/citycraft/SimpleEssential/config/ConfigLoader.java (100%)
 rename src/{ => main/java}/cn/citycraft/SimpleEssential/config/FileConfig.java (100%)
 rename src/{ => main/java}/cn/citycraft/SimpleEssential/config/Language.java (100%)
 rename src/{ => main/java}/cn/citycraft/SimpleEssential/config/PlayerConfig.java (100%)
 rename src/{ => main/java}/cn/citycraft/SimpleEssential/inventory/InventoryControl.java (100%)
 rename src/{ => main/java}/cn/citycraft/SimpleEssential/listen/PlayerInventoryViewListen.java (100%)
 rename src/{ => main/java}/cn/citycraft/SimpleEssential/listen/PlayerLocationListen.java (100%)
 rename src/{ => main/java}/cn/citycraft/SimpleEssential/teleport/TeleportControl.java (100%)
 rename src/{ => main/java}/cn/citycraft/SimpleEssential/teleport/TeleportInfo.java (100%)
 rename src/{ => main/java}/cn/citycraft/SimpleEssential/teleport/TeleportType.java (100%)
 rename src/{ => main/java}/cn/citycraft/SimpleEssential/utils/EffectUtil.java (100%)
 rename src/{ => main/java}/cn/citycraft/SimpleEssential/utils/VersionChecker.java (100%)
 rename src/{ => main/resources}/config.yml (100%)
 rename src/{ => main/resources}/language.yml (100%)
 rename src/{ => main/resources}/plugin.yml (92%)

diff --git a/.classpath b/.classpath
index a92a607..2c705bb 100644
--- a/.classpath
+++ b/.classpath
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/pom.xml b/pom.xml
index 8fb1c31..6ca5cc7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,21 +1,18 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>cn.CityCraft</groupId>
+	<groupId>cn.citycraft</groupId>
 	<artifactId>SimpleEssential</artifactId>
 	<version>1.1</version>
 	<name>SimpleEssential</name>
 	<build>
 		<finalName>${project.name}</finalName>
-		<sourceDirectory>src</sourceDirectory>
-		<resources>
-			<resource>
-				<directory>src</directory>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</resource>
-		</resources>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/cn/citycraft/SimpleEssential/SimpleEssential.java b/src/main/java/cn/citycraft/SimpleEssential/SimpleEssential.java
similarity index 100%
rename from src/cn/citycraft/SimpleEssential/SimpleEssential.java
rename to src/main/java/cn/citycraft/SimpleEssential/SimpleEssential.java
diff --git a/src/cn/citycraft/SimpleEssential/command/BaseCommand.java b/src/main/java/cn/citycraft/SimpleEssential/command/BaseCommand.java
similarity index 100%
rename from src/cn/citycraft/SimpleEssential/command/BaseCommand.java
rename to src/main/java/cn/citycraft/SimpleEssential/command/BaseCommand.java
diff --git a/src/cn/citycraft/SimpleEssential/command/CommandBack.java b/src/main/java/cn/citycraft/SimpleEssential/command/CommandBack.java
similarity index 100%
rename from src/cn/citycraft/SimpleEssential/command/CommandBack.java
rename to src/main/java/cn/citycraft/SimpleEssential/command/CommandBack.java
diff --git a/src/cn/citycraft/SimpleEssential/command/CommandEnchantBench.java b/src/main/java/cn/citycraft/SimpleEssential/command/CommandEnchantBench.java
similarity index 100%
rename from src/cn/citycraft/SimpleEssential/command/CommandEnchantBench.java
rename to src/main/java/cn/citycraft/SimpleEssential/command/CommandEnchantBench.java
diff --git a/src/cn/citycraft/SimpleEssential/command/CommandHat.java b/src/main/java/cn/citycraft/SimpleEssential/command/CommandHat.java
similarity index 100%
rename from src/cn/citycraft/SimpleEssential/command/CommandHat.java
rename to src/main/java/cn/citycraft/SimpleEssential/command/CommandHat.java
diff --git a/src/cn/citycraft/SimpleEssential/command/CommandHome.java b/src/main/java/cn/citycraft/SimpleEssential/command/CommandHome.java
similarity index 100%
rename from src/cn/citycraft/SimpleEssential/command/CommandHome.java
rename to src/main/java/cn/citycraft/SimpleEssential/command/CommandHome.java
diff --git a/src/cn/citycraft/SimpleEssential/command/CommandSetHome.java b/src/main/java/cn/citycraft/SimpleEssential/command/CommandSetHome.java
similarity index 100%
rename from src/cn/citycraft/SimpleEssential/command/CommandSetHome.java
rename to src/main/java/cn/citycraft/SimpleEssential/command/CommandSetHome.java
diff --git a/src/cn/citycraft/SimpleEssential/command/CommandSetSpawn.java b/src/main/java/cn/citycraft/SimpleEssential/command/CommandSetSpawn.java
similarity index 100%
rename from src/cn/citycraft/SimpleEssential/command/CommandSetSpawn.java
rename to src/main/java/cn/citycraft/SimpleEssential/command/CommandSetSpawn.java
diff --git a/src/cn/citycraft/SimpleEssential/command/CommandSpawn.java b/src/main/java/cn/citycraft/SimpleEssential/command/CommandSpawn.java
similarity index 100%
rename from src/cn/citycraft/SimpleEssential/command/CommandSpawn.java
rename to src/main/java/cn/citycraft/SimpleEssential/command/CommandSpawn.java
diff --git a/src/cn/citycraft/SimpleEssential/command/CommandSuicide.java b/src/main/java/cn/citycraft/SimpleEssential/command/CommandSuicide.java
similarity index 100%
rename from src/cn/citycraft/SimpleEssential/command/CommandSuicide.java
rename to src/main/java/cn/citycraft/SimpleEssential/command/CommandSuicide.java
diff --git a/src/cn/citycraft/SimpleEssential/command/CommandTop.java b/src/main/java/cn/citycraft/SimpleEssential/command/CommandTop.java
similarity index 100%
rename from src/cn/citycraft/SimpleEssential/command/CommandTop.java
rename to src/main/java/cn/citycraft/SimpleEssential/command/CommandTop.java
diff --git a/src/cn/citycraft/SimpleEssential/command/CommandTpa.java b/src/main/java/cn/citycraft/SimpleEssential/command/CommandTpa.java
similarity index 100%
rename from src/cn/citycraft/SimpleEssential/command/CommandTpa.java
rename to src/main/java/cn/citycraft/SimpleEssential/command/CommandTpa.java
diff --git a/src/cn/citycraft/SimpleEssential/command/CommandTpaccept.java b/src/main/java/cn/citycraft/SimpleEssential/command/CommandTpaccept.java
similarity index 100%
rename from src/cn/citycraft/SimpleEssential/command/CommandTpaccept.java
rename to src/main/java/cn/citycraft/SimpleEssential/command/CommandTpaccept.java
diff --git a/src/cn/citycraft/SimpleEssential/command/CommandTpdeny.java b/src/main/java/cn/citycraft/SimpleEssential/command/CommandTpdeny.java
similarity index 100%
rename from src/cn/citycraft/SimpleEssential/command/CommandTpdeny.java
rename to src/main/java/cn/citycraft/SimpleEssential/command/CommandTpdeny.java
diff --git a/src/cn/citycraft/SimpleEssential/command/CommandTphere.java b/src/main/java/cn/citycraft/SimpleEssential/command/CommandTphere.java
similarity index 100%
rename from src/cn/citycraft/SimpleEssential/command/CommandTphere.java
rename to src/main/java/cn/citycraft/SimpleEssential/command/CommandTphere.java
diff --git a/src/cn/citycraft/SimpleEssential/command/CommandWorkBench.java b/src/main/java/cn/citycraft/SimpleEssential/command/CommandWorkBench.java
similarity index 100%
rename from src/cn/citycraft/SimpleEssential/command/CommandWorkBench.java
rename to src/main/java/cn/citycraft/SimpleEssential/command/CommandWorkBench.java
diff --git a/src/cn/citycraft/SimpleEssential/config/Config.java b/src/main/java/cn/citycraft/SimpleEssential/config/Config.java
similarity index 100%
rename from src/cn/citycraft/SimpleEssential/config/Config.java
rename to src/main/java/cn/citycraft/SimpleEssential/config/Config.java
diff --git a/src/cn/citycraft/SimpleEssential/config/ConfigLoader.java b/src/main/java/cn/citycraft/SimpleEssential/config/ConfigLoader.java
similarity index 100%
rename from src/cn/citycraft/SimpleEssential/config/ConfigLoader.java
rename to src/main/java/cn/citycraft/SimpleEssential/config/ConfigLoader.java
diff --git a/src/cn/citycraft/SimpleEssential/config/FileConfig.java b/src/main/java/cn/citycraft/SimpleEssential/config/FileConfig.java
similarity index 100%
rename from src/cn/citycraft/SimpleEssential/config/FileConfig.java
rename to src/main/java/cn/citycraft/SimpleEssential/config/FileConfig.java
diff --git a/src/cn/citycraft/SimpleEssential/config/Language.java b/src/main/java/cn/citycraft/SimpleEssential/config/Language.java
similarity index 100%
rename from src/cn/citycraft/SimpleEssential/config/Language.java
rename to src/main/java/cn/citycraft/SimpleEssential/config/Language.java
diff --git a/src/cn/citycraft/SimpleEssential/config/PlayerConfig.java b/src/main/java/cn/citycraft/SimpleEssential/config/PlayerConfig.java
similarity index 100%
rename from src/cn/citycraft/SimpleEssential/config/PlayerConfig.java
rename to src/main/java/cn/citycraft/SimpleEssential/config/PlayerConfig.java
diff --git a/src/cn/citycraft/SimpleEssential/inventory/InventoryControl.java b/src/main/java/cn/citycraft/SimpleEssential/inventory/InventoryControl.java
similarity index 100%
rename from src/cn/citycraft/SimpleEssential/inventory/InventoryControl.java
rename to src/main/java/cn/citycraft/SimpleEssential/inventory/InventoryControl.java
diff --git a/src/cn/citycraft/SimpleEssential/listen/PlayerInventoryViewListen.java b/src/main/java/cn/citycraft/SimpleEssential/listen/PlayerInventoryViewListen.java
similarity index 100%
rename from src/cn/citycraft/SimpleEssential/listen/PlayerInventoryViewListen.java
rename to src/main/java/cn/citycraft/SimpleEssential/listen/PlayerInventoryViewListen.java
diff --git a/src/cn/citycraft/SimpleEssential/listen/PlayerLocationListen.java b/src/main/java/cn/citycraft/SimpleEssential/listen/PlayerLocationListen.java
similarity index 100%
rename from src/cn/citycraft/SimpleEssential/listen/PlayerLocationListen.java
rename to src/main/java/cn/citycraft/SimpleEssential/listen/PlayerLocationListen.java
diff --git a/src/cn/citycraft/SimpleEssential/teleport/TeleportControl.java b/src/main/java/cn/citycraft/SimpleEssential/teleport/TeleportControl.java
similarity index 100%
rename from src/cn/citycraft/SimpleEssential/teleport/TeleportControl.java
rename to src/main/java/cn/citycraft/SimpleEssential/teleport/TeleportControl.java
diff --git a/src/cn/citycraft/SimpleEssential/teleport/TeleportInfo.java b/src/main/java/cn/citycraft/SimpleEssential/teleport/TeleportInfo.java
similarity index 100%
rename from src/cn/citycraft/SimpleEssential/teleport/TeleportInfo.java
rename to src/main/java/cn/citycraft/SimpleEssential/teleport/TeleportInfo.java
diff --git a/src/cn/citycraft/SimpleEssential/teleport/TeleportType.java b/src/main/java/cn/citycraft/SimpleEssential/teleport/TeleportType.java
similarity index 100%
rename from src/cn/citycraft/SimpleEssential/teleport/TeleportType.java
rename to src/main/java/cn/citycraft/SimpleEssential/teleport/TeleportType.java
diff --git a/src/cn/citycraft/SimpleEssential/utils/EffectUtil.java b/src/main/java/cn/citycraft/SimpleEssential/utils/EffectUtil.java
similarity index 100%
rename from src/cn/citycraft/SimpleEssential/utils/EffectUtil.java
rename to src/main/java/cn/citycraft/SimpleEssential/utils/EffectUtil.java
diff --git a/src/cn/citycraft/SimpleEssential/utils/VersionChecker.java b/src/main/java/cn/citycraft/SimpleEssential/utils/VersionChecker.java
similarity index 100%
rename from src/cn/citycraft/SimpleEssential/utils/VersionChecker.java
rename to src/main/java/cn/citycraft/SimpleEssential/utils/VersionChecker.java
diff --git a/src/config.yml b/src/main/resources/config.yml
similarity index 100%
rename from src/config.yml
rename to src/main/resources/config.yml
diff --git a/src/language.yml b/src/main/resources/language.yml
similarity index 100%
rename from src/language.yml
rename to src/main/resources/language.yml
diff --git a/src/plugin.yml b/src/main/resources/plugin.yml
similarity index 92%
rename from src/plugin.yml
rename to src/main/resources/plugin.yml
index f4bb190..87f49d8 100644
--- a/src/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,7 +1,7 @@
-name: SimpleEssential
-main: cn.citycraft.SimpleEssential.SimpleEssential
-website: http://ci.citycraft.cn:8800/jenkins/job/SimpleEssential/
-version: 1.1
+name: ${project.artifactId}
+main: ${project.groupId}.${project.artifactId}.${project.artifactId}
+website: http://ci.citycraft.cn:8800/jenkins/job/${project.artifactId}/
+version: ${project.version}
 commands:
   simpleessential:
     description: 简单基础插件