diff --git a/.classpath b/.classpath index a92a607..2c705bb 100644 --- a/.classpath +++ b/.classpath @@ -1,11 +1,7 @@ - - - - - - + + diff --git a/pom.xml b/pom.xml index 8fb1c31..6ca5cc7 100644 --- a/pom.xml +++ b/pom.xml @@ -1,21 +1,18 @@ 4.0.0 - cn.CityCraft + cn.citycraft SimpleEssential 1.1 SimpleEssential ${project.name} - src - - - src - - **/*.java - - - + + + src/main/resources + true + + maven-compiler-plugin 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: 简单基础插件