diff --git a/.gitignore b/.gitignore index 4089fdb..28d2db2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1,10 @@ -## -# JetBrains IDEs -## +## JetBrains IDEs /.idea/ *.iml -## -# Maven -## -/target/ - +## Maven +/**/target/ dependency-reduced-pom.xml -## -# Misc. -## +## Misc. .DS_Store diff --git a/EpicAnchors-API/pom.xml b/EpicAnchors-API/pom.xml new file mode 100644 index 0000000..1a3cce0 --- /dev/null +++ b/EpicAnchors-API/pom.xml @@ -0,0 +1,60 @@ + + + 4.0.0 + + + com.craftaro + EpicAnchors-Parent + 2.2.7 + ../pom.xml + + EpicAnchors-API + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.5.0 + + + + site + + jar + + + + + + + https://hub.spigotmc.org/javadocs/spigot/ + + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 3.4.5 + + + + org.apache.maven.plugins + maven-site-plugin + 3.12.1 + + + + + + + org.spigotmc + spigot-api + 1.8-R0.1-SNAPSHOT + provided + + + diff --git a/EpicAnchors-Plugin/pom.xml b/EpicAnchors-Plugin/pom.xml new file mode 100644 index 0000000..01de74e --- /dev/null +++ b/EpicAnchors-Plugin/pom.xml @@ -0,0 +1,98 @@ + + + 4.0.0 + + + com.craftaro + EpicAnchors-Parent + 2.2.7 + ../pom.xml + + EpicAnchors-Plugin + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.4.1 + + + + package + + shade + + + + ${project.name}-${project.version} + + false + true + true + + + + com.craftaro.core + com.songoda.epicanchors.core + + + + + + *:* + + + META-INF/** + LICENSE + LICENSE.** + + + + + com.craftaro:CraftaroCore + false + + **/nms/v*/** + + + + + + + + + + + + src/main/resources + true + + + + + + + com.craftaro + EpicAnchors-API + ${project.parent.version} + compile + + + + com.craftaro + CraftaroCore + 3.0.0-SNAPSHOT + compile + + + + org.spigotmc + spigot-api + 1.8-R0.1-SNAPSHOT + provided + + + diff --git a/src/main/java/com/songoda/epicanchors/Anchor.java b/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/Anchor.java similarity index 100% rename from src/main/java/com/songoda/epicanchors/Anchor.java rename to EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/Anchor.java diff --git a/src/main/java/com/songoda/epicanchors/AnchorManager.java b/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/AnchorManager.java similarity index 100% rename from src/main/java/com/songoda/epicanchors/AnchorManager.java rename to EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/AnchorManager.java diff --git a/src/main/java/com/songoda/epicanchors/EpicAnchors.java b/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/EpicAnchors.java similarity index 100% rename from src/main/java/com/songoda/epicanchors/EpicAnchors.java rename to EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/EpicAnchors.java diff --git a/src/main/java/com/songoda/epicanchors/api/AnchorAccessCheck.java b/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/api/AnchorAccessCheck.java similarity index 100% rename from src/main/java/com/songoda/epicanchors/api/AnchorAccessCheck.java rename to EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/api/AnchorAccessCheck.java diff --git a/src/main/java/com/songoda/epicanchors/commands/EpicAnchorsCommand.java b/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/commands/EpicAnchorsCommand.java similarity index 100% rename from src/main/java/com/songoda/epicanchors/commands/EpicAnchorsCommand.java rename to EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/commands/EpicAnchorsCommand.java diff --git a/src/main/java/com/songoda/epicanchors/commands/sub/GiveCommand.java b/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/commands/sub/GiveCommand.java similarity index 100% rename from src/main/java/com/songoda/epicanchors/commands/sub/GiveCommand.java rename to EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/commands/sub/GiveCommand.java diff --git a/src/main/java/com/songoda/epicanchors/commands/sub/ReloadCommand.java b/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/commands/sub/ReloadCommand.java similarity index 100% rename from src/main/java/com/songoda/epicanchors/commands/sub/ReloadCommand.java rename to EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/commands/sub/ReloadCommand.java diff --git a/src/main/java/com/songoda/epicanchors/commands/sub/SettingsCommand.java b/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/commands/sub/SettingsCommand.java similarity index 100% rename from src/main/java/com/songoda/epicanchors/commands/sub/SettingsCommand.java rename to EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/commands/sub/SettingsCommand.java diff --git a/src/main/java/com/songoda/epicanchors/commands/sub/ShowCommand.java b/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/commands/sub/ShowCommand.java similarity index 100% rename from src/main/java/com/songoda/epicanchors/commands/sub/ShowCommand.java rename to EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/commands/sub/ShowCommand.java diff --git a/src/main/java/com/songoda/epicanchors/files/DataManager.java b/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/files/DataManager.java similarity index 100% rename from src/main/java/com/songoda/epicanchors/files/DataManager.java rename to EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/files/DataManager.java diff --git a/src/main/java/com/songoda/epicanchors/files/Settings.java b/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/files/Settings.java similarity index 100% rename from src/main/java/com/songoda/epicanchors/files/Settings.java rename to EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/files/Settings.java diff --git a/src/main/java/com/songoda/epicanchors/files/migration/AnchorMigration.java b/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/files/migration/AnchorMigration.java similarity index 100% rename from src/main/java/com/songoda/epicanchors/files/migration/AnchorMigration.java rename to EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/files/migration/AnchorMigration.java diff --git a/src/main/java/com/songoda/epicanchors/files/migration/_1_InitialMigration.java b/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/files/migration/_1_InitialMigration.java similarity index 100% rename from src/main/java/com/songoda/epicanchors/files/migration/_1_InitialMigration.java rename to EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/files/migration/_1_InitialMigration.java diff --git a/src/main/java/com/songoda/epicanchors/guis/AnchorGui.java b/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/guis/AnchorGui.java similarity index 100% rename from src/main/java/com/songoda/epicanchors/guis/AnchorGui.java rename to EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/guis/AnchorGui.java diff --git a/src/main/java/com/songoda/epicanchors/guis/DestroyConfirmationGui.java b/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/guis/DestroyConfirmationGui.java similarity index 100% rename from src/main/java/com/songoda/epicanchors/guis/DestroyConfirmationGui.java rename to EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/guis/DestroyConfirmationGui.java diff --git a/src/main/java/com/songoda/epicanchors/listener/AnchorListener.java b/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/listener/AnchorListener.java similarity index 100% rename from src/main/java/com/songoda/epicanchors/listener/AnchorListener.java rename to EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/listener/AnchorListener.java diff --git a/src/main/java/com/songoda/epicanchors/listener/BlockListener.java b/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/listener/BlockListener.java similarity index 100% rename from src/main/java/com/songoda/epicanchors/listener/BlockListener.java rename to EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/listener/BlockListener.java diff --git a/src/main/java/com/songoda/epicanchors/listener/DebugListener.java b/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/listener/DebugListener.java similarity index 100% rename from src/main/java/com/songoda/epicanchors/listener/DebugListener.java rename to EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/listener/DebugListener.java diff --git a/src/main/java/com/songoda/epicanchors/listener/WorldListener.java b/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/listener/WorldListener.java similarity index 100% rename from src/main/java/com/songoda/epicanchors/listener/WorldListener.java rename to EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/listener/WorldListener.java diff --git a/src/main/java/com/songoda/epicanchors/tasks/AnchorTask.java b/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/tasks/AnchorTask.java similarity index 100% rename from src/main/java/com/songoda/epicanchors/tasks/AnchorTask.java rename to EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/tasks/AnchorTask.java diff --git a/src/main/java/com/songoda/epicanchors/tasks/VisualizeTask.java b/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/tasks/VisualizeTask.java similarity index 100% rename from src/main/java/com/songoda/epicanchors/tasks/VisualizeTask.java rename to EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/tasks/VisualizeTask.java diff --git a/src/main/java/com/songoda/epicanchors/utils/Callback.java b/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/utils/Callback.java similarity index 100% rename from src/main/java/com/songoda/epicanchors/utils/Callback.java rename to EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/utils/Callback.java diff --git a/src/main/java/com/songoda/epicanchors/utils/ThreadSync.java b/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/utils/ThreadSync.java similarity index 100% rename from src/main/java/com/songoda/epicanchors/utils/ThreadSync.java rename to EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/utils/ThreadSync.java diff --git a/src/main/java/com/songoda/epicanchors/utils/UpdateCallback.java b/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/utils/UpdateCallback.java similarity index 100% rename from src/main/java/com/songoda/epicanchors/utils/UpdateCallback.java rename to EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/utils/UpdateCallback.java diff --git a/src/main/java/com/songoda/epicanchors/utils/Utils.java b/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/utils/Utils.java similarity index 100% rename from src/main/java/com/songoda/epicanchors/utils/Utils.java rename to EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/utils/Utils.java diff --git a/src/main/java/com/songoda/epicanchors/utils/WorldUtils.java b/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/utils/WorldUtils.java similarity index 100% rename from src/main/java/com/songoda/epicanchors/utils/WorldUtils.java rename to EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/utils/WorldUtils.java diff --git a/src/main/resources/en_US.lang b/EpicAnchors-Plugin/src/main/resources/en_US.lang similarity index 100% rename from src/main/resources/en_US.lang rename to EpicAnchors-Plugin/src/main/resources/en_US.lang diff --git a/src/main/resources/plugin.yml b/EpicAnchors-Plugin/src/main/resources/plugin.yml similarity index 80% rename from src/main/resources/plugin.yml rename to EpicAnchors-Plugin/src/main/resources/plugin.yml index d064692..787fbe0 100644 --- a/src/main/resources/plugin.yml +++ b/EpicAnchors-Plugin/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ -name: ${project.name} -description: ${project.description} +name: ${project.parent.name} +description: ${project.parent.description} version: ${project.version} api-version: 1.13 @@ -11,7 +11,7 @@ softdepend: author: Craftaro authors: [ SpraxDev ] -website: ${project.url} +website: ${project.parent.url} commands: EpicAnchors: diff --git a/pom.xml b/pom.xml index 1ab5233..1641736 100644 --- a/pom.xml +++ b/pom.xml @@ -4,17 +4,25 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.songoda - EpicAnchors + com.craftaro + EpicAnchors-Parent + pom 2.2.7 + + + + EpicAnchors-API + EpicAnchors-Plugin + EpicAnchors Allow your players to keep chunks loaded for a limited amount of time for a cost. https://songoda.com/marketplace/product/31 - 1.8 - 8 + 8 + 1.8 + 1.8 UTF-8 @@ -32,107 +40,14 @@ scm:git:git://github.com/craftaro/EpicAnchors.git - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.11.0 - - - ${java.version} - ${java.version} - - ${java.release} - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.4.1 - - - - package - - shade - - - - ${project.name}-${project.version} - - false - true - true - - - - com.craftaro.core - com.songoda.epicanchors.core - - - - - - *:* - - - META-INF/** - LICENSE - LICENSE.** - - - - - com.craftaro:CraftaroCore - false - - **/nms/v*/** - - - - - - - - - - - - src/main/resources - true - - - - - SpigotMC + spigot-repo https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - songoda-public - https://repo.songoda.com/repository/public/ - - - org.spigotmc - spigot-api - 1.8-R0.1-SNAPSHOT - provided - - - - com.craftaro - CraftaroCore - 3.0.0-SNAPSHOT - compile - - org.jetbrains